[jbossws-commits] JBossWS SVN: r2902 - in branches/jbossws-2.0: jbossws-core/src/java/org/jboss/ws/core/server and 8 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-04-23 11:20:46 -0400 (Mon, 23 Apr 2007) New Revision: 2902 Added: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/ Removed: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1093TestCase.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ServletTest.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/ServletEndpointContextImpl.java branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/application-client.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/web.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/webservices.xml branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/wstools-config.xml Log: [JBWS-1619] ServletEndpointContext.getHttpSession always creates HTTPSession Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/ServletEndpointContextImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/ServletEndpointContextImpl.java 2007-04-23 12:40:34 UTC (rev 2901) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/jaxrpc/ServletEndpointContextImpl.java 2007-04-23 15:20:46 UTC (rev 2902) @@ -53,9 +53,22 @@ this.response = context.getHttpServletResponse(); } + /** + * The getHttpSession method returns the current HTTP session (as a javax.servlet.http.HTTPSession). + * When invoked by the service endpoint within a remote method implementation, the getHttpSession returns the HTTP + * session associated currently with this method invocation. This method returns null if there is no HTTP session + * currently active and associated with this service endpoint. An endpoint class should not rely on an active HTTP + * session being always there; the underlying JAX-RPC runtime system is responsible for managing whether or not there + * is an active HTTP session. + * + * The getHttpSession method throws JAXRPCException if invoked by an non HTTP bound endpoint. + * + * @return The HTTP session associated with the current invocation or null if there is no active session. + */ public HttpSession getHttpSession() { - return request.getSession(); + // [JBWS-1619] ServletEndpointContext.getHttpSession has an incorrect implementation + return request.getSession(false); } public MessageContext getMessageContext() Modified: branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-04-23 12:40:34 UTC (rev 2901) +++ branches/jbossws-2.0/jbossws-core/src/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-04-23 15:20:46 UTC (rev 2902) @@ -400,8 +400,6 @@ public void processRequest(ObjectName sepID, InputStream inStream, OutputStream outStream, EndpointContext context) throws Exception { - final String SESSION_COOKIES = "org.jboss.ws.cookies"; - ServiceEndpoint wsEndpoint = getServiceEndpointByID(sepID); if (wsEndpoint == null) throw new WSException("Cannot obtain endpoint for: " + sepID); Modified: branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-04-23 12:40:34 UTC (rev 2901) +++ branches/jbossws-2.0/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-04-23 15:20:46 UTC (rev 2902) @@ -2453,6 +2453,33 @@ </metainf> </jar> + <!-- jbossws-jbws1619 --> + <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1619.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1619-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jbws1619/TestEndpoint.class"/> + <include name="org/jboss/test/ws/jbws1619/ClientHandler.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1619/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"> Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619 (from rev 2899, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093) Added: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.java 2007-04-23 15:20:46 UTC (rev 2902) @@ -0,0 +1,75 @@ +/* + * 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.jbws1619; + +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.MimeHeaders; + +import org.jboss.logging.Logger; + +/** + * A simple client side handler + * + * @author thomas.diesler(a)jboss.org + */ +public class ClientHandler extends GenericHandler +{ + // provide logging + private static final Logger log = Logger.getLogger(ClientHandler.class); + + public static String message; + public static String cookie; + + public QName[] getHeaders() + { + return new QName[0]; + } + + public boolean handleResponse(MessageContext msgContext) + { + log.info("handleResponse"); + + try + { + if ("Use MessageContext".equals(message)) + { + SOAPMessageContext soapContext = (SOAPMessageContext)msgContext; + MimeHeaders mimeHeaders = soapContext.getMessage().getMimeHeaders(); + + String[] cookies = mimeHeaders.getHeader("Set-Cookie"); + if (cookies == null || cookies.length != 1) + throw new IllegalStateException("Unexpected cookie list: " + mimeHeaders); + + cookie = cookies[0]; + } + } + catch (Exception e) + { + log.error("Handler processing error", e); + } + + return true; + } +} Property changes on: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ClientHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1093TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093/JBWS1093TestCase.java 2007-04-23 12:30:58 UTC (rev 2899) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1093TestCase.java 2007-04-23 15:20:46 UTC (rev 2902) @@ -1,104 +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.jaxrpc.jbws1093; - -import java.io.BufferedReader; -import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; - -import javax.naming.InitialContext; -import javax.xml.namespace.QName; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; - -/** - * Deploying a war that also contains normal servlets the web.xml is modified as if they are all endpoints - * - * http://jira.jboss.org/jira/browse/JBWS-1093 - * - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public class JBWS1093TestCase extends JBossWSTest -{ - - private static TestEndpoint port; - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS1093TestCase.class, "jaxrpc-jbws1093.war, jaxrpc-jbws1093-client.jar"); - } - - public void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - if (isTargetJBoss()) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - else - { - ServiceFactoryImpl factory = new ServiceFactoryImpl(); - URL wsdlURL = new File("resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl").toURL(); - URL mappingURL = new File("resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml").toURL(); - QName qname = new QName("http://org.jboss.test.ws/jbws1093", "TestService"); - Service service = factory.createService(wsdlURL, qname, mappingURL); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - } - } - - public void testAccessEnpoint() throws Exception - { - assertEquals(ServletTest.MESSAGE, port.echoString(ServletTest.MESSAGE)); - } - - public void testAccessServlet() throws Exception - { - if (true) - { - System.out.println("FIXME: [JBAS-4210] HTTP request dispatched to the wrong servlet"); - return; - } - - URL servletURL = new URL("http://" + getServerHost() + ":8080" + "/jaxrpc-jbws1093/ServletTest"); - - InputStream is = servletURL.openStream(); - InputStreamReader isr = new InputStreamReader(is); - BufferedReader br = new BufferedReader(isr); - - String line = br.readLine(); - - assertEquals(ServletTest.MESSAGE, line); - } -} Added: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java 2007-04-23 15:20:46 UTC (rev 2902) @@ -0,0 +1,92 @@ +/* + * 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.jbws1619; + +import java.io.File; +import java.net.URL; + +import javax.naming.InitialContext; +import javax.xml.namespace.QName; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl; + +/** + * ServletEndpointContext.getHttpSession has an incorrect implementation + * + * http://jira.jboss.org/jira/browse/JBWS-1619 + * + * @author Thomas.Diesler(a)jboss.com + * @since 23-Apr-2007 + */ +public class JBWS1619TestCase extends JBossWSTest +{ + + private static TestEndpoint port; + + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(JBWS1619TestCase.class, "jaxrpc-jbws1619.war, jaxrpc-jbws1619-client.jar"); + } + + public void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + if (isTargetJBoss()) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + port = (TestEndpoint)service.getPort(TestEndpoint.class); + } + else + { + ServiceFactoryImpl factory = new ServiceFactoryImpl(); + URL wsdlURL = new File("resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl").toURL(); + URL mappingURL = new File("resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml").toURL(); + QName qname = new QName("http://org.jboss.test.ws/jbws1619", "TestService"); + Service service = factory.createService(wsdlURL, qname, mappingURL); + port = (TestEndpoint)service.getPort(TestEndpoint.class); + } + } + } + + public void testServletEndpointContext() throws Exception + { + ClientHandler.message = "Use ServletEndpointContext"; + String retStr = port.echoString(ClientHandler.message); + assertEquals("httpSession: null", retStr); + } + + public void testMessageContext() throws Exception + { + ClientHandler.message = "Use MessageContext"; + String retStr = port.echoString(ClientHandler.message); + assertTrue("Expect a session", retStr.startsWith("httpSession") && !retStr.endsWith("null")); + assertTrue("Expect a cookie", ClientHandler.cookie.startsWith("JSESSIONID")); + } +} Property changes on: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/JBWS1619TestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ServletTest.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.java 2007-04-23 12:30:58 UTC (rev 2899) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/ServletTest.java 2007-04-23 15:20:46 UTC (rev 2902) @@ -1,49 +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.jaxrpc.jbws1093; - -import java.io.IOException; -import java.io.PrintWriter; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * JBWS-1093 - This servlet is called ServletTest to check that we are - * not identifying servlets by the classname ending in 'Servlet'. - * - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public class ServletTest extends HttpServlet -{ - public static final String MESSAGE = "Success!!"; - - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException - { - PrintWriter writer = response.getWriter(); - writer.println(MESSAGE); - } - -} Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java 2007-04-23 12:30:58 UTC (rev 2899) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java 2007-04-23 15:20:46 UTC (rev 2902) @@ -1,36 +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.jaxrpc.jbws1093; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public interface TestEndpoint extends Remote -{ - - public String echoString(final String message) throws RemoteException; - -} Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java (from rev 2901, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.java) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpoint.java 2007-04-23 15:20:46 UTC (rev 2902) @@ -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.jbws1619; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +public interface TestEndpoint extends Remote +{ + + public String echoString(final String message) throws RemoteException; + +} Deleted: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java 2007-04-23 12:30:58 UTC (rev 2899) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java 2007-04-23 15:20:46 UTC (rev 2902) @@ -1,38 +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.jaxrpc.jbws1093; - -import java.rmi.RemoteException; - -/** - * @author darran.lofthouse(a)jboss.com - * @since 17-October-2006 - */ -public class TestEndpointImpl implements TestEndpoint -{ - - public String echoString(String message) throws RemoteException - { - return message; - } - -} Copied: branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java (from rev 2901, branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.java) =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java (rev 0) +++ branches/jbossws-2.0/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1619/TestEndpointImpl.java 2007-04-23 15:20:46 UTC (rev 2902) @@ -0,0 +1,65 @@ +/* + * 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.jbws1619; + +import java.rmi.RemoteException; + +import javax.servlet.http.HttpSession; +import javax.xml.rpc.ServiceException; +import javax.xml.rpc.handler.MessageContext; +import javax.xml.rpc.server.ServiceLifecycle; +import javax.xml.rpc.server.ServletEndpointContext; + +import org.jboss.logging.Logger; + +public class TestEndpointImpl implements TestEndpoint, ServiceLifecycle +{ + private Logger log = Logger.getLogger(TestEndpointImpl.class); + + private ServletEndpointContext context; + + public String echoString(String message) throws RemoteException + { + HttpSession httpSession = null; + if ("Use ServletEndpointContext".equals(message)) + { + httpSession = context.getHttpSession(); + } + else if ("Use MessageContext".equals(message)) + { + MessageContext msgContext = context.getMessageContext(); + httpSession = (HttpSession)msgContext.getProperty("javax.xml.ws.servlet.session"); + } + + log.info("echoString: " + httpSession); + return "httpSession: " + httpSession; + } + + public void init(Object context) throws ServiceException + { + this.context = (ServletEndpointContext)context; + } + + public void destroy() + { + } +} Copied: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619 (from rev 2899, branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1093) Modified: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/application-client.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1093/META-INF/application-client.xml 2007-04-23 12:30:58 UTC (rev 2899) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/application-client.xml 2007-04-23 15:20:46 UTC (rev 2902) @@ -13,8 +13,12 @@ <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.jbws1093.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1619.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-tests/src/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1093/META-INF/jboss-client.xml 2007-04-23 12:30:58 UTC (rev 2899) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/META-INF/jboss-client.xml 2007-04-23 15:20:46 UTC (rev 2902) @@ -9,7 +9,7 @@ <service-ref> <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1093/TestEndpoint?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1619/TestEndpoint?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1093/WEB-INF/jaxrpc-mapping.xml 2007-04-23 12:30:58 UTC (rev 2899) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/jaxrpc-mapping.xml 2007-04-23 15:20:46 UTC (rev 2902) @@ -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.jbws1093</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1093/types</namespaceURI> + <package-type>org.jboss.test.ws.jaxrpc.jbws1619</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1619/types</namespaceURI> </package-mapping> <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1093.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1093'>serviceNS:TestService</wsdl-service-name> + <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> <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.jbws1093.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1093'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1093'>bindingNS:TestEndpointBinding</wsdl-binding> + <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-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/jbws1093'>wsdlMsgNS:TestEndpoint_echoString</wsdl-message> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1619'>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/jbws1093'>wsdlMsgNS:TestEndpoint_echoStringResponse</wsdl-message> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1619'>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-tests/src/resources/jaxrpc/jbws1619/WEB-INF/web.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1093/WEB-INF/web.xml 2007-04-23 12:30:58 UTC (rev 2899) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/web.xml 2007-04-23 15:20:46 UTC (rev 2902) @@ -7,23 +7,13 @@ <servlet> <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1093.TestEndpointImpl</servlet-class> + <servlet-class>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpointImpl</servlet-class> </servlet> - <servlet> - <servlet-name>ServletTest</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1093.ServletTest</servlet-class> - </servlet> - <servlet-mapping> <servlet-name>TestEndpoint</servlet-name> <url-pattern>/TestEndpoint</url-pattern> </servlet-mapping> - <servlet-mapping> - <servlet-name>ServletTest</servlet-name> - <url-pattern>/ServletTest</url-pattern> - </servlet-mapping> - </web-app> Modified: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/webservices.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1093/WEB-INF/webservices.xml 2007-04-23 12:30:58 UTC (rev 2899) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/webservices.xml 2007-04-23 15:20:46 UTC (rev 2902) @@ -1,4 +1,4 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1093' 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/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'> <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.jbws1093.TestEndpoint</service-endpoint-interface> + <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint</service-endpoint-interface> <service-impl-bean> <servlet-link>TestEndpoint</servlet-link> </service-impl-bean> Modified: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1093/WEB-INF/wsdl/TestService.wsdl 2007-04-23 12:30:58 UTC (rev 2899) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/WEB-INF/wsdl/TestService.wsdl 2007-04-23 15:20:46 UTC (rev 2902) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1093' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1093' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> +<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'> <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/jbws1093' use='literal'/> + <soap:body namespace='http://org.jboss.test.ws/jbws1619' use='literal'/> </input> <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1093' use='literal'/> + <soap:body namespace='http://org.jboss.test.ws/jbws1619' use='literal'/> </output> </operation> </binding> <service name='TestService'> <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://localhost:8080//jaxrpc-jbws1093/TestEndpoint?wsdl'/> + <soap:address location='http://localhost:8080//jaxrpc-jbws1619/TestEndpoint?wsdl'/> </port> </service> </definitions> \ No newline at end of file Modified: branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1093/wstools-config.xml 2007-04-23 12:30:58 UTC (rev 2899) +++ branches/jbossws-2.0/jbossws-tests/src/resources/jaxrpc/jbws1619/wstools-config.xml 2007-04-23 15:20:46 UTC (rev 2902) @@ -4,14 +4,14 @@ wstools -cp ../../../../../output/classes -dest ./WEB-INF -config wstools-config.xml --> -<!-- Set the soap:address location to 'http://localhost:8080//jbossws-jbws1093/TestEndpoint?wsdl' to run with Tomcat --> +<!-- 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.jbws1093.TestEndpoint" style="rpc"> + <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1619.TestEndpoint" style="rpc"> </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1093" type-namespace="http://org.jboss.test.ws/jbws1093/types"/> + <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>