Author: sagara Date: Wed Apr 11 08:11:21 2012 New Revision: 1324616 URL: http://svn.apache.org/viewvc?rev=1324616&view=rev Log: * Added support to run plug-in server in fork mode. This is useful feature for Maven integrations tests. * Maven test classes build directory added to Calsspath so that plug-in can be used to deploy Classes on test packages.
Modified: axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/Constants.java Modified: axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java?rev=1324616&r1=1324615&r2=1324616&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java (original) +++ axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java Wed Apr 11 08:11:21 2012 @@ -82,6 +82,13 @@ public class SimpleHttpServerMojo extend private String port; /** + * Indicates whether to fork the server. + * + * @parameter default-value="false" + */ + private boolean fork; + + /** * @parameter default-value="1024" */ private int dataBufferSize; @@ -126,7 +133,7 @@ public class SimpleHttpServerMojo extend private String projectId; private Axis2Server server; - private boolean fork; + public RepoHelper getRepoHelper() { RepoHelper repoHelper = new RepoHelper(repoPath); @@ -164,7 +171,7 @@ public class SimpleHttpServerMojo extend if (fork) { new Thread(new Runnable() { public void run() { - getLog().info(" Starting Axis2 Simple HTTP Server..................... "); + getLog().info(" Starting Axis2 Simple HTTP Server in a foke mode................. "); server.startServer(); getLog().info(" Axis2 Simple HTTP server satreted"); waitForShutdown(); @@ -188,7 +195,9 @@ public class SimpleHttpServerMojo extend .currentThread().getContextClassLoader()); } File cls = new File(buildDir + File.separator + Constants.DEFAULT_CLASSES_DIRECTORY); + File testCls = new File(buildDir + File.separator + Constants.DEFAULT_TEST_CLASSES_DIRECTORY); realm.addURL(cls.toURI().toURL()); + realm.addURL(testCls.toURI().toURL()); Thread.currentThread().setContextClassLoader(realm); } Modified: axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/Constants.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/Constants.java?rev=1324616&r1=1324615&r2=1324616&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/Constants.java (original) +++ axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/Constants.java Wed Apr 11 08:11:21 2012 @@ -50,6 +50,9 @@ public class Constants { /** The Constant DEFAULT_CLASSES_DIRECTOY. */ public static final String DEFAULT_CLASSES_DIRECTORY = "classes"; + /** The Constant DEFAULT_TEST_CLASSES_DIRECTOY. */ + public static final String DEFAULT_TEST_CLASSES_DIRECTORY = "test-classes"; + /** The Constant DEFAULT_PORT_PARAM. */ public static final String DEFAULT_PORT_PARAM = "port";