Author: veithen
Date: Sat Feb 4 14:52:58 2012
New Revision: 1240511
URL: http://svn.apache.org/viewvc?rev=1240511&view=rev
Log:
Mavenized TestProxySample.
Added:
axis/axis1/java/trunk/samples/proxy-sample/
axis/axis1/java/trunk/samples/proxy-sample/pom.xml (with props)
axis/axis1/java/trunk/samples/proxy-sample/src/
axis/axis1/java/trunk/samples/proxy-sample/src/main/
axis/axis1/java/trunk/samples/proxy-sample/src/main/java/
axis/axis1/java/trunk/samples/proxy-sample/src/main/java/samples/
axis/axis1/java/trunk/samples/proxy-sample/src/main/java/samples/proxy/
axis/axis1/java/trunk/samples/proxy-sample/src/main/java/samples/proxy/ProxyService.java
- copied unchanged from r1240491,
axis/axis1/java/trunk/distribution/src/main/files/samples/proxy/ProxyService.java
axis/axis1/java/trunk/samples/proxy-sample/src/main/wsdd/
axis/axis1/java/trunk/samples/proxy-sample/src/main/wsdd/client_deploy.wsdd
- copied unchanged from r1240491,
axis/axis1/java/trunk/distribution/src/main/files/samples/proxy/client_deploy.wsdd
axis/axis1/java/trunk/samples/proxy-sample/src/main/wsdd/deploy.wsdd
- copied unchanged from r1240491,
axis/axis1/java/trunk/distribution/src/main/files/samples/proxy/deploy.wsdd
axis/axis1/java/trunk/samples/proxy-sample/src/test/
axis/axis1/java/trunk/samples/proxy-sample/src/test/java/
axis/axis1/java/trunk/samples/proxy-sample/src/test/java/test/
axis/axis1/java/trunk/samples/proxy-sample/src/test/java/test/functional/
axis/axis1/java/trunk/samples/proxy-sample/src/test/java/test/functional/TestProxySample.java
- copied, changed from r1240491,
axis/axis1/java/trunk/test/functional/TestProxySample.java
Removed:
axis/axis1/java/trunk/distribution/src/main/files/samples/proxy/ProxyService.java
axis/axis1/java/trunk/distribution/src/main/files/samples/proxy/client_deploy.wsdd
axis/axis1/java/trunk/distribution/src/main/files/samples/proxy/deploy.wsdd
axis/axis1/java/trunk/test/functional/TestProxySample.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=1240511&r1=1240510&r2=1240511&view=diff
==============================================================================
--- axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml (original)
+++ axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml Sat Feb 4
14:52:58 2012
@@ -93,6 +93,14 @@
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
+ <directory>../samples/proxy-sample/src/main/java</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/proxy-sample/src/main/wsdd</directory>
+ <outputDirectory>samples/proxy</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>../samples/stock-sample/src/main/java</directory>
<outputDirectory>/</outputDirectory>
</fileSet>
Modified: axis/axis1/java/trunk/samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/pom.xml?rev=1240511&r1=1240510&r2=1240511&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/pom.xml (original)
+++ axis/axis1/java/trunk/samples/pom.xml Sat Feb 4 14:52:58 2012
@@ -40,6 +40,7 @@
<module>handler-sample</module>
<module>message-sample</module>
<module>misc-sample</module>
+ <module>proxy-sample</module>
<module>stock-sample</module>
<module>transport-sample</module>
</modules>
Added: axis/axis1/java/trunk/samples/proxy-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/proxy-sample/pom.xml?rev=1240511&view=auto
==============================================================================
--- axis/axis1/java/trunk/samples/proxy-sample/pom.xml (added)
+++ axis/axis1/java/trunk/samples/proxy-sample/pom.xml Sat Feb 4 14:52:58 2012
@@ -0,0 +1,108 @@
+<?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>proxy-sample</artifactId>
+ <name>Proxy Sample</name>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>transport-sample</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>misc-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>
+ <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>axis-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>start-server</id>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-server</id>
+ <goals>
+ <goal>stop-server</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>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: axis/axis1/java/trunk/samples/proxy-sample/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
axis/axis1/java/trunk/samples/proxy-sample/src/test/java/test/functional/TestProxySample.java
(from r1240491, axis/axis1/java/trunk/test/functional/TestProxySample.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/proxy-sample/src/test/java/test/functional/TestProxySample.java?p2=axis/axis1/java/trunk/samples/proxy-sample/src/test/java/test/functional/TestProxySample.java&p1=axis/axis1/java/trunk/test/functional/TestProxySample.java&r1=1240491&r2=1240511&rev=1240511&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/functional/TestProxySample.java (original)
+++
axis/axis1/java/trunk/samples/proxy-sample/src/test/java/test/functional/TestProxySample.java
Sat Feb 4 14:52:58 2012
@@ -50,13 +50,13 @@ public class TestProxySample extends Tes
log.info("Testing deployment...");
// deploy the proxy service
- String[] args = { "samples/proxy/deploy.wsdd" };
+ String[] args = { System.getProperty("basedir") +
"/src/main/wsdd/deploy.wsdd" };
AdminClient.main(args);
log.info("Testing server-side client deployment...");
// deploy the proxy service
- String[] args2 = { "samples/proxy/client_deploy.xml" };
+ String[] args2 = { System.getProperty("basedir") +
"/src/main/wsdd/client_deploy.wsdd" };
AdminClient.main(args2);
log.info("Testing service...");
