Author: veithen
Date: Sat Aug 26 10:33:32 2017
New Revision: 1806282
URL: http://svn.apache.org/viewvc?rev=1806282&view=rev
Log:
Don't add generated code to the sources; instead generate it during the build.
Removed:
axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/wsdl/ProxyDocLitnonWrapped.wsdl
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/sei/
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl
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=1806282&r1=1806281&r2=1806282&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Sat Aug 26
10:33:32 2017
@@ -367,19 +367,6 @@
</configuration>
</execution>
<execution>
- <id>xjc-ProxyDocLitnonWrapped</id>
- <goals>
- <goal>testXjc</goal>
- </goals>
- <configuration>
- <sourceType>WSDL</sourceType>
- <testSources>
-
<testSource>test-resources/wsdl/ProxyDocLitnonWrapped.wsdl</testSource>
- </testSources>
-
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/ProxyDocLitnonWrapped</outputDirectory>
- </configuration>
- </execution>
- <execution>
<id>xjc-samplemtomjpeg</id>
<goals>
<goal>testXjc</goal>
@@ -722,6 +709,18 @@
<packageName>org.apache.axis2.jaxws.nonanonymous.complextype</packageName>
</configuration>
</execution>
+ <execution>
+ <id>wsimport-proxy_doclit_unwr</id>
+ <goals>
+ <goal>wsimport-test</goal>
+ </goals>
+ <configuration>
+ <wsdlFiles>
+
<wsdlFile>${basedir}/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl</wsdlFile>
+ </wsdlFiles>
+
<packageName>org.apache.axis2.jaxws.proxy.doclitnonwrapped</packageName>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java?rev=1806282&r1=1806281&r2=1806282&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/AsyncCallback.java
Sat Aug 26 10:33:32 2017
@@ -46,8 +46,8 @@ public class AsyncCallback implements As
TestLogger.logger.debug(">>Return String = " +
type.getReturnStr());
return;
}
- if(obj instanceof org.test.proxy.doclitnonwrapped.ReturnType){
- org.test.proxy.doclitnonwrapped.ReturnType returnType =
(org.test.proxy.doclitnonwrapped.ReturnType)obj;
+ if(obj instanceof
org.apache.axis2.jaxws.proxy.doclitnonwrapped.ReturnType){
+ org.apache.axis2.jaxws.proxy.doclitnonwrapped.ReturnType
returnType = (org.apache.axis2.jaxws.proxy.doclitnonwrapped.ReturnType)obj;
TestLogger.logger.debug(">>Return String = " +
returnType.getReturnStr());
return;
}
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java?rev=1806282&r1=1806281&r2=1806282&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyNonWrappedTests.java
Sat Aug 26 10:33:32 2017
@@ -23,18 +23,16 @@ import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.axis2.jaxws.TestLogger;
import org.apache.axis2.jaxws.framework.AbstractTestCase;
-import org.apache.axis2.jaxws.proxy.doclitnonwrapped.sei.DocLitnonWrappedProxy;
-import
org.apache.axis2.jaxws.proxy.doclitnonwrapped.sei.ProxyDocLitUnwrappedService;
-import org.test.proxy.doclitnonwrapped.Invoke;
-import org.test.proxy.doclitnonwrapped.ObjectFactory;
-import org.test.proxy.doclitnonwrapped.ReturnType;
+import org.apache.axis2.jaxws.proxy.doclitnonwrapped.DocLitnonWrappedProxy;
+import org.apache.axis2.jaxws.proxy.doclitnonwrapped.Invoke;
+import org.apache.axis2.jaxws.proxy.doclitnonwrapped.ObjectFactory;
+import
org.apache.axis2.jaxws.proxy.doclitnonwrapped.ProxyDocLitUnwrappedService;
+import org.apache.axis2.jaxws.proxy.doclitnonwrapped.ReturnType;
import javax.xml.namespace.QName;
import javax.xml.ws.AsyncHandler;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
-import java.io.File;
-import java.net.URL;
import java.util.concurrent.Future;
/**
@@ -46,7 +44,6 @@ public class ProxyNonWrappedTests extend
QName serviceName = new QName("http://doclitnonwrapped.proxy.test.org";,
"ProxyDocLitUnwrappedService");
private String axisEndpoint =
"http://localhost:6060/axis2/services/ProxyDocLitUnwrappedService.DocLitnonWrappedImplPort";;
private QName portName = new
QName("http://org.apache.axis2.proxy.doclitwrapped";, "ProxyDocLitWrappedPort");
- private String wsdlLocation =
System.getProperty("basedir",".")+"/"+"test-resources/wsdl/ProxyDocLitnonWrapped.wsdl";
public static Test suite() {
return getTestSetup(new TestSuite(ProxyNonWrappedTests.class));
@@ -104,17 +101,14 @@ public class ProxyNonWrappedTests extend
try{
TestLogger.logger.debug("---------------------------------------");
TestLogger.logger.debug("DocLitNonWrapped test case: " +
getName());
- //Create wsdl url
- File wsdl= new File(wsdlLocation);
- URL wsdlUrl = wsdl.toURL();
ObjectFactory factory = new ObjectFactory();
//create input object to web service operation
Invoke invokeObj = factory.createInvoke();
invokeObj.setInvokeStr("test request for twoWay Async Operation");
//Create Service
- ProxyDocLitUnwrappedService service = new
ProxyDocLitUnwrappedService(wsdlUrl, serviceName);
+ ProxyDocLitUnwrappedService service = new
ProxyDocLitUnwrappedService();
//Create proxy
- DocLitnonWrappedProxy proxy =
service.getProxyDocLitnonWrappedPort();
+ DocLitnonWrappedProxy proxy =
service.getDocLitnonWrappedImplPort();
TestLogger.logger.debug(">>Invoking Binding Provider property");
//Setup Endpoint url -- optional.
BindingProvider p = (BindingProvider)proxy;
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl?rev=1806282&r1=1806281&r2=1806282&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl
Sat Aug 26 10:33:32 2017
@@ -69,7 +69,10 @@
</wsdl:message>
<wsdl:portType name="DocLitnonWrappedProxy">
-
+ <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws";>
+ <jaxws:enableWrapperStyle>false</jaxws:enableWrapperStyle>
+ <jaxws:enableAsyncMapping>true</jaxws:enableAsyncMapping>
+ </jaxws:bindings>
<wsdl:operation name="invoke">
<wsdl:input message="tns:invokeRequest" />
