Author: thomas.diesler(a)jboss.com Date: 2007-05-23 05:46:06 -0400 (Wed, 23 May 2007) New Revision: 3205 Removed: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java Modified: trunk/build/ant-import/build-testsuite.xml trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java trunk/integration/jbws/ant-import/build-testsuite.xml trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java trunk/integration/sunri/ant-import/build-testsuite.xml trunk/integration/xfire/ant-import/build-testsuite.xml trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppDesciptorModifierImpl.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml Log: Fix core jboss42 issues Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/build/ant-import/build-testsuite.xml 2007-05-23 09:46:06 UTC (rev 3205) @@ -110,6 +110,7 @@ <pathelement location="${jboss.client}/wsdl4j.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> + <pathelement location="${jboss.lib}/jboss-vfs.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-05-23 09:46:06 UTC (rev 3205) @@ -70,11 +70,7 @@ { super.create(ep); - ObjectName epName = ep.getName(); - String ejbName = epName.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - if (ejbName == null) - throw new WebServiceException("Cannot obtain ejb-link from port component"); - + String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData; UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(ejbName); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-05-23 09:46:06 UTC (rev 3205) @@ -58,10 +58,7 @@ { super.create(ep); - String ejbName = ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - if (ejbName == null) - throw new WebServiceException("Cannot obtain ejb-link"); - + String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName; if (udi.parent != null) Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ModifyWebMetaDataDeployer.java 2007-05-23 09:46:06 UTC (rev 3205) @@ -59,7 +59,7 @@ { if (ep.getTargetBean() == null) { - String servletName = ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); + String servletName = ep.getShortName(); String beanClassName = results.sepTargetMap.get(servletName); if (beanClassName == null) throw new IllegalStateException("Cannot obtain target bean for: " + servletName); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-05-23 09:46:06 UTC (rev 3205) @@ -72,11 +72,7 @@ { super.create(ep); - ObjectName epName = ep.getName(); - String ejbName = epName.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - if (ejbName == null) - throw new WebServiceException("Cannot obtain ejb-link from port component"); - + String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); UnifiedApplicationMetaData applMetaData = (UnifiedApplicationMetaData)udi.metaData; UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)applMetaData.getBeanByEjbName(ejbName); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-05-23 09:46:06 UTC (rev 3205) @@ -56,10 +56,7 @@ public void create(Endpoint ep) { - String ejbName = ep.getName().getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - if (ejbName == null) - throw new WebServiceException("Cannot obtain ejb-link"); - + String ejbName = ep.getShortName(); UnifiedDeploymentInfo udi = ep.getService().getDeployment().getContext().getAttachment(UnifiedDeploymentInfo.class); String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + udi.simpleName; if (udi.parent != null) Modified: trunk/integration/jbws/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-23 09:46:06 UTC (rev 3205) @@ -43,7 +43,7 @@ <!-- Compiling --> <!-- ================================================================== --> - <target name="tests-compile" depends="tests-classpath" description="Compile sources"> + <target name="tests-compile" depends="tests-init" description="Compile sources"> <macro-compile-classes srcdir="${tests.java.dir}"/> </target> Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/EndpointServlet.java 2007-05-23 09:46:06 UTC (rev 3205) @@ -55,16 +55,11 @@ { super.init(servletConfig); epRegistry = EndpointRegistryFactory.getEndpointRegistry(); + endpoint = initServiceEndpoint(getServletContext().getContextPath()); } public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { - if (endpoint == null) - { - String contextPath = req.getContextPath(); - initServiceEndpoint(contextPath); - } - try { EndpointAssociation.setEndpoint(endpoint); @@ -79,11 +74,12 @@ /** Initialize the service endpoint */ - protected void initServiceEndpoint(String contextPath) + protected Endpoint initServiceEndpoint(String contextPath) { if (contextPath.startsWith("/")) contextPath = contextPath.substring(1); + Endpoint endpoint = null; String servletName = getServletName(); for (ObjectName sepId : epRegistry.getEndpoints()) { @@ -102,5 +98,7 @@ + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName); throw new WebServiceException("Cannot obtain endpoint for: " + oname); } + + return endpoint; } } Modified: trunk/integration/sunri/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-05-23 09:46:06 UTC (rev 3205) @@ -53,7 +53,7 @@ <!-- Compiling --> <!-- ================================================================== --> - <target name="tests-compile" depends="tests-classpath" description="Compile sources"> + <target name="tests-compile" depends="tests-init" description="Compile sources"> <macro-compile-classes srcdir="${tests.java.dir}"/> </target> Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-05-23 09:46:06 UTC (rev 3205) @@ -73,7 +73,7 @@ <!-- Compiling --> <!-- ================================================================== --> - <target name="tests-compile" depends="tests-classpath" description="Compile sources"> + <target name="tests-compile" depends="tests-init" description="Compile sources"> <macro-compile-classes srcdir="${tests.java.dir}"/> </target> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-05-23 09:46:06 UTC (rev 3205) @@ -25,7 +25,7 @@ <!-- Init the various classpaths --> - <target name="tests-init" depends="jars,tests-prepare"> + <target name="tests-init" depends="thirdparty-classpath,tests-classpath"> <path id="ws.stack.classpath"> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> @@ -48,18 +48,18 @@ <!-- The jBPM BPEL classpath --> <path id="jbpm.bpel.classpath"> <path refid="ws.stack.classpath"/> - <pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml --> - <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" /> - <pathelement location="${thirdparty.dir}/commons-collections.jar"/> - <pathelement location="${thirdparty.dir}/commons-logging.jar"/> - <pathelement location="${thirdparty.dir}/dom4j.jar"/> - <pathelement location="${thirdparty.dir}/jaxen.jar"/> - <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> - <pathelement location="${thirdparty.dir}/jboss-logging-log4j.jar"/> + <pathelement location="${core.dir}/thirdparty/jbpm-bpel"/> <!-- jbpm.cfg.xml --> + <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-bpel.jar" /> + <pathelement location="${core.dir}/thirdparty/jbpm-bpel/jbpm-jpdl.jar" /> + <pathelement location="${core.dir}/thirdparty/jbpm-bpel/commons-lang.jar" /> + <pathelement location="${core.dir}/thirdparty/commons-collections.jar"/> + <pathelement location="${core.dir}/thirdparty/commons-logging.jar"/> + <pathelement location="${core.dir}/thirdparty/dom4j.jar"/> + <pathelement location="${core.dir}/thirdparty/jaxen.jar"/> + <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> + <pathelement location="${core.dir}/thirdparty/jboss-logging-log4j.jar"/> <!-- - <pathelement location="${thirdparty.dir}/log4j.jar"/> + <pathelement location="${core.dir}/thirdparty/log4j.jar"/> <pathelement location="${tests.etc.dir}"/> --> </path> @@ -75,8 +75,8 @@ <!-- Define the JAX-WS wsconsume task --> <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> <classpath refid="ws.stack.classpath"/> - <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/> - <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> + <classpath location="${core.dir}/thirdparty/jbossws-wsconsume-impl.jar"/> + <classpath location="${core.dir}/thirdparty/jaxb-xjc.jar"/> </taskdef> <wsconsume wsdl="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" package="org.jboss.test.ws.benchmark.jaxws.doclit" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true" verbose="false"/> @@ -98,7 +98,7 @@ <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" /> </zip> <!-- Copy the BPEL sar --> - <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> + <copy file="${core.dir}/thirdparty/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> <!-- generate wsdl binding and service definitions for bpel processes --> <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> @@ -118,9 +118,7 @@ <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath refid="ws.stack.classpath"/> <classpath refid="thirdparty.classpath"/> - <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/> - <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/> - <classpath location="${thirdparty.dir}/concurrent.jar"/> + <classpath location="${core.dir}/thirdparty/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}"/> </taskdef> @@ -173,7 +171,7 @@ <taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide"> <classpath refid="ws.stack.classpath"/> <classpath refid="thirdparty.classpath"/> - <classpath location="${thirdparty.dir}/concurrent.jar"/> + <classpath location="${core.dir}/thirdparty/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> </taskdef> Deleted: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/AbstractServiceEndpointServlet.java 2007-05-23 09:46:06 UTC (rev 3205) @@ -1,97 +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.ws.core.server; - -// $Id$ - -import java.io.IOException; - -import javax.management.ObjectName; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.jboss.ws.WSException; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.RequestHandler; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.utils.ObjectNameFactory; - -/** - * A servlet that is installed for every web service endpoint. - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public abstract class AbstractServiceEndpointServlet extends HttpServlet -{ - protected Endpoint endpoint; - protected EndpointRegistry epRegistry; - - public void init(ServletConfig config) throws ServletException - { - super.init(config); - epRegistry = EndpointRegistryFactory.getEndpointRegistry(); - } - - public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - if (endpoint == null) - { - String contextPath = req.getContextPath(); - initServiceEndpoint(contextPath); - } - - RequestHandler requestHandler = (RequestHandler)endpoint.getRequestHandler(); - requestHandler.handleHttpRequest(endpoint, req, res, getServletContext()); - } - - /** Initialize the service endpoint - */ - protected void initServiceEndpoint(String contextPath) - { - String servletName = getServletName(); - if (contextPath.startsWith("/")) - contextPath = contextPath.substring(1); - - for (ObjectName sepId : epRegistry.getEndpoints()) - { - String propContext = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_CONTEXT); - String propEndpoint = sepId.getKeyProperty(Endpoint.SEPID_PROPERTY_ENDPOINT); - if (servletName.equals(propEndpoint) && contextPath.equals(propContext)) - { - endpoint = epRegistry.getEndpoint(sepId); - break; - } - } - - if (endpoint == null) - { - ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," - + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + servletName); - throw new WSException("Cannot obtain endpoint for: " + oname); - } - } -} Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointServlet.java 2007-05-23 09:46:06 UTC (rev 3205) @@ -26,8 +26,9 @@ import javax.servlet.ServletContext; import org.jboss.logging.Logger; -import org.jboss.ws.core.server.AbstractServiceEndpointServlet; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.invocation.EndpointServlet; /** * A servlet that is installed for every web service endpoint. @@ -35,16 +36,17 @@ * @author Thomas.Diesler(a)jboss.org * @since 25-Apr-2007 */ -public class ServiceEndpointServlet extends AbstractServiceEndpointServlet +public class ServiceEndpointServlet extends EndpointServlet { // provide logging private static final Logger log = Logger.getLogger(ServiceEndpointServlet.class); /** Initialize the service endpoint */ - protected void initServiceEndpoint(String contextPath) + @Override + protected Endpoint initServiceEndpoint(String contextPath) { - super.initServiceEndpoint(contextPath); + Endpoint endpoint = super.initServiceEndpoint(contextPath); // read the config name/file from web.xml ServletContext ctx = getServletContext(); @@ -59,5 +61,7 @@ log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile); epMetaData.setConfigName(configName, configFile); } + + return endpoint; } } Modified: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppDesciptorModifierImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppDesciptorModifierImpl.java 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/jbws/WebAppDesciptorModifierImpl.java 2007-05-23 09:46:06 UTC (rev 3205) @@ -90,7 +90,7 @@ // Nothing to do if we have an <init-param> if (isAlreadyModified(servlet)) { - for (Iterator itParam = servlet.elementIterator("init-param"); it.hasNext();) + for (Iterator itParam = servlet.elementIterator("init-param"); itParam.hasNext();) { Element elParam = (Element)itParam.next(); String paramName = elParam.element("param-name").getTextTrim(); @@ -121,7 +121,7 @@ if (orgServletClassName.equals(servletClass) == false) { targetBeanName = orgServletClassName; - Element paramElement = classElement.addElement("init-param"); + Element paramElement = servlet.addElement("init-param"); paramElement.addElement("param-name").addText(Endpoint.SEPID_DOMAIN_ENDPOINT); paramElement.addElement("param-value").addText(targetBeanName); } Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.java 2007-05-23 09:46:06 UTC (rev 3205) @@ -110,7 +110,7 @@ try { ServiceFactory serviceFactory = ServiceFactory.newInstance(); - Service service = serviceFactory.createService(new URL("http://" + getServerHost() + ":8080/jaxrpc-jbas897/HelloSLSB?wsdl"), SERVICE_NAME); + Service service = serviceFactory.createService(new URL("http://" + getServerHost() + ":8080/jaxrpc-jbas897/HelloEJB?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/HelloSLSB"); + URL url = new URL("http://" + getServerHost() + ":8080/jaxrpc-jbas897-fail/ShoulBeHello"); url.openStream(); fail("Deployment was expected to fail"); } Modified: trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws124/WEB-INF/web.xml 2007-05-23 09:46:06 UTC (rev 3205) @@ -8,7 +8,7 @@ <!-- Test that we can deploy an already modified web.xml --> <servlet> <servlet-name>Hello</servlet-name> - <servlet-class>org.jboss.ws.core.server.ServiceEndpointServlet</servlet-class> + <servlet-class>org.jboss.wsf.stack.jbws.ServiceEndpointServlet</servlet-class> <init-param> <param-name>jboss.ws.endpoint</param-name> <param-value>org.jboss.test.ws.jaxrpc.jbws124.HelloJavaBean</param-value> Modified: trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml 2007-05-23 09:37:57 UTC (rev 3204) +++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws165/META-INF/jboss-client.xml 2007-05-23 09:46:06 UTC (rev 3205) @@ -9,22 +9,22 @@ <service-ref> <service-ref-name>service/HelloNone</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/HelloEJBService/HelloEJB?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws165-jaxrpc-jbws165-none/HelloNone?wsdl</wsdl-override> </service-ref> <service-ref> <service-ref-name>service/HelloPCOne</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/Explicit/Path/HelloPCOne?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws165-jaxrpc-jbws165-pcuri/Explicit/Path/HelloPCOne?wsdl</wsdl-override> </service-ref> <service-ref> <service-ref-name>service/HelloPCTwo</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/Explicit/Path/HelloPCTwo?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws165-jaxrpc-jbws165-pcuri/Explicit/Path/HelloPCTwo?wsdl</wsdl-override> </service-ref> <service-ref> <service-ref-name>service/HelloContextRoot</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/Explicit/Context/HelloEJB?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/Explicit/Context/HelloContextRoot?wsdl</wsdl-override> </service-ref> <service-ref>