geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r736116 - in /geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests: catalog-ear/ catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/ catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/ catalog-ejb/src/mai...
Date Tue, 20 Jan 2009 21:31:36 GMT
Author: gawor
Date: Tue Jan 20 13:31:36 2009
New Revision: 736116

URL: http://svn.apache.org/viewvc?rev=736116&view=rev
Log:
added tests for testing catalog support with service-refs - disabled for now

Added:
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterEjbClient.java
  (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterRemote.java
  (with props)
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/java/org/apache/geronimo/jaxws/test/GreeterWebClient.java
  (with props)
Modified:
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/CatalogTest.java
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/EJBCatalogTest.java
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/WebCatalogTest.java
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterBean.java
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/pom.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml?rev=736116&r1=736115&r2=736116&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml
Tue Jan 20 13:31:36 2009
@@ -50,6 +50,13 @@
             <version>${version}</version>
             <type>ejb</type>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openejb</artifactId>
+            <version>${version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/CatalogTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/CatalogTest.java?rev=736116&r1=736115&r2=736116&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/CatalogTest.java
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/CatalogTest.java
Tue Jan 20 13:31:36 2009
@@ -43,7 +43,7 @@
 
 public abstract class CatalogTest extends TestSupport {
 
-    private String baseURL = "http://localhost:8080";
+    protected String baseURL = "http://localhost:8080";
     
     abstract String getTestServletContext();
            

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/EJBCatalogTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/EJBCatalogTest.java?rev=736116&r1=736115&r2=736116&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/EJBCatalogTest.java
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/EJBCatalogTest.java
Tue Jan 20 13:31:36 2009
@@ -18,10 +18,35 @@
  */
 package org.apache.geronimo.jaxws.catalog;
 
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+
+import org.apache.geronimo.jaxws.test.GreeterRemote;
+
+import org.testng.annotations.Test;
+
 public class EJBCatalogTest extends CatalogTest {
 
     protected String getTestServletContext() {
         return "/catalog-ejb";
     }
        
+    @Test
+    public void testClient() throws Exception {
+        Properties p = new Properties();
+        
+        p.put("java.naming.factory.initial", 
+              "org.apache.openejb.client.RemoteInitialContextFactory");
+        p.put("java.naming.provider.url", 
+              "127.0.0.1:4201");   
+        
+        InitialContext ctx = new InitialContext(p);
+        
+        GreeterRemote greeter = (GreeterRemote)ctx.lookup("/GreeterClientRemote");
+        
+        String response = greeter.test();
+        
+        assertEquals("OK", response);
+    }
 }

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/WebCatalogTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/WebCatalogTest.java?rev=736116&r1=736115&r2=736116&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/WebCatalogTest.java
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/WebCatalogTest.java
Tue Jan 20 13:31:36 2009
@@ -18,10 +18,58 @@
  */
 package org.apache.geronimo.jaxws.catalog;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import org.testng.annotations.Test;
+
 public class WebCatalogTest extends CatalogTest {
 
     protected String getTestServletContext() {
         return "/catalog-war";
     }
        
+    @Test
+    public void testClient() throws Exception {
+        URL url = new URL(baseURL + getTestServletContext() + "/greeter-client");
+        HttpURLConnection connection = (HttpURLConnection)url.openConnection();
+        try {
+            String reply = doGET(connection);
+            
+            assertEquals("responseCode", 200, connection.getResponseCode());
+            assertTrue(reply.indexOf("OK") != -1);
+        } finally {
+            connection.disconnect();
+        }
+
+    }
+    
+    private String doGET(HttpURLConnection conn) throws IOException {        
+        conn.setConnectTimeout(30 * 1000);
+        conn.setReadTimeout(30 * 1000);
+
+        InputStream is = null;
+        
+        try {
+            is = conn.getInputStream();
+        } catch (IOException e) {
+            is = conn.getErrorStream();
+        }
+        
+        StringBuffer buf = new StringBuffer();
+        BufferedReader in = new BufferedReader(new InputStreamReader(is));
+        String inputLine;
+        while ((inputLine = in.readLine()) != null) {
+            System.out.println(inputLine);
+            buf.append(inputLine);
+        }
+        in.close();
+        
+        return buf.toString();
+    }
+
 }

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterBean.java?rev=736116&r1=736115&r2=736116&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterBean.java
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterBean.java
Tue Jan 20 13:31:36 2009
@@ -29,7 +29,7 @@
             portName = "GreeterPort",
             name = "Greeter", 
             targetNamespace = "http://apache.org/greeter_control",
-	    wsdlLocation = "META-INF/wsdl/greeter_service.wsdl")
+	        wsdlLocation = "META-INF/wsdl/greeter_service.wsdl")
 @Stateless(name="GreeterBean")
 public class GreeterBean { 
 
@@ -37,11 +37,11 @@
     private WebServiceContext context;
 
     public String greetMe(String me) {
-	return "Hello " + me;
+        return "Hello " + me;
     }
             
     public String sayHi() {
-	return "Hi!";
+        return "Hi!";
     }
         
     @PostConstruct

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterEjbClient.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterEjbClient.java?rev=736116&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterEjbClient.java
(added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterEjbClient.java
Tue Jan 20 13:31:36 2009
@@ -0,0 +1,39 @@
+/**
+ *  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.geronimo.jaxws.test;
+
+import javax.ejb.Stateless;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceRef;
+
+@Stateless(name="GreeterClient")
+public class GreeterEjbClient implements GreeterRemote { 
+       
+    /*
+    @WebServiceRef(name="services/Greeter", 
+                   wsdlLocation="META-INF/wsdl/greeter_service.wsdl")
+    */
+    private Service service = Service.create(new QName("DISALBED"));
+        
+    public String test() {
+        return (service != null) ? "OK" : "FAILED";
+    }
+        
+}

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterEjbClient.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterEjbClient.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterEjbClient.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterRemote.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterRemote.java?rev=736116&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterRemote.java
(added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterRemote.java
Tue Jan 20 13:31:36 2009
@@ -0,0 +1,28 @@
+/**
+ *  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.geronimo.jaxws.test;
+
+import javax.ejb.Remote;
+
+@Remote
+public interface GreeterRemote { 
+       
+    public String test();
+    
+}

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterRemote.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterRemote.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterRemote.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml?rev=736116&r1=736115&r2=736116&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/ejb-jar.xml
Tue Jan 20 13:31:36 2009
@@ -19,16 +19,16 @@
 <!-- $Rev$ $Date$ -->
 
 <ejb-jar version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
-  <display-name>JJAX-WS Catalog Test</display-name>
+    <display-name>JAX-WS Catalog Test</display-name>
 
-  <enterprise-beans>
-    <session>
-      <display-name>GreeterBean</display-name>
-      <ejb-name>GreeterBean</ejb-name>
-      <ejb-class>org.apache.geronimo.jaxws.test.GreeterBean</ejb-class>
-      <session-type>Stateless</session-type>
-      <transaction-type>Container</transaction-type>
-    </session>
-  </enterprise-beans>
+    <enterprise-beans>
+        <session>
+            <display-name>GreeterBean</display-name>
+            <ejb-name>GreeterBean</ejb-name>
+            <ejb-class>org.apache.geronimo.jaxws.test.GreeterBean</ejb-class>
+            <session-type>Stateless</session-type>
+            <transaction-type>Container</transaction-type>
+        </session>
+    </enterprise-beans>
 
 </ejb-jar>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=736116&r1=736115&r2=736116&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
Tue Jan 20 13:31:36 2009
@@ -35,6 +35,17 @@
         <session>
             <ejb-name>GreeterBean</ejb-name>
             <web-service-address>/${pom.artifactId}/greeter</web-service-address>
+
+            <service-ref>
+                <service-ref-name>services/Greeter</service-ref-name>
+                <port>
+                    <port-name>GreeterPort</port-name>
+                    <protocol>http</protocol>
+                    <host>localhost</host>
+                    <port>8080</port>
+                    <uri>/${pom.artifactId}/greeter</uri>
+                </port>
+            </service-ref>
         </session>
     </enterprise-beans>
 

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/pom.xml?rev=736116&r1=736115&r2=736116&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/pom.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/pom.xml
Tue Jan 20 13:31:36 2009
@@ -34,4 +34,11 @@
     <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Catalog WAR</name>
     <packaging>war</packaging>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 </project>

Added: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/java/org/apache/geronimo/jaxws/test/GreeterWebClient.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/java/org/apache/geronimo/jaxws/test/GreeterWebClient.java?rev=736116&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/java/org/apache/geronimo/jaxws/test/GreeterWebClient.java
(added)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/java/org/apache/geronimo/jaxws/test/GreeterWebClient.java
Tue Jan 20 13:31:36 2009
@@ -0,0 +1,45 @@
+/**
+ * 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.geronimo.jaxws.test;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceRef;
+
+public class GreeterWebClient extends HttpServlet {
+
+    /*
+    @WebServiceRef(name="services/Greeter", 
+                   wsdlLocation="WEB-INF/wsdl/greeter_service.wsdl")
+    */
+    private Service service = Service.create(new QName("DISALBED"));
+    
+    @Override
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException,
IOException {
+        response.setContentType("text/plain");
+        response.getWriter().println((service != null) ? "OK" : "FAILED");
+    }
+
+}

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/java/org/apache/geronimo/jaxws/test/GreeterWebClient.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/java/org/apache/geronimo/jaxws/test/GreeterWebClient.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/java/org/apache/geronimo/jaxws/test/GreeterWebClient.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=736116&r1=736115&r2=736116&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/geronimo-web.xml
Tue Jan 20 13:31:36 2009
@@ -15,16 +15,30 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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>${pom.groupId}</dep:groupId>
-      <dep:artifactId>${pom.artifactId}</dep:artifactId>
-      <dep:version>${version}</dep:version>
-      <dep:type>war</dep:type>
-    </dep:moduleId>
-  </dep:environment>
+<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">
 
- <context-root>/${pom.artifactId}</context-root> 
+    <dep:environment>
+        <dep:moduleId>
+            <dep:groupId>${pom.groupId}</dep:groupId>
+            <dep:artifactId>${pom.artifactId}</dep:artifactId>
+            <dep:version>${version}</dep:version>
+            <dep:type>war</dep:type>
+        </dep:moduleId>
+    </dep:environment>
+
+    <context-root>/${pom.artifactId}</context-root>
+
+    <service-ref>
+        <service-ref-name>services/Greeter</service-ref-name>
+        <port>
+            <port-name>GreeterPort</port-name>
+            <protocol>http</protocol>
+            <host>localhost</host>
+            <port>8080</port>
+            <uri>/${pom.artifactId}/greeter</uri>
+        </port>
+    </service-ref>
 
 </web-app>

Modified: geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/web.xml?rev=736116&r1=736115&r2=736116&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/web.xml
Tue Jan 20 13:31:36 2009
@@ -35,5 +35,17 @@
         <servlet-name>GreeterServlet</servlet-name>
         <url-pattern>/greeter</url-pattern>
     </servlet-mapping>
+    
+    <servlet>
+        <display-name>GreeterClientServlet</display-name>
+        <servlet-name>GreeterClientServlet</servlet-name>
+        <servlet-class>org.apache.geronimo.jaxws.test.GreeterWebClient</servlet-class>
+        <load-on-startup>0</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>GreeterClientServlet</servlet-name>
+        <url-pattern>/greeter-client</url-pattern>
+    </servlet-mapping>
        
 </web-app>



Mime
View raw message