Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 88908 invoked from network); 20 Jan 2009 21:31:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Jan 2009 21:31:59 -0000 Received: (qmail 25240 invoked by uid 500); 20 Jan 2009 21:31:59 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 25110 invoked by uid 500); 20 Jan 2009 21:31:58 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 25101 invoked by uid 99); 20 Jan 2009 21:31:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jan 2009 13:31:58 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jan 2009 21:31:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1E701238896B; Tue, 20 Jan 2009 13:31:37 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090120213137.1E701238896B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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} ejb + + + org.apache.geronimo.modules + geronimo-openejb + ${version} + test + 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 @@ - JJAX-WS Catalog Test + JAX-WS Catalog Test - - - GreeterBean - GreeterBean - org.apache.geronimo.jaxws.test.GreeterBean - Stateless - Container - - + + + GreeterBean + GreeterBean + org.apache.geronimo.jaxws.test.GreeterBean + Stateless + Container + + 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 @@ GreeterBean /${pom.artifactId}/greeter + + + services/Greeter + + GreeterPort + http + localhost + 8080 + /${pom.artifactId}/greeter + + 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 @@ Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Catalog WAR war + + + org.apache.geronimo.specs + geronimo-servlet_2.5_spec + provided + + 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. --> - - - - ${pom.groupId} - ${pom.artifactId} - ${version} - war - - + - /${pom.artifactId} + + + ${pom.groupId} + ${pom.artifactId} + ${version} + war + + + + /${pom.artifactId} + + + services/Greeter + + GreeterPort + http + localhost + 8080 + /${pom.artifactId}/greeter + + 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 @@ GreeterServlet /greeter + + + GreeterClientServlet + GreeterClientServlet + org.apache.geronimo.jaxws.test.GreeterWebClient + 0 + + + + GreeterClientServlet + /greeter-client +