Author: thomas.diesler(a)jboss.com Date: 2007-04-15 08:02:39 -0400 (Sun, 15 Apr 2007) New Revision: 2861 Added: trunk/jbossws-tests/src/resources/jaxrpc/enventry/META-INF/jboss.xml trunk/jbossws-tests/src/resources/jaxrpc/jbas897/META-INF/jboss.xml trunk/jbossws-tests/src/resources/jaxrpc/jbws1011/META-INF/jboss.xml trunk/jbossws-tests/src/resources/jaxrpc/jbws331/WS-META-INF/jboss.xml trunk/jbossws-tests/src/resources/jaxrpc/jbws358/META-INF/jboss.xml trunk/jbossws-tests/src/resources/jaxrpc/jbws626/META-INF/jboss.xml trunk/jbossws-tests/src/resources/jaxrpc/jbws772/META-INF-ONE/jboss.xml Removed: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean01.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean02.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean03.java Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java trunk/jbossws-tests/src/resources/jaxrpc/enventry/META-INF/jboss-client.xml trunk/jbossws-tests/src/resources/jaxrpc/jbws165/META-INF/jboss-client.xml trunk/jbossws-tests/src/resources/jaxrpc/jbws331/META-INF/jboss-client.xml trunk/jbossws-tests/src/resources/jaxrpc/jbws358/META-INF/jboss-client.xml trunk/jbossws-tests/src/resources/jaxrpc/jbws626/META-INF/jboss-client.xml trunk/jbossws-tests/src/resources/jaxrpc/jbws772/META-INF-ONE/jboss-client.xml Log: Use explicit context root for EJB endpoints Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-04-15 12:02:39 UTC (rev 2861) @@ -255,6 +255,7 @@ </metainf> <metainf dir="${tests.output.dir}/resources/jaxrpc/enventry/META-INF"> <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> <include name="webservices.xml"/> </metainf> </jar> @@ -282,6 +283,7 @@ </fileset> <metainf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF"> <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -293,6 +295,7 @@ <include name="org/jboss/test/ws/jaxrpc/jbas897/HelloSLSB.class"/> </fileset> <metainf dir="${tests.output.dir}/resources/jaxrpc/jbas897/META-INF"> + <include name="jboss.xml"/> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -908,6 +911,7 @@ </fileset> <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws331/WS-META-INF"> <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -982,6 +986,7 @@ </fileset> <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws358/META-INF"> <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -1397,6 +1402,7 @@ </fileset> <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws626/META-INF"> <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/TestService.wsdl"/> @@ -1812,6 +1818,7 @@ </fileset> <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws772/META-INF-ONE"> <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -2009,6 +2016,7 @@ </fileset> <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1011/META-INF"> <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> <include name="jbosscmp-jdbc.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java 2007-04-15 12:02:39 UTC (rev 2861) @@ -110,7 +110,7 @@ try { ServiceFactory serviceFactory = ServiceFactory.newInstance(); - Service service = serviceFactory.createService(new URL("http://" + getServerHost() + ":8080/jaxrpc-jbas897/HelloEJB?wsdl"), SERVICE_NAME); + Service service = serviceFactory.createService(new URL("http://" + getServerHost() + ":8080/jaxrpc-jbas897/HelloSLSB?wsdl"), SERVICE_NAME); Call call = (Call)service.createCall(new QName(NAMESPACE, "HelloPort"), "sayHello"); String retstr = (String)call.invoke(new Object[] { "Hello" }); assertEquals("'Hello' to you too!", retstr); @@ -139,7 +139,7 @@ try { - URL url = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbas897-fail/HelloEJB"); + URL url = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbas897-fail/HelloSLSB"); url.openStream(); fail("Deployment was expected to fail"); } Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.java 2007-04-15 12:02:39 UTC (rev 2861) @@ -32,7 +32,7 @@ /** - * Unpackaged ear deployments with unpackaged jars inside them do not undeploy WS correctly + * EAR deployment of ejb.jar + ws-ejb.jar * * http://jira.jboss.com/jira/browse/JBWS-331 * Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2007-04-15 12:02:39 UTC (rev 2861) @@ -52,7 +52,7 @@ // jboss propriatary annotations @RemoteBinding(jndiBinding = "/ejb3/EJB3Bean01") -@WebContext(authMethod="BASIC", transportGuarantee="NONE", secureWSDLAccess=false) +@WebContext(contextRoot="/jaxws-samples-jsr181ejb", authMethod="BASIC", transportGuarantee="NONE", secureWSDLAccess=false) @SecurityDomain("JBossWS") public class EJB3Bean01 implements EJB3RemoteInterface { Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/OrderMgmtBean.java 2007-04-15 12:02:39 UTC (rev 2861) @@ -35,6 +35,7 @@ import org.jboss.test.ws.jaxws.samples.retail.profile.DiscountResponse; import org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmt; import org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmtService; +import org.jboss.ws.annotation.WebContext; /** * An example order management component @@ -42,6 +43,7 @@ */ @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.OrderMgmt", name="OrderMgmt", serviceName = "OrderMgmtService") +@WebContext(contextRoot="/jaxws-samples-retail") @HandlerChain(file = "jaxws-handler.xml") public class OrderMgmtBean implements OrderMgmt { Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/cc/CCVerificationBean.java 2007-04-15 12:02:39 UTC (rev 2861) @@ -27,9 +27,11 @@ import javax.xml.ws.Response; import org.jboss.logging.Logger; +import org.jboss.ws.annotation.WebContext; @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.cc.CCVerification", name="CCVerification") +@WebContext(contextRoot="/jaxws-samples-retail") @HandlerChain(file = "../jaxws-handler.xml") public class CCVerificationBean implements CCVerification { Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/retail/profile/ProfileMgmtBean.java 2007-04-15 12:02:39 UTC (rev 2861) @@ -25,8 +25,11 @@ import javax.jws.HandlerChain; import javax.jws.WebService; +import org.jboss.ws.annotation.WebContext; + @Stateless @WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.retail.profile.ProfileMgmt", name="ProfileMgmt", serviceName = "ProfileMgmtService") +@WebContext(contextRoot="/jaxws-samples-retail") @HandlerChain(file = "../jaxws-handler.xml") public class ProfileMgmtBean implements ProfileMgmt { Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean01.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean01.java 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean01.java 2007-04-15 12:02:39 UTC (rev 2861) @@ -1,74 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.webservice; - -import java.rmi.RemoteException; - -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.ws.annotation.WebContext; - -/** - * Test the JSR-181 annotation: javax.jws.WebService - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Apr-2005 - */ -@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService") -@SOAPBinding(style = SOAPBinding.Style.RPC) -@WebContext(urlPattern="/*") -public class EJB21Bean01 implements SessionBean -{ - - @WebMethod - public String echo(String input) - { - return input; - } - - // EJB Lifecycle ---------------------------------------------------------------------- - - public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException - { - } - - public void ejbCreate() - { - } - - public void ejbRemove() - { - } - - public void ejbActivate() - { - } - - public void ejbPassivate() - { - } -} Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean02.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean02.java 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean02.java 2007-04-15 12:02:39 UTC (rev 2861) @@ -1,76 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.webservice; - -import java.rmi.RemoteException; - -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.jws.WebMethod; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.ws.annotation.WebContext; - -/** - * Test the JSR-181 annotation: javax.jws.WebService - * - * Uses the wsdlLocation attribute. - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Apr-2005 - */ -@WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService", wsdlLocation = "META-INF/wsdl/TestService.wsdl") -@SOAPBinding(style = SOAPBinding.Style.RPC) -@WebContext(urlPattern="/*") -public class EJB21Bean02 implements SessionBean -{ - - @WebMethod - public String echo(String input) - { - return input; - } - - // EJB Lifecycle ---------------------------------------------------------------------- - - public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException - { - } - - public void ejbCreate() - { - } - - public void ejbRemove() - { - } - - public void ejbActivate() - { - } - - public void ejbPassivate() - { - } -} Deleted: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean03.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean03.java 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB21Bean03.java 2007-04-15 12:02:39 UTC (rev 2861) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.webservice; - -import java.rmi.RemoteException; - -import javax.ejb.EJBException; -import javax.ejb.SessionBean; -import javax.ejb.SessionContext; -import javax.jws.WebService; - -/** - * Test the JSR-181 annotation: javax.jws.WebService - * - * @author Thomas.Diesler(a)jboss.org - * @since 29-Apr-2005 - */ -@WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService") -public class EJB21Bean03 implements SessionBean -{ - private SessionContext sessionContext; - public String echo(String input) - { - return input; - } - - // EJB Lifecycle ---------------------------------------------------------------------- - - public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException - { - this.sessionContext = ctx; - } - - public void ejbCreate() - { - } - - public void ejbRemove() - { - } - - public void ejbActivate() - { - } - - public void ejbPassivate() - { - } -} Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java 2007-04-15 12:02:39 UTC (rev 2861) @@ -37,7 +37,7 @@ * @since 29-Apr-2005 */ @WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService") -@WebContext(urlPattern="/*") +@WebContext(contextRoot="/jaxws-samples-webservice01-ejb3", urlPattern="/*") @SOAPBinding(style = SOAPBinding.Style.RPC) @Remote(EJB3RemoteInterface.class) @RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface") Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java 2007-04-15 12:02:39 UTC (rev 2861) @@ -41,7 +41,7 @@ * @since 29-Apr-2005 */ @WebService(name = "EndpointInterface", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService", wsdlLocation = "META-INF/wsdl/TestService.wsdl") -@WebContext(urlPattern="/*") +@WebContext(contextRoot="/jaxws-samples-webservice02-ejb3", urlPattern="/*") @SOAPBinding(style = SOAPBinding.Style.RPC) @Remote(EJB3RemoteInterface.class) @RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface") Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java 2007-04-15 12:02:39 UTC (rev 2861) @@ -26,6 +26,7 @@ import javax.jws.WebService; import org.jboss.annotation.ejb.RemoteBinding; +import org.jboss.ws.annotation.WebContext; /** * Test the JSR-181 annotation: javax.jws.WebService @@ -34,6 +35,7 @@ * @since 29-Apr-2005 */ @WebService(endpointInterface = "org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03", targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName = "TestService") +@WebContext(contextRoot="/jaxws-samples-webservice03-ejb3", urlPattern="/*") @Remote(EJB3RemoteInterface.class) @RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface") @Stateless Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.java 2007-04-15 12:02:39 UTC (rev 2861) @@ -36,7 +36,6 @@ * @since 29-Apr-2005 */ @WebService(targetNamespace = "http://foo") -@WebContext(urlPattern="/*") @SOAPBinding(style = SOAPBinding.Style.RPC) public interface EndpointInterface03 extends Remote { Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxws/samples/webservice/JSR181WebServiceBase.java 2007-04-15 12:02:39 UTC (rev 2861) @@ -40,45 +40,45 @@ public class JSR181WebServiceBase extends JBossWSTest { - private EndpointInterface getPort(String context) throws MalformedURLException + private EndpointInterface getPort(String endpointURI) throws MalformedURLException { QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld";, "TestService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + context + "?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + endpointURI + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); return service.getPort(EndpointInterface.class); } - private EndpointInterface03 getPort03(String context) throws MalformedURLException + private EndpointInterface03 getPort03(String endpointURI) throws MalformedURLException { QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld";, "TestService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + context + "?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + endpointURI + "?wsdl"); Service service = Service.create(wsdlURL, serviceName); return service.getPort(EndpointInterface03.class); } - private void sayHello(String context) throws RemoteException, MalformedURLException + private void sayHello(String endpointURI) throws RemoteException, MalformedURLException { String helloWorld = "Hello world!"; - Object retObj = getPort(context).echo(helloWorld); + Object retObj = getPort(endpointURI).echo(helloWorld); assertEquals(helloWorld, retObj); } - public void webServiceTest(String context) throws Exception + public void webServiceTest(String endpointURI) throws Exception { - sayHello(context); + sayHello(endpointURI); } - public void webServiceWsdlLocationTest(String context) throws Exception + public void webServiceWsdlLocationTest(String endpointURI) throws Exception { - sayHello(context); + sayHello(endpointURI); } - public void webServiceEndpointInterfaceTest(String context) throws Exception + public void webServiceEndpointInterfaceTest(String endpointURI) throws Exception { String helloWorld = "Hello Interface!"; - Object retObj = getPort03(context).echo(helloWorld); + Object retObj = getPort03(endpointURI).echo(helloWorld); assertEquals(helloWorld, retObj); } } \ No newline at end of file Modified: trunk/jbossws-tests/src/resources/jaxrpc/enventry/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/enventry/META-INF/jboss-client.xml 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/resources/jaxrpc/enventry/META-INF/jboss-client.xml 2007-04-15 12:02:39 UTC (rev 2861) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-enventry/TestService?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-enventry/EnvEntryBeanEJB?wsdl</wsdl-override> </service-ref> </jboss-client> Added: trunk/jbossws-tests/src/resources/jaxrpc/enventry/META-INF/jboss.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/enventry/META-INF/jboss.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxrpc/enventry/META-INF/jboss.xml 2007-04-15 12:02:39 UTC (rev 2861) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> + +<jboss> + + <webservices> + <context-root>/jaxrpc-enventry</context-root> + </webservices> + +</jboss> Property changes on: trunk/jbossws-tests/src/resources/jaxrpc/enventry/META-INF/jboss.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/resources/jaxrpc/jbas897/META-INF/jboss.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbas897/META-INF/jboss.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbas897/META-INF/jboss.xml 2007-04-15 12:02:39 UTC (rev 2861) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> + +<jboss> + + <webservices> + <context-root>/jaxrpc-jbas897</context-root> + </webservices> + +</jboss> Property changes on: trunk/jbossws-tests/src/resources/jaxrpc/jbas897/META-INF/jboss.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/jbossws-tests/src/resources/jaxrpc/jbws1011/META-INF/jboss.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws1011/META-INF/jboss.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1011/META-INF/jboss.xml 2007-04-15 12:02:39 UTC (rev 2861) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> + +<jboss> + + <webservices> + <context-root>/jaxrpc-jbws1011</context-root> + </webservices> + +</jboss> Property changes on: trunk/jbossws-tests/src/resources/jaxrpc/jbws1011/META-INF/jboss.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-tests/src/resources/jaxrpc/jbws165/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws165/META-INF/jboss-client.xml 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws165/META-INF/jboss-client.xml 2007-04-15 12:02:39 UTC (rev 2861) @@ -9,7 +9,7 @@ <service-ref> <service-ref-name>service/HelloNone</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080//jaxrpc-jbws165-jaxrpc-jbws165-none/HelloNone?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/HelloEJBService/HelloEJB?wsdl</wsdl-override> </service-ref> <service-ref> @@ -24,7 +24,7 @@ <service-ref> <service-ref-name>service/HelloContextRoot</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/Explicit/Context/HelloContextRoot?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/Explicit/Context/HelloEJB?wsdl</wsdl-override> </service-ref> <service-ref> Modified: trunk/jbossws-tests/src/resources/jaxrpc/jbws331/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws331/META-INF/jboss-client.xml 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws331/META-INF/jboss-client.xml 2007-04-15 12:02:39 UTC (rev 2861) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/HelloService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws331-jaxrpc-jbws331-ws/HelloBean?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws331/HelloEndpoint?wsdl</wsdl-override> </service-ref> </jboss-client> Added: trunk/jbossws-tests/src/resources/jaxrpc/jbws331/WS-META-INF/jboss.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws331/WS-META-INF/jboss.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws331/WS-META-INF/jboss.xml 2007-04-15 12:02:39 UTC (rev 2861) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> + +<jboss> + + <webservices> + <context-root>/jaxrpc-jbws331</context-root> + </webservices> + +</jboss> Property changes on: trunk/jbossws-tests/src/resources/jaxrpc/jbws331/WS-META-INF/jboss.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-tests/src/resources/jaxrpc/jbws358/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws358/META-INF/jboss-client.xml 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws358/META-INF/jboss-client.xml 2007-04-15 12:02:39 UTC (rev 2861) @@ -9,7 +9,7 @@ <service-ref> <service-ref-name>service/HelloService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws358-jaxrpc-jbws358/HelloBean?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws358/HelloBean?wsdl</wsdl-override> </service-ref> </jboss-client> Added: trunk/jbossws-tests/src/resources/jaxrpc/jbws358/META-INF/jboss.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws358/META-INF/jboss.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws358/META-INF/jboss.xml 2007-04-15 12:02:39 UTC (rev 2861) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> + +<jboss> + + <webservices> + <context-root>/jaxrpc-jbws358</context-root> + </webservices> + +</jboss> Property changes on: trunk/jbossws-tests/src/resources/jaxrpc/jbws358/META-INF/jboss.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-tests/src/resources/jaxrpc/jbws626/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws626/META-INF/jboss-client.xml 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws626/META-INF/jboss-client.xml 2007-04-15 12:02:39 UTC (rev 2861) @@ -9,7 +9,7 @@ <service-ref> <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws626-jaxrpc-jbws626/JBWS626TestBean?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws626/DemoBean?wsdl</wsdl-override> </service-ref> </jboss-client> Added: trunk/jbossws-tests/src/resources/jaxrpc/jbws626/META-INF/jboss.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws626/META-INF/jboss.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws626/META-INF/jboss.xml 2007-04-15 12:02:39 UTC (rev 2861) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> + +<jboss> + + <webservices> + <context-root>/jaxrpc-jbws626</context-root> + </webservices> + +</jboss> Property changes on: trunk/jbossws-tests/src/resources/jaxrpc/jbws626/META-INF/jboss.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/jbossws-tests/src/resources/jaxrpc/jbws772/META-INF-ONE/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws772/META-INF-ONE/jboss-client.xml 2007-04-15 10:09:54 UTC (rev 2860) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws772/META-INF-ONE/jboss-client.xml 2007-04-15 12:02:39 UTC (rev 2861) @@ -14,7 +14,7 @@ <service-ref> <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws772-jaxrpc-jbws772-endpoint/HelloEJBOne?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws772/HelloSLSB?wsdl</wsdl-override> </service-ref> </jboss-client> Added: trunk/jbossws-tests/src/resources/jaxrpc/jbws772/META-INF-ONE/jboss.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws772/META-INF-ONE/jboss.xml (rev 0) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws772/META-INF-ONE/jboss.xml 2007-04-15 12:02:39 UTC (rev 2861) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> + +<jboss> + + <webservices> + <context-root>/jaxrpc-jbws772</context-root> + </webservices> + +</jboss> Property changes on: trunk/jbossws-tests/src/resources/jaxrpc/jbws772/META-INF-ONE/jboss.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF