geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r499580 - in /geronimo/server/trunk: modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ testsuite/webservices-testsuite/jaxws-tests/jaxws-war/ testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/hello_wor...
Date Wed, 24 Jan 2007 21:41:10 GMT
Author: djencks
Date: Wed Jan 24 13:41:08 2007
New Revision: 499580

URL: http://svn.apache.org/viewvc?view=rev&rev=499580
Log:
GERONIMO-2762 Update jax-ws tests, improve CXFWebServiceContainerFactoryGBean, thanks jarek

Modified:
    geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/webservices.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/wsdl/greeter_control.wsdl
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request1.xml

Modified: geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java?view=diff&rev=499580&r1=499579&r2=499580
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java
(original)
+++ geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/CXFWebServiceContainerFactoryGBean.java
Wed Jan 24 13:41:08 2007
@@ -63,7 +63,7 @@
         }
 
         this.portInfo = portInfo;
-        this.bus = new CXFBusFactory().getDefaultBus();
+        this.bus = (new CXFBusFactory()).createBus();
         Class endpointClass = classLoader.loadClass(endpointClassName);
         endpointInstance = endpointClass.newInstance();
     }

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml?view=diff&rev=499580&r1=499579&r2=499580
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml (original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml Wed
Jan 24 13:41:08 2007
@@ -137,7 +137,7 @@
                             <goal>undeploy-module</goal>
                         </goals>
                         <configuration>
-                            <moduleId>CXF/cxfPojoServlet/1.1/car</moduleId>
+                            <moduleId>JEE5/JAXWSServlet/1.1/car</moduleId>
                         </configuration>
                     </execution>
                 </executions>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java?view=diff&rev=499580&r1=499579&r2=499580
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java
Wed Jan 24 13:41:08 2007
@@ -37,12 +37,14 @@
             targetNamespace = "http://apache.org/hello_world_soap_http")
 public class GreeterImpl implements Greeter {
 
-    private static final Logger LOG = Logger.getLogger(GreeterImpl.class.getName());
+    private static final Logger LOG =
+        Logger.getLogger(GreeterImpl.class.getName());
 
     @Resource
     private WebServiceContext context;
 
-    private int invocationCount;
+    @Resource(name="greeting")
+    private String greeting;
 
     public WebServiceContext getContext() {
         return context;
@@ -50,7 +52,10 @@
 
     public String greetMe(String me) {
         LOG.info("Invoking greetMe " + me);
-        invocationCount++;
-        return "Hello " + me;
+
+        LOG.info("Principal: " + context.getUserPrincipal());
+        LOG.info("Context: " + context.getMessageContext());
+        
+        return greeting + " " + me;
     }
 }

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=499580&r1=499579&r2=499580
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/geronimo-web.xml
Wed Jan 24 13:41:08 2007
@@ -18,8 +18,8 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1"
xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
   <dep:environment>
     <dep:moduleId>
-      <dep:groupId>CXF</dep:groupId>
-      <dep:artifactId>cxfPojoServlet</dep:artifactId>
+      <dep:groupId>JEE5</dep:groupId>
+      <dep:artifactId>JAXWSServlet</dep:artifactId>
       <dep:version>1.1</dep:version>
       <dep:type>car</dep:type>
     </dep:moduleId>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/web.xml?view=diff&rev=499580&r1=499579&r2=499580
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/web.xml
Wed Jan 24 13:41:08 2007
@@ -22,18 +22,25 @@
          version="2.5"
         >
 
-    <display-name>Geronimo CXF POJO WS War</display-name>
+    <display-name>Geronimo POJO WS War</display-name>
 
     <servlet>
-        <display-name>Geronimo CXF POJO WS</display-name>
-        <servlet-name>cxfPojoServlet</servlet-name>
+        <display-name>Geronimo POJO WS</display-name>
+        <servlet-name>POJOServlet</servlet-name>
         <servlet-class>org.apache.hello_world_soap_http.GreeterImpl</servlet-class>
         <load-on-startup>0</load-on-startup>
     </servlet>
 
     <servlet-mapping>
-        <servlet-name>cxfPojoServlet</servlet-name>
+        <servlet-name>POJOServlet</servlet-name>
         <url-pattern>/servlet</url-pattern>
     </servlet-mapping>
+
+    <env-entry>
+        <description>Welcome message</description>
+        <env-entry-name>greeting</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>Hello</env-entry-value>
+   </env-entry>
 
 </web-app>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/webservices.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/webservices.xml?view=diff&rev=499580&r1=499579&r2=499580
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/webservices.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/webservices.xml
Wed Jan 24 13:41:08 2007
@@ -26,15 +26,15 @@
 		http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd"
              version="1.2">
     <webservice-description>
-        <webservice-description-name>cxfPojo</webservice-description-name>
+        <webservice-description-name>POJO WS</webservice-description-name>
         <wsdl-file>WEB-INF/wsdl/greeter_control.wsdl</wsdl-file>
         <port-component>
-            <port-component-name>cxfPojoName</port-component-name>
+            <port-component-name>POJOPort</port-component-name>
             <wsdl-service></wsdl-service>
             <enable-mtom>false</enable-mtom>
             <service-endpoint-interface>org.apache.hello_world_soap_http.Greeter</service-endpoint-interface>
             <service-impl-bean>
-                <servlet-link>cxfPojoServlet</servlet-link>
+                <servlet-link>POJOServlet</servlet-link>
             </service-impl-bean>
         </port-component>
     </webservice-description>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/wsdl/greeter_control.wsdl
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/wsdl/greeter_control.wsdl?view=diff&rev=499580&r1=499579&r2=499580
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/wsdl/greeter_control.wsdl
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/wsdl/greeter_control.wsdl
Wed Jan 24 13:41:08 2007
@@ -19,13 +19,13 @@
 -->
 <wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:tns="http://cxf.apache.org/greeter_control"
-    xmlns:x1="http://cxf.apache.org/greeter_control/types"
+    xmlns:tns="http://apache.org/greeter_control"
+    xmlns:x1="http://apache.org/greeter_control/types"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://cxf.apache.org/greeter_control" name="HelloWorld">
+    targetNamespace="http://apache.org/greeter_control" name="HelloWorld">
     <wsdl:types>
-        <schema targetNamespace="http://cxf.apache.org/greeter_control/types" 
+        <schema targetNamespace="http://apache.org/greeter_control/types" 
             xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
             <element name="sayHi">
                 <complexType/>
@@ -73,31 +73,6 @@
                 </complexType>
             </element>
             
-            <element name="startGreeter">
-                <complexType>
-                    <sequence>
-                        <element name="requestType" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="startGreeterResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="xsd:boolean"/>
-                    </sequence>
-                </complexType>
-            </element>
-            <element name="stopGreeter">
-                <complexType/>
-            </element>
-            <element name="stopGreeterResponse">
-                <complexType>
-                    <sequence>
-                        <element name="responseType" type="xsd:boolean"/>
-                    </sequence>
-                </complexType>
-            </element>
-
         </schema>
     </wsdl:types>
 
@@ -126,20 +101,7 @@
     <wsdl:message name="pingMeFault">
         <wsdl:part name="faultDetail" element="x1:faultDetail"/>
     </wsdl:message> 
-    
-    <wsdl:message name="startGreeterRequest">
-        <wsdl:part element="x1:startGreeter" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="startGreeterResponse">
-        <wsdl:part element="x1:startGreeterResponse" name="out"/>
-    </wsdl:message>    
-    <wsdl:message name="stopGreeterRequest">
-        <wsdl:part element="x1:stopGreeter" name="in"/>
-    </wsdl:message>
-    <wsdl:message name="stopGreeterResponse">
-        <wsdl:part element="x1:stopGreeterResponse" name="out"/>
-    </wsdl:message>
-    
+        
     <wsdl:portType name="Greeter">
         <wsdl:operation name="sayHi">
             <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
@@ -162,17 +124,6 @@
         </wsdl:operation> 
     </wsdl:portType>
     
-    <wsdl:portType name="Control">
-        <wsdl:operation name="startGreeter">
-            <wsdl:input message="tns:startGreeterRequest" name="startGreeterRequest"/>
-            <wsdl:output message="tns:startGreeterResponse" name="startGreeterResponse"/>
-        </wsdl:operation>
-        
-        <wsdl:operation name="stopGreeter">
-            <wsdl:input message="tns:stopGreeterRequest" name="stopGreeterRequest"/>
-            <wsdl:output message="tns:stopGreeterResponse" name="stopGreeterResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
 
     <wsdl:binding name="GreeterSOAPBinding" type="tns:Greeter">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
@@ -219,37 +170,9 @@
         
     </wsdl:binding>
   
-    <wsdl:binding name="ControlSOAPBinding" type="tns:Control">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="startGreeter">
-            <soap:operation soapAction="" style="document"/>
-            <wsdl:input name="startGreeterRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="startGreeterResponse">
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="stopGreeter">
-            <soap:operation soapAction="" style="document"/>
-            <wsdl:input name="stopGreeterRequest">
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="stopGreeterResponse">
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="ControlService">
-        <wsdl:port binding="tns:ControlSOAPBinding" name="ControlPort">
-            <soap:address location="http://localhost:9001/SoapContext/ControlPort"/>
-        </wsdl:port>
-    </wsdl:service>
-    
     <wsdl:service name="GreeterService">
         <wsdl:port binding="tns:GreeterSOAPBinding" name="GreeterPort">
-            <soap:address location="http://localhost:9020/SoapContext/GreeterPort"/>
+            <soap:address location="http://localhost:8080/SoapContext/GreeterPort"/>
             <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/08/addressing/wsdl"/>
         </wsdl:port>
     </wsdl:service>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request1.xml?view=diff&rev=499580&r1=499579&r2=499580
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request1.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request1.xml
Wed Jan 24 13:41:08 2007
@@ -19,7 +19,7 @@
 -->
 <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
    <soap:Body>
-     <greetMe xmlns="http://apache.org/hello_world_soap_http">
+     <greetMe xmlns="http://apache.org/greeter_control/types">
        <requestType>foo bar</requestType>
      </greetMe>
    </soap:Body>



Mime
View raw message