[jbossws-commits] JBossWS SVN: r3727 - in branches/jbossws-2.0/jbossws-core: src/main/java/org/jboss/ws/core and 8 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Jun 26 09:10:04 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-06-26 09:10:04 -0400 (Tue, 26 Jun 2007)
New Revision: 3727
Added:
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java
branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml
Removed:
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/wstools-config.xml
Modified:
branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/application-client.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/jboss-client.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/jaxrpc-mapping.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/web.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/webservices.xml
branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/wsdl/TestService.wsdl
Log:
[JBWS-1653] Post-handler-chain not invoked for Standard Client configuration
Modified: branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml 2007-06-26 11:36:04 UTC (rev 3726)
+++ branches/jbossws-2.0/jbossws-core/ant-import-tests/build-jars-jaxrpc.xml 2007-06-26 13:10:04 UTC (rev 3727)
@@ -2522,6 +2522,32 @@
</webinf>
</war>
+ <!-- jbossws-jbws1653 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1653.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1653/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1653/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1653-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1653/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1653/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1653/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jaxrpc-marshall-doclit.war -->
<war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-06-26 11:36:04 UTC (rev 3726)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/CommonClient.java 2007-06-26 13:10:04 UTC (rev 3727)
@@ -104,6 +104,9 @@
{
this.epMetaData = serviceMetaData.getEndpoints().get(0);
}
+
+ // Initialize the binding provider
+ this.bindingProvider = getCommonBindingProvider();
}
/** Create a call for a known WSDL endpoint.
@@ -111,6 +114,9 @@
protected CommonClient(EndpointMetaData epMetaData)
{
this.epMetaData = epMetaData;
+
+ // Initialize the binding provider
+ this.bindingProvider = getCommonBindingProvider();
}
/** Create a call for a known WSDL endpoint.
@@ -137,6 +143,9 @@
{
setOperationName(opName);
}
+
+ // Initialize the binding provider
+ this.bindingProvider = getCommonBindingProvider();
}
/** Gets the address of a target service endpoint.
@@ -472,14 +481,7 @@
protected abstract CommonMessageContext processPivot(CommonMessageContext requestContext);
- protected CommonBindingProvider getCommonBindingProvider()
- {
- if (bindingProvider == null)
- {
- bindingProvider = new CommonBindingProvider(getEndpointMetaData());
- }
- return bindingProvider;
- }
+ protected abstract CommonBindingProvider getCommonBindingProvider();
protected abstract Map<String, Object> getRequestContext();
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-06-26 11:36:04 UTC (rev 3726)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/CallImpl.java 2007-06-26 13:10:04 UTC (rev 3727)
@@ -47,6 +47,7 @@
import org.jboss.logging.Logger;
import org.jboss.ws.Constants;
+import org.jboss.ws.core.CommonBindingProvider;
import org.jboss.ws.core.CommonClient;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.RoleSource;
@@ -478,6 +479,15 @@
else return null;
}
+ protected CommonBindingProvider getCommonBindingProvider()
+ {
+ if (bindingProvider == null)
+ {
+ bindingProvider = new CommonBindingProvider(getEndpointMetaData());
+ }
+ return bindingProvider;
+ }
+
@Override
protected void setInboundContextProperties()
{
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java 2007-06-26 11:36:04 UTC (rev 3726)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/HandlerRegistryImpl.java 2007-06-26 13:10:04 UTC (rev 3727)
@@ -24,7 +24,9 @@
// $Id$
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -113,8 +115,15 @@
handler.setEndpointMetaData(epMetaData);
handler.setHandlerClassName(info.getHandlerClass().getName());
handler.setSoapRoles(roles);
- if(log.isDebugEnabled()) log.debug("Add handler to: " + portName + handler);
+
+ Set<QName> headers = new HashSet<QName>();
+ for (QName header : info.getHeaders())
+ headers.add(header);
+
+ handler.setSoapHeaders(headers);
+
epMetaData.addHandler(handler);
+ log.debug("Add handler to: " + portName + handler);
}
}
}
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-06-26 11:36:04 UTC (rev 3726)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/client/ServiceImpl.java 2007-06-26 13:10:04 UTC (rev 3727)
@@ -415,6 +415,8 @@
ClassLoader cl = epMetaData.getClassLoader();
Remote proxy = (Remote)Proxy.newProxyInstance(cl, new Class[] { seiClass, Stub.class, StubExt.class }, handler);
+ setupHandlerChain(epMetaData);
+
return proxy;
}
@@ -490,35 +492,39 @@
void setupHandlerChain(EndpointMetaData epMetaData)
{
- QName portName = epMetaData.getPortName();
- Set<String> handlerRoles = new HashSet<String>();
- ArrayList handlerInfos = new ArrayList();
- for (HandlerMetaData handlerMetaData : epMetaData.getHandlerMetaData(HandlerType.ALL))
+ if (epMetaData.isHandlersInitialized() == false)
{
- HandlerMetaDataJAXRPC jaxrpcMetaData = (HandlerMetaDataJAXRPC)handlerMetaData;
- handlerRoles.addAll(jaxrpcMetaData.getSoapRoles());
-
- HashMap hConfig = new HashMap();
- for (UnifiedInitParamMetaData param : jaxrpcMetaData.getInitParams())
+ QName portName = epMetaData.getPortName();
+ Set<String> handlerRoles = new HashSet<String>();
+ List<HandlerInfo> handlerInfos = new ArrayList<HandlerInfo>();
+ for (HandlerMetaData handlerMetaData : epMetaData.getHandlerMetaData(HandlerType.ALL))
{
- hConfig.put(param.getParamName(), param.getParamValue());
- }
+ HandlerMetaDataJAXRPC jaxrpcMetaData = (HandlerMetaDataJAXRPC)handlerMetaData;
+ handlerRoles.addAll(jaxrpcMetaData.getSoapRoles());
- Set<QName> headers = jaxrpcMetaData.getSoapHeaders();
- QName[] headerArr = new QName[headers.size()];
- headers.toArray(headerArr);
+ HashMap hConfig = new HashMap();
+ for (UnifiedInitParamMetaData param : jaxrpcMetaData.getInitParams())
+ {
+ hConfig.put(param.getParamName(), param.getParamValue());
+ }
- Class hClass = jaxrpcMetaData.getHandlerClass();
- hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType());
- HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr);
+ Set<QName> headers = jaxrpcMetaData.getSoapHeaders();
+ QName[] headerArr = new QName[headers.size()];
+ headers.toArray(headerArr);
- if (log.isDebugEnabled())
+ Class hClass = jaxrpcMetaData.getHandlerClass();
+ hConfig.put(HandlerType.class.getName(), jaxrpcMetaData.getHandlerType());
+ HandlerInfo info = new HandlerInfo(hClass, hConfig, headerArr);
+
log.debug("Adding client side handler to endpoint '" + portName + "': " + info);
- handlerInfos.add(info);
+ handlerInfos.add(info);
- // register the handlers with the client engine
- if (handlerInfos.size() > 0)
- registerHandlerChain(portName, handlerInfos, handlerRoles);
+ // register the handlers with the client engine
+ if (handlerInfos.size() > 0)
+ registerHandlerChain(portName, handlerInfos, handlerRoles);
+ }
+
+ epMetaData.setHandlersInitialized(true);
}
}
}
Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/ClientHandler.java 2007-06-26 13:10:04 UTC (rev 3727)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.jaxrpc.jbws1653;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.MessageContext;
+import javax.xml.rpc.handler.soap.SOAPMessageContext;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPMessage;
+
+import org.jboss.logging.Logger;
+
+/**
+ * A simple client side handler
+ *
+ * @author thomas.diesler at jboss.org
+ */
+public class ClientHandler extends GenericHandler
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(ClientHandler.class);
+
+ public static String message;
+
+ public QName[] getHeaders()
+ {
+ return new QName[0];
+ }
+
+ public boolean handleResponse(MessageContext msgContext)
+ {
+ log.info("handleResponse");
+
+ try
+ {
+ SOAPMessageContext soapContext = (SOAPMessageContext)msgContext;
+ SOAPMessage soapMessage = soapContext.getMessage();
+ SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
+ soapElement = (SOAPElement)soapElement.getChildElements().next();
+ message = soapElement.getValue();
+ }
+ catch (Exception e)
+ {
+ log.error("Handler processing error", e);
+ }
+
+ return true;
+ }
+}
Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/JBWS1653TestCase.java 2007-06-26 13:10:04 UTC (rev 3727)
@@ -0,0 +1,121 @@
+/*
+ * 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.jaxrpc.jbws1653;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.spi.test.JBossWSTest;
+import org.jboss.wsf.spi.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-1653] Post-handler-chain not invoked for "Standard Client" configuration
+ *
+ * @author Thomas.Diesler at jboss.com
+ * @since 26-Jun-2007
+ */
+public class JBWS1653TestCase extends JBossWSTest
+{
+ public static Test suite() throws Exception
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1653TestCase.class, "jaxrpc-jbws1653.war, jaxrpc-jbws1653-client.jar");
+ }
+
+ public void setUp() throws Exception
+ {
+ ClientHandler.message = null;
+ }
+
+ public void testStandardConfig() throws Exception
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+
+ String retStr = port.echoString("kermit");
+ assertEquals("kermit", retStr);
+ assertNull(ClientHandler.message);
+ }
+
+ public void testCustomConfig() throws Exception
+ {
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ URLClassLoader urlLoader = new URLClassLoader(new URL[] {}, ctxLoader)
+ {
+ public URL findResource(String resName)
+ {
+ URL resURL = super.findResource(resName);
+ try
+ {
+ if (resName.endsWith("META-INF/standard-jaxrpc-client-config.xml"))
+ resURL = new File("resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml").toURL();
+ }
+ catch (MalformedURLException ex)
+ {
+ // ignore
+ }
+ return resURL;
+ }
+
+ public URL getResource(String resName)
+ {
+ URL resURL = super.getResource(resName);
+ try
+ {
+ if (resName.endsWith("META-INF/standard-jaxrpc-client-config.xml"))
+ resURL = new File("resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml").toURL();
+ }
+ catch (MalformedURLException ex)
+ {
+ // ignore
+ }
+ return resURL;
+ }
+ };
+ Thread.currentThread().setContextClassLoader(urlLoader);
+
+ URL configURL = urlLoader.findResource("META-INF/standard-jaxrpc-client-config.xml");
+ assertTrue("Invalid config url: " + configURL, configURL.toExternalForm().indexOf("jbws1653") > 0);
+
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ TestEndpoint port = (TestEndpoint)service.getPort(TestEndpoint.class);
+
+ try
+ {
+ String retStr = port.echoString("kermit");
+ assertEquals("kermit", retStr);
+ assertEquals("kermit", ClientHandler.message);
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(ctxLoader);
+ }
+ }
+}
Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpoint.java 2007-06-26 13:10:04 UTC (rev 3727)
@@ -0,0 +1,32 @@
+/*
+ * 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.jaxrpc.jbws1653;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+public interface TestEndpoint extends Remote
+{
+
+ public String echoString(final String message) throws RemoteException;
+
+}
Added: branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/jaxrpc/jbws1653/TestEndpointImpl.java 2007-06-26 13:10:04 UTC (rev 3727)
@@ -0,0 +1,37 @@
+/*
+ * 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.jaxrpc.jbws1653;
+
+import java.rmi.RemoteException;
+
+import org.jboss.logging.Logger;
+
+public class TestEndpointImpl implements TestEndpoint
+{
+ private Logger log = Logger.getLogger(TestEndpointImpl.class);
+
+ public String echoString(String message) throws RemoteException
+ {
+ log.info("echoString: " + message);
+ return message;
+ }
+}
Copied: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653 (from rev 3720, branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619)
Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/application-client.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619/META-INF/application-client.xml 2007-06-26 06:04:26 UTC (rev 3720)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/application-client.xml 2007-06-26 13:10:04 UTC (rev 3727)
@@ -13,12 +13,8 @@
<wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
<jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
<port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1653.TestEndpoint</service-endpoint-interface>
</port-component-ref>
- <handler>
- <handler-name>ClientHandler</handler-name>
- <handler-class>org.jboss.test.ws.jaxrpc.jbws1619.ClientHandler</handler-class>
- </handler>
</service-ref>
</application-client>
Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml 2007-06-26 06:04:26 UTC (rev 3720)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/jboss-client.xml 2007-06-26 13:10:04 UTC (rev 3727)
@@ -9,7 +9,7 @@
<service-ref>
<service-ref-name>service/TestService</service-ref-name>
- <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1619/TestEndpoint?wsdl</wsdl-override>
+ <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1653/TestEndpoint?wsdl</wsdl-override>
</service-ref>
</jboss-client>
Added: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml (rev 0)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/META-INF/standard-jaxrpc-client-config.xml 2007-06-26 13:10:04 UTC (rev 3727)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: standard-jaxrpc-client-config.xml 3004 2007-05-08 23:24:24Z thomas.diesler at jboss.com $ -->
+
+<jaxrpc-config xmlns="urn:jboss:jaxrpc-config:2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+ xsi:schemaLocation="urn:jboss:jaxrpc-config:2.0 jaxrpc-config_2_0.xsd">
+
+ <client-config>
+ <config-name>Standard Client</config-name>
+ <post-handler-chain>
+ <handler-chain-name>Handlers</handler-chain-name>
+ <handler>
+ <j2ee:handler-name>ClientHandler</j2ee:handler-name>
+ <j2ee:handler-class>org.jboss.test.ws.jaxrpc.jbws1653.ClientHandler</j2ee:handler-class>
+ </handler>
+ </post-handler-chain>
+ </client-config>
+
+</jaxrpc-config>
\ No newline at end of file
Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml 2007-06-26 06:04:26 UTC (rev 3720)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/jaxrpc-mapping.xml 2007-06-26 13:10:04 UTC (rev 3727)
@@ -1,20 +1,20 @@
<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
<package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.jbws1619</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1619/types</namespaceURI>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws1653</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1653/types</namespaceURI>
</package-mapping>
<service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1619'>serviceNS:TestService</wsdl-service-name>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1653.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1653'>serviceNS:TestService</wsdl-service-name>
<port-mapping>
<port-name>TestEndpointPort</port-name>
<java-port-name>TestEndpointPort</java-port-name>
</port-mapping>
</service-interface-mapping>
<service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1619'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1619'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1653.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1653'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1653'>bindingNS:TestEndpointBinding</wsdl-binding>
<service-endpoint-method-mapping>
<java-method-name>echoString</java-method-name>
<wsdl-operation>echoString</wsdl-operation>
@@ -22,14 +22,14 @@
<param-position>0</param-position>
<param-type>java.lang.String</param-type>
<wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1619'>wsdlMsgNS:TestEndpoint_echoString</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1653'>wsdlMsgNS:TestEndpoint_echoString</wsdl-message>
<wsdl-message-part-name>String_1</wsdl-message-part-name>
<parameter-mode>IN</parameter-mode>
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
<method-return-value>java.lang.String</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1619'>wsdlMsgNS:TestEndpoint_echoStringResponse</wsdl-message>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1653'>wsdlMsgNS:TestEndpoint_echoStringResponse</wsdl-message>
<wsdl-message-part-name>result</wsdl-message-part-name>
</wsdl-return-value-mapping>
</service-endpoint-method-mapping>
Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/web.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619/WEB-INF/web.xml 2007-06-26 06:04:26 UTC (rev 3720)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/web.xml 2007-06-26 13:10:04 UTC (rev 3727)
@@ -7,7 +7,7 @@
<servlet>
<servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpointImpl</servlet-class>
+ <servlet-class>org.jboss.test.ws.jaxrpc.jbws1653.TestEndpointImpl</servlet-class>
</servlet>
<servlet-mapping>
Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619/WEB-INF/webservices.xml 2007-06-26 06:04:26 UTC (rev 3720)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/webservices.xml 2007-06-26 13:10:04 UTC (rev 3727)
@@ -1,4 +1,4 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1619' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
+<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1653' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
<webservice-description>
<webservice-description-name>TestService</webservice-description-name>
<wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
@@ -6,7 +6,7 @@
<port-component>
<port-component-name>TestEndpointPort</port-component-name>
<wsdl-port>impl:TestEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1653.TestEndpoint</service-endpoint-interface>
<service-impl-bean>
<servlet-link>TestEndpoint</servlet-link>
</service-impl-bean>
Modified: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl 2007-06-26 06:04:26 UTC (rev 3720)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/WEB-INF/wsdl/TestService.wsdl 2007-06-26 13:10:04 UTC (rev 3727)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1619' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1619' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1653' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1653' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
<types/>
<message name='TestEndpoint_echoString'>
<part name='String_1' type='xsd:string'/>
@@ -18,16 +18,16 @@
<operation name='echoString'>
<soap:operation soapAction=''/>
<input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1619' use='literal'/>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1653' use='literal'/>
</input>
<output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1619' use='literal'/>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1653' use='literal'/>
</output>
</operation>
</binding>
<service name='TestService'>
<port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='http://localhost:8080//jaxrpc-jbws1619/TestEndpoint?wsdl'/>
+ <soap:address location='http://localhost:8080//jaxrpc-jbws1653/TestEndpoint?wsdl'/>
</port>
</service>
</definitions>
\ No newline at end of file
Deleted: branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/wstools-config.xml
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1619/wstools-config.xml 2007-06-26 06:04:26 UTC (rev 3720)
+++ branches/jbossws-2.0/jbossws-core/src/test/resources/jaxrpc/jbws1653/wstools-config.xml 2007-06-26 13:10:04 UTC (rev 3727)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml
--->
-
-<!-- Set the soap:address location to 'http://localhost:8080//jbossws-jbws1619/TestEndpoint?wsdl' to run with Tomcat -->
-
-<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
- <java-wsdl>
- <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint" style="rpc">
- </service>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1619" type-namespace="http://org.jboss.test.ws/jbws1619/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-</configuration>
More information about the jbossws-commits
mailing list