From 7cdb2bafb8b16aecd17209e77c917bb2ea633118 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Sun, 8 Mar 2020 13:23:19 +0100 Subject: [PATCH] Split parent and daemon modules --- .gitignore | 1 - README.md | 2 +- daemon/pom.xml | 155 ++++++++++++++++++ {src => daemon/src}/main/distro/bin/mvnd | 0 {src => daemon/src}/main/distro/bin/mvns | 0 .../src}/main/distro/conf/logging/logback.xml | 0 .../apache/maven/cli/CliRequestBuilder.java | 0 .../org/apache/maven/cli/DaemonMavenCli.java | 0 .../maven/project/CachingProjectBuilder.java | 0 .../maven/project/SnapshotModelCache.java | 0 .../fuse/mvnd/builder/DependencyGraph.java | 0 .../fuse/mvnd/builder/ProjectComparator.java | 0 .../mvnd/builder/ProjectExecutorService.java | 0 .../fuse/mvnd/builder/ReactorBuildQueue.java | 0 .../fuse/mvnd/builder/ReactorBuildStats.java | 0 .../jboss/fuse/mvnd/builder/SmartBuilder.java | 0 .../fuse/mvnd/builder/SmartBuilderImpl.java | 0 .../jboss/fuse/mvnd/daemon/BufferCaster.java | 0 .../org/jboss/fuse/mvnd/daemon/Client.java | 0 .../mvnd/daemon/DaemonClientConnection.java | 0 .../mvnd/daemon/DaemonCompatibilitySpec.java | 0 .../fuse/mvnd/daemon/DaemonConnection.java | 0 .../fuse/mvnd/daemon/DaemonConnector.java | 0 .../fuse/mvnd/daemon/DaemonDiagnostics.java | 0 .../fuse/mvnd/daemon/DaemonException.java | 0 .../fuse/mvnd/daemon/DaemonExpiration.java | 0 .../jboss/fuse/mvnd/daemon/DaemonInfo.java | 0 .../fuse/mvnd/daemon/DaemonRegistry.java | 0 .../jboss/fuse/mvnd/daemon/DaemonStarter.java | 0 .../jboss/fuse/mvnd/daemon/DaemonState.java | 0 .../fuse/mvnd/daemon/DaemonStopEvent.java | 0 .../org/jboss/fuse/mvnd/daemon/Layout.java | 0 .../org/jboss/fuse/mvnd/daemon/Message.java | 0 .../jboss/fuse/mvnd/daemon/Serializer.java | 0 .../org/jboss/fuse/mvnd/daemon/Server.java | 0 .../jboss/fuse/mvnd/daemon/ServerMain.java | 0 .../java/org/jboss/fuse/mvnd/jpm/Process.java | 0 .../org/jboss/fuse/mvnd/jpm/ProcessImpl.java | 0 .../org/jboss/fuse/mvnd/jpm/ScriptUtils.java | 0 .../logging/smart/AbstractLoggingSpy.java | 0 .../mvnd/logging/smart/EventSpyWrapper.java | 0 .../mvnd/logging/smart/MavenLoggingSpy.java | 0 .../smart/ProjectBuildLogAppender.java | 2 +- .../jboss/fuse/mvnd/plugin/CliCacheUtils.java | 0 .../fuse/mvnd/plugin/CliPluginRealmCache.java | 0 .../fuse/mvnd/timing/BuildTimeEventSpy.java | 0 .../src}/main/provisio/maven-distro.xml | 0 .../maven/slf4j-configuration.properties | 0 .../resources/META-INF/plexus/components.xml | 0 .../jboss/fuse/mvnd/daemon/build.properties | 0 .../org/jboss/fuse/mvnd/jpm/unix/start.sh | 0 .../jboss/fuse/mvnd/jpm/windows/destroy.vbs | 0 .../jboss/fuse/mvnd/jpm/windows/running.vbs | 0 .../org/jboss/fuse/mvnd/jpm/windows/start.vbs | 0 .../builder/AbstractSmartBuilderTest.java | 0 .../mvnd/builder/DependencyGraphTest.java | 0 .../mvnd/builder/ProjectComparatorTest.java | 0 .../builder/ProjectExecutorServiceTest.java | 0 .../mvnd/builder/ReactorBuildQueueTest.java | 0 .../builder/TestProjectDependencyGraph.java | 0 .../fuse/mvnd/daemon/DaemonRegistryTest.java | 0 pom.xml | 147 +---------------- 62 files changed, 163 insertions(+), 144 deletions(-) create mode 100644 daemon/pom.xml rename {src => daemon/src}/main/distro/bin/mvnd (100%) rename {src => daemon/src}/main/distro/bin/mvns (100%) rename {src => daemon/src}/main/distro/conf/logging/logback.xml (100%) rename {src => daemon/src}/main/java/org/apache/maven/cli/CliRequestBuilder.java (100%) rename {src => daemon/src}/main/java/org/apache/maven/cli/DaemonMavenCli.java (100%) rename {src => daemon/src}/main/java/org/apache/maven/project/CachingProjectBuilder.java (100%) rename {src => daemon/src}/main/java/org/apache/maven/project/SnapshotModelCache.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/builder/DependencyGraph.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/builder/ProjectComparator.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/builder/ProjectExecutorService.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/builder/ReactorBuildQueue.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/builder/ReactorBuildStats.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/builder/SmartBuilder.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/builder/SmartBuilderImpl.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/BufferCaster.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/Client.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/DaemonClientConnection.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/DaemonCompatibilitySpec.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/DaemonConnection.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/DaemonConnector.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/DaemonDiagnostics.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/DaemonException.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/DaemonExpiration.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/DaemonInfo.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/DaemonRegistry.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/DaemonStarter.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/DaemonState.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/DaemonStopEvent.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/Layout.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/Message.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/Serializer.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/Server.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/daemon/ServerMain.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/jpm/Process.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/jpm/ProcessImpl.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/jpm/ScriptUtils.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/logging/smart/AbstractLoggingSpy.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/logging/smart/EventSpyWrapper.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/logging/smart/MavenLoggingSpy.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/logging/smart/ProjectBuildLogAppender.java (97%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/plugin/CliCacheUtils.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/plugin/CliPluginRealmCache.java (100%) rename {src => daemon/src}/main/java/org/jboss/fuse/mvnd/timing/BuildTimeEventSpy.java (100%) rename {src => daemon/src}/main/provisio/maven-distro.xml (100%) rename {src => daemon/src}/main/resources/META-INF/maven/slf4j-configuration.properties (100%) rename {src => daemon/src}/main/resources/META-INF/plexus/components.xml (100%) rename {src => daemon/src}/main/resources/org/jboss/fuse/mvnd/daemon/build.properties (100%) rename {src => daemon/src}/main/resources/org/jboss/fuse/mvnd/jpm/unix/start.sh (100%) rename {src => daemon/src}/main/resources/org/jboss/fuse/mvnd/jpm/windows/destroy.vbs (100%) rename {src => daemon/src}/main/resources/org/jboss/fuse/mvnd/jpm/windows/running.vbs (100%) rename {src => daemon/src}/main/resources/org/jboss/fuse/mvnd/jpm/windows/start.vbs (100%) rename {src => daemon/src}/test/java/org/jboss/fuse/mvnd/builder/AbstractSmartBuilderTest.java (100%) rename {src => daemon/src}/test/java/org/jboss/fuse/mvnd/builder/DependencyGraphTest.java (100%) rename {src => daemon/src}/test/java/org/jboss/fuse/mvnd/builder/ProjectComparatorTest.java (100%) rename {src => daemon/src}/test/java/org/jboss/fuse/mvnd/builder/ProjectExecutorServiceTest.java (100%) rename {src => daemon/src}/test/java/org/jboss/fuse/mvnd/builder/ReactorBuildQueueTest.java (100%) rename {src => daemon/src}/test/java/org/jboss/fuse/mvnd/builder/TestProjectDependencyGraph.java (100%) rename {src => daemon/src}/test/java/org/jboss/fuse/mvnd/daemon/DaemonRegistryTest.java (100%) diff --git a/.gitignore b/.gitignore index 3f5083a1..041a4df5 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,6 @@ release.properties .project .classpath .settings/ -bin/ # IDEA .idea diff --git a/README.md b/README.md index c3c0947f..d89c8c3a 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ mvn package ## Configuring ``` -export PATH=[mvn-root]/target/maven-distro/bin:$PATH +export PATH=[mvn-root]/daemon/target/maven-distro/bin:$PATH ``` ## Usage diff --git a/daemon/pom.xml b/daemon/pom.xml new file mode 100644 index 00000000..24c147da --- /dev/null +++ b/daemon/pom.xml @@ -0,0 +1,155 @@ + + + 4.0.0 + + org.jboss.fuse.mvnd + mvnd + 0.1-SNAPSHOT + + + mvnd-daemon + + jar + Maven Daemon + + + + org.apache.maven + maven-embedder + ${mavenVersion} + provided + + + io.takari.aether + takari-local-repository + ${takariLocalRepositoryVersion} + + + + + ch.qos.logback + logback-classic + ${logbackVersion} + + + org.slf4j + log4j-over-slf4j + ${slf4jVersion} + + + org.slf4j + jcl-over-slf4j + ${slf4jVersion} + + + org.slf4j + jul-to-slf4j + ${slf4jVersion} + + + + org.jline + jline-terminal + ${jlineVersion} + + + org.jline + jline-terminal-jansi + ${jlineVersion} + + + org.codehaus.groovy + groovy + ${groovyVersion} + + + + junit + junit + ${junitVersion} + test + + + io.takari.maven.plugins + takari-plugin-testing + ${pluginTestingVersion} + test + + + io.takari.maven.plugins + takari-plugin-integration-testing + ${pluginTestingVersion} + pom + test + + + + + + + ${basedir}/src/main/resources + true + + + + + io.takari.maven.plugins + takari-lifecycle-plugin + ${takariLifecycleVersion} + + + + sisu-index + + process-classes + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${mavenCompilerPluginVersion} + + 1.8 + 1.8 + + + + io.takari.maven.plugins + provisio-maven-plugin + ${takariProvisioVersion} + + + maven-distro + package + + provision + + + ${project.build.directory}/maven-distro + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${mavenSurefirePluginVersion} + + + integration-test + integration-test + + test + + + **/*IT.java + + + + + + + + \ No newline at end of file diff --git a/src/main/distro/bin/mvnd b/daemon/src/main/distro/bin/mvnd similarity index 100% rename from src/main/distro/bin/mvnd rename to daemon/src/main/distro/bin/mvnd diff --git a/src/main/distro/bin/mvns b/daemon/src/main/distro/bin/mvns similarity index 100% rename from src/main/distro/bin/mvns rename to daemon/src/main/distro/bin/mvns diff --git a/src/main/distro/conf/logging/logback.xml b/daemon/src/main/distro/conf/logging/logback.xml similarity index 100% rename from src/main/distro/conf/logging/logback.xml rename to daemon/src/main/distro/conf/logging/logback.xml diff --git a/src/main/java/org/apache/maven/cli/CliRequestBuilder.java b/daemon/src/main/java/org/apache/maven/cli/CliRequestBuilder.java similarity index 100% rename from src/main/java/org/apache/maven/cli/CliRequestBuilder.java rename to daemon/src/main/java/org/apache/maven/cli/CliRequestBuilder.java diff --git a/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java similarity index 100% rename from src/main/java/org/apache/maven/cli/DaemonMavenCli.java rename to daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java diff --git a/src/main/java/org/apache/maven/project/CachingProjectBuilder.java b/daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java similarity index 100% rename from src/main/java/org/apache/maven/project/CachingProjectBuilder.java rename to daemon/src/main/java/org/apache/maven/project/CachingProjectBuilder.java diff --git a/src/main/java/org/apache/maven/project/SnapshotModelCache.java b/daemon/src/main/java/org/apache/maven/project/SnapshotModelCache.java similarity index 100% rename from src/main/java/org/apache/maven/project/SnapshotModelCache.java rename to daemon/src/main/java/org/apache/maven/project/SnapshotModelCache.java diff --git a/src/main/java/org/jboss/fuse/mvnd/builder/DependencyGraph.java b/daemon/src/main/java/org/jboss/fuse/mvnd/builder/DependencyGraph.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/builder/DependencyGraph.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/builder/DependencyGraph.java diff --git a/src/main/java/org/jboss/fuse/mvnd/builder/ProjectComparator.java b/daemon/src/main/java/org/jboss/fuse/mvnd/builder/ProjectComparator.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/builder/ProjectComparator.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/builder/ProjectComparator.java diff --git a/src/main/java/org/jboss/fuse/mvnd/builder/ProjectExecutorService.java b/daemon/src/main/java/org/jboss/fuse/mvnd/builder/ProjectExecutorService.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/builder/ProjectExecutorService.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/builder/ProjectExecutorService.java diff --git a/src/main/java/org/jboss/fuse/mvnd/builder/ReactorBuildQueue.java b/daemon/src/main/java/org/jboss/fuse/mvnd/builder/ReactorBuildQueue.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/builder/ReactorBuildQueue.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/builder/ReactorBuildQueue.java diff --git a/src/main/java/org/jboss/fuse/mvnd/builder/ReactorBuildStats.java b/daemon/src/main/java/org/jboss/fuse/mvnd/builder/ReactorBuildStats.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/builder/ReactorBuildStats.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/builder/ReactorBuildStats.java diff --git a/src/main/java/org/jboss/fuse/mvnd/builder/SmartBuilder.java b/daemon/src/main/java/org/jboss/fuse/mvnd/builder/SmartBuilder.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/builder/SmartBuilder.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/builder/SmartBuilder.java diff --git a/src/main/java/org/jboss/fuse/mvnd/builder/SmartBuilderImpl.java b/daemon/src/main/java/org/jboss/fuse/mvnd/builder/SmartBuilderImpl.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/builder/SmartBuilderImpl.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/builder/SmartBuilderImpl.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/BufferCaster.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/BufferCaster.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/BufferCaster.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/BufferCaster.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/Client.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Client.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/Client.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Client.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonClientConnection.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonClientConnection.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/DaemonClientConnection.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonClientConnection.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonCompatibilitySpec.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonCompatibilitySpec.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/DaemonCompatibilitySpec.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonCompatibilitySpec.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonConnection.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonConnection.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/DaemonConnection.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonConnection.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonConnector.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonConnector.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/DaemonConnector.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonConnector.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonDiagnostics.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonDiagnostics.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/DaemonDiagnostics.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonDiagnostics.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonException.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonException.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/DaemonException.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonException.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonExpiration.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonExpiration.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/DaemonExpiration.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonExpiration.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonInfo.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonInfo.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/DaemonInfo.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonInfo.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonRegistry.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonRegistry.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/DaemonRegistry.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonRegistry.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonStarter.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonStarter.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/DaemonStarter.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonStarter.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonState.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonState.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/DaemonState.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonState.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonStopEvent.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonStopEvent.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/DaemonStopEvent.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/DaemonStopEvent.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/Layout.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Layout.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/Layout.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Layout.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/Message.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Message.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/Message.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Message.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/Serializer.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Serializer.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/Serializer.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Serializer.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/Server.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/Server.java diff --git a/src/main/java/org/jboss/fuse/mvnd/daemon/ServerMain.java b/daemon/src/main/java/org/jboss/fuse/mvnd/daemon/ServerMain.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/daemon/ServerMain.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/daemon/ServerMain.java diff --git a/src/main/java/org/jboss/fuse/mvnd/jpm/Process.java b/daemon/src/main/java/org/jboss/fuse/mvnd/jpm/Process.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/jpm/Process.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/jpm/Process.java diff --git a/src/main/java/org/jboss/fuse/mvnd/jpm/ProcessImpl.java b/daemon/src/main/java/org/jboss/fuse/mvnd/jpm/ProcessImpl.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/jpm/ProcessImpl.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/jpm/ProcessImpl.java diff --git a/src/main/java/org/jboss/fuse/mvnd/jpm/ScriptUtils.java b/daemon/src/main/java/org/jboss/fuse/mvnd/jpm/ScriptUtils.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/jpm/ScriptUtils.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/jpm/ScriptUtils.java diff --git a/src/main/java/org/jboss/fuse/mvnd/logging/smart/AbstractLoggingSpy.java b/daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/AbstractLoggingSpy.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/logging/smart/AbstractLoggingSpy.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/AbstractLoggingSpy.java diff --git a/src/main/java/org/jboss/fuse/mvnd/logging/smart/EventSpyWrapper.java b/daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/EventSpyWrapper.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/logging/smart/EventSpyWrapper.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/EventSpyWrapper.java diff --git a/src/main/java/org/jboss/fuse/mvnd/logging/smart/MavenLoggingSpy.java b/daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/MavenLoggingSpy.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/logging/smart/MavenLoggingSpy.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/MavenLoggingSpy.java diff --git a/src/main/java/org/jboss/fuse/mvnd/logging/smart/ProjectBuildLogAppender.java b/daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/ProjectBuildLogAppender.java similarity index 97% rename from src/main/java/org/jboss/fuse/mvnd/logging/smart/ProjectBuildLogAppender.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/ProjectBuildLogAppender.java index ac2bb06e..3cb89513 100644 --- a/src/main/java/org/jboss/fuse/mvnd/logging/smart/ProjectBuildLogAppender.java +++ b/daemon/src/main/java/org/jboss/fuse/mvnd/logging/smart/ProjectBuildLogAppender.java @@ -56,7 +56,7 @@ public class ProjectBuildLogAppender extends AppenderBase { protected void append(ILoggingEvent event) { Map mdc = event.getMDCPropertyMap(); String projectId = mdc != null ? mdc.get(KEY_PROJECT_ID) : null; - AbstractLoggingSpy.instance.append(projectId, layout.doLayout(event)); + AbstractLoggingSpy.instance().append(projectId, layout.doLayout(event)); } public void setPattern(String pattern) { diff --git a/src/main/java/org/jboss/fuse/mvnd/plugin/CliCacheUtils.java b/daemon/src/main/java/org/jboss/fuse/mvnd/plugin/CliCacheUtils.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/plugin/CliCacheUtils.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/plugin/CliCacheUtils.java diff --git a/src/main/java/org/jboss/fuse/mvnd/plugin/CliPluginRealmCache.java b/daemon/src/main/java/org/jboss/fuse/mvnd/plugin/CliPluginRealmCache.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/plugin/CliPluginRealmCache.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/plugin/CliPluginRealmCache.java diff --git a/src/main/java/org/jboss/fuse/mvnd/timing/BuildTimeEventSpy.java b/daemon/src/main/java/org/jboss/fuse/mvnd/timing/BuildTimeEventSpy.java similarity index 100% rename from src/main/java/org/jboss/fuse/mvnd/timing/BuildTimeEventSpy.java rename to daemon/src/main/java/org/jboss/fuse/mvnd/timing/BuildTimeEventSpy.java diff --git a/src/main/provisio/maven-distro.xml b/daemon/src/main/provisio/maven-distro.xml similarity index 100% rename from src/main/provisio/maven-distro.xml rename to daemon/src/main/provisio/maven-distro.xml diff --git a/src/main/resources/META-INF/maven/slf4j-configuration.properties b/daemon/src/main/resources/META-INF/maven/slf4j-configuration.properties similarity index 100% rename from src/main/resources/META-INF/maven/slf4j-configuration.properties rename to daemon/src/main/resources/META-INF/maven/slf4j-configuration.properties diff --git a/src/main/resources/META-INF/plexus/components.xml b/daemon/src/main/resources/META-INF/plexus/components.xml similarity index 100% rename from src/main/resources/META-INF/plexus/components.xml rename to daemon/src/main/resources/META-INF/plexus/components.xml diff --git a/src/main/resources/org/jboss/fuse/mvnd/daemon/build.properties b/daemon/src/main/resources/org/jboss/fuse/mvnd/daemon/build.properties similarity index 100% rename from src/main/resources/org/jboss/fuse/mvnd/daemon/build.properties rename to daemon/src/main/resources/org/jboss/fuse/mvnd/daemon/build.properties diff --git a/src/main/resources/org/jboss/fuse/mvnd/jpm/unix/start.sh b/daemon/src/main/resources/org/jboss/fuse/mvnd/jpm/unix/start.sh similarity index 100% rename from src/main/resources/org/jboss/fuse/mvnd/jpm/unix/start.sh rename to daemon/src/main/resources/org/jboss/fuse/mvnd/jpm/unix/start.sh diff --git a/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/destroy.vbs b/daemon/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/destroy.vbs similarity index 100% rename from src/main/resources/org/jboss/fuse/mvnd/jpm/windows/destroy.vbs rename to daemon/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/destroy.vbs diff --git a/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/running.vbs b/daemon/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/running.vbs similarity index 100% rename from src/main/resources/org/jboss/fuse/mvnd/jpm/windows/running.vbs rename to daemon/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/running.vbs diff --git a/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/start.vbs b/daemon/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/start.vbs similarity index 100% rename from src/main/resources/org/jboss/fuse/mvnd/jpm/windows/start.vbs rename to daemon/src/main/resources/org/jboss/fuse/mvnd/jpm/windows/start.vbs diff --git a/src/test/java/org/jboss/fuse/mvnd/builder/AbstractSmartBuilderTest.java b/daemon/src/test/java/org/jboss/fuse/mvnd/builder/AbstractSmartBuilderTest.java similarity index 100% rename from src/test/java/org/jboss/fuse/mvnd/builder/AbstractSmartBuilderTest.java rename to daemon/src/test/java/org/jboss/fuse/mvnd/builder/AbstractSmartBuilderTest.java diff --git a/src/test/java/org/jboss/fuse/mvnd/builder/DependencyGraphTest.java b/daemon/src/test/java/org/jboss/fuse/mvnd/builder/DependencyGraphTest.java similarity index 100% rename from src/test/java/org/jboss/fuse/mvnd/builder/DependencyGraphTest.java rename to daemon/src/test/java/org/jboss/fuse/mvnd/builder/DependencyGraphTest.java diff --git a/src/test/java/org/jboss/fuse/mvnd/builder/ProjectComparatorTest.java b/daemon/src/test/java/org/jboss/fuse/mvnd/builder/ProjectComparatorTest.java similarity index 100% rename from src/test/java/org/jboss/fuse/mvnd/builder/ProjectComparatorTest.java rename to daemon/src/test/java/org/jboss/fuse/mvnd/builder/ProjectComparatorTest.java diff --git a/src/test/java/org/jboss/fuse/mvnd/builder/ProjectExecutorServiceTest.java b/daemon/src/test/java/org/jboss/fuse/mvnd/builder/ProjectExecutorServiceTest.java similarity index 100% rename from src/test/java/org/jboss/fuse/mvnd/builder/ProjectExecutorServiceTest.java rename to daemon/src/test/java/org/jboss/fuse/mvnd/builder/ProjectExecutorServiceTest.java diff --git a/src/test/java/org/jboss/fuse/mvnd/builder/ReactorBuildQueueTest.java b/daemon/src/test/java/org/jboss/fuse/mvnd/builder/ReactorBuildQueueTest.java similarity index 100% rename from src/test/java/org/jboss/fuse/mvnd/builder/ReactorBuildQueueTest.java rename to daemon/src/test/java/org/jboss/fuse/mvnd/builder/ReactorBuildQueueTest.java diff --git a/src/test/java/org/jboss/fuse/mvnd/builder/TestProjectDependencyGraph.java b/daemon/src/test/java/org/jboss/fuse/mvnd/builder/TestProjectDependencyGraph.java similarity index 100% rename from src/test/java/org/jboss/fuse/mvnd/builder/TestProjectDependencyGraph.java rename to daemon/src/test/java/org/jboss/fuse/mvnd/builder/TestProjectDependencyGraph.java diff --git a/src/test/java/org/jboss/fuse/mvnd/daemon/DaemonRegistryTest.java b/daemon/src/test/java/org/jboss/fuse/mvnd/daemon/DaemonRegistryTest.java similarity index 100% rename from src/test/java/org/jboss/fuse/mvnd/daemon/DaemonRegistryTest.java rename to daemon/src/test/java/org/jboss/fuse/mvnd/daemon/DaemonRegistryTest.java diff --git a/pom.xml b/pom.xml index e98a12f1..49e70035 100644 --- a/pom.xml +++ b/pom.xml @@ -7,8 +7,8 @@ mvnd 0.1-SNAPSHOT - jar - Maven Daemon + pom + Maven Daemon - Parent UTF-8 @@ -27,143 +27,8 @@ 2.22.2 - - - org.apache.maven - maven-embedder - ${mavenVersion} - provided - - - io.takari.aether - takari-local-repository - ${takariLocalRepositoryVersion} - + + daemon + - - - ch.qos.logback - logback-classic - ${logbackVersion} - - - org.slf4j - log4j-over-slf4j - ${slf4jVersion} - - - org.slf4j - jcl-over-slf4j - ${slf4jVersion} - - - org.slf4j - jul-to-slf4j - ${slf4jVersion} - - - - org.jline - jline-terminal - ${jlineVersion} - - - org.jline - jline-terminal-jansi - ${jlineVersion} - - - org.codehaus.groovy - groovy - ${groovyVersion} - - - - junit - junit - ${junitVersion} - test - - - io.takari.maven.plugins - takari-plugin-testing - ${pluginTestingVersion} - test - - - io.takari.maven.plugins - takari-plugin-integration-testing - ${pluginTestingVersion} - pom - test - - - - - - - ${basedir}/src/main/resources - true - - - - - io.takari.maven.plugins - takari-lifecycle-plugin - ${takariLifecycleVersion} - - - - sisu-index - - process-classes - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${mavenCompilerPluginVersion} - - 1.8 - 1.8 - - - - io.takari.maven.plugins - provisio-maven-plugin - ${takariProvisioVersion} - - - maven-distro - package - - provision - - - ${project.build.directory}/maven-distro - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${mavenSurefirePluginVersion} - - - integration-test - integration-test - - test - - - **/*IT.java - - - - - - - - \ No newline at end of file +