You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by wo...@apache.org on 2008/03/19 00:53:39 UTC

svn commit: r638645 - in /webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws: provider/string/ proxy/ proxy/doclitnonwrapped/ proxy/doclitnonwrapped/META-INF/ proxy/doclitwrapped/ proxy/doclitwrapped/META-INF/

Author: woodroy
Date: Tue Mar 18 16:53:35 2008
New Revision: 638645

URL: http://svn.apache.org/viewvc?rev=638645&view=rev
Log:
AXIS2-3479
Contributor: Roy Wood
Updated Providers to use SOAP binding with a wsdlLocation

Modified:
    webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/string/StringProvider.java
    webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java
    webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/DocLitnonWrappedImpl.java
    webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl
    webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/DocLitWrappedProxyImpl.java
    webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl

Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/string/StringProvider.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/string/StringProvider.java?rev=638645&r1=638644&r2=638645&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/string/StringProvider.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/provider/string/StringProvider.java Tue Mar 18 16:53:35 2008
@@ -26,9 +26,14 @@
 import javax.xml.ws.WebServiceException;
 import javax.xml.ws.WebServiceProvider;
 import javax.xml.ws.http.HTTPBinding;
+import javax.xml.ws.soap.SOAPBinding;
 
-@WebServiceProvider(serviceName="StringProviderService")
-@BindingType(HTTPBinding.HTTP_BINDING)
+
+@WebServiceProvider(
+        serviceName="StringProviderService", 
+        wsdlLocation="META-INF/echostring.wsdl", 
+        targetNamespace="http://stringprovider.sample.test.org")
+@BindingType(SOAPBinding.SOAP11HTTP_BINDING)
 public class StringProvider implements Provider<String> {
     
     public String invoke(String text) {

Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java?rev=638645&r1=638644&r2=638645&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/ProxyTests.java Tue Mar 18 16:53:35 2008
@@ -135,14 +135,16 @@
     }
 
     public void testInvokeWithWSDL(){
-        try{ 
+
+    	try{ 
             if(!runningOnAxis){
                 return;
             }
             TestLogger.logger.debug("---------------------------------------");
             File wsdl= new File(wsdlLocation); 
             URL wsdlUrl = wsdl.toURL(); 
-            Service service = Service.create(wsdlUrl, serviceName);
+            Service service = Service.create(null, serviceName);
+//            Service service = Service.create(wsdlUrl, serviceName);
             String request = new String("some string request"); 
             Object proxy =service.getPort(portName, DocLitWrappedProxy.class);
             TestLogger.logger.debug(">>Invoking Binding Provider property");
@@ -158,6 +160,7 @@
             e.printStackTrace(); 
             fail("Exception received" + e);
         }
+
     }
     
     public void testInvokeAsyncCallback(){

Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/DocLitnonWrappedImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/DocLitnonWrappedImpl.java?rev=638645&r1=638644&r2=638645&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/DocLitnonWrappedImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/DocLitnonWrappedImpl.java Tue Mar 18 16:53:35 2008
@@ -25,10 +25,13 @@
 import javax.xml.ws.Provider;
 import javax.xml.ws.WebServiceProvider;
 import javax.xml.ws.http.HTTPBinding;
+import javax.xml.ws.soap.SOAPBinding;
 
-
-@WebServiceProvider(serviceName="ProxyDocLitUnwrappedService")
-@BindingType(HTTPBinding.HTTP_BINDING)
+@WebServiceProvider(
+        serviceName="ProxyDocLitUnwrappedService", 
+        wsdlLocation="META-INF/proxy_doclit_unwr.wsdl", 
+        targetNamespace="http://doclitnonwrapped.proxy.test.org")
+@BindingType(SOAPBinding.SOAP11HTTP_BINDING)
 public class DocLitnonWrappedImpl implements Provider<String> {
 
 	

Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl?rev=638645&r1=638644&r2=638645&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl Tue Mar 18 16:53:35 2008
@@ -94,7 +94,7 @@
 	</wsdl:binding>
 	
 	<wsdl:service name="ProxyDocLitUnwrappedService">
-		<wsdl:port binding="tns:ProxyDocLitnonWrapped" name="ProxyDocLitnonWrappedPort">
+		<wsdl:port binding="tns:ProxyDocLitnonWrapped" name="DocLitnonWrappedImplPort">
 			<soap:address location="http://@HOST@:@PORT@/jaxws.proxy/services/ProxyDocLitUnwrappedService" />
 		</wsdl:port>
 	</wsdl:service>

Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/DocLitWrappedProxyImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/DocLitWrappedProxyImpl.java?rev=638645&r1=638644&r2=638645&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/DocLitWrappedProxyImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/DocLitWrappedProxyImpl.java Tue Mar 18 16:53:35 2008
@@ -25,9 +25,12 @@
 import javax.xml.ws.Provider;
 import javax.xml.ws.WebServiceProvider;
 import javax.xml.ws.http.HTTPBinding;
-
-@WebServiceProvider(serviceName="ProxyDocLitWrappedService")
-@BindingType(HTTPBinding.HTTP_BINDING)
+import javax.xml.ws.soap.SOAPBinding;
+@WebServiceProvider(
+        serviceName="ProxyDocLitWrappedService", 
+        wsdlLocation="META-INF/ProxyDocLitWrapped.wsdl", 
+        targetNamespace="http://doclitwrapped.proxy.test.org")
+@BindingType(SOAPBinding.SOAP11HTTP_BINDING)
 public class DocLitWrappedProxyImpl implements Provider<String> {
 
 	public String invoke(String invoke_str) {

Modified: webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl?rev=638645&r1=638644&r2=638645&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl (original)
+++ webservices/axis2/trunk/java/modules/jaxws-integration/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl Tue Mar 18 16:53:35 2008
@@ -293,7 +293,7 @@
 
 	<wsdl:service name="ProxyDocLitWrappedService">
 		<wsdl:port binding="tns:ProxyDocLitWrapped"
-			name="ProxyDocLitWrappedPort">
+			name="DocLitWrappedProxyImplPort">
 			<soap:address
 				location="http://localhost:9080/axis2/services/ProxyDocLitWrappedService/invoke" />
 		</wsdl:port>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org