Modified: axis/axis1/java/branches/AXIS-2882/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java?rev=1418406&r1=1418405&r2=1418406&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java (original) +++ axis/axis1/java/branches/AXIS-2882/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java Fri Dec 7 17:23:31 2012 @@ -35,7 +35,7 @@ public class JavaStubWriterEx extends Ja if (clientOutputDirectory == null) { return super.getFileName(); } else { - return clientOutputDirectory + File.separator + packageName.replaceAll("\\.", File.separator) + File.separator + className + ".java"; + return clientOutputDirectory + File.separator + packageName.replace('.', File.separatorChar) + File.separator + className + ".java"; } } }
Modified: axis/axis1/java/branches/AXIS-2882/maven/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/maven/pom.xml?rev=1418406&r1=1418405&r2=1418406&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/maven/pom.xml (original) +++ axis/axis1/java/branches/AXIS-2882/maven/pom.xml Fri Dec 7 17:23:31 2012 @@ -68,6 +68,7 @@ </dependencyManagement> <modules> <module>nsmap</module> + <module>maven-wsdd-plugin</module> <module>maven-wsdl2java-plugin</module> <module>maven-java2wsdl-plugin</module> <module>maven-axis-server-plugin</module> Modified: axis/axis1/java/branches/AXIS-2882/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/pom.xml?rev=1418406&r1=1418405&r2=1418406&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/pom.xml (original) +++ axis/axis1/java/branches/AXIS-2882/pom.xml Fri Dec 7 17:23:31 2012 @@ -61,6 +61,7 @@ <module>axis-ant</module> <module>axis-codegen</module> <module>axis-jaxrpc</module> + <module>axis-model</module> <module>axis-rt-compat</module> <module>axis-rt-core</module> <module>axis-rt-jws</module> @@ -125,6 +126,11 @@ <artifactId>axiom-testutils</artifactId> <version>1.2.13</version> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.6</version> + </dependency> </dependencies> </dependencyManagement> <prerequisites> @@ -217,6 +223,10 @@ <artifactId>gmaven-plugin</artifactId> <version>1.2</version> </plugin> + <plugin> + <artifactId>maven-shade-plugin</artifactId> + <version>2.0</version> + </plugin> </plugins> </pluginManagement> <plugins> Modified: axis/axis1/java/branches/AXIS-2882/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java?rev=1418406&r1=1418405&r2=1418406&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java (original) +++ axis/axis1/java/branches/AXIS-2882/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java Fri Dec 7 17:23:31 2012 @@ -31,27 +31,27 @@ public class TestAttachmentsSample exten } public void testAttachments1() throws Exception { - boolean res = new EchoAttachment(opts).echo(false, System.getProperty("basedir") + "/pom.xml"); + boolean res = new EchoAttachment(opts).echo(false, "pom.xml"); assertEquals("Didn't process attachment correctly", res, true) ; } public void testAttachmentsD1() throws Exception { - boolean res = new EchoAttachment(opts).echo(true, System.getProperty("basedir") + "/pom.xml"); + boolean res = new EchoAttachment(opts).echo(true, "pom.xml"); assertEquals("Didn't process attachment correctly", res, true) ; } public void testAttachmentsDimeLeaveEmpty() throws Exception { - boolean res = new EchoAttachment(opts).echo(true, System.getProperty("basedir") + "/src/test/files/leaveempty.txt"); + boolean res = new EchoAttachment(opts).echo(true, "src/test/files/leaveempty.txt"); assertEquals("Didn't process attachment correctly", res, true) ; } public void testAttachments2() throws Exception { - boolean res = new EchoAttachment(opts).echoDir(false, System.getProperty("basedir") + "/src/main/java/samples/attachments"); + boolean res = new EchoAttachment(opts).echoDir(false, "src/main/java/samples/attachments"); assertEquals("Didn't process attachments correctly", res, true); } public void testAttachmentsD2() throws Exception { - boolean res = new EchoAttachment(opts).echoDir(true, System.getProperty("basedir") + "/src/main/java/samples/attachments"); + boolean res = new EchoAttachment(opts).echoDir(true, "src/main/java/samples/attachments"); assertEquals("Didn't process attachments correctly", res, true); } Modified: axis/axis1/java/branches/AXIS-2882/samples/echo-sample/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/echo-sample/pom.xml?rev=1418406&r1=1418405&r2=1418406&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/echo-sample/pom.xml (original) +++ axis/axis1/java/branches/AXIS-2882/samples/echo-sample/pom.xml Fri Dec 7 17:23:31 2012 @@ -70,13 +70,32 @@ </executions> </plugin> <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>maven-wsdd-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <!-- We create a server-config.wsdd file to prevent Axis from creating a default one in the source tree --> + <phase>generate-test-sources</phase> + <goals> + <goal>generate-wsdd</goal> + </goals> + <configuration> + <type>server</type> + <output>${project.build.directory}/server-config.wsdd</output> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <executions> <execution> <id>default-test</id> <configuration> - <!-- Prevent Axis from creating a server-config.wsdd file in the source tree --> - <workingDirectory>${project.build.directory}/work</workingDirectory> + <systemPropertyVariables> + <axis.ServerConfigFile>${project.build.directory}/server-config.wsdd</axis.ServerConfigFile> + </systemPropertyVariables> </configuration> </execution> </executions> Modified: axis/axis1/java/branches/AXIS-2882/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java?rev=1418406&r1=1418405&r2=1418406&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java (original) +++ axis/axis1/java/branches/AXIS-2882/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java Fri Dec 7 17:23:31 2012 @@ -43,7 +43,7 @@ public class TestEchoSample extends Test // deploy the echo service String[] args = {"-l", "local:///AdminService", - System.getProperty("basedir") + "/src/main/wsdd/deploy.wsdd"}; + "src/main/wsdd/deploy.wsdd"}; AdminClient.main(args); // define the tests using JUnit assert facilities, and tell client to Modified: axis/axis1/java/branches/AXIS-2882/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java?rev=1418406&r1=1418405&r2=1418406&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java (original) +++ axis/axis1/java/branches/AXIS-2882/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java Fri Dec 7 17:23:31 2012 @@ -26,7 +26,7 @@ import org.apache.commons.io.FileUtils; public class VerifyFilesTest extends TestCase { public void testDeployUseless() throws Exception { - File file = new File(System.getProperty("basedir", "."), "target/work/example1/com/examples/www/wsdl/HelloService_wsdl/Hello_Service.lst"); + File file = new File("target/work/example1/com/examples/www/wsdl/HelloService_wsdl/Hello_Service.lst"); assertTrue(file.exists()); assertEquals("Hello_Port", FileUtils.readFileToString(file).trim()); } Modified: axis/axis1/java/branches/AXIS-2882/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java?rev=1418406&r1=1418405&r2=1418406&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java (original) +++ axis/axis1/java/branches/AXIS-2882/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java Fri Dec 7 17:23:31 2012 @@ -26,7 +26,7 @@ import org.apache.commons.io.FileUtils; public class VerifyFilesTest extends TestCase { public void testDeployUseless() throws Exception { - File file = new File(System.getProperty("basedir", "."), "target/work/example2/com/examples/www/wsdl/HelloService_wsdl/deploy.useless"); + File file = new File("target/work/example2/com/examples/www/wsdl/HelloService_wsdl/deploy.useless"); assertTrue(file.exists()); assertEquals("Hi ho! Hi ho! It's off to work we go.", FileUtils.readFileToString(file).trim()); } Modified: axis/axis1/java/branches/AXIS-2882/samples/transport-sample/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/transport-sample/pom.xml?rev=1418406&r1=1418405&r2=1418406&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/transport-sample/pom.xml (original) +++ axis/axis1/java/branches/AXIS-2882/samples/transport-sample/pom.xml Fri Dec 7 17:23:31 2012 @@ -104,6 +104,24 @@ </executions> </plugin> <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>maven-wsdd-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <!-- We create a server-config.wsdd file to prevent Axis from creating a default one in the source tree --> + <phase>pre-integration-test</phase> + <goals> + <goal>generate-wsdd</goal> + </goals> + <configuration> + <type>server</type> + <output>${project.build.directory}/server-config.wsdd</output> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-failsafe-plugin</artifactId> <executions> <execution> @@ -115,9 +133,8 @@ <includes> <include>**/Test*.java</include> </includes> - <!-- Prevent Axis from creating a server-config.wsdd file in the source tree --> - <workingDirectory>${project.build.directory}/work</workingDirectory> <systemPropertyVariables> + <axis.ServerConfigFile>${project.build.directory}/server-config.wsdd</axis.ServerConfigFile> <test.functional.TCPListenerPort>${test.functional.TCPListenerPort}</test.functional.TCPListenerPort> </systemPropertyVariables> </configuration> Modified: axis/axis1/java/branches/AXIS-2882/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java?rev=1418406&r1=1418405&r2=1418406&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java (original) +++ axis/axis1/java/branches/AXIS-2882/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java Fri Dec 7 17:23:31 2012 @@ -48,7 +48,7 @@ public class TestTCPTransportSample exte } public void doTestDeploy () throws Exception { - String[] args = { "-l" + uri, System.getProperty("basedir", ".") + "/src/main/wsdd/deploy.wsdd" }; + String[] args = { "-l" + uri, "src/main/wsdd/deploy.wsdd" }; AdminClient.main(args); } Modified: axis/axis1/java/branches/AXIS-2882/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java?rev=1418406&r1=1418405&r2=1418406&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java (original) +++ axis/axis1/java/branches/AXIS-2882/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java Fri Dec 7 17:23:31 2012 @@ -35,7 +35,7 @@ public class TestTransportSample extends } public void doTestDeploy () throws Exception { - String[] args = { "-llocal:", System.getProperty("basedir") + "/src/main/wsdd/deploy.wsdd" }; + String[] args = { "-llocal:", "src/main/wsdd/deploy.wsdd" }; AdminClient.main(args); } Propchange: axis/axis1/java/branches/AXIS-2882/test/wsdl/interop/ ------------------------------------------------------------------------------ Merged /axis/axis1/java/trunk/test/wsdl/interop:r1410918-1418400 Merged /axis/axis1/java/branches/EMF/test/wsdl/interop:r1417039-1418230 Modified: axis/axis1/java/branches/AXIS-2882/tests/spring-compat-tests/pom.xml URL: http://svn.apache.org/viewvc/axis/axis1/java/branches/AXIS-2882/tests/spring-compat-tests/pom.xml?rev=1418406&r1=1418405&r2=1418406&view=diff ============================================================================== --- axis/axis1/java/branches/AXIS-2882/tests/spring-compat-tests/pom.xml (original) +++ axis/axis1/java/branches/AXIS-2882/tests/spring-compat-tests/pom.xml Fri Dec 7 17:23:31 2012 @@ -68,13 +68,32 @@ <deployScope>application</deployScope> <implementationClassName>org.apache.axis.test.spring.OrderEndpoint</implementationClassName> <writeStubToTestSources>true</writeStubToTestSources> - <!-- TODO: need to merge the output into server-config.wsdd --> <deployWsdd>${project.build.directory}/wsdd/OrderService.wsdd</deployWsdd> </configuration> </execution> </executions> </plugin> <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>maven-wsdd-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>generate-wsdd</goal> + </goals> + <configuration> + <type>server</type> + <files> + <file>${project.build.directory}/wsdd/OrderService.wsdd</file> + </files> + <output>${project.build.directory}/webapp/WEB-INF/server-config.wsdd</output> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> @@ -104,6 +123,12 @@ <port>${test.httpPort}</port> </connector> </connectors> + <webApp> + <resourceBases> + <resourceBase>${basedir}/src/main/webapp</resourceBase> + <resourceBase>${project.build.directory}/webapp</resourceBase> + </resourceBases> + </webApp> </configuration> <executions> <execution>
