Author: veithen
Date: Thu Feb 16 20:47:23 2012
New Revision: 1245171
URL: http://svn.apache.org/viewvc?rev=1245171&view=rev
Log:
Mavenized TestJAXRPCSamples.
Added:
axis/axis1/java/trunk/samples/jaxrpc-sample/
axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml (with props)
axis/axis1/java/trunk/samples/jaxrpc-sample/src/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/GetInfo.java
- copied unchanged from r1245126,
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/GetInfo.java
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/GetQuote1.java
- copied unchanged from r1245126,
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/GetQuote1.java
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/address/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/address/AddressClient.java
- copied, changed from r1245126,
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/address/AddressClient.java
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/address/AddressSoapBindingImpl.java
- copied unchanged from r1245126,
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/address/AddressSoapBindingImpl.java
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/hello/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/hello/ClientHandler.java
- copied unchanged from r1245126,
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/ClientHandler.java
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/hello/HelloBindingImpl.java
- copied unchanged from r1245126,
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/HelloBindingImpl.java
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/hello/HelloClient.java
- copied, changed from r1245126,
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/HelloClient.java
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/hello/ServerHandler.java
- copied unchanged from r1245126,
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/ServerHandler.java
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/wsdd/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/wsdl/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/wsdl/address/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/wsdl/address/Address.wsdl
- copied unchanged from r1245126,
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/address/Address.wsdl
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/wsdl/hello/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/wsdl/hello/HelloWorld.wsdl
- copied unchanged from r1245126,
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/HelloWorld.wsdl
axis/axis1/java/trunk/samples/jaxrpc-sample/src/test/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/test/java/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/test/java/test/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/test/java/test/functional/
axis/axis1/java/trunk/samples/jaxrpc-sample/src/test/java/test/functional/TestJAXRPCSamples.java
- copied, changed from r1245126,
axis/axis1/java/trunk/test/functional/TestJAXRPCSamples.java
Removed:
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/GetInfo.java
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/GetQuote1.java
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/address/Address.wsdl
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/address/AddressBean.java
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/address/AddressClient.java
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/address/AddressSoapBindingImpl.java
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/ClientHandler.java
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/Hello.java
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/HelloBindingImpl.java
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/HelloClient.java
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/HelloWorld.wsdl
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/ServerHandler.java
axis/axis1/java/trunk/test/functional/TestJAXRPCSamples.java
Modified:
axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml
axis/axis1/java/trunk/samples/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=1245171&r1=1245170&r2=1245171&view=diff
==============================================================================
--- axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml (original)
+++ axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml Thu Feb 16
20:47:23 2012
@@ -85,6 +85,14 @@
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
+ <directory>../samples/jaxrpc-sample/src/main/java</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/jaxrpc-sample/src/main/wsdl</directory>
+ <outputDirectory>samples/jaxrpc</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>../samples/message-sample/src/main/java</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
Added: axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml?rev=1245171&view=auto
==============================================================================
--- axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml (added)
+++ axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml Thu Feb 16 20:47:23 2012
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>jaxrpc-sample</artifactId>
+ <name>JAX-RPC Sample</name>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <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>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>maven-wsdl2java-plugin</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <output>${project.build.directory}/work</output>
+ </configuration>
+ <executions>
+ <execution>
+ <id>address</id>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ <configuration>
+ <file>src/main/wsdl/address/Address.wsdl</file>
+ <serverSide>true</serverSide>
+ </configuration>
+ </execution>
+ <execution>
+ <id>hello</id>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ <configuration>
+ <file>src/main/wsdl/hello/HelloWorld.wsdl</file>
+ <serverSide>true</serverSide>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <portNames>
+
<portName>test.functional.ServicePort</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>maven-axis-server-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>start-server</id>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <port>${test.functional.ServicePort}</port>
+ <wsdds>
+ <wsdd>
+
<directory>../stock-sample/src/main/wsdd</directory>
+ <includes>
+ <include>**/*.wsdd</include>
+ </includes>
+ </wsdd>
+ <wsdd>
+
<directory>${project.build.directory}/work</directory>
+ <includes>
+ <include>**/*.wsdd</include>
+ </includes>
+ </wsdd>
+ </wsdds>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop-server</id>
+ <goals>
+ <goal>stop-all</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ <systemPropertyVariables>
+
<test.functional.ServicePort>${test.functional.ServicePort}</test.functional.ServicePort>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/address/AddressClient.java
(from r1245126,
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/address/AddressClient.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/address/AddressClient.java?p2=axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/address/AddressClient.java&p1=axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/address/AddressClient.java&r1=1245126&r2=1245171&rev=1245171&view=diff
==============================================================================
---
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/address/AddressClient.java
(original)
+++
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/address/AddressClient.java
Thu Feb 16 20:47:23 2012
@@ -7,7 +7,7 @@ import java.net.URL;
public class AddressClient {
public static void main(String[] args) throws Exception {
- URL urlWsdl = new
URL("http://localhost:8080/axis/services/Address?wsdl";);
+ URL urlWsdl = new URL((args.length > 0 ? args[0] :
"http://localhost:8080";) + "/axis/services/Address?wsdl");
String nameSpaceUri = "http://address.jaxrpc.samples";;
String serviceName = "AddressServiceService";
String portName = "Address";
Copied:
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/hello/HelloClient.java
(from r1245126,
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/HelloClient.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/hello/HelloClient.java?p2=axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/hello/HelloClient.java&p1=axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/HelloClient.java&r1=1245126&r2=1245171&rev=1245171&view=diff
==============================================================================
---
axis/axis1/java/trunk/distribution/src/main/files/samples/jaxrpc/hello/HelloClient.java
(original)
+++
axis/axis1/java/trunk/samples/jaxrpc-sample/src/main/java/samples/jaxrpc/hello/HelloClient.java
Thu Feb 16 20:47:23 2012
@@ -7,7 +7,7 @@ import java.net.URL;
public class HelloClient {
public static void main(String[] args) throws Exception {
- String UrlString =
"http://localhost:8080/axis/services/HelloPort?wsdl";;
+ String UrlString = (args.length > 0 ? args[0] :
"http://localhost:8080";) + "/axis/services/HelloPort?wsdl";
String nameSpaceUri = "http://hello.jaxrpc.samples/";;
String serviceName = "HelloWorld";
String portName = "HelloPort";
Copied:
axis/axis1/java/trunk/samples/jaxrpc-sample/src/test/java/test/functional/TestJAXRPCSamples.java
(from r1245126, axis/axis1/java/trunk/test/functional/TestJAXRPCSamples.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/jaxrpc-sample/src/test/java/test/functional/TestJAXRPCSamples.java?p2=axis/axis1/java/trunk/samples/jaxrpc-sample/src/test/java/test/functional/TestJAXRPCSamples.java&p1=axis/axis1/java/trunk/test/functional/TestJAXRPCSamples.java&r1=1245126&r2=1245171&rev=1245171&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/functional/TestJAXRPCSamples.java (original)
+++
axis/axis1/java/trunk/samples/jaxrpc-sample/src/test/java/test/functional/TestJAXRPCSamples.java
Thu Feb 16 20:47:23 2012
@@ -34,11 +34,6 @@ public class TestJAXRPCSamples extends T
super(name);
} // ctor
- public void doTestDeploy() throws Exception {
- String[] args = {"samples/stock/deploy.wsdd"};
- AdminClient.main(args);
- } // doTestDeploy
-
public void doTestGetQuoteXXX() throws Exception {
String[] args = {"-uuser1", "-wpass1", "XXX"};
float val = new GetQuote1().getQuote1(args);
@@ -51,11 +46,6 @@ public class TestJAXRPCSamples extends T
GetQuote1.main(args);
} // doTestGetQuoteMain
- public void doTestUndeploy() throws Exception {
- String[] args = {"samples/stock/undeploy.wsdd"};
- AdminClient.main(args);
- } // doTestStockNoAction
-
// public void testGetQuote() throws Exception {
// try {
// log.info("Testing JAX-RPC GetQuote1 sample.");
@@ -76,29 +66,28 @@ public class TestJAXRPCSamples extends T
public void testGetInfo() throws Exception {
log.info("Testing JAX-RPC GetInfo sample.");
- log.info("Testing deployment...");
- doTestDeploy();
log.info("Testing service...");
- String[] args = {"-uuser3", "-wpass3", "IBM", "symbol"};
+ String[] args = { "-p",
System.getProperty("test.functional.ServicePort", "8080"),
+ "-uuser3", "-wpass3", "IBM", "symbol"};
GetInfo.main(args);
- args = new String[] {"-uuser3", "-wpass3", "MACR", "name"};
+ args = new String[] { "-p",
System.getProperty("test.functional.ServicePort", "8080"),
+ "-uuser3", "-wpass3", "MACR", "name"};
GetInfo.main(args);
- args = new String[] {"-uuser3", "-wpass3", "CSCO", "address"};
+ args = new String[] { "-p",
System.getProperty("test.functional.ServicePort", "8080"),
+ "-uuser3", "-wpass3", "CSCO", "address"};
GetInfo.main(args);
- log.info("Testing undeployment...");
- doTestUndeploy();
log.info("Test complete.");
} // testGetInfo
public void testHello() throws Exception {
log.info("Testing JAX-RPC hello sample.");
- samples.jaxrpc.hello.HelloClient.main(new String[]{});
+ samples.jaxrpc.hello.HelloClient.main(new String[]{
"http://localhost:"; + System.getProperty("test.functional.ServicePort", "8080")
});
log.info("Test complete.");
}
public void testAddress() throws Exception {
log.info("Testing JAX-RPC Address sample.");
- samples.jaxrpc.address.AddressClient.main(new String[]{});
+ samples.jaxrpc.address.AddressClient.main(new String[]{
"http://localhost:"; + System.getProperty("test.functional.ServicePort", "8080")
});
log.info("Test complete.");
}
Modified: axis/axis1/java/trunk/samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/pom.xml?rev=1245171&r1=1245170&r2=1245171&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/pom.xml (original)
+++ axis/axis1/java/trunk/samples/pom.xml Thu Feb 16 20:47:23 2012
@@ -39,6 +39,7 @@
<module>faults-sample</module>
<module>handler-sample</module>
<module>jaxm-sample</module>
+ <module>jaxrpc-sample</module>
<module>message-sample</module>
<module>misc-sample</module>
<module>proxy-sample</module>
