Author: veithen
Date: Thu Mar 24 21:57:00 2011
New Revision: 1085157
URL: http://svn.apache.org/viewvc?rev=1085157&view=rev
Log:
Eliminated a couple of generated files that where checked in to SVN. Instead,
regenerate them during the build. Having these kinds of generated files in the
source tree is a constant maintenance headache.
Added:
axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/wsdl/echo.wsdl
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceImpl.java
- copied, changed from r1083157,
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceSkeleton.java
Removed:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceMessageReceiverInOut.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceSkeleton.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoString.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoStringResponse.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/META-INF/services.xml
Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=1085157&r1=1085156&r2=1085157&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Thu Mar 24
21:57:00 2011
@@ -178,6 +178,31 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-wsdl2code-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>wsdl2code</goal>
+ </goals>
+ <configuration>
+ <packageName>server</packageName>
+ <wsdlFile>test-resources/wsdl/echo.wsdl</wsdlFile>
+ <databindingName>adb</databindingName>
+ <generateServerSide>true</generateServerSide>
+ <namespaceURIs>
+ <namespaceURI>
+ <uri>http://test</uri>
+ <packageName>server</packageName>
+ </namespaceURI>
+ </namespaceURIs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -1228,7 +1253,8 @@
</goals>
<configuration>
<sources>
- <source>${basedir}/target/schema/src</source>
+
<source>${project.build.directory}/schema/src</source>
+
<source>${project.build.directory}/generated-sources/axis2/wsdl2code/src</source>
</sources>
</configuration>
</execution>
Added:
axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/wsdl/echo.wsdl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/wsdl/echo.wsdl?rev=1085157&view=auto
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/wsdl/echo.wsdl
(added)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/wsdl/echo.wsdl
Thu Mar 24 21:57:00 2011
@@ -0,0 +1,59 @@
+<?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.
+ -->
+<definitions targetNamespace="http://test";
+ xmlns:tns="http://test";
+ xmlns="http://schemas.xmlsoap.org/wsdl/";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";>
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://test";
schemaLocation="../xsd/echo.xsd"/>
+ </xsd:schema>
+ </types>
+ <message name="echoString">
+ <part name="body" element="tns:echoString"/>
+ </message>
+ <message name="echoStringResponse">
+ <part name="body" element="tns:echoStringResponse"/>
+ </message>
+ <portType name="EchoPortType">
+ <operation name="echoString">
+ <input message="tns:echoString"/>
+ <output message="tns:echoStringResponse"/>
+ </operation>
+ </portType>
+ <binding name="EchoBinding" type="tns:EchoPortType">
+ <soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="echoString">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="EchoService">
+ <port binding="tns:EchoBinding" name="EchoPort">
+ <soap:address location="REPLACE_WITH_ACTUAL_URI"/>
+ </port>
+ </service>
+</definitions>
Copied:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceImpl.java
(from r1083157,
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceSkeleton.java)
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceImpl.java?p2=axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceImpl.java&p1=axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceSkeleton.java&r1=1083157&r2=1085157&rev=1085157&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceSkeleton.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceImpl.java
Thu Mar 24 21:57:00 2011
@@ -17,25 +17,12 @@
* under the License.
*/
-/**
- * EchoServiceSkeleton.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis2 version: SNAPSHOT Apr 09, 2006 (10:20:36 CDT)
- */
package server;
import org.apache.axis2.jaxws.TestLogger;
-/**
- * EchoServiceSkeleton java skeleton for the axisService
- */
-public class EchoServiceSkeleton {
+public class EchoServiceImpl extends EchoServiceSkeleton {
- /**
- * Auto generated method signature
- * @param param0
- */
public server.EchoStringResponse echoString(server.EchoString input) {
TestLogger.logger
.debug(">> Entering method [EchoStringResponse
EchoServiceSkeleton.echoString(EchoString)]");
@@ -43,9 +30,13 @@ public class EchoServiceSkeleton {
TestLogger.logger.debug(">> Returning string [ECHO:" +
input.getInput() + "]");
TestLogger.logger
.debug("<< Done with method [EchoStringResponse
EchoServiceSkeleton.echoString(EchoString)]");
- EchoStringResponse output = new EchoStringResponse();
- output.setEchoStringReturn("ECHO:" + input.getInput());
- return output;
+ if (input.getInput().equals("THROW EXCEPTION")) {
+ throw new RuntimeException("test exception");
+ } else {
+ EchoStringResponse output = new EchoStringResponse();
+ output.setEchoStringReturn("ECHO:" + input.getInput());
+ return output;
+ }
}
}
\ No newline at end of file
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/META-INF/services.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/META-INF/services.xml?rev=1085157&r1=1085156&r2=1085157&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/META-INF/services.xml
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/META-INF/services.xml
Thu Mar 24 21:57:00 2011
@@ -22,7 +22,7 @@
<messageReceivers>
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out";
class="server.EchoServiceMessageReceiverInOut"/>
</messageReceivers>
- <parameter name="ServiceClass">server.EchoServiceSkeleton</parameter>
+ <parameter name="ServiceClass">server.EchoServiceImpl</parameter>
<operation name="echoString" mep="http://www.w3.org/2004/08/wsdl/in-out";>
<actionMapping/>
</operation>
