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:01:25 UTC
svn commit: r1400099 - in /axis/axis1/java/trunk:
distribution/src/main/assembly/ distribution/src/main/files/samples/addr/
integration/ integration/src/test/java/test/dynamic/ samples/
samples/addr-sample/ samples/addr-sample/src/ samples/addr-sample/...
Author: veithen
Date: Fri Oct 19 14:01:24 2012
New Revision: 1400099
URL: http://svn.apache.org/viewvc?rev=1400099&view=rev
Log:
* Mavenized the addressbook sample.
* Reuse the artifacts generated by addr-sample and echo-sample in the integration tests (instead of regenerating them).
Added:
axis/axis1/java/trunk/samples/addr-sample/
axis/axis1/java/trunk/samples/addr-sample/pom.xml
axis/axis1/java/trunk/samples/addr-sample/src/
axis/axis1/java/trunk/samples/addr-sample/src/main/
axis/axis1/java/trunk/samples/addr-sample/src/main/java/
axis/axis1/java/trunk/samples/addr-sample/src/main/java/samples/
axis/axis1/java/trunk/samples/addr-sample/src/main/java/samples/addr/
axis/axis1/java/trunk/samples/addr-sample/src/main/java/samples/addr/AddressBookSOAPBindingImpl.java
- copied unchanged from r1399984, axis/axis1/java/trunk/distribution/src/main/files/samples/addr/AddressBookSOAPBindingImpl.java
axis/axis1/java/trunk/samples/addr-sample/src/main/java/samples/addr/DOMUtils.java
- copied unchanged from r1399984, axis/axis1/java/trunk/distribution/src/main/files/samples/addr/DOMUtils.java
axis/axis1/java/trunk/samples/addr-sample/src/main/java/samples/addr/Main.java
- copied unchanged from r1399984, axis/axis1/java/trunk/distribution/src/main/files/samples/addr/Main.java
axis/axis1/java/trunk/samples/addr-sample/src/main/wsdl/
axis/axis1/java/trunk/samples/addr-sample/src/main/wsdl/AddressBook.wsdl
- copied unchanged from r1399984, axis/axis1/java/trunk/distribution/src/main/files/samples/addr/AddressBook.wsdl
axis/axis1/java/trunk/samples/addr-sample/src/test/
axis/axis1/java/trunk/samples/addr-sample/src/test/java/
axis/axis1/java/trunk/samples/addr-sample/src/test/java/samples/
axis/axis1/java/trunk/samples/addr-sample/src/test/java/samples/addr/
axis/axis1/java/trunk/samples/addr-sample/src/test/java/samples/addr/AddressBookTestCase.java
- copied, changed from r1399984, axis/axis1/java/trunk/distribution/src/main/files/samples/addr/AddressBookTestCase.java
Removed:
axis/axis1/java/trunk/distribution/src/main/files/samples/addr/AddressBook.wsdl
axis/axis1/java/trunk/distribution/src/main/files/samples/addr/AddressBookSOAPBindingImpl.java
axis/axis1/java/trunk/distribution/src/main/files/samples/addr/AddressBookTestCase.java
axis/axis1/java/trunk/distribution/src/main/files/samples/addr/DOMUtils.java
axis/axis1/java/trunk/distribution/src/main/files/samples/addr/Main.java
Modified:
axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml
axis/axis1/java/trunk/integration/pom.xml
axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java
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=1400099&r1=1400098&r2=1400099&view=diff
==============================================================================
--- axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml (original)
+++ axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml Fri Oct 19 14:01:24 2012
@@ -29,6 +29,18 @@
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
+ <directory>../samples/addr-sample/src/main/java</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/addr-sample/src/test/java</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/addr-sample/src/main/wsdl</directory>
+ <outputDirectory>samples/addr</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>../samples/attachments-sample/src/main/java</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
Modified: axis/axis1/java/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1400099&r1=1400098&r2=1400099&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Fri Oct 19 14:01:24 2012
@@ -51,6 +51,18 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>addr-sample</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>echo-sample</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
@@ -194,44 +206,6 @@
<testDefaultHttpPort>8080</testDefaultHttpPort>
</configuration>
<executions>
- <execution>
- <id>samples-echo</id>
- <goals>
- <goal>generate-test-sources</goal>
- </goals>
- <configuration>
- <file>../samples/echo-sample/src/main/wsdl/InteropTest.wsdl</file>
- <generate>client</generate>
- <typeMappingVersion>1.1</typeMappingVersion>
- <mappings>
- <mapping>
- <namespace>http://soapinterop.org/</namespace>
- <package>samples.echo</package>
- </mapping>
- <mapping>
- <namespace>http://soapinterop.org/xsd</namespace>
- <package>samples.echo</package>
- </mapping>
- </mappings>
- </configuration>
- </execution>
- <execution>
- <id>samples-addr</id>
- <goals>
- <goal>generate-test-sources</goal>
- </goals>
- <configuration>
- <file>../distribution/src/main/files/samples/addr/AddressBook.wsdl</file>
- <generate>client</generate>
- <typeMappingVersion>1.1</typeMappingVersion>
- <mappings>
- <mapping>
- <namespace>urn:AddressFetcher2</namespace>
- <package>samples.addr</package>
- </mapping>
- </mappings>
- </configuration>
- </execution>
<!-- Import Test 1: some namespace->package mappings from the -->
<!-- command line, some generated, some from -->
<!-- NStoPkg.properties. -->
Modified: axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java?rev=1400099&r1=1400098&r2=1400099&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java (original)
+++ axis/axis1/java/trunk/integration/src/test/java/test/dynamic/ServiceGetPort.java Fri Oct 19 14:01:24 2012
@@ -39,7 +39,7 @@ public class ServiceGetPort extends Test
public void testGetGeneratedStub() throws Exception {
Service service = ServiceFactory.newInstance().createService(
- new URL("file:../distribution/src/main/files/samples/addr/AddressBook.wsdl"),
+ new URL("file:../samples/addr-sample/src/main/wsdl/AddressBook.wsdl"),
new QName("urn:AddressFetcher2", "AddressBookService"));
QName portName = new QName("urn:AddressFetcher2", "AddressBook");
Remote stub = service.getPort(portName, AddressBook.class);
Added: 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=1400099&view=auto
==============================================================================
--- axis/axis1/java/trunk/samples/addr-sample/pom.xml (added)
+++ axis/axis1/java/trunk/samples/addr-sample/pom.xml Fri Oct 19 14:01:24 2012
@@ -0,0 +1,154 @@
+<?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>addr-sample</artifactId>
+ <name>Addressbook Sample</name>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-core</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>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>maven-wsdl2java-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>samples-addr</id>
+ <goals>
+ <goal>generate-sources</goal>
+ </goals>
+ <configuration>
+ <file>src/main/wsdl/AddressBook.wsdl</file>
+ <generate>both</generate>
+ <typeMappingVersion>1.1</typeMappingVersion>
+ <skeleton>true</skeleton>
+ <deployScope>session</deployScope>
+ <mappings>
+ <mapping>
+ <namespace>urn:AddressFetcher2</namespace>
+ <package>samples.addr</package>
+ </mapping>
+ </mappings>
+ <deployWsdd>${project.build.directory}/wsdd/AddressBook.wsdd</deployWsdd>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <configuration>
+ <skip>true</skip>
+ </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>${project.build.directory}/wsdd</directory>
+ </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>**/*TestCase.java</include>
+ </includes>
+ <systemPropertyVariables>
+ <test.functional.ServicePort>${test.functional.ServicePort}</test.functional.ServicePort>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Copied: axis/axis1/java/trunk/samples/addr-sample/src/test/java/samples/addr/AddressBookTestCase.java (from r1399984, axis/axis1/java/trunk/distribution/src/main/files/samples/addr/AddressBookTestCase.java)
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/addr-sample/src/test/java/samples/addr/AddressBookTestCase.java?p2=axis/axis1/java/trunk/samples/addr-sample/src/test/java/samples/addr/AddressBookTestCase.java&p1=axis/axis1/java/trunk/distribution/src/main/files/samples/addr/AddressBookTestCase.java&r1=1399984&r2=1400099&rev=1400099&view=diff
==============================================================================
--- axis/axis1/java/trunk/distribution/src/main/files/samples/addr/AddressBookTestCase.java (original)
+++ axis/axis1/java/trunk/samples/addr-sample/src/test/java/samples/addr/AddressBookTestCase.java Fri Oct 19 14:01:24 2012
@@ -32,7 +32,7 @@ public class AddressBookTestCase extends
}
public void doTest () throws Exception {
- String[] args = {};
+ String[] args = { "-p", System.getProperty("test.functional.ServicePort", "8080") };
Main.main(args);
}
Modified: axis/axis1/java/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/pom.xml?rev=1400099&r1=1400098&r2=1400099&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/pom.xml (original)
+++ axis/axis1/java/trunk/samples/pom.xml Fri Oct 19 14:01:24 2012
@@ -32,6 +32,7 @@
Root POM for the Axis samples.
</description>
<modules>
+ <module>addr-sample</module>
<module>attachments-sample</module>
<module>bidbuy-sample</module>
<module>echo-sample</module>