Author: veithen
Date: Mon Jan 30 17:30:38 2012
New Revision: 1237814
URL: http://svn.apache.org/viewvc?rev=1237814&view=rev
Log:
Mavenized TestEchoSample.
Added:
axis/axis1/java/trunk/samples/echo-sample/
axis/axis1/java/trunk/samples/echo-sample/pom.xml (with props)
axis/axis1/java/trunk/samples/echo-sample/src/
axis/axis1/java/trunk/samples/echo-sample/src/main/
axis/axis1/java/trunk/samples/echo-sample/src/main/java/
axis/axis1/java/trunk/samples/echo-sample/src/main/java/samples/
axis/axis1/java/trunk/samples/echo-sample/src/main/java/samples/echo/
axis/axis1/java/trunk/samples/echo-sample/src/main/java/samples/echo/InteropTestSoapBindingImpl.java
- copied unchanged from r1237796,
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/InteropTestSoapBindingImpl.java
axis/axis1/java/trunk/samples/echo-sample/src/main/java/samples/echo/TestClient.java
- copied unchanged from r1237796,
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/TestClient.java
axis/axis1/java/trunk/samples/echo-sample/src/main/java/samples/echo/echoHeaderStringHandler.java
- copied unchanged from r1237796,
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/echoHeaderStringHandler.java
axis/axis1/java/trunk/samples/echo-sample/src/main/java/samples/echo/echoHeaderStructHandler.java
- copied unchanged from r1237796,
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/echoHeaderStructHandler.java
axis/axis1/java/trunk/samples/echo-sample/src/main/wsdd/
axis/axis1/java/trunk/samples/echo-sample/src/main/wsdd/deploy.wsdd
- copied unchanged from r1237796,
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/deploy.wsdd
axis/axis1/java/trunk/samples/echo-sample/src/main/wsdd/deployA.wsdd
- copied unchanged from r1237796,
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/deployA.wsdd
axis/axis1/java/trunk/samples/echo-sample/src/main/wsdd/deployB.wsdd
- copied unchanged from r1237796,
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/deployB.wsdd
axis/axis1/java/trunk/samples/echo-sample/src/main/wsdl/
axis/axis1/java/trunk/samples/echo-sample/src/main/wsdl/InteropTest.wsdl
- copied unchanged from r1237796,
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/InteropTest.wsdl
axis/axis1/java/trunk/samples/echo-sample/src/test/
axis/axis1/java/trunk/samples/echo-sample/src/test/java/
axis/axis1/java/trunk/samples/echo-sample/src/test/java/test/
axis/axis1/java/trunk/samples/echo-sample/src/test/java/test/functional/
axis/axis1/java/trunk/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java
- copied, changed from r1237796,
axis/axis1/java/trunk/test/functional/TestEchoSample.java
Removed:
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/InteropTest.wsdl
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/InteropTestSoapBindingImpl.java
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/TestClient.java
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/deploy.wsdd
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/deployA.wsdd
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/deployB.wsdd
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/echoHeaderStringHandler.java
axis/axis1/java/trunk/distribution/src/main/files/samples/echo/echoHeaderStructHandler.java
axis/axis1/java/trunk/test/functional/TestEchoSample.java
Modified:
axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml
axis/axis1/java/trunk/integration/pom.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=1237814&r1=1237813&r2=1237814&view=diff
==============================================================================
--- axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml (original)
+++ axis/axis1/java/trunk/distribution/src/main/assembly/bin.xml Mon Jan 30
17:30:38 2012
@@ -44,6 +44,18 @@
<directory>../samples/bidbuy-sample/src/main/wsdd</directory>
<outputDirectory>samples/bidbuy</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>../samples/echo-sample/src/main/java</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/echo-sample/src/main/wsdl</directory>
+ <outputDirectory>samples/echo</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../samples/echo-sample/src/main/wsdd</directory>
+ <outputDirectory>samples/echo</outputDirectory>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Modified: axis/axis1/java/trunk/integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1237814&r1=1237813&r2=1237814&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Mon Jan 30 17:30:38 2012
@@ -66,7 +66,7 @@
<goal>wsdl2java-test</goal>
</goals>
<configuration>
-
<file>../distribution/src/main/files/samples/echo/InteropTest.wsdl</file>
+
<file>../samples/echo-sample/src/main/wsdl/InteropTest.wsdl</file>
<typeMappingVersion>1.1</typeMappingVersion>
<mappings>
<mapping>
Added: axis/axis1/java/trunk/samples/echo-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/echo-sample/pom.xml?rev=1237814&view=auto
==============================================================================
--- axis/axis1/java/trunk/samples/echo-sample/pom.xml (added)
+++ axis/axis1/java/trunk/samples/echo-sample/pom.xml Mon Jan 30 17:30:38 2012
@@ -0,0 +1,77 @@
+<?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>echo-sample</artifactId>
+ <name>Echo 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>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <!-- TODO: the Maven plugin should have a default here -->
+ <output>${project.build.directory}/work</output>
+ </configuration>
+ <executions>
+ <execution>
+ <id>samples-echo</id>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ <configuration>
+ <file>src/main/wsdl/InteropTest.wsdl</file>
+ <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>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: axis/axis1/java/trunk/samples/echo-sample/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
axis/axis1/java/trunk/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java
(from r1237796, axis/axis1/java/trunk/test/functional/TestEchoSample.java)
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java?p2=axis/axis1/java/trunk/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java&p1=axis/axis1/java/trunk/test/functional/TestEchoSample.java&r1=1237796&r2=1237814&rev=1237814&view=diff
==============================================================================
--- axis/axis1/java/trunk/test/functional/TestEchoSample.java (original)
+++
axis/axis1/java/trunk/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java
Mon Jan 30 17:30:38 2012
@@ -43,7 +43,7 @@ public class TestEchoSample extends Test
// deploy the echo service
String[] args = {"-l",
"local:///AdminService",
- "samples/echo/deploy.wsdd"};
+ System.getProperty("basedir") +
"/src/main/wsdd/deploy.wsdd"};
AdminClient.main(args);
// define the tests using JUnit assert facilities, and tell client to
Modified: axis/axis1/java/trunk/samples/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/pom.xml?rev=1237814&r1=1237813&r2=1237814&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/pom.xml (original)
+++ axis/axis1/java/trunk/samples/pom.xml Mon Jan 30 17:30:38 2012
@@ -34,5 +34,6 @@
<modules>
<module>attachments-sample</module>
<module>bidbuy-sample</module>
+ <module>echo-sample</module>
</modules>
</project>
