[jbossws-commits] JBossWS SVN: r1279 - in branches/jbossws-1.0/src: main/java/org/jboss/ws/common main/java/org/jboss/ws/server test/ant test/java/org/jboss/test/ws/jaxrpc test/java/org/jboss/test/ws/jaxrpc/jbws1179 test/resources/jaxrpc test/resources/jaxrpc/jbws1179 test/resources/jaxrpc/jbws1179/META-INF test/resources/jaxrpc/jbws1179/WEB-INF test/resources/jaxrpc/jbws1179/WEB-INF/wsdl

Author: darran.lofthouse(a)jboss.com Date: 2006-10-22 09:20:45 -0400 (Sun, 22 Oct 2006) New Revision: 1279 Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/wstools-config.xml Removed: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/wstools-config.xml Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonMessageContext.java branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml Log: JBWS-1179 - Delay creation of HttpSession until it is actually used. Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonMessageContext.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonMessageContext.java 2006-10-22 12:01:19 UTC (rev 1278) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/common/CommonMessageContext.java 2006-10-22 13:20:45 UTC (rev 1279) @@ -119,7 +119,14 @@ */ public Object getProperty(String name) { - return props.get(name); + Object value = props.get(name); + + if (value instanceof MessageContextPropertyHelper) + { + return ((MessageContextPropertyHelper)value).get(); + } + + return value; } /** Added: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java 2006-10-22 12:01:19 UTC (rev 1278) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java 2006-10-22 13:20:45 UTC (rev 1279) @@ -0,0 +1,41 @@ +/* + * 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.common; + +/** + * Interface to be implemented by property helpers to assist the retrieval + * of objects added to the property context. + * + * If an instance of MessageContextPropertyHelper is added to the + * CommonMessageContext a call to get for the same property will return + * the result of callig get on the helper instead of returning the helper + * itself. + * + * @author darran.lofthouse(a)jboss.com + * @since Oct 22, 2006 + */ +public interface MessageContextPropertyHelper +{ + + public Object get(); + +} Property changes on: branches/jbossws-1.0/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java =================================================================== --- branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-10-22 12:01:19 UTC (rev 1278) +++ branches/jbossws-1.0/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-10-22 13:20:45 UTC (rev 1279) @@ -46,7 +46,6 @@ import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; @@ -58,6 +57,7 @@ import org.jboss.ws.WSException; import org.jboss.ws.addressing.AddressingConstantsImpl; import org.jboss.ws.common.CommonMessageContext; +import org.jboss.ws.common.MessageContextPropertyHelper; import org.jboss.ws.jaxrpc.handler.MessageContextJAXRPC; import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC; import org.jboss.ws.metadata.HandlerMetaData; @@ -353,7 +353,7 @@ // Get the type of the endpoint ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData(); - HttpSession httpSession = context.getHttpSession(); + MessageContextPropertyHelper httpSession = new HttpSessionPropertyHelper(context); ServletContext servletContext = context.getServletContext(); HttpServletRequest httpRequest = context.getHttpServletRequest(); HttpServletResponse httpResponse = context.getHttpServletResponse(); @@ -628,4 +628,21 @@ } return server; } + + public static class HttpSessionPropertyHelper implements MessageContextPropertyHelper + { + + private EndpointContext context; + + public HttpSessionPropertyHelper(final EndpointContext context) + { + this.context = context; + } + + public Object get() + { + return context.getHttpSession(); + } + + } } Modified: branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml =================================================================== --- branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-22 12:01:19 UTC (rev 1278) +++ branches/jbossws-1.0/src/test/ant/build-jars-jaxrpc.xml 2006-10-22 13:20:45 UTC (rev 1279) @@ -743,6 +743,32 @@ </metainf> </jar> + <!-- jbossws-jbws1179 --> + <war warfile="${build.test.dir}/libs/jaxrpc-jbws1179.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml"> + <classes dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.class"/> + <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> + </classes> + <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1179-client.jar"> + <fileset dir="${build.test.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> + </fileset> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1179/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </metainf> + </jar> + <!-- jbossws-jbws1186 --> <war warfile="${build.test.dir}/libs/jaxrpc-jbws1186.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml"> <classes dir="${build.test.dir}/classes"> Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179 (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179) Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2006-10-22 13:20:45 UTC (rev 1279) @@ -1,78 +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.jbws1179; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.naming.InitialContext; -import javax.xml.rpc.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 18-October-2006 - */ -public class JBWS1179TestCase extends JBossWSTest -{ - - public static TestEndpoint port; - - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(JBWS1179TestCase.class, "jaxrpc-jbws1179.war, jaxrpc-jbws1179-client.jar"); - } - - protected void setUp() throws Exception - { - super.setUp(); - if (port == null) - { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); - port = (TestEndpoint)service.getPort(TestEndpoint.class); - } - } - - protected int getActiveSessions() throws Exception - { - MBeanServerConnection server = getServer(); - ObjectName objectName = new ObjectName("jboss.web:host=localhost,path=/jaxrpc-jbws1179,type=Manager"); - - return ((Integer)server.getAttribute(objectName, "activeSessions")).intValue(); - } - - public void testCallCreateNoSession() throws Exception - { - int originalSessions = getActiveSessions(); - - port.echoMessage("Hello"); - - int finalSessions = getActiveSessions(); - - assertEquals("activeSessions after call", originalSessions, finalSessions); - } -} Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java) =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2006-10-22 13:20:45 UTC (rev 1279) @@ -0,0 +1,89 @@ +/* + * 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.jbws1179; + +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import javax.naming.InitialContext; +import javax.xml.rpc.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 18-October-2006 + */ +public class JBWS1179TestCase extends JBossWSTest +{ + + public static TestEndpoint port; + + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(JBWS1179TestCase.class, "jaxrpc-jbws1179.war, jaxrpc-jbws1179-client.jar"); + } + + protected void setUp() throws Exception + { + super.setUp(); + if (port == null) + { + InitialContext iniCtx = getInitialContext(); + Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService"); + port = (TestEndpoint)service.getPort(TestEndpoint.class); + } + } + + protected int getActiveSessions() throws Exception + { + MBeanServerConnection server = getServer(); + ObjectName objectName = new ObjectName("jboss.web:host=localhost,path=/jaxrpc-jbws1179,type=Manager"); + + return ((Integer)server.getAttribute(objectName, "activeSessions")).intValue(); + } + + public void testCallCreateNoSession() throws Exception + { + int originalSessions = getActiveSessions(); + + port.echoMessage("Hello"); + + int finalSessions = getActiveSessions(); + + assertEquals("activeSessions after call", originalSessions, finalSessions); + } + + public void testAccessSession() throws Exception + { + int originalSessions = getActiveSessions(); + + assertTrue("Can access session", port.canAccessSession()); + + int finalSessions = getActiveSessions(); + + assertEquals("activeSessions after call", originalSessions + 1, finalSessions); + } +} Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java 2006-10-22 13:20:45 UTC (rev 1279) @@ -1,37 +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.jbws1179; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 18-October-2006 - */ -public interface TestEndpoint extends Remote -{ - - public String echoMessage(final String message) throws RemoteException; - -} Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java) =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java 2006-10-22 13:20:45 UTC (rev 1279) @@ -0,0 +1,51 @@ +/* + * 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.jbws1179; + +import java.rmi.Remote; +import java.rmi.RemoteException; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 18-October-2006 + */ +public interface TestEndpoint extends Remote +{ + + /** + * Simple call to test if a session is created. + * + * @param message + * @return + * @throws RemoteException + */ + public String echoMessage(final String message) throws RemoteException; + + /** + * Call to test if the session can be accessed. + * + * @return + * @throws RemoteException + */ + public boolean canAccessSession() throws RemoteException; +} Deleted: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java 2006-10-22 13:20:45 UTC (rev 1279) @@ -1,37 +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.jbws1179; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since 18-October-2006 - */ -public class TestEndpointImpl implements TestEndpoint -{ - - public String echoMessage(String message) - { - return message; - } - -} Copied: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java) =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java 2006-10-22 13:20:45 UTC (rev 1279) @@ -0,0 +1,60 @@ +/* + * 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.jbws1179; + +import java.rmi.RemoteException; + +import javax.servlet.http.HttpSession; + +import org.jboss.ws.common.CommonMessageContext; +import org.jboss.ws.jaxrpc.handler.MessageContextJAXRPC; +import org.jboss.ws.soap.MessageContextAssociation; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since 18-October-2006 + */ +public class TestEndpointImpl implements TestEndpoint +{ + + public String echoMessage(String message) + { + return message; + } + + public boolean canAccessSession() throws RemoteException + { + CommonMessageContext context = MessageContextAssociation.peekMessageContext(); + HttpSession session = (HttpSession)context.getProperty(MessageContextJAXRPC.SERVLET_SESSION); + + session.setAttribute("Test", "Test String"); + String testString = (String)session.getAttribute("Test"); + if ("Test String".equals(testString) == false) + { + throw new RuntimeException("Invalid attribute returned."); + } + + return true; + } + +} Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179 (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179) Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/META-INF) Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml 2006-10-22 13:20:45 UTC (rev 1279) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<application-client 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://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd" - version="1.4"> - - <display-name>TestService</display-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <service-interface>javax.xml.rpc.Service</service-interface> - <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.jbws1179.TestEndpoint</service-endpoint-interface> - </port-component-ref> - </service-ref> - -</application-client> - Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml) Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml 2006-10-22 13:20:45 UTC (rev 1279) @@ -1,15 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC - "-//JBoss//DTD Application Client 4.0//EN" - "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> - - <service-ref> - <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1179/TestEndpoint?wsdl</wsdl-override> - </service-ref> - -</jboss-client> Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml) Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF) Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml 2006-10-22 13:20:45 UTC (rev 1279) @@ -1,37 +0,0 @@ -<?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.jbws1179</package-type> - <namespaceURI>http://org.jboss.test.ws/jbws1179/types</namespaceURI> - </package-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestService</service-interface> - <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1179'>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.jbws1179.TestEndpoint</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1179'>portTypeNS:TestEndpoint</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1179'>bindingNS:TestEndpointBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>echoMessage</java-method-name> - <wsdl-operation>echoMessage</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>java.lang.String</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1179'>wsdlMsgNS:TestEndpoint_echoMessage</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/jbws1179'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml) =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml 2006-10-22 13:20:45 UTC (rev 1279) @@ -0,0 +1,46 @@ +<?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.jbws1179</package-type> + <namespaceURI>http://org.jboss.test.ws/jbws1179/types</namespaceURI> + </package-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestService</service-interface> + <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1179'>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.jbws1179.TestEndpoint</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1179'>portTypeNS:TestEndpoint</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1179'>bindingNS:TestEndpointBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>echoMessage</java-method-name> + <wsdl-operation>echoMessage</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>java.lang.String</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1179'>wsdlMsgNS:TestEndpoint_echoMessage</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/jbws1179'>wsdlMsgNS:TestEndpoint_echoMessageResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + <service-endpoint-method-mapping> + <java-method-name>canAccessSession</java-method-name> + <wsdl-operation>canAccessSession</wsdl-operation> + <wsdl-return-value-mapping> + <method-return-value>boolean</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1179'>wsdlMsgNS:TestEndpoint_canAccessSessionResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml 2006-10-22 13:20:45 UTC (rev 1279) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app 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://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>TestEndpoint</servlet-name> - <servlet-class>org.jboss.test.ws.jaxrpc.jbws1179.TestEndpointImpl</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>TestEndpoint</servlet-name> - <url-pattern>/TestEndpoint</url-pattern> - </servlet-mapping> - -</web-app> - Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml) Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml 2006-10-22 13:20:45 UTC (rev 1279) @@ -1,15 +0,0 @@ -<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1179' 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> - <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> - <port-component> - <port-component-name>TestEndpointPort</port-component-name> - <wsdl-port>impl:TestEndpointPort</wsdl-port> - <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestEndpoint</service-endpoint-interface> - <service-impl-bean> - <servlet-link>TestEndpoint</servlet-link> - </service-impl-bean> - </port-component> - </webservice-description> -</webservices> \ No newline at end of file Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml) Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl) Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl 2006-10-22 13:20:45 UTC (rev 1279) @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1179' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1179' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types/> - <message name='TestEndpoint_echoMessage'> - <part name='String_1' type='xsd:string'/> - </message> - <message name='TestEndpoint_echoMessageResponse'> - <part name='result' type='xsd:string'/> - </message> - <portType name='TestEndpoint'> - <operation name='echoMessage' parameterOrder='String_1'> - <input message='tns:TestEndpoint_echoMessage'/> - <output message='tns:TestEndpoint_echoMessageResponse'/> - </operation> - </portType> - <binding name='TestEndpointBinding' type='tns:TestEndpoint'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoMessage'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/> - </output> - </operation> - </binding> - <service name='TestService'> - <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl) =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl 2006-10-22 13:20:45 UTC (rev 1279) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1179' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1179' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types/> + <message name='TestEndpoint_canAccessSession'/> + <message name='TestEndpoint_canAccessSessionResponse'> + <part name='result' type='xsd:boolean'/> + </message> + <message name='TestEndpoint_echoMessage'> + <part name='String_1' type='xsd:string'/> + </message> + <message name='TestEndpoint_echoMessageResponse'> + <part name='result' type='xsd:string'/> + </message> + <portType name='TestEndpoint'> + <operation name='canAccessSession'> + <input message='tns:TestEndpoint_canAccessSession'/> + <output message='tns:TestEndpoint_canAccessSessionResponse'/> + </operation> + <operation name='echoMessage' parameterOrder='String_1'> + <input message='tns:TestEndpoint_echoMessage'/> + <output message='tns:TestEndpoint_echoMessageResponse'/> + </operation> + </portType> + <binding name='TestEndpointBinding' type='tns:TestEndpoint'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='canAccessSession'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/> + </output> + </operation> + <operation name='echoMessage'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/> + </output> + </operation> + </binding> + <service name='TestService'> + <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/wstools-config.xml =================================================================== --- branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/wstools-config.xml 2006-10-18 10:02:48 UTC (rev 1252) +++ branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/wstools-config.xml 2006-10-22 13:20:45 UTC (rev 1279) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml ---> - -<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.jbws1179.TestEndpoint" style="rpc"> - </service> - <namespaces target-namespace="http://org.jboss.test.ws/jbws1179" type-namespace="http://org.jboss.test.ws/jbws1179/types"/> - <mapping file="jaxrpc-mapping.xml"/> - <webservices servlet-link="TestEndpoint"/> - </java-wsdl> -</configuration> Copied: branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/wstools-config.xml (from rev 1252, branches/dlofthouse/JBWS-1179/src/test/resources/jaxrpc/jbws1179/wstools-config.xml)