Let maven-axis-server-plugin automatically add axis-standalone-server to the classpath so that it is no longer required to declare it as a dependency.

veithen · veithen · commit a170c458754d · 2012-12-09T09:45:08.000Z
diff --git a/axis-rt-transport-http-javanet/pom.xml b/axis-rt-transport-http-javanet/pom.xml
@@ -51,12 +51,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>interop-mock</artifactId>
diff --git a/integration/pom.xml b/integration/pom.xml
@@ -43,12 +43,6 @@
             <artifactId>axis-codegen</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>axis-testutils</artifactId>
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
@@ -21,19 +21,37 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactCollector;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.resolver.DebugResolutionListener;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.toolchain.Toolchain;
 import org.apache.maven.toolchain.ToolchainManager;
+import org.codehaus.plexus.logging.LogEnabled;
+import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.StringUtils;
 
-public abstract class AbstractStartProcessMojo extends AbstractServerMojo {
+public abstract class AbstractStartProcessMojo extends AbstractServerMojo implements LogEnabled {
     /**
      * The maven project.
      *
@@ -52,6 +70,49 @@ public abstract class AbstractStartProcessMojo extends AbstractServerMojo {
      */
     private MavenSession session;
     
+    /**
+     * @component
+     */
+    private MavenProjectBuilder projectBuilder;
+    
+    /**
+     * Local maven repository.
+     * 
+     * @parameter expression="${localRepository}"
+     * @required
+     * @readonly
+     */
+    private ArtifactRepository localRepository;
+    
+    /**
+     * Remote repositories.
+     * 
+     * @parameter expression="${project.remoteArtifactRepositories}"
+     * @required
+     * @readonly
+     */
+    private List remoteArtifactRepositories;
+    
+    /**
+     * @component
+     */
+    protected ArtifactFactory artifactFactory;
+    
+    /**
+     * @component
+     */
+    private ArtifactResolver artifactResolver;
+    
+    /**
+     * @component
+     */
+    private ArtifactCollector artifactCollector;
+    
+    /**
+     * @component
+     */
+    private ArtifactMetadataSource artifactMetadataSource;
+    
     /**
      * @component
      */
@@ -98,11 +159,71 @@ public abstract class AbstractStartProcessMojo extends AbstractServerMojo {
      */
     private String argLine;
     
+    private Logger logger;
+    
+    public void enableLogging(Logger logger) {
+        this.logger = logger;
+    }
+    
     protected boolean isDebug() {
         return debug;
     }
 
-    protected void startJavaProcess(String description, String mainClass, String[] args, File workDir, ProcessControl processControl) throws MojoExecutionException, MojoFailureException {
+    private List/*<File>*/ buildClasspath(Set/*<Artifact>*/ additionalArtifacts) throws ProjectBuildingException, InvalidDependencyVersionException, ArtifactResolutionException, ArtifactNotFoundException {
+        final Log log = getLog();
+        
+        // We need dependencies in scope test. Since this is the largest scope, we don't need
+        // to do any additional filtering based on dependency scope.
+        Set projectDependencies = project.getArtifacts();
+        
+        final Set artifacts = new HashSet(projectDependencies);
+        
+        if (additionalArtifacts != null) {
+            for (Iterator it = additionalArtifacts.iterator(); it.hasNext(); ) {
+                Artifact a = (Artifact)it.next();
+                if (log.isDebugEnabled()) {
+                    log.debug("Resolving artifact to be added to classpath: " + a);
+                }
+                ArtifactFilter filter = new ArtifactFilter() {
+                    public boolean include(Artifact artifact) {
+                        String id = artifact.getDependencyConflictId();
+                        for (Iterator it = artifacts.iterator(); it.hasNext(); ) {
+                            if (id.equals(((Artifact)it.next()).getDependencyConflictId())) {
+                                return false;
+                            }
+                        }
+                        return true;
+                    }
+                };
+                MavenProject p = projectBuilder.buildFromRepository(a, remoteArtifactRepositories, localRepository);
+                if (filter.include(p.getArtifact())) {
+                    Set s = p.createArtifacts(artifactFactory, Artifact.SCOPE_RUNTIME, filter);
+                    artifacts.addAll(artifactCollector.collect(s,
+                            p.getArtifact(), p.getManagedVersionMap(),
+                            localRepository, remoteArtifactRepositories, artifactMetadataSource, filter,
+                            Collections.singletonList(new DebugResolutionListener(logger))).getArtifacts());
+                    artifacts.add(p.getArtifact());
+                }
+            }
+        }
+        
+        List/*<File>*/ cp = new ArrayList();
+        cp.add(project.getBuild().getTestOutputDirectory());
+        cp.add(project.getBuild().getOutputDirectory());
+        for (Iterator it = artifacts.iterator(); it.hasNext(); ) {
+            Artifact a = (Artifact)it.next();
+            if (a.getArtifactHandler().isAddedToClasspath()) {
+                if (a.getFile() == null) {
+                    artifactResolver.resolve(a, remoteArtifactRepositories, localRepository);
+                }
+                cp.add(a.getFile());
+            }
+        }
+        
+        return cp;
+    }
+    
+    protected final void startJavaProcess(String description, String mainClass, Set additionalDependencies, String[] args, File workDir, ProcessControl processControl) throws MojoExecutionException, MojoFailureException {
         Log log = getLog();
         
         // Locate java executable to use
@@ -120,9 +241,9 @@ protected void startJavaProcess(String description, String mainClass, String[] a
         // Get class path
         List classpath;
         try {
-            classpath = project.getTestClasspathElements();
-        } catch (DependencyResolutionRequiredException ex) {
-            throw new MojoExecutionException("Unexpected exception", ex);
+            classpath = buildClasspath(additionalDependencies);
+        } catch (Exception ex) {
+            throw new MojoExecutionException("Failed to build classpath", ex);
         }
         if (log.isDebugEnabled()) {
             log.debug("Class path elements: " + classpath);
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
@@ -72,6 +72,6 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
         if (args != null) {
             System.arraycopy(args, 0, vmArgs, 2, args.length);
         }
-        startJavaProcess(daemonClass, "org.apache.axis.testutils.daemon.Launcher", vmArgs, workDir, new DaemonProcessControl(controlPort));
+        startJavaProcess(daemonClass, "org.apache.axis.testutils.daemon.Launcher", null, vmArgs, workDir, new DaemonProcessControl(controlPort));
     }
 }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java
@@ -57,7 +57,7 @@ public class StartProcessMojo extends AbstractStartProcessMojo {
 
     protected void doExecute() throws MojoExecutionException, MojoFailureException {
         workDir.mkdirs();
-        startJavaProcess(mainClass, mainClass, args != null ? args : new String[0], workDir, new ProcessControl() {
+        startJavaProcess(mainClass, mainClass, null, args != null ? args : new String[0], workDir, new ProcessControl() {
             public void initializeProcess(Logger logger, Process process) throws Exception {
             }
 
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
@@ -22,14 +22,17 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.axis.client.AdminClient;
 import org.apache.axis.deployment.wsdd.WSDDConstants;
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
@@ -47,6 +50,13 @@
  * @requiresDependencyResolution test
  */
 public class StartServerMojo extends AbstractStartProcessMojo {
+    /**
+     * @parameter default-value="${plugin.version}"
+     * @required
+     * @readonly
+     */
+    private String axisVersion;
+    
     /**
      * @parameter default-value="${project.build.directory}/axis-server"
      * @required
@@ -214,9 +224,12 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
         try {
             AdminClient adminClient = new AdminClient(true);
             adminClient.setTargetEndpointAddress(new URL("http://localhost:" + actualPort + "/axis/services/AdminService"));
+            Set additionalDependencies = new HashSet();
+            additionalDependencies.add(artifactFactory.createArtifact("org.apache.axis", "axis-standalone-server", axisVersion, Artifact.SCOPE_TEST, "jar"));
             startJavaProcess(
                     "Server on port " + actualPort,
                     "org.apache.axis.server.standalone.StandaloneAxisServer",
+                    additionalDependencies,
                     (String[])args.toArray(new String[args.size()]),
                     workDir,
                     new AxisServerProcessControl(actualPort, adminClient,
diff --git a/samples/addr-sample/pom.xml b/samples/addr-sample/pom.xml
@@ -38,12 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/attachments-sample/pom.xml b/samples/attachments-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/bidbuy-sample/pom.xml b/samples/bidbuy-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/encoding-sample/pom.xml b/samples/encoding-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/faults-sample/pom.xml b/samples/faults-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/handler-sample/pom.xml b/samples/handler-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/jaxrpc-sample/pom.xml b/samples/jaxrpc-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>stock-sample</artifactId>
diff --git a/samples/message-sample/pom.xml b/samples/message-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/misc-sample/pom.xml b/samples/misc-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/proxy-sample/pom.xml b/samples/proxy-sample/pom.xml
@@ -49,11 +49,6 @@
         	<version>${project.version}</version>
         	<scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/stock-sample/pom.xml b/samples/stock-sample/pom.xml
@@ -43,11 +43,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,6 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {`
`72`	`72`	`if (args != null) {`
`73`	`73`	`System.arraycopy(args, 0, vmArgs, 2, args.length);`
`74`	`74`	`}`
`75`		`- startJavaProcess(daemonClass, "org.apache.axis.testutils.daemon.Launcher", vmArgs, workDir, new DaemonProcessControl(controlPort));`
	`75`	`+ startJavaProcess(daemonClass, "org.apache.axis.testutils.daemon.Launcher", null, vmArgs, workDir, new DaemonProcessControl(controlPort));`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public class StartProcessMojo extends AbstractStartProcessMojo {`
`57`	`57`
`58`	`58`	`protected void doExecute() throws MojoExecutionException, MojoFailureException {`
`59`	`59`	`workDir.mkdirs();`
`60`		`- startJavaProcess(mainClass, mainClass, args != null ? args : new String[0], workDir, new ProcessControl() {`
	`60`	`+ startJavaProcess(mainClass, mainClass, null, args != null ? args : new String[0], workDir, new ProcessControl() {`
`61`	`61`	`public void initializeProcess(Logger logger, Process process) throws Exception {`
`62`	`62`	`}`
`63`	`63`