[jbossws-commits] JBossWS SVN: r4308 - in stack/native/trunk: src/main/java/org/jboss/ws/core and 5 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Aug 10 05:21:51 EDT 2007
Author: richard_opalka
Date: 2007-08-10 05:21:51 -0400 (Fri, 10 Aug 2007)
New Revision: 4308
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java
stack/native/trunk/src/test/resources/jaxws/jbws1733/
stack/native/trunk/src/test/resources/jaxws/jbws1733/WEB-INF/
stack/native/trunk/src/test/resources/jaxws/jbws1733/WEB-INF/web.xml
Removed:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java
stack/native/trunk/src/test/resources/jaxws/jbws1733/WEB-INF/
stack/native/trunk/src/test/resources/jaxws/jbws1733/WEB-INF/web.xml
Modified:
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
stack/native/trunk/src/main/java/org/jboss/ws/core/CommonClient.java
Log:
[JBWS-1733] issue fix + test
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-08-09 18:35:56 UTC (rev 4307)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-08-10 09:21:51 UTC (rev 4308)
@@ -348,7 +348,15 @@
<webinf dir="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF"/>
</war>
- <!-- jaxws namespace -->
+ <!-- jaxws-jbws1733 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws1733.war" webxml="${tests.output.dir}/resources/jaxws/jbws1733/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.class"/>
+ </classes>
+ </war>
+
+ <!-- jaxws namespace -->
<war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/>
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonClient.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/CommonClient.java 2007-08-09 18:35:56 UTC (rev 4307)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/CommonClient.java 2007-08-10 09:21:51 UTC (rev 4308)
@@ -412,7 +412,7 @@
private void saveSessionInfo(Map<String, Object> remotingMetadata, Map<String, Object> requestContext)
{
- Map<String, String> cookies = (Map)remotingMetadata.get(SESSION_COOKIES);
+ Map<String, String> cookies = (Map)requestContext.get(SESSION_COOKIES);
if (cookies == null)
{
cookies = new HashMap<String, String>();
Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733 (from rev 4281, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733)
Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java 2007-08-09 09:59:33 UTC (rev 4281)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java 2007-08-10 09:21:51 UTC (rev 4308)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws1733;
-
-import javax.jws.WebService;
-
- at WebService
-public interface JBWS1733
-{
- int getCounter();
-}
Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java (from rev 4281, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java)
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733.java 2007-08-10 09:21:51 UTC (rev 4308)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1733;
+
+import javax.jws.WebService;
+
+ at WebService
+public interface JBWS1733
+{
+ int getCounter();
+}
Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java 2007-08-09 09:59:33 UTC (rev 4281)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java 2007-08-10 09:21:51 UTC (rev 4308)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws1733;
-
-import javax.jws.WebService;
-import javax.annotation.Resource;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.handler.MessageContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletRequest;
-
- at WebService(name="JBWS1733", serviceName="JBWS1733Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1733.JBWS1733")
-public class JBWS1733Impl implements JBWS1733
-{
-
- @Resource
- private WebServiceContext wsContext;
-
- public int getCounter()
- {
- MessageContext mc = wsContext.getMessageContext();
- HttpSession session = ((HttpServletRequest)mc.get(MessageContext.SERVLET_REQUEST)).getSession();
- // Get a session property "counter" from context
- if (session == null)
- throw new WebServiceException("No session in WebServiceContext");
- Integer counter = (Integer)session.getAttribute("counter");
- if (counter == null) {
- counter = new Integer(0);
- System.out.println("Starting the Session");
- }
- counter = new Integer(counter.intValue() + 1);
- session.setAttribute("counter", counter);
- return counter;
- }
-
-}
Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java (from rev 4281, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java)
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.java 2007-08-10 09:21:51 UTC (rev 4308)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1733;
+
+import javax.jws.WebService;
+import javax.annotation.Resource;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
+
+ at WebService(name="JBWS1733", serviceName="JBWS1733Service", endpointInterface="org.jboss.test.ws.jaxws.jbws1733.JBWS1733")
+public class JBWS1733Impl implements JBWS1733
+{
+
+ @Resource
+ private WebServiceContext wsContext;
+
+ public int getCounter()
+ {
+ MessageContext mc = wsContext.getMessageContext();
+ HttpSession session = ((HttpServletRequest)mc.get(MessageContext.SERVLET_REQUEST)).getSession();
+ // Get a session property "counter" from context
+ if (session == null)
+ throw new WebServiceException("No session in WebServiceContext");
+ Integer counter = (Integer)session.getAttribute("counter");
+ if (counter == null) {
+ counter = new Integer(0);
+ System.out.println("Starting the Session");
+ }
+ counter = new Integer(counter.intValue() + 1);
+ session.setAttribute("counter", counter);
+ return counter;
+ }
+
+}
Deleted: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java
===================================================================
--- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java 2007-08-09 09:59:33 UTC (rev 4281)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java 2007-08-10 09:21:51 UTC (rev 4308)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws1733;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.BindingProvider;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * [JBWS-1733] JBoss WebService client not sending JSESSIONID cookie after 2 calls
- *
- * @author ropalka at redhat.com
- * @since 09-Aug-2007
- */
-public class JBWS1733TestCase extends JBossWSTest
-{
- private String targetNS = "http://jbws1733.jaxws.ws.test.jboss.org/";
- private JBWS1733 proxy;
-
- public static Test suite()
- {
- return new JBossWSTestSetup(JBWS1733TestCase.class, "jaxws-jbws1733.war");
- }
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
-
- QName serviceName = new QName(targetNS, "JBWS1733Service");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1733/JBWS1733Service?wsdl");
-
- Service service = Service.create(wsdlURL, serviceName);
- proxy = (JBWS1733)service.getPort(JBWS1733.class);
- }
-
- public void testIssue() throws Exception {
- ((BindingProvider)proxy)
- .getRequestContext()
- .put(BindingProvider.SESSION_MAINTAIN_PROPERTY,true);
- int result = proxy.getCounter();
- System.out.println(result);
- result = proxy.getCounter();
- System.out.println(result);
- result = proxy.getCounter();
- System.out.println(result);
- }
-
-}
Copied: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java (from rev 4281, stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java)
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1733/JBWS1733TestCase.java 2007-08-10 09:21:51 UTC (rev 4308)
@@ -0,0 +1,73 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1733;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.BindingProvider;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-1733] JBoss WebService client not sending JSESSIONID cookie after 2 calls
+ *
+ * @author ropalka at redhat.com
+ * @since 09-Aug-2007
+ */
+public class JBWS1733TestCase extends JBossWSTest
+{
+ private String targetNS = "http://jbws1733.jaxws.ws.test.jboss.org/";
+ private JBWS1733 proxy;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS1733TestCase.class, "jaxws-jbws1733.war");
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ QName serviceName = new QName(targetNS, "JBWS1733Service");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1733/JBWS1733Service?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ proxy = (JBWS1733)service.getPort(JBWS1733.class);
+ }
+
+ public void testIssue() throws Exception {
+ ((BindingProvider)proxy)
+ .getRequestContext()
+ .put(BindingProvider.SESSION_MAINTAIN_PROPERTY,true);
+
+ for ( int i = 1; i <= 10; i++ ) {
+ assertTrue( proxy.getCounter() == i );
+ }
+ }
+
+}
Copied: stack/native/trunk/src/test/resources/jaxws/jbws1733 (from rev 4280, stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1733)
Copied: stack/native/trunk/src/test/resources/jaxws/jbws1733/WEB-INF (from rev 4280, stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1733/WEB-INF)
Deleted: stack/native/trunk/src/test/resources/jaxws/jbws1733/WEB-INF/web.xml
===================================================================
--- stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1733/WEB-INF/web.xml 2007-08-09 09:58:12 UTC (rev 4280)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1733/WEB-INF/web.xml 2007-08-10 09:21:51 UTC (rev 4308)
@@ -1,18 +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>JBWS1733Service</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws1733.JBWS1733Impl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>JBWS1733Service</servlet-name>
- <url-pattern>/JBWS1733Service</url-pattern>
- </servlet-mapping>
-
-</web-app>
Copied: stack/native/trunk/src/test/resources/jaxws/jbws1733/WEB-INF/web.xml (from rev 4280, stack/native/branches/native-2.0/src/test/resources/jaxws/jbws1733/WEB-INF/web.xml)
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1733/WEB-INF/web.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1733/WEB-INF/web.xml 2007-08-10 09:21:51 UTC (rev 4308)
@@ -0,0 +1,18 @@
+<?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>JBWS1733Service</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws1733.JBWS1733Impl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>JBWS1733Service</servlet-name>
+ <url-pattern>/JBWS1733Service</url-pattern>
+ </servlet-mapping>
+
+</web-app>
More information about the jbossws-commits
mailing list