Author: veithen
Date: Sun Feb 5 23:11:50 2012
New Revision: 1240855
URL: http://svn.apache.org/viewvc?rev=1240855&view=rev
Log:
Mavenized TestTransportSample.
Added:
axis/axis1/java/trunk/samples/transport-sample/src/main/wsdd/
axis/axis1/java/trunk/samples/transport-sample/src/main/wsdd/client_deploy.wsdd
- copied unchanged from r1240851,
axis/axis1/java/trunk/distribution/src/main/files/samples/transport/client_deploy.wsdd
axis/axis1/java/trunk/samples/transport-sample/src/main/wsdd/deploy.wsdd
- copied unchanged from r1240851,
axis/axis1/java/trunk/distribution/src/main/files/samples/transport/deploy.wsdd
axis/axis1/java/trunk/samples/transport-sample/src/test/
axis/axis1/java/trunk/samples/transport-sample/src/test/java/
axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/
axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/
axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java
- copied, changed from r1240851,
axis/axis1/java/trunk/test/functional/TestTransportSample.java
Removed:
axis/axis1/java/trunk/distribution/src/main/files/samples/transport/client_deploy.wsdd
axis/axis1/java/trunk/distribution/src/main/files/samples/transport/deploy.wsdd
axis/axis1/java/trunk/test/functional/TestTransportSample.java
Modified:
axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml
axis/axis1/java/trunk/samples/transport-sample/pom.xml
Modified: axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml?rev=1240855&r1=1240854&r2=1240855&view=diff
==============================================================================
--- axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml (original)
+++ axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml Sun Feb 5
23:11:50 2012
@@ -124,6 +124,10 @@
<directory>../samples/transport-sample/src/main/java</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>../samples/transport-sample/src/main/wsdd</directory>
+ <outputDirectory>samples/transport</outputDirectory>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Modified: axis/axis1/java/trunk/samples/transport-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/transport-sample/pom.xml?rev=1240855&r1=1240854&r2=1240855&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/transport-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/transport-sample/pom.xml Sun Feb 5 23:11:50
2012
@@ -40,11 +40,17 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>stock-sample</artifactId>
+ <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>
+ <!-- build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -93,5 +99,5 @@
</executions>
</plugin>
</plugins>
- </build>
+ </build -->
</project>
Copied:
axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java
(from r1240851, axis/axis1/java/trunk/test/functional/TestTransportSample.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java?p2=axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java&p1=axis/axis1/java/trunk/test/functional/TestTransportSample.java&r1=1240851&r2=1240855&rev=1240855&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/functional/TestTransportSample.java (original)
+++
axis/axis1/java/trunk/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java
Sun Feb 5 23:11:50 2012
@@ -35,7 +35,7 @@ public class TestTransportSample extends
}
public void doTestDeploy () throws Exception {
- String[] args = { "-llocal:", "samples/transport/deploy.wsdd" };
+ String[] args = { "-llocal:", System.getProperty("basedir") +
"/src/main/wsdd/deploy.wsdd" };
AdminClient.main(args);
}
@@ -71,8 +71,9 @@ public class TestTransportSample extends
log.info("Testing transport sample.");
log.info("Testing deployment...");
doTestDeploy();
- log.info("Testing service with symbol IBM...");
- doTestIBM();
+ // TODO: this test no longer works because it depends on a 3rd
party service that is no longer available
+// log.info("Testing service with symbol IBM...");
+// doTestIBM();
log.info("Testing service with symbol XXX...");
doTestXXX();
log.info("Test complete.");
