geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r595186 - in /geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src: main/java/org/apache/greeter_control/ main/webapp/WEB-INF/ test/java/org/apache/geronimo/testsuite/testset/
Date Thu, 15 Nov 2007 02:23:27 GMT
Author: gawor
Date: Wed Nov 14 18:23:14 2007
New Revision: 595186

URL: http://svn.apache.org/viewvc?rev=595186&view=rev
Log:
updated tests with new understanding of SEI override

Added:
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl2.java
  (with props)
Removed:
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/Greeter2.java
Modified:
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/webservices.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/WSTest.java

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl2.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl2.java?rev=595186&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl2.java
(added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl2.java
Wed Nov 14 18:23:14 2007
@@ -0,0 +1,59 @@
+/**
+ * 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.
+ */
+
+package org.apache.greeter_control;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.annotation.Resource;
+import javax.jws.WebService;
+import javax.xml.ws.WebServiceContext;
+
+/* serviceName, portName, sei specified in webservices.xml */
+@WebService(serviceName = "SOAPService",
+            portName = "SoapPort",            
+            targetNamespace = "http://apache.org/greeter_control")
+public class GreeterImpl2 {
+
+    @Resource
+    private WebServiceContext context;
+
+    public WebServiceContext getContext() {
+        return context;
+    }
+
+    public String greetMe(String me) {
+        return "Hello " + me;
+    }
+
+    public String sayHi() {
+        return "Hi";
+    }
+    
+    @PostConstruct
+    public void init() {
+        System.out.println(this + " PostConstruct");
+    }
+
+    @PreDestroy()
+    public void destroy() {
+        System.out.println(this + " PreDestroy");
+    }
+
+}

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/web.xml?rev=595186&r1=595185&r2=595186&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/web.xml
Wed Nov 14 18:23:14 2007
@@ -35,9 +35,9 @@
     </servlet>
     
     <servlet>
-        <display-name>Geronimo JAX-WS POJO WS</display-name>
+        <display-name>Geronimo JAX-WS POJO WS II</display-name>
         <servlet-name>JAXWSServlet2</servlet-name>
-        <servlet-class>org.apache.greeter_control.GreeterImpl</servlet-class>
+        <servlet-class>org.apache.greeter_control.GreeterImpl2</servlet-class>
         <load-on-startup>0</load-on-startup>
     </servlet>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/webservices.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/webservices.xml?rev=595186&r1=595185&r2=595186&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/webservices.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/webservices.xml
Wed Nov 14 18:23:14 2007
@@ -57,8 +57,8 @@
             <port-component-name>JAXWSPort2</port-component-name>
             <wsdl-service>greeter:GreeterService</wsdl-service>
             <wsdl-port>greeter:GreeterPort</wsdl-port> 
-            <enable-mtom>false</enable-mtom>
-            <service-endpoint-interface>org.apache.greeter_control.Greeter2</service-endpoint-interface>
+            <enable-mtom>false</enable-mtom>                        
+            <service-endpoint-interface>org.apache.greeter_control.Greeter</service-endpoint-interface>
                 
             <service-impl-bean>
                 <servlet-link>JAXWSServlet2</servlet-link>
             </service-impl-bean>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/WSTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/WSTest.java?rev=595186&r1=595185&r2=595186&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/WSTest.java
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/WSTest.java
Wed Nov 14 18:23:14 2007
@@ -112,12 +112,12 @@
     public void testJAXWSWSDL1() throws Exception {
         testWSDL("servlet2", new String [] {"greetMe"});
     }
-    
+        
     /*
     @Test
     public void testJAXWSWSDL2() throws Exception {
-        testWSDL("servlet3", new String [] {"greetMe", "sayHi"});
-    }    
+        testWSDL("servlet3", new String [] {"greetMe"});
+    }        
     */
     
     private void testWSDL(String servlet, String[] operations) throws Exception {



Mime
View raw message