Use org.mvndaemon package

This commit is contained in:
Guillaume Nodet
2020-11-12 00:39:22 +01:00
committed by Peter Palaga
parent c8c5d08e1f
commit c83f7045d6
141 changed files with 373 additions and 374 deletions

View File

@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.fuse.mvnd</groupId>
<groupId>org.mvndaemon.mvnd</groupId>
<artifactId>mvnd</artifactId>
<version>0.0.12-SNAPSHOT</version>
</parent>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.fuse.mvnd</groupId>
<groupId>org.mvndaemon.mvnd</groupId>
<artifactId>mvnd-common</artifactId>
</dependency>
<dependency>
@@ -117,13 +117,13 @@
</executions>
<configuration>
<skip>false</skip>
<mainClass>org.jboss.fuse.mvnd.client.DefaultClient</mainClass>
<mainClass>org.mvndaemon.mvnd.client.DefaultClient</mainClass>
<imageName>mvnd</imageName>
<buildArgs>
--no-server
--no-fallback
--allow-incomplete-classpath
-H:IncludeResources=org/jboss/fuse/mvnd/.*
-H:IncludeResources=org/mvndaemon/mvnd/.*
-H:-ParseRuntimeOptions
-ea
</buildArgs>

View File

@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.client;
package org.mvndaemon.mvnd.client;
import java.util.Arrays;
import java.util.List;
import org.jboss.fuse.mvnd.common.logging.ClientOutput;
import org.mvndaemon.mvnd.common.logging.ClientOutput;
public interface Client {

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.client;
package org.mvndaemon.mvnd.client;
import java.io.Closeable;
import java.io.IOException;
@@ -26,12 +26,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.jboss.fuse.mvnd.common.DaemonConnection;
import org.jboss.fuse.mvnd.common.DaemonException;
import org.jboss.fuse.mvnd.common.DaemonException.ConnectException;
import org.jboss.fuse.mvnd.common.DaemonException.StaleAddressException;
import org.jboss.fuse.mvnd.common.DaemonInfo;
import org.jboss.fuse.mvnd.common.Message;
import org.mvndaemon.mvnd.common.DaemonConnection;
import org.mvndaemon.mvnd.common.DaemonException;
import org.mvndaemon.mvnd.common.DaemonException.ConnectException;
import org.mvndaemon.mvnd.common.DaemonException.StaleAddressException;
import org.mvndaemon.mvnd.common.DaemonInfo;
import org.mvndaemon.mvnd.common.Message;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.client;
package org.mvndaemon.mvnd.client;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@@ -32,25 +32,25 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import org.jboss.fuse.mvnd.common.BuildProperties;
import org.jboss.fuse.mvnd.common.DaemonCompatibilitySpec;
import org.jboss.fuse.mvnd.common.DaemonCompatibilitySpec.Result;
import org.jboss.fuse.mvnd.common.DaemonConnection;
import org.jboss.fuse.mvnd.common.DaemonException;
import org.jboss.fuse.mvnd.common.DaemonInfo;
import org.jboss.fuse.mvnd.common.DaemonRegistry;
import org.jboss.fuse.mvnd.common.DaemonState;
import org.jboss.fuse.mvnd.common.DaemonStopEvent;
import org.jboss.fuse.mvnd.common.Environment;
import org.jboss.fuse.mvnd.common.MavenDaemon;
import org.jboss.fuse.mvnd.common.Message;
import org.jboss.fuse.mvnd.common.Os;
import org.jboss.fuse.mvnd.common.logging.ClientOutput;
import org.mvndaemon.mvnd.common.BuildProperties;
import org.mvndaemon.mvnd.common.DaemonCompatibilitySpec;
import org.mvndaemon.mvnd.common.DaemonCompatibilitySpec.Result;
import org.mvndaemon.mvnd.common.DaemonConnection;
import org.mvndaemon.mvnd.common.DaemonException;
import org.mvndaemon.mvnd.common.DaemonInfo;
import org.mvndaemon.mvnd.common.DaemonRegistry;
import org.mvndaemon.mvnd.common.DaemonState;
import org.mvndaemon.mvnd.common.DaemonStopEvent;
import org.mvndaemon.mvnd.common.Environment;
import org.mvndaemon.mvnd.common.MavenDaemon;
import org.mvndaemon.mvnd.common.Message;
import org.mvndaemon.mvnd.common.Os;
import org.mvndaemon.mvnd.common.logging.ClientOutput;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.lang.Thread.sleep;
import static org.jboss.fuse.mvnd.common.DaemonState.Canceled;
import static org.mvndaemon.mvnd.common.DaemonState.Canceled;
/**
* File origin:
@@ -135,7 +135,7 @@ public class DaemonConnector {
AtomicReference<Throwable> throwable = new AtomicReference<>();
Thread serverThread = new Thread(() -> {
try {
Class<?> clazz = getClass().getClassLoader().loadClass("org.jboss.fuse.mvnd.daemon.Server");
Class<?> clazz = getClass().getClassLoader().loadClass("org.mvndaemon.mvnd.daemon.Server");
try (AutoCloseable server = (AutoCloseable) clazz.getConstructor().newInstance()) {
((Runnable) server).run();
}

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.client;
package org.mvndaemon.mvnd.client;
import java.io.BufferedReader;
import java.io.IOException;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.client;
package org.mvndaemon.mvnd.client;
import java.io.File;
import java.io.IOException;
@@ -38,9 +38,9 @@ import org.apache.maven.cli.internal.extension.model.CoreExtension;
import org.apache.maven.cli.internal.extension.model.io.xpp3.CoreExtensionsXpp3Reader;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.jboss.fuse.mvnd.common.BuildProperties;
import org.jboss.fuse.mvnd.common.Environment;
import org.jboss.fuse.mvnd.common.Os;
import org.mvndaemon.mvnd.common.BuildProperties;
import org.mvndaemon.mvnd.common.Environment;
import org.mvndaemon.mvnd.common.Os;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.client;
package org.mvndaemon.mvnd.client;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -23,18 +23,18 @@ import java.time.ZoneId;
import java.util.ArrayList;
import java.util.List;
import org.fusesource.jansi.Ansi;
import org.jboss.fuse.mvnd.common.BuildProperties;
import org.jboss.fuse.mvnd.common.DaemonException;
import org.jboss.fuse.mvnd.common.DaemonInfo;
import org.jboss.fuse.mvnd.common.DaemonRegistry;
import org.jboss.fuse.mvnd.common.Environment;
import org.jboss.fuse.mvnd.common.Message;
import org.jboss.fuse.mvnd.common.Message.BuildException;
import org.jboss.fuse.mvnd.common.OsUtils;
import org.jboss.fuse.mvnd.common.logging.ClientOutput;
import org.jboss.fuse.mvnd.common.logging.TerminalOutput;
import org.jline.utils.AttributedString;
import org.jline.utils.AttributedStyle;
import org.mvndaemon.mvnd.common.BuildProperties;
import org.mvndaemon.mvnd.common.DaemonException;
import org.mvndaemon.mvnd.common.DaemonInfo;
import org.mvndaemon.mvnd.common.DaemonRegistry;
import org.mvndaemon.mvnd.common.Environment;
import org.mvndaemon.mvnd.common.Message;
import org.mvndaemon.mvnd.common.Message.BuildException;
import org.mvndaemon.mvnd.common.OsUtils;
import org.mvndaemon.mvnd.common.logging.ClientOutput;
import org.mvndaemon.mvnd.common.logging.TerminalOutput;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.client;
package org.mvndaemon.mvnd.client;
/**
* A result of a {@code mvnd} build.

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.client.svm;
package org.mvndaemon.mvnd.client.svm;
import com.oracle.svm.core.annotate.AutomaticFeature;
import org.graalvm.nativeimage.hosted.Feature;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.client.svm;
package org.mvndaemon.mvnd.client.svm;
import com.oracle.svm.core.annotate.Substitute;
import com.oracle.svm.core.annotate.TargetClass;

View File

@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.client;
package org.mvndaemon.mvnd.client;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import org.jboss.fuse.mvnd.common.Environment;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.common.Environment;
public class EnvironmentTest {

View File

@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.client;
package org.mvndaemon.mvnd.client;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.common.OsUtils;
import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.common.OsUtils;
public class OsUtilsTest {

View File

@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.fuse.mvnd</groupId>
<groupId>org.mvndaemon.mvnd</groupId>
<artifactId>mvnd</artifactId>
<version>0.0.12-SNAPSHOT</version>
</parent>

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import java.nio.Buffer;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import java.io.IOException;
import java.io.InputStream;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import java.nio.file.Path;
import java.nio.file.Paths;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import java.io.Closeable;
import java.io.DataInputStream;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
public class DaemonException extends RuntimeException {

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
/**
* Expiration status for daemon expiration check results.

View File

@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import java.util.List;
import static org.jboss.fuse.mvnd.common.DaemonState.Busy;
import static org.jboss.fuse.mvnd.common.DaemonState.Idle;
import static org.mvndaemon.mvnd.common.DaemonState.Busy;
import static org.mvndaemon.mvnd.common.DaemonState.Idle;
/**
* File origin:

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import java.io.File;
import java.io.IOException;
@@ -41,8 +41,8 @@ import org.slf4j.LoggerFactory;
import sun.misc.Unsafe;
import sun.nio.ch.DirectBuffer;
import static org.jboss.fuse.mvnd.common.DaemonState.Canceled;
import static org.jboss.fuse.mvnd.common.DaemonState.Idle;
import static org.mvndaemon.mvnd.common.DaemonState.Canceled;
import static org.mvndaemon.mvnd.common.DaemonState.Idle;
/**
* Access to daemon registry files. Useful also for testing.

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
/**
* File origin

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import java.io.Serializable;
import java.text.DateFormat;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import java.nio.file.Path;
import java.nio.file.Paths;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import java.io.File;
import java.net.MalformedURLException;
@@ -71,7 +71,7 @@ public class MavenDaemon {
}
};
Thread.currentThread().setContextClassLoader(loader);
Class<?> clazz = loader.loadClass("org.jboss.fuse.mvnd.daemon.Server");
Class<?> clazz = loader.loadClass("org.mvndaemon.mvnd.daemon.Server");
try (AutoCloseable server = (AutoCloseable) clazz.getConstructor().newInstance()) {
((Runnable) server).run();
}

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import java.io.DataInputStream;
import java.io.DataOutputStream;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import java.util.Locale;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import java.io.BufferedReader;
import java.io.IOException;

View File

@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common.logging;
package org.mvndaemon.mvnd.common.logging;
import java.util.List;
import java.util.function.Consumer;
import org.jboss.fuse.mvnd.common.Message;
import org.mvndaemon.mvnd.common.Message;
/**
* A sink for various kinds of events sent by the daemon.

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common.logging;
package org.mvndaemon.mvnd.common.logging;
import java.io.IOException;
import java.io.InterruptedIOException;
@@ -33,11 +33,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Consumer;
import java.util.stream.Collector;
import java.util.stream.Collectors;
import org.jboss.fuse.mvnd.common.Message;
import org.jboss.fuse.mvnd.common.Message.BuildException;
import org.jboss.fuse.mvnd.common.Message.BuildStarted;
import org.jboss.fuse.mvnd.common.Message.ProjectEvent;
import org.jboss.fuse.mvnd.common.Message.StringMessage;
import org.jline.terminal.Size;
import org.jline.terminal.Terminal;
import org.jline.terminal.TerminalBuilder;
@@ -46,6 +41,11 @@ import org.jline.utils.AttributedString;
import org.jline.utils.AttributedStringBuilder;
import org.jline.utils.AttributedStyle;
import org.jline.utils.Display;
import org.mvndaemon.mvnd.common.Message;
import org.mvndaemon.mvnd.common.Message.BuildException;
import org.mvndaemon.mvnd.common.Message.BuildStarted;
import org.mvndaemon.mvnd.common.Message.ProjectEvent;
import org.mvndaemon.mvnd.common.Message.StringMessage;
/**
* A terminal {@link ClientOutput} based on JLine.

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import java.io.File;
import java.io.IOException;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.common;
package org.mvndaemon.mvnd.common;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

View File

@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.fuse.mvnd</groupId>
<groupId>org.mvndaemon.mvnd</groupId>
<artifactId>mvnd</artifactId>
<version>0.0.12-SNAPSHOT</version>
</parent>
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.fuse.mvnd</groupId>
<groupId>org.mvndaemon.mvnd</groupId>
<artifactId>mvnd-common</artifactId>
<exclusions>
<exclusion>

View File

@@ -90,10 +90,10 @@ import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.transfer.TransferListener;
import org.jboss.fuse.mvnd.common.Environment;
import org.jboss.fuse.mvnd.logging.internal.Slf4jLoggerManager;
import org.jboss.fuse.mvnd.logging.smart.AbstractLoggingSpy;
import org.jboss.fuse.mvnd.logging.smart.LoggingExecutionListener;
import org.mvndaemon.mvnd.common.Environment;
import org.mvndaemon.mvnd.logging.internal.Slf4jLoggerManager;
import org.mvndaemon.mvnd.logging.smart.AbstractLoggingSpy;
import org.mvndaemon.mvnd.logging.smart.LoggingExecutionListener;
import org.slf4j.ILoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -355,7 +355,7 @@ public class DaemonMavenCli {
// Workaround for https://github.com/mvndaemon/mvnd/issues/39
ch.qos.logback.classic.Logger mvndLogger = (ch.qos.logback.classic.Logger) slf4jLoggerFactory
.getLogger("org.jboss.fuse.mvnd");
.getLogger("org.mvndaemon.mvnd");
mvndLogger.setLevel(ch.qos.logback.classic.Level.toLevel(System.getProperty("mvnd.log.level", "INFO")));
}
@@ -457,7 +457,7 @@ public class DaemonMavenCli {
exportedPackages.addAll(extension.getExportedPackages());
}
exportedPackages.add("org.codehaus.plexus.components.interactivity");
exportedPackages.add("org.jboss.fuse.mvnd.interactivity");
exportedPackages.add("org.mvndaemon.mvnd.interactivity");
exportedArtifacts.add("org.codehaus.plexus:plexus-interactivity-api");
final CoreExports exports = new CoreExports(containerRealm, exportedArtifacts, exportedPackages);

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.builder;
package org.mvndaemon.mvnd.builder;
import java.util.Arrays;
import java.util.List;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.builder;
package org.mvndaemon.mvnd.builder;
import java.util.Collection;
import java.util.Collections;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.builder;
package org.mvndaemon.mvnd.builder;
import java.util.Collection;
import java.util.Comparator;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.builder;
package org.mvndaemon.mvnd.builder;
import java.util.Collection;
import java.util.HashSet;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.builder;
package org.mvndaemon.mvnd.builder;
import com.google.common.collect.ImmutableMap;
import java.util.ArrayList;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.builder;
package org.mvndaemon.mvnd.builder;
import groovy.lang.Binding;
import groovy.lang.GroovyShell;

View File

@@ -12,7 +12,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
package org.jboss.fuse.mvnd.builder;
package org.mvndaemon.mvnd.builder;
import java.util.ArrayList;
import java.util.Comparator;
@@ -29,7 +29,7 @@ import org.apache.maven.lifecycle.internal.ReactorContext;
import org.apache.maven.lifecycle.internal.TaskSegment;
import org.apache.maven.lifecycle.internal.builder.Builder;
import org.apache.maven.project.MavenProject;
import org.jboss.fuse.mvnd.builder.ProjectExecutorService.ProjectRunnable;
import org.mvndaemon.mvnd.builder.ProjectExecutorService.ProjectRunnable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.mvndaemon.mvnd.daemon;
import java.util.function.Predicate;
import org.jboss.fuse.mvnd.common.Message;
import org.mvndaemon.mvnd.common.Message;
public interface Connection {

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.mvndaemon.mvnd.daemon;
import java.nio.file.Files;
import java.nio.file.Paths;
@@ -22,18 +22,18 @@ import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import org.jboss.fuse.mvnd.common.DaemonCompatibilitySpec;
import org.jboss.fuse.mvnd.common.DaemonCompatibilitySpec.Result;
import org.jboss.fuse.mvnd.common.DaemonExpirationStatus;
import org.jboss.fuse.mvnd.common.DaemonInfo;
import org.jboss.fuse.mvnd.common.DaemonState;
import org.jboss.fuse.mvnd.common.Environment;
import org.mvndaemon.mvnd.common.DaemonCompatibilitySpec;
import org.mvndaemon.mvnd.common.DaemonCompatibilitySpec.Result;
import org.mvndaemon.mvnd.common.DaemonExpirationStatus;
import org.mvndaemon.mvnd.common.DaemonInfo;
import org.mvndaemon.mvnd.common.DaemonState;
import org.mvndaemon.mvnd.common.Environment;
import static org.jboss.fuse.mvnd.common.DaemonExpirationStatus.DO_NOT_EXPIRE;
import static org.jboss.fuse.mvnd.common.DaemonExpirationStatus.GRACEFUL_EXPIRE;
import static org.jboss.fuse.mvnd.common.DaemonExpirationStatus.IMMEDIATE_EXPIRE;
import static org.jboss.fuse.mvnd.common.DaemonExpirationStatus.QUIET_EXPIRE;
import static org.jboss.fuse.mvnd.daemon.DaemonExpiration.DaemonExpirationResult.NOT_TRIGGERED;
import static org.mvndaemon.mvnd.common.DaemonExpirationStatus.DO_NOT_EXPIRE;
import static org.mvndaemon.mvnd.common.DaemonExpirationStatus.GRACEFUL_EXPIRE;
import static org.mvndaemon.mvnd.common.DaemonExpirationStatus.IMMEDIATE_EXPIRE;
import static org.mvndaemon.mvnd.common.DaemonExpirationStatus.QUIET_EXPIRE;
import static org.mvndaemon.mvnd.daemon.DaemonExpiration.DaemonExpirationResult.NOT_TRIGGERED;
/**
* File origin:

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.mvndaemon.mvnd.daemon;
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.daemon;
package org.mvndaemon.mvnd.daemon;
import java.io.IOException;
import java.lang.reflect.Field;
@@ -41,30 +41,30 @@ import java.util.function.Predicate;
import java.util.stream.Collectors;
import org.apache.maven.cli.DaemonMavenCli;
import org.apache.maven.execution.MavenSession;
import org.jboss.fuse.mvnd.builder.SmartBuilder;
import org.jboss.fuse.mvnd.common.DaemonConnection;
import org.jboss.fuse.mvnd.common.DaemonException;
import org.jboss.fuse.mvnd.common.DaemonExpirationStatus;
import org.jboss.fuse.mvnd.common.DaemonInfo;
import org.jboss.fuse.mvnd.common.DaemonRegistry;
import org.jboss.fuse.mvnd.common.DaemonState;
import org.jboss.fuse.mvnd.common.DaemonStopEvent;
import org.jboss.fuse.mvnd.common.Environment;
import org.jboss.fuse.mvnd.common.Message;
import org.jboss.fuse.mvnd.common.Message.BuildException;
import org.jboss.fuse.mvnd.common.Message.BuildRequest;
import org.jboss.fuse.mvnd.common.Message.BuildStarted;
import org.jboss.fuse.mvnd.daemon.DaemonExpiration.DaemonExpirationResult;
import org.jboss.fuse.mvnd.daemon.DaemonExpiration.DaemonExpirationStrategy;
import org.jboss.fuse.mvnd.logging.smart.AbstractLoggingSpy;
import org.mvndaemon.mvnd.builder.SmartBuilder;
import org.mvndaemon.mvnd.common.DaemonConnection;
import org.mvndaemon.mvnd.common.DaemonException;
import org.mvndaemon.mvnd.common.DaemonExpirationStatus;
import org.mvndaemon.mvnd.common.DaemonInfo;
import org.mvndaemon.mvnd.common.DaemonRegistry;
import org.mvndaemon.mvnd.common.DaemonState;
import org.mvndaemon.mvnd.common.DaemonStopEvent;
import org.mvndaemon.mvnd.common.Environment;
import org.mvndaemon.mvnd.common.Message;
import org.mvndaemon.mvnd.common.Message.BuildException;
import org.mvndaemon.mvnd.common.Message.BuildRequest;
import org.mvndaemon.mvnd.common.Message.BuildStarted;
import org.mvndaemon.mvnd.daemon.DaemonExpiration.DaemonExpirationResult;
import org.mvndaemon.mvnd.daemon.DaemonExpiration.DaemonExpirationStrategy;
import org.mvndaemon.mvnd.logging.smart.AbstractLoggingSpy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.jboss.fuse.mvnd.common.DaemonState.Broken;
import static org.jboss.fuse.mvnd.common.DaemonState.Busy;
import static org.jboss.fuse.mvnd.common.DaemonState.Canceled;
import static org.jboss.fuse.mvnd.common.DaemonState.StopRequested;
import static org.jboss.fuse.mvnd.common.DaemonState.Stopped;
import static org.mvndaemon.mvnd.common.DaemonState.Broken;
import static org.mvndaemon.mvnd.common.DaemonState.Busy;
import static org.mvndaemon.mvnd.common.DaemonState.Canceled;
import static org.mvndaemon.mvnd.common.DaemonState.StopRequested;
import static org.mvndaemon.mvnd.common.DaemonState.Stopped;
public class Server implements AutoCloseable, Runnable {

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.interactivity;
package org.mvndaemon.mvnd.interactivity;
import java.io.IOException;
import java.util.Iterator;
@@ -29,9 +29,9 @@ import org.codehaus.plexus.components.interactivity.PrompterException;
import org.codehaus.plexus.util.StringUtils;
import org.eclipse.sisu.Priority;
import org.eclipse.sisu.Typed;
import org.jboss.fuse.mvnd.common.Message;
import org.jboss.fuse.mvnd.daemon.Connection;
import org.jboss.fuse.mvnd.logging.smart.ProjectBuildLogAppender;
import org.mvndaemon.mvnd.common.Message;
import org.mvndaemon.mvnd.daemon.Connection;
import org.mvndaemon.mvnd.logging.smart.ProjectBuildLogAppender;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.logging.internal;
package org.mvndaemon.mvnd.logging.internal;
import org.apache.maven.cli.logging.Slf4jConfiguration;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.logging.internal;
package org.mvndaemon.mvnd.logging.internal;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.pattern.ThrowableProxyConverter;

View File

@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jboss.fuse.mvnd.logging.internal;
package org.mvndaemon.mvnd.logging.internal;
import org.codehaus.plexus.logging.Logger;
import org.jboss.fuse.mvnd.logging.smart.ProjectBuildLogAppender;
import org.mvndaemon.mvnd.logging.smart.ProjectBuildLogAppender;
import org.slf4j.MDC;
/**

View File

@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jboss.fuse.mvnd.logging.internal;
package org.mvndaemon.mvnd.logging.internal;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.LoggerManager;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.logging.smart;
package org.mvndaemon.mvnd.logging.smart;
import org.apache.maven.execution.ExecutionEvent;
import org.apache.maven.execution.MavenSession;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.logging.smart;
package org.mvndaemon.mvnd.logging.smart;
import org.apache.maven.execution.ExecutionEvent;
import org.apache.maven.execution.ExecutionListener;
@@ -26,7 +26,7 @@ public class LoggingExecutionListener implements ExecutionListener {
private final ExecutionListener delegate;
static {
Logger logger = LoggerFactory.getLogger("org.jboss.fuse.mvnd");
Logger logger = LoggerFactory.getLogger("org.mvndaemon.mvnd");
System.setOut(new LoggingOutputStream(s -> logger.info("[stdout] " + s)).printStream());
System.setErr(new LoggingOutputStream(s -> logger.info("[stderr] " + s)).printStream());
}

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.logging.smart;
package org.mvndaemon.mvnd.logging.smart;
import java.io.ByteArrayOutputStream;
import java.io.FilterOutputStream;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.logging.smart;
package org.mvndaemon.mvnd.logging.smart;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.PatternLayout;

View File

@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jboss.fuse.mvnd.plugin;
package org.mvndaemon.mvnd.plugin;
import java.util.Iterator;
import java.util.List;

View File

@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.jboss.fuse.mvnd.plugin;
package org.mvndaemon.mvnd.plugin;
import java.io.File;
import java.io.IOException;
@@ -35,7 +35,6 @@ import java.util.Map.Entry;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import javax.enterprise.inject.Default;
import javax.inject.Named;
import javax.inject.Singleton;
import org.apache.maven.RepositoryUtils;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.plugin;
package org.mvndaemon.mvnd.plugin;
import java.net.URL;
import java.nio.file.Path;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.timing;
package org.mvndaemon.mvnd.timing;
import java.util.Comparator;
import java.util.Locale;

View File

@@ -16,4 +16,4 @@
# key = Slf4j effective logger factory implementation
# value = corresponding o.a.m.cli.logging.Slf4jConfiguration class
ch.qos.logback.classic.LoggerContext org.jboss.fuse.mvnd.logging.internal.MvndSlf4jConfiguration
ch.qos.logback.classic.LoggerContext org.mvndaemon.mvnd.logging.internal.MvndSlf4jConfiguration

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.builder;
package org.mvndaemon.mvnd.builder;
import java.util.Arrays;
import java.util.Collection;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.builder;
package org.mvndaemon.mvnd.builder;
import java.util.Arrays;
import java.util.HashSet;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.builder;
package org.mvndaemon.mvnd.builder;
import java.util.Comparator;
import java.util.HashMap;
@@ -24,7 +24,7 @@ import org.apache.maven.project.MavenProject;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import static org.jboss.fuse.mvnd.builder.ProjectComparator.id;
import static org.mvndaemon.mvnd.builder.ProjectComparator.id;
public class ProjectComparatorTest extends AbstractSmartBuilderTest {

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.builder;
package org.mvndaemon.mvnd.builder;
import com.google.common.util.concurrent.Monitor;
import java.util.ArrayList;
@@ -24,11 +24,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.maven.project.MavenProject;
import org.jboss.fuse.mvnd.builder.ProjectExecutorService.ProjectRunnable;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.builder.ProjectExecutorService.ProjectRunnable;
import static org.jboss.fuse.mvnd.builder.ProjectComparator.id;
import static org.mvndaemon.mvnd.builder.ProjectComparator.id;
public class ProjectExecutorServiceTest extends AbstractSmartBuilderTest {
@@ -88,7 +88,7 @@ public class ProjectExecutorServiceTest extends AbstractSmartBuilderTest {
}
// copy&paste from ThreadPoolExecutor javadoc (use of Guava is a nice touch there)
private static class PausibleProjectExecutorService extends org.jboss.fuse.mvnd.builder.ProjectExecutorService {
private static class PausibleProjectExecutorService extends org.mvndaemon.mvnd.builder.ProjectExecutorService {
private final Monitor monitor = new Monitor();
private boolean isPaused = true;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.builder;
package org.mvndaemon.mvnd.builder;
import org.apache.maven.project.MavenProject;
import org.junit.jupiter.api.Assertions;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.builder;
package org.mvndaemon.mvnd.builder;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.builder;
package org.mvndaemon.mvnd.builder;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;

6
dist/pom.xml vendored
View File

@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.fuse.mvnd</groupId>
<groupId>org.mvndaemon.mvnd</groupId>
<artifactId>mvnd</artifactId>
<version>0.0.12-SNAPSHOT</version>
</parent>
@@ -32,11 +32,11 @@
<dependencies>
<dependency>
<groupId>org.jboss.fuse.mvnd</groupId>
<groupId>org.mvndaemon.mvnd</groupId>
<artifactId>mvnd-client</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.fuse.mvnd</groupId>
<groupId>org.mvndaemon.mvnd</groupId>
<artifactId>mvnd-daemon</artifactId>
</dependency>
</dependencies>

View File

@@ -170,7 +170,7 @@ for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do s
:endReadAdditionalConfig
for %%i in ("%MVND_HOME%"\boot\*.jar "%MVND_HOME%"\lib\ext\*.jar "%MVND_HOME%"\lib\*.jar) do set DAEMON_JAR="%%i"
set DAEMON_LAUNCHER=org.jboss.fuse.mvnd.client.DefaultClient
set DAEMON_LAUNCHER=org.mvndaemon.mvnd.client.DefaultClient
"%JAVACMD%" ^
%JVM_CONFIG_MAVEN_PROPS% ^

View File

@@ -104,7 +104,7 @@ fi
DAEMON_JAR=`echo "${MVND_HOME}"/mvn/boot/*.jar "${MVND_HOME}"/mvn/lib/ext/*.jar "${MVND_HOME}"/mvn/lib/*.jar`
DAEMON_JAR=$(echo $DAEMON_JAR | sed -e 's/ /:/g')
DAEMON_LAUNCHER=org.jboss.fuse.mvnd.client.DefaultClient
DAEMON_LAUNCHER=org.mvndaemon.mvnd.client.DefaultClient
# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then

View File

@@ -28,7 +28,7 @@
<!--
| write project-specific build log messages to ${project.build.directory}/build.log files
-->
<appender name="CONSOLE" class="org.jboss.fuse.mvnd.logging.internal.SimpleAppender" />
<appender name="CONSOLE" class="org.mvndaemon.mvnd.logging.internal.SimpleAppender" />
<logger name="Sisu" level="INFO" />

View File

@@ -28,7 +28,7 @@
<!--
| write project-specific build log messages to ${project.build.directory}/build.log files
-->
<appender name="MEM" class="org.jboss.fuse.mvnd.logging.smart.ProjectBuildLogAppender">
<appender name="MEM" class="org.mvndaemon.mvnd.logging.smart.ProjectBuildLogAppender">
<pattern>[%level] %msg%n</pattern>
</appender>
@@ -39,7 +39,7 @@
</encoder>
</appender>
<logger name="org.jboss.fuse.mvnd.daemon" level="DEBUG" additivity="false">
<logger name="org.mvndaemon.mvnd.daemon" level="DEBUG" additivity="false">
<appender-ref ref="DAEMON" />
</logger>

View File

@@ -25,7 +25,7 @@
</artifactSet>
<artifactSet to="/mvn/lib/ext">
<artifact id="org.jboss.fuse.mvnd:mvnd-daemon:${project.version}">
<artifact id="org.mvndaemon.mvnd:mvnd-daemon:${project.version}">
<exclusion id="org.codehaus.plexus:plexus-classworlds"/>
<exclusion id="*:cdi-api"/>
<exclusion id="*:commons-cli"/>
@@ -60,7 +60,7 @@
<exclusion id="*:plexus-utils"/>
<exclusion id="*:plexus-container-default"/>
</artifact>
<artifact id="org.jboss.fuse.mvnd:mvnd-client:${project.version}">
<artifact id="org.mvndaemon.mvnd:mvnd-client:${project.version}">
<exclusion id="*:*"/>
</artifact>
</artifactSet>

View File

@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.fuse.mvnd</groupId>
<groupId>org.mvndaemon.mvnd</groupId>
<artifactId>mvnd</artifactId>
<version>0.0.12-SNAPSHOT</version>
</parent>
@@ -47,7 +47,7 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.fuse.mvnd</groupId>
<groupId>org.mvndaemon.mvnd</groupId>
<artifactId>mvnd-dist</artifactId>
<type>pom</type>
<scope>test</scope>

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.assertj;
package org.mvndaemon.mvnd.assertj;
import java.util.Collection;
import java.util.List;

View File

@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.assertj;
package org.mvndaemon.mvnd.assertj;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.common.Message;
import org.jboss.fuse.mvnd.common.logging.ClientOutput;
import org.mvndaemon.mvnd.common.Message;
import org.mvndaemon.mvnd.common.logging.ClientOutput;
public class TestClientOutput implements ClientOutput {
private final List<Message> messages = new ArrayList<>();

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import java.io.IOException;
import java.nio.file.Files;
@@ -21,13 +21,13 @@ import java.nio.file.Path;
import java.util.stream.Stream;
import javax.inject.Inject;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.assertj.TestClientOutput;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.DaemonParameters;
import org.jboss.fuse.mvnd.common.DaemonException;
import org.jboss.fuse.mvnd.junit.MvndTest;
import org.jboss.fuse.mvnd.junit.TestUtils;
import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.assertj.TestClientOutput;
import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.common.DaemonException;
import org.mvndaemon.mvnd.junit.MvndTest;
import org.mvndaemon.mvnd.junit.TestUtils;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -53,7 +53,7 @@ public class DaemonCrashTest {
TestUtils.deleteDir(localMavenRepo);
final Path[] installedJars = {
localMavenRepo.resolve(
"org/jboss/fuse/mvnd/test/daemon-crash/daemon-crash-maven-plugin/0.0.1-SNAPSHOT/daemon-crash-maven-plugin-0.0.1-SNAPSHOT.jar"),
"org/mvndaemon/mvnd/test/daemon-crash/daemon-crash-maven-plugin/0.0.1-SNAPSHOT/daemon-crash-maven-plugin-0.0.1-SNAPSHOT.jar"),
};
Stream.of(installedJars).forEach(jar -> Assertions.assertThat(jar).doesNotExist());

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import java.nio.file.Files;
import java.nio.file.Path;

View File

@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import java.io.IOException;
import javax.inject.Inject;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.assertj.TestClientOutput;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.DaemonParameters;
import org.jboss.fuse.mvnd.common.DaemonInfo;
import org.jboss.fuse.mvnd.junit.MvndNativeTest;
import org.jboss.fuse.mvnd.junit.TestRegistry;
import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.assertj.TestClientOutput;
import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.common.DaemonInfo;
import org.mvndaemon.mvnd.junit.MvndNativeTest;
import org.mvndaemon.mvnd.junit.TestRegistry;
import static org.junit.jupiter.api.Assertions.assertTrue;

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import org.jboss.fuse.mvnd.junit.MvndTest;
import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/extensions")
public class ExtensionsTest extends ExtensionsNativeIT {

View File

@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import java.io.IOException;
import javax.inject.Inject;
import org.jboss.fuse.mvnd.assertj.TestClientOutput;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.DaemonParameters;
import org.jboss.fuse.mvnd.common.Message;
import org.jboss.fuse.mvnd.common.Message.Prompt;
import org.jboss.fuse.mvnd.junit.MvndTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.assertj.TestClientOutput;
import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.common.Message;
import org.mvndaemon.mvnd.common.Message.Prompt;
import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/single-module")
public class InteractiveTest {

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -23,11 +23,11 @@ import java.util.List;
import java.util.regex.Pattern;
import javax.inject.Inject;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.assertj.TestClientOutput;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.DaemonParameters;
import org.jboss.fuse.mvnd.junit.MvndNativeTest;
import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.assertj.TestClientOutput;
import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.junit.MvndNativeTest;
@MvndNativeTest(projectDir = "src/test/projects/invoker")
public class InvokerNativeIT {

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import org.jboss.fuse.mvnd.junit.MvndTest;
import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/invoker")
public class InvokerTest extends InvokerNativeIT {

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -22,12 +22,12 @@ import java.nio.file.Path;
import java.util.stream.Stream;
import javax.inject.Inject;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.assertj.TestClientOutput;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.DaemonParameters;
import org.jboss.fuse.mvnd.junit.MvndNativeTest;
import org.jboss.fuse.mvnd.junit.TestUtils;
import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.assertj.TestClientOutput;
import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.junit.MvndNativeTest;
import org.mvndaemon.mvnd.junit.TestUtils;
@MvndNativeTest(projectDir = "src/test/projects/module-and-plugin")
public class ModuleAndPluginNativeIT {
@@ -54,7 +54,7 @@ public class ModuleAndPluginNativeIT {
TestUtils.deleteDir(localMavenRepo);
final Path[] installedJars = {
localMavenRepo.resolve(
"org/jboss/fuse/mvnd/test/module-and-plugin/module-and-plugin-maven-plugin/0.0.1-SNAPSHOT/module-and-plugin-maven-plugin-0.0.1-SNAPSHOT.jar"),
"org/mvndaemon/mvnd/test/module-and-plugin/module-and-plugin-maven-plugin/0.0.1-SNAPSHOT/module-and-plugin-maven-plugin-0.0.1-SNAPSHOT.jar"),
};
Stream.of(installedJars).forEach(jar -> Assertions.assertThat(jar).doesNotExist());
@@ -74,7 +74,7 @@ public class ModuleAndPluginNativeIT {
/* Build #2: with the mojo source changed to output "Hi" to target/hello.txt */
{
final Path mojoPath = parameters.multiModuleProjectDirectory()
.resolve("plugin/src/main/java/org/jboss/fuse/mvnd/test/module/plugin/mojo/HelloMojo.java");
.resolve("plugin/src/main/java/org/mvndaemon/mvnd/test/module/plugin/mojo/HelloMojo.java");
TestUtils.replace(mojoPath, "\"Hello\".getBytes", "\"Hi\".getBytes");
final TestClientOutput output = new TestClientOutput();

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import org.jboss.fuse.mvnd.junit.MvndTest;
import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/module-and-plugin")
public class ModuleAndPluginTest extends ModuleAndPluginNativeIT {

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import java.io.IOException;
import java.nio.file.Files;
@@ -24,15 +24,15 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.inject.Inject;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.assertj.MatchInOrderAmongOthers;
import org.jboss.fuse.mvnd.assertj.TestClientOutput;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.DaemonParameters;
import org.jboss.fuse.mvnd.common.Message;
import org.jboss.fuse.mvnd.common.Message.ProjectEvent;
import org.jboss.fuse.mvnd.junit.MvndTest;
import org.jboss.fuse.mvnd.junit.TestUtils;
import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.assertj.MatchInOrderAmongOthers;
import org.mvndaemon.mvnd.assertj.TestClientOutput;
import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.common.Message;
import org.mvndaemon.mvnd.common.Message.ProjectEvent;
import org.mvndaemon.mvnd.junit.MvndTest;
import org.mvndaemon.mvnd.junit.TestUtils;
@MvndTest(projectDir = "src/test/projects/multi-module")
public class MultiModuleTest {
@@ -61,11 +61,11 @@ public class MultiModuleTest {
TestUtils.deleteDir(localMavenRepo);
final Path[] installedJars = {
localMavenRepo.resolve(
"org/jboss/fuse/mvnd/test/multi-module/multi-module-api/0.0.1-SNAPSHOT/multi-module-api-0.0.1-SNAPSHOT.jar"),
"org/mvndaemon/mvnd/test/multi-module/multi-module-api/0.0.1-SNAPSHOT/multi-module-api-0.0.1-SNAPSHOT.jar"),
localMavenRepo.resolve(
"org/jboss/fuse/mvnd/test/multi-module/multi-module-hello/0.0.1-SNAPSHOT/multi-module-hello-0.0.1-SNAPSHOT.jar"),
"org/mvndaemon/mvnd/test/multi-module/multi-module-hello/0.0.1-SNAPSHOT/multi-module-hello-0.0.1-SNAPSHOT.jar"),
localMavenRepo.resolve(
"org/jboss/fuse/mvnd/test/multi-module/multi-module-hi/0.0.1-SNAPSHOT/multi-module-hi-0.0.1-SNAPSHOT.jar")
"org/mvndaemon/mvnd/test/multi-module/multi-module-hi/0.0.1-SNAPSHOT/multi-module-hi-0.0.1-SNAPSHOT.jar")
};
Stream.of(installedJars).forEach(jar -> Assertions.assertThat(jar).doesNotExist());
@@ -82,16 +82,16 @@ public class MultiModuleTest {
.satisfiesAnyOf( /* Two orderings are possible */
messages -> Assertions.assertThat(messages)
.is(new MatchInOrderAmongOthers<>(
"SUCCESS build of project org.jboss.fuse.mvnd.test.multi-module:multi-module$",
"SUCCESS build of project org.jboss.fuse.mvnd.test.multi-module:multi-module-api",
"SUCCESS build of project org.jboss.fuse.mvnd.test.multi-module:multi-module-hello",
"SUCCESS build of project org.jboss.fuse.mvnd.test.multi-module:multi-module-hi")),
"SUCCESS build of project org.mvndaemon.mvnd.test.multi-module:multi-module$",
"SUCCESS build of project org.mvndaemon.mvnd.test.multi-module:multi-module-api",
"SUCCESS build of project org.mvndaemon.mvnd.test.multi-module:multi-module-hello",
"SUCCESS build of project org.mvndaemon.mvnd.test.multi-module:multi-module-hi")),
messages -> Assertions.assertThat(messages)
.is(new MatchInOrderAmongOthers<>(
"SUCCESS build of project org.jboss.fuse.mvnd.test.multi-module:multi-module$",
"SUCCESS build of project org.jboss.fuse.mvnd.test.multi-module:multi-module-api",
"SUCCESS build of project org.jboss.fuse.mvnd.test.multi-module:multi-module-hi",
"SUCCESS build of project org.jboss.fuse.mvnd.test.multi-module:multi-module-hello")));
"SUCCESS build of project org.mvndaemon.mvnd.test.multi-module:multi-module$",
"SUCCESS build of project org.mvndaemon.mvnd.test.multi-module:multi-module-api",
"SUCCESS build of project org.mvndaemon.mvnd.test.multi-module:multi-module-hi",
"SUCCESS build of project org.mvndaemon.mvnd.test.multi-module:multi-module-hello")));
}
{

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import java.io.IOException;
import java.io.Reader;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import java.io.IOException;
import java.nio.file.Files;
@@ -23,14 +23,14 @@ import java.util.Properties;
import java.util.stream.Collectors;
import javax.inject.Inject;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.assertj.MatchInOrderAmongOthers;
import org.jboss.fuse.mvnd.assertj.TestClientOutput;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.DaemonParameters;
import org.jboss.fuse.mvnd.common.Message;
import org.jboss.fuse.mvnd.junit.MvndNativeTest;
import org.jboss.fuse.mvnd.junit.TestUtils;
import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.assertj.MatchInOrderAmongOthers;
import org.mvndaemon.mvnd.assertj.TestClientOutput;
import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.common.Message;
import org.mvndaemon.mvnd.junit.MvndNativeTest;
import org.mvndaemon.mvnd.junit.TestUtils;
@MvndNativeTest(projectDir = "src/test/projects/single-module")
public class SingleModuleNativeIT {
@@ -51,7 +51,7 @@ public class SingleModuleNativeIT {
final Path localMavenRepo = parameters.mavenRepoLocal();
TestUtils.deleteDir(localMavenRepo);
final Path installedJar = localMavenRepo.resolve(
"org/jboss/fuse/mvnd/test/single-module/single-module/0.0.1-SNAPSHOT/single-module-0.0.1-SNAPSHOT.jar");
"org/mvndaemon/mvnd/test/single-module/single-module/0.0.1-SNAPSHOT/single-module-0.0.1-SNAPSHOT.jar");
Assertions.assertThat(installedJar).doesNotExist();
final TestClientOutput o = new TestClientOutput();

View File

@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import java.util.List;
import java.util.Properties;
import java.util.stream.Collectors;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.assertj.MatchInOrderAmongOthers;
import org.jboss.fuse.mvnd.assertj.TestClientOutput;
import org.jboss.fuse.mvnd.common.Message;
import org.jboss.fuse.mvnd.junit.MvndTest;
import org.mvndaemon.mvnd.assertj.MatchInOrderAmongOthers;
import org.mvndaemon.mvnd.assertj.TestClientOutput;
import org.mvndaemon.mvnd.common.Message;
import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/single-module")
public class SingleModuleTest extends SingleModuleNativeIT {

View File

@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import java.io.IOException;
import java.util.stream.Collectors;
import javax.inject.Inject;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.assertj.TestClientOutput;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.common.DaemonInfo;
import org.jboss.fuse.mvnd.junit.MvndTest;
import org.jboss.fuse.mvnd.junit.TestRegistry;
import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.assertj.TestClientOutput;
import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.common.DaemonInfo;
import org.mvndaemon.mvnd.junit.MvndTest;
import org.mvndaemon.mvnd.junit.TestRegistry;
@MvndTest(projectDir = "src/test/projects/single-module")
public class StopStatusTest {

View File

@@ -13,22 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Arrays;
import javax.inject.Inject;
import org.assertj.core.api.Assertions;
import org.jboss.fuse.mvnd.assertj.TestClientOutput;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.common.DaemonInfo;
import org.jboss.fuse.mvnd.junit.ClientFactory;
import org.jboss.fuse.mvnd.junit.MvndNativeTest;
import org.jboss.fuse.mvnd.junit.TestParameters;
import org.jboss.fuse.mvnd.junit.TestRegistry;
import org.jboss.fuse.mvnd.junit.TestUtils;
import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.assertj.TestClientOutput;
import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.common.DaemonInfo;
import org.mvndaemon.mvnd.junit.ClientFactory;
import org.mvndaemon.mvnd.junit.MvndNativeTest;
import org.mvndaemon.mvnd.junit.TestParameters;
import org.mvndaemon.mvnd.junit.TestRegistry;
import org.mvndaemon.mvnd.junit.TestUtils;
@MvndNativeTest(projectDir = "src/test/projects/upgrades-in-bom")
public class UpgradesInBomNativeIT {
@@ -72,7 +72,7 @@ public class UpgradesInBomNativeIT {
"<hello.version>0.0.2-SNAPSHOT</hello.version>");
/* Adapt the caller */
final Path useHelloPath = parentDir
.resolve("module/src/main/java/org/jboss/fuse/mvnd/test/upgrades/bom/module/UseHello.java");
.resolve("module/src/main/java/org/mvndaemon/mvnd/test/upgrades/bom/module/UseHello.java");
TestUtils.replace(useHelloPath, "new Hello().sayHello()", "new Hello().sayWisdom()");
{
final TestClientOutput output = new TestClientOutput();

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import org.jboss.fuse.mvnd.junit.MvndTest;
import org.mvndaemon.mvnd.junit.MvndTest;
@MvndTest(projectDir = "src/test/projects/upgrades-in-bom")
public class UpgradesInBomTest extends UpgradesInBomNativeIT {

View File

@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import java.io.IOException;
import javax.inject.Inject;
import org.jboss.fuse.mvnd.assertj.TestClientOutput;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.DaemonParameters;
import org.jboss.fuse.mvnd.junit.MvndNativeTest;
import org.jboss.fuse.mvnd.junit.MvndTestExtension;
import org.junit.jupiter.api.Test;
import org.mvndaemon.mvnd.assertj.TestClientOutput;
import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.junit.MvndNativeTest;
import org.mvndaemon.mvnd.junit.MvndTestExtension;
@MvndNativeTest(projectDir = MvndTestExtension.TEMP_EXTERNAL)
public class VersionNativeIT {

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.it;
package org.mvndaemon.mvnd.it;
import org.jboss.fuse.mvnd.junit.MvndTest;
import org.jboss.fuse.mvnd.junit.MvndTestExtension;
import org.mvndaemon.mvnd.junit.MvndTest;
import org.mvndaemon.mvnd.junit.MvndTestExtension;
@MvndTest(projectDir = MvndTestExtension.TEMP_EXTERNAL)
public class VersionTest extends VersionNativeIT {

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.junit;
package org.mvndaemon.mvnd.junit;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.client.DaemonParameters;
public interface ClientFactory {
Client newClient(DaemonParameters parameters);

View File

@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.junit;
package org.mvndaemon.mvnd.junit;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.jboss.fuse.mvnd.client.Client;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mvndaemon.mvnd.client.Client;
@ExtendWith(MvndTestExtension.class)
@Retention(RetentionPolicy.RUNTIME)
@@ -34,7 +34,7 @@ public @interface MvndNativeTest {
String projectDir();
/**
* Timeout for {@link Client#execute(org.jboss.fuse.mvnd.common.ClientOutput, java.util.List)} in seconds
* Timeout for {@link Client#execute(org.mvndaemon.mvnd.common.ClientOutput, java.util.List)} in seconds
*/
long timeoutSec() default 300;
}

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.junit;
package org.mvndaemon.mvnd.junit;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.junit;
package org.mvndaemon.mvnd.junit;
import java.io.IOException;
import java.lang.reflect.Field;
@@ -25,18 +25,18 @@ import java.util.Locale;
import java.util.Objects;
import java.util.stream.Stream;
import org.apache.log4j.Logger;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.DaemonParameters;
import org.jboss.fuse.mvnd.client.DefaultClient;
import org.jboss.fuse.mvnd.common.DaemonRegistry;
import org.jboss.fuse.mvnd.common.Environment;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.extension.ExtensionContext.Store;
import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.client.DefaultClient;
import org.mvndaemon.mvnd.common.DaemonRegistry;
import org.mvndaemon.mvnd.common.Environment;
import static org.jboss.fuse.mvnd.junit.TestUtils.deleteDir;
import static org.mvndaemon.mvnd.junit.TestUtils.deleteDir;
public class MvndTestExtension implements BeforeAllCallback, BeforeEachCallback, AfterAllCallback {

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jboss.fuse.mvnd.junit;
package org.mvndaemon.mvnd.junit;
import java.io.IOException;
import java.nio.file.Path;
@@ -21,13 +21,13 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import org.jboss.fuse.mvnd.client.Client;
import org.jboss.fuse.mvnd.client.DaemonParameters;
import org.jboss.fuse.mvnd.client.ExecutionResult;
import org.jboss.fuse.mvnd.common.Environment;
import org.jboss.fuse.mvnd.common.Message;
import org.jboss.fuse.mvnd.common.OsUtils.CommandProcess;
import org.jboss.fuse.mvnd.common.logging.ClientOutput;
import org.mvndaemon.mvnd.client.Client;
import org.mvndaemon.mvnd.client.DaemonParameters;
import org.mvndaemon.mvnd.client.ExecutionResult;
import org.mvndaemon.mvnd.common.Environment;
import org.mvndaemon.mvnd.common.Message;
import org.mvndaemon.mvnd.common.OsUtils.CommandProcess;
import org.mvndaemon.mvnd.common.logging.ClientOutput;
/**
* A wrapper around the native executable.

Some files were not shown because too many files have changed in this diff Show More