You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/10/19 16:25:01 UTC
svn commit: r1400113 - in /axis/axis1/java/trunk: integration/pom.xml
integration/src/test/java/test/wsdl/multithread/
integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java
samples/addr-sample/pom.xml test/wsdl/multithread/
Author: veithen
Date: Fri Oct 19 14:25:01 2012
New Revision: 1400113
URL: http://svn.apache.org/viewvc?rev=1400113&view=rev
Log:
Migrated test/wsdl/multithread to the Maven build.
Added:
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/multithread/
axis/axis1/java/trunk/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java
- copied, changed from r1399984, axis/axis1/java/trunk/test/wsdl/multithread/MultithreadTestCase.java
Removed:
axis/axis1/java/trunk/test/wsdl/multithread/
Modified:
axis/axis1/java/trunk/integration/pom.xml
axis/axis1/java/trunk/samples/addr-sample/pom.xml
Modified: axis/axis1/java/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1400113&r1=1400112&r2=1400113&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Fri Oct 19 14:25:01 2012
@@ -1319,6 +1319,30 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>addr-sample</artifactId>
+ <version>${project.version}</version>
+ <type>wsdd</type>
+ <classifier>deploy</classifier>
+ <outputDirectory>${project.build.directory}/wsdd</outputDirectory>
+ <destFileName>addr.wsdd</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
Copied: axis/axis1/java/trunk/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java (from r1399984, axis/axis1/java/trunk/test/wsdl/multithread/MultithreadTestCase.java)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java?p2=axis/axis1/java/trunk/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java&p1=axis/axis1/java/trunk/test/wsdl/multithread/MultithreadTestCase.java&r1=1399984&r2=1400113&rev=1400113&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/wsdl/multithread/MultithreadTestCase.java (original)
+++ axis/axis1/java/trunk/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java Fri Oct 19 14:25:01 2012
@@ -11,6 +11,7 @@ import samples.addr.AddressBookSOAPBindi
import samples.addr.AddressBookServiceLocator;
import samples.addr.Phone;
import samples.addr.StateType;
+import test.HttpTestUtil;
import javax.xml.rpc.ServiceException;
import java.net.ConnectException;
@@ -106,9 +107,10 @@ public class MultithreadTestCase extends
} // run
} // class Run
- public void testMultithreading() {
+ public void testMultithreading() throws Exception {
try {
- binding = new AddressBookServiceLocator().getAddressBook();
+ AddressBookServiceLocator loc = new AddressBookServiceLocator();
+ binding = loc.getAddressBook(HttpTestUtil.getTestEndpoint(loc.getAddressBookAddress()));
}
catch (ServiceException jre) {
throw new AssertionFailedError("ServiceException caught: " + jre);
@@ -135,10 +137,5 @@ public class MultithreadTestCase extends
throw error;
}
} // testMultithreading
-
- public static void main(String[] args) {
- MultithreadTestCase testCase = new MultithreadTestCase("MultithreadTestCase");
- testCase.testMultithreading();
- }
} // class MultithreadTestCase
Modified: axis/axis1/java/trunk/samples/addr-sample/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/addr-sample/pom.xml?rev=1400113&r1=1400112&r2=1400113&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/addr-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/addr-sample/pom.xml Fri Oct 19 14:25:01 2012
@@ -101,6 +101,22 @@
</portNames>
</configuration>
</execution>
+ <execution>
+ <id>attach-wsdd</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/wsdd/AddressBook.wsdd</file>
+ <type>wsdd</type>
+ <classifier>deploy</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>