geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r726127 - in /geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests: provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/ provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ provider-te...
Date Fri, 12 Dec 2008 21:49:13 GMT
Author: gawor
Date: Fri Dec 12 13:49:13 2008
New Revision: 726127

URL: http://svn.apache.org/viewvc?rev=726127&view=rev
Log:
enable http binding tests (GERONIMO-4457)

Modified:
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/ProviderTest.java
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/TestServlet.java
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/wsdl/greeter_provider.wsdl

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/ProviderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/ProviderTest.java?rev=726127&r1=726126&r2=726127&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/ProviderTest.java
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/ProviderTest.java
Fri Dec 12 13:49:13 2008
@@ -54,7 +54,7 @@
         in.close();
         return buf.toString();
     }
-/*
+
     @Test
     public void testHTTPDataSource() throws Exception {
         runTest("testHTTPDataSource");
@@ -69,7 +69,7 @@
     public void testHTTPSourcePayloadMode() throws Exception {
         runTest("testHTTPSourcePayloadMode");
     }
-*/
+
     @Test
     public void testSOAP11SOAPMessage() throws Exception {
         runTest("testSOAP11SOAPMessage");
@@ -99,7 +99,7 @@
     public void testSOAP12SourcePayloadMode() throws Exception {
         runTest("testSOAP12SourcePayloadMode");
     }
-
+    
     protected void runTest(String testName) throws Exception {
         String warName = System.getProperty("webAppName");
         assertNotNull(warName);

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/TestServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/TestServlet.java?rev=726127&r1=726126&r2=726127&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/TestServlet.java
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/TestServlet.java
Fri Dec 12 13:49:13 2008
@@ -32,10 +32,8 @@
 import javax.xml.soap.SOAPConstants;
 import javax.xml.soap.SOAPMessage;
 import javax.xml.transform.Source;
-import javax.xml.ws.BindingProvider;
 import javax.xml.ws.Dispatch;
 import javax.xml.ws.Service;
-import javax.xml.ws.http.HTTPBinding;
 
 import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
 
@@ -100,16 +98,8 @@
         response.setContentType("text/plain");
         response.getWriter().println("Test '" + testName + "' passed");
     }
-
-    
-    /**
-     * TODO With Axis2, it seems that there is an issue about finding the operation for client
request.
-     * So we create Service dynamically without WSDL, so that the GenericProviderDispatcher
could take effect. 
-     * @throws Exception
-     */
+        
     public void testHTTPDataSource() throws Exception {
-        Service service = Service.create(GREETER_SERVICE);
-        service.addPort(GreeterHTTPDataSourcePort, HTTPBinding.HTTP_BINDING, getHTTPDataSourceAddress());
         Dispatch<DataSource> dispatch = service.createDispatch(GreeterHTTPDataSourcePort,

                                                                DataSource.class,
                                                                Service.Mode.MESSAGE);

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=726127&r1=726126&r2=726127&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/geronimo-web.xml
Fri Dec 12 13:49:13 2008
@@ -29,13 +29,13 @@
 
  <service-ref>
    <service-ref-name>services/Provider</service-ref-name>
-   <!--port>
+   <port>
       <port-name>GreeterHTTPDataSourcePort</port-name>
       <protocol>http</protocol>
       <host>localhost</host>
       <port>8080</port>
       <uri>/provider-war/provider/http/datasource</uri>
-   </port-->
+   </port>
    <port>
       <port-name>GreeterHTTPSourceMessageModePort</port-name>
       <protocol>http</protocol>
@@ -96,13 +96,13 @@
  
   <service-ref>
    <service-ref-name>services/ejb/Provider</service-ref-name>
-   <!--port>
+   <port>
       <port-name>GreeterHTTPDataSourcePort</port-name>
       <protocol>http</protocol>
       <host>localhost</host>
       <port>8080</port>
       <uri>/GreeterService/GreeterHTTPDataSourceProvider</uri>
-   </port-->
+   </port>
    <port>
       <port-name>GreeterHTTPSourceMessageModePort</port-name>
       <protocol>http</protocol>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/wsdl/greeter_provider.wsdl
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/wsdl/greeter_provider.wsdl?rev=726127&r1=726126&r2=726127&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/wsdl/greeter_provider.wsdl
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/wsdl/greeter_provider.wsdl
Fri Dec 12 13:49:13 2008
@@ -85,9 +85,9 @@
         </wsdl:operation>
     </wsdl:binding>
     <wsdl:service name="GreeterService">
-        <!--wsdl:port binding="tns:GreeterHTTPBinding" name="GreeterHTTPDataSourcePort">
+        <wsdl:port binding="tns:GreeterHTTPBinding" name="GreeterHTTPDataSourcePort">
             <http:address location="http://localhost:8080/provider-war/provider/http/datasource"/>
-        </wsdl:port-->
+        </wsdl:port>
         <wsdl:port binding="tns:GreeterHTTPBinding" name="GreeterHTTPSourceMessageModePort">
             <http:address location="http://localhost:8080/provider-war/provider/http/source/message"/>
         </wsdl:port>



Mime
View raw message