JBossWS SVN: r9472 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-03 07:19:52 -0500 (Tue, 03 Mar 2009)
New Revision: 9472
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747/
Log:
[JBPAPP-1747] Branch for patch.
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1747 (from rev 9471, stack/native/tags/jbossws-native-2.0.1.SP2_CP05)
15 years, 10 months
- 1
- 0
JBossWS SVN: r9471 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-03 07:12:10 -0500 (Tue, 03 Mar 2009)
New Revision: 9471
Added:
stack/native/branches/dlofthouse/JBPAPP-1746/
Log:
Branch to assemble backport.
Copied: stack/native/branches/dlofthouse/JBPAPP-1746 (from rev 9470, stack/native/branches/jbossws-native-2.0.1.SP2_CP)
15 years, 10 months
- 1
- 0
JBossWS SVN: r9470 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744: ant-import-tests and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-02 10:07:01 -0500 (Mon, 02 Mar 2009)
New Revision: 9470
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd
Removed:
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/version.properties
Log:
[JBPAPP-1744] WSDL schema imports do not published successfully.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/ant-import-tests/build-jars-jaxws.xml 2009-03-02 13:03:24 UTC (rev 9469)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/ant-import-tests/build-jars-jaxws.xml 2009-03-02 15:07:01 UTC (rev 9470)
@@ -570,6 +570,17 @@
</webinf>
</war>
+ <!-- jaxws-jbws2412 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws2412.war" webxml="${tests.output.dir}/resources/jaxws/jbws2412/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2412/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2412/*TestCase.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxws/jbws2412/WEB-INF">
+ <include name="wsdl/*"/>
+ </webinf>
+ </war>
+
<!-- jaxws-jbws2437 -->
<jar destfile="${tests.output.dir}/libs/jaxws-jbws2437.jar">
<fileset dir="${tests.output.dir}/classes">
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-03-02 13:03:24 UTC (rev 9469)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java 2009-03-02 15:07:01 UTC (rev 9470)
@@ -164,7 +164,7 @@
// infinity loops prevention
if (published.contains(locationURI))
{
- return;
+ continue;
}
else
{
@@ -215,7 +215,7 @@
// infinity loops prevention
if (published.contains(schemaLocation))
{
- return;
+ continue;
}
else
{
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412 (from rev 9114, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java 2009-01-23 19:06:01 UTC (rev 9114)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java 2009-03-02 15:07:01 UTC (rev 9470)
@@ -1,66 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2009, 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.jaxws.jbws2412;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-/**
- * Test case to test JBWS-2412 for the correct publising of imported schemas.
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 23rd January 2009
- */
-public class JBWS2412TestCase extends JBossWSTest
-{
-
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(JBWS2412TestCase.class, "jaxws-jbws2412.war");
- }
-
- private TestEndpoint getPort() throws Exception
- {
-
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2412?wsdl");
- QName serviceName = new QName("http://org.jboss.test.ws/jbws2412", "TestEndpointService");
-
- Service service = Service.create(wsdlURL, serviceName);
-
- return service.getPort(TestEndpoint.class);
- }
-
- public void testCall() throws Exception
- {
- String message = "Hi";
- String response = getPort().echo(message);
- assertEquals(message, response);
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java (from rev 9114, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/JBWS2412TestCase.java 2009-03-02 15:07:01 UTC (rev 9470)
@@ -0,0 +1,66 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2009, 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.jaxws.jbws2412;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test case to test JBWS-2412 for the correct publising of imported schemas.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 23rd January 2009
+ */
+public class JBWS2412TestCase extends JBossWSTest
+{
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS2412TestCase.class, "jaxws-jbws2412.war");
+ }
+
+ private TestEndpoint getPort() throws Exception
+ {
+
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2412?wsdl");
+ QName serviceName = new QName("http://org.jboss.test.ws/jbws2412", "TestEndpointService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+
+ return service.getPort(TestEndpoint.class);
+ }
+
+ public void testCall() throws Exception
+ {
+ String message = "Hi";
+ String response = getPort().echo(message);
+ assertEquals(message, response);
+ }
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java 2009-01-23 19:06:01 UTC (rev 9114)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java 2009-03-02 15:07:01 UTC (rev 9470)
@@ -1,37 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2009, 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.jaxws.jbws2412;
-
-import javax.jws.WebService;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 23rd January 2009
- */
-@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.test.ws/jbws2412")
-public interface TestEndpoint
-{
-
- public String echo(final String message);
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java (from rev 9114, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpoint.java 2009-03-02 15:07:01 UTC (rev 9470)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2009, 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.jaxws.jbws2412;
+
+import javax.jws.WebService;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 23rd January 2009
+ */
+@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.test.ws/jbws2412")
+public interface TestEndpoint
+{
+
+ public String echo(final String message);
+
+}
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java 2009-01-23 19:06:01 UTC (rev 9114)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java 2009-03-02 15:07:01 UTC (rev 9470)
@@ -1,40 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2009, 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.jaxws.jbws2412;
-
-import javax.jws.WebService;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 23rd January 2009
- */
-@WebService(name = "TestEndpoint", serviceName="TestEndpointService", targetNamespace = "http://org.jboss.test.ws/jbws2412", wsdlLocation="WEB-INF/wsdl/TestService.wsdl")
-public class TestEndpointImpl implements TestEndpoint
-{
-
- public String echo(String message)
- {
- return message;
- }
-
-}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java (from rev 9114, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/java/org/jboss/test/ws/jaxws/jbws2412/TestEndpointImpl.java 2009-03-02 15:07:01 UTC (rev 9470)
@@ -0,0 +1,40 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2009, 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.jaxws.jbws2412;
+
+import javax.jws.WebService;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 23rd January 2009
+ */
+@WebService(name = "TestEndpoint", serviceName="TestEndpointService", targetNamespace = "http://org.jboss.test.ws/jbws2412", wsdlLocation="WEB-INF/wsdl/TestService.wsdl")
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ public String echo(String message)
+ {
+ return message;
+ }
+
+}
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412 (from rev 9114, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412)
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF (from rev 9114, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml 2009-01-23 19:06:01 UTC (rev 9114)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml 2009-03-02 15:07:01 UTC (rev 9470)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4" 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">
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws2412.TestEndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml (from rev 9114, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/web.xml 2009-03-02 15:07:01 UTC (rev 9470)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" 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">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2412.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl (from rev 9114, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl)
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl 2009-01-23 19:06:01 UTC (rev 9114)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl 2009-03-02 15:07:01 UTC (rev 9470)
@@ -1,51 +0,0 @@
-<definitions name='TestEndpointService' targetNamespace='http://org.jboss.test.ws/jbws2412' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws2412' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <xs:schema targetNamespace='http://org.jboss.test.ws/jbws2412' version='1.0' xmlns:tns='http://org.jboss.test.ws/jbws2412' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
-
- <xs:import namespace="http://org.jboss.test.ws/jbws2412/schema1" schemaLocation="./schema1.xsd"/>
- <xs:import namespace="http://org.jboss.test.ws/jbws2412/schema4" schemaLocation="./schema4.xsd"/>
-
- <xs:element name='echo' type='tns:echo'/>
- <xs:element name='echoResponse' type='tns:echoResponse'/>
- <xs:complexType name='echo'>
- <xs:sequence>
- <xs:element minOccurs='0' name='arg0' type='xs:string'/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name='echoResponse'>
- <xs:sequence>
- <xs:element minOccurs='0' name='return' type='xs:string'/>
- </xs:sequence>
- </xs:complexType>
- </xs:schema>
- </types>
- <message name='TestEndpoint_echoResponse'>
- <part element='tns:echoResponse' name='echoResponse'></part>
- </message>
- <message name='TestEndpoint_echo'>
- <part element='tns:echo' name='echo'></part>
- </message>
- <portType name='TestEndpoint'>
- <operation name='echo' parameterOrder='echo'>
- <input message='tns:TestEndpoint_echo'></input>
- <output message='tns:TestEndpoint_echoResponse'></output>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echo'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestEndpointService'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='http://127.0.0.1:8080/jaxws-jbws2412'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl (from rev 9114, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl 2009-03-02 15:07:01 UTC (rev 9470)
@@ -0,0 +1,51 @@
+<definitions name='TestEndpointService' targetNamespace='http://org.jboss.test.ws/jbws2412' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws2412' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://org.jboss.test.ws/jbws2412' version='1.0' xmlns:tns='http://org.jboss.test.ws/jbws2412' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+
+ <xs:import namespace="http://org.jboss.test.ws/jbws2412/schema1" schemaLocation="./schema1.xsd"/>
+ <xs:import namespace="http://org.jboss.test.ws/jbws2412/schema4" schemaLocation="./schema4.xsd"/>
+
+ <xs:element name='echo' type='tns:echo'/>
+ <xs:element name='echoResponse' type='tns:echoResponse'/>
+ <xs:complexType name='echo'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='arg0' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoResponse'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='return' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='TestEndpoint_echoResponse'>
+ <part element='tns:echoResponse' name='echoResponse'></part>
+ </message>
+ <message name='TestEndpoint_echo'>
+ <part element='tns:echo' name='echo'></part>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echo' parameterOrder='echo'>
+ <input message='tns:TestEndpoint_echo'></input>
+ <output message='tns:TestEndpoint_echoResponse'></output>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestEndpointService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='http://127.0.0.1:8080/jaxws-jbws2412'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd 2009-01-23 19:06:01 UTC (rev 9114)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd 2009-03-02 15:07:01 UTC (rev 9470)
@@ -1,5 +0,0 @@
-<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema1'
- xmlns='http://www.w3.org/2001/XMLSchema'>
- <import namespace="http://org.jboss.test.ws/jbws2412/schema2" schemaLocation="./schema2.xsd"/>
- <import namespace="http://org.jboss.test.ws/jbws2412/schema5" schemaLocation="./schema5.xsd"/>
-</schema>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd (from rev 9114, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema1.xsd 2009-03-02 15:07:01 UTC (rev 9470)
@@ -0,0 +1,5 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema1'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+ <import namespace="http://org.jboss.test.ws/jbws2412/schema2" schemaLocation="./schema2.xsd"/>
+ <import namespace="http://org.jboss.test.ws/jbws2412/schema5" schemaLocation="./schema5.xsd"/>
+</schema>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd 2009-01-23 19:06:01 UTC (rev 9114)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd 2009-03-02 15:07:01 UTC (rev 9470)
@@ -1,4 +0,0 @@
-<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema2'
- xmlns='http://www.w3.org/2001/XMLSchema'>
-
-</schema>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd (from rev 9114, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema2.xsd 2009-03-02 15:07:01 UTC (rev 9470)
@@ -0,0 +1,4 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema2'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+
+</schema>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd 2009-01-23 19:06:01 UTC (rev 9114)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd 2009-03-02 15:07:01 UTC (rev 9470)
@@ -1,4 +0,0 @@
-<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema3'
- xmlns='http://www.w3.org/2001/XMLSchema'>
-
-</schema>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd (from rev 9114, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema3.xsd 2009-03-02 15:07:01 UTC (rev 9470)
@@ -0,0 +1,4 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema3'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+
+</schema>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd 2009-01-23 19:06:01 UTC (rev 9114)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd 2009-03-02 15:07:01 UTC (rev 9470)
@@ -1,5 +0,0 @@
-<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema4'
- xmlns='http://www.w3.org/2001/XMLSchema'>
- <import namespace="http://org.jboss.test.ws/jbws2412/schema2" schemaLocation="./schema2.xsd"/>
- <import namespace="http://org.jboss.test.ws/jbws2412/schema3" schemaLocation="./schema3.xsd"/>
-</schema>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd (from rev 9114, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema4.xsd 2009-03-02 15:07:01 UTC (rev 9470)
@@ -0,0 +1,5 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema4'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+ <import namespace="http://org.jboss.test.ws/jbws2412/schema2" schemaLocation="./schema2.xsd"/>
+ <import namespace="http://org.jboss.test.ws/jbws2412/schema3" schemaLocation="./schema3.xsd"/>
+</schema>
\ No newline at end of file
Deleted: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd 2009-01-23 19:06:01 UTC (rev 9114)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd 2009-03-02 15:07:01 UTC (rev 9470)
@@ -1,4 +0,0 @@
-<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema5'
- xmlns='http://www.w3.org/2001/XMLSchema'>
-
-</schema>
\ No newline at end of file
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd (from rev 9114, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd)
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/schema5.xsd 2009-03-02 15:07:01 UTC (rev 9470)
@@ -0,0 +1,4 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema5'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+
+</schema>
\ No newline at end of file
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/version.properties
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/version.properties 2009-03-02 13:03:24 UTC (rev 9469)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/version.properties 2009-03-02 15:07:01 UTC (rev 9470)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-2.0
-version.id=2.0.1.SP2_CP05
-repository.id=2.0.1.SP2_CP05
+version.id=2.0.1.SP2_CP05_JBPAPP-1744
+repository.id=2.0.1.SP2_CP05_JBPAPP-1744
implementation.title=JBoss Web Services - Native
implementation.url=http://www.jboss.org/products/jbossws
15 years, 10 months
- 1
- 0
JBossWS SVN: r9469 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-02 08:03:24 -0500 (Mon, 02 Mar 2009)
New Revision: 9469
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744/
Log:
[JBPAPP-1744] Branch for patch.
Copied: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1744 (from rev 9468, stack/native/tags/jbossws-native-2.0.1.SP2_CP05)
15 years, 10 months
- 1
- 0
JBossWS SVN: r9468 - in stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730: src/main/java/org/jboss/ws/core/soap/attachment and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2009-03-02 07:10:56 -0500 (Mon, 02 Mar 2009)
New Revision: 9468
Added:
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/JBWS2419TestCase.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ClientHandler.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11Endpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11EndpointBean.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ClientHandler.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12Endpoint.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12EndpointBean.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers1.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers2.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/resources/jaxws/jbws2419/
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/resources/jaxws/jbws2419/WEB-INF/
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/resources/jaxws/jbws2419/WEB-INF/web.xml
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/ant-import-tests/build-jars-jaxws.xml
stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java
Log:
[JBPAPP-1730] Patch for [JBWS-2419 MTOM/XOP message always sets start-info as "text/xml"]
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/ant-import-tests/build-jars-jaxws.xml 2009-03-02 11:31:40 UTC (rev 9467)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/ant-import-tests/build-jars-jaxws.xml 2009-03-02 12:10:56 UTC (rev 9468)
@@ -570,6 +570,20 @@
</webinf>
</war>
+ <!-- jaxws-jbws2419 -->
+ <war warfile="${tests.output.dir}/libs/jaxws-jbws2419.war" webxml="${tests.output.dir}/resources/jaxws/jbws2419/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2419/SOAP12EndpointBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2419/SOAP12Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2419/SOAP11EndpointBean.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2419/SOAP11Endpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers1.xml"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers2.xml"/>
+ </classes>
+ </war>
+
<!-- jaxws-jbws2437 -->
<jar destfile="${tests.output.dir}/libs/jaxws-jbws2437.jar">
<fileset dir="${tests.output.dir}/classes">
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java 2009-03-02 11:31:40 UTC (rev 9467)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java 2009-03-02 12:10:56 UTC (rev 9468)
@@ -27,6 +27,7 @@
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.ParameterList;
+import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
@@ -57,10 +58,14 @@
public void encodeMultipartRelatedMessage() throws SOAPException, MessagingException
{
+ SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope();
+ boolean isSoap12 = SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE.equals(soapEnv.getElementQName().getNamespaceURI());
+ String soapType = isSoap12 ? MimeConstants.TYPE_SOAP12 : MimeConstants.TYPE_SOAP11;
+
ParameterList p = new ParameterList();
p.set("type", MimeConstants.TYPE_APPLICATION_XOP_XML);
p.set("start", MimeConstants.ROOTPART_CID);
- p.set("start-info", MimeConstants.START_INFO_XOP);
+ p.set("start-info", soapType);
MimeMultipart multipart = new MimeMultipart("related" + p);
MimeBodyPart rootPart = new MimeBodyPart();
@@ -71,12 +76,11 @@
* to marshall the message. In this way the root part can be lazily written to the output
* stream.
*/
- SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope();
String envStr = SOAPElementWriter.writeElement((SOAPElementImpl)soapEnv, false);
rootPart.setText(envStr, "UTF-8");
rootPart.setContentID(MimeConstants.ROOTPART_CID);
- rootPart.setHeader(MimeConstants.CONTENT_TYPE, MimeConstants.TYPE_APPLICATION_XOP_XML + "; type=\"text/xml\"");
+ rootPart.setHeader(MimeConstants.CONTENT_TYPE, MimeConstants.TYPE_APPLICATION_XOP_XML + "; type=\"" + soapType + "\"");
rootPart.setHeader(MimeConstants.CONTENT_TRANSFER_ENCODING, MimeConstants.TEXT_8BIT_ENCODING);
multipart.addBodyPart(rootPart);
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/JBWS2419TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/JBWS2419TestCase.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/JBWS2419TestCase.java 2009-03-02 12:10:56 UTC (rev 9468)
@@ -0,0 +1,119 @@
+/*
+ * 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.jaxws.jbws2419;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.activation.DataHandler;
+import javax.wsdl.Binding;
+import javax.wsdl.Definition;
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Service;
+import javax.xml.ws.handler.Handler;
+import javax.xml.ws.soap.SOAPBinding;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test SOAP 1.2 and SOAP 1.1 MTOM/XOP request/response content type and start-info
+ *
+ * @author mageshbk(a)jboss.com
+ * @since 20-Feb-2009
+ */
+public class JBWS2419TestCase extends JBossWSTest
+{
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2419";
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2419TestCase.class, "jaxws-jbws2419.war");
+ }
+
+ public void testSOAP12ClientAccess() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "/soap12?wsdl");
+ QName qname = new QName("http://org.jboss.ws/jaxws/jbws2419", "SOAP12EndpointBeanService");
+ Service service = Service.create(wsdlURL, qname);
+ SOAP12Endpoint port = (SOAP12Endpoint)service.getPort(SOAP12Endpoint.class);
+
+ BindingProvider provider = (BindingProvider)port;
+ List<Handler> handlerChain = new ArrayList<Handler>();
+ handlerChain.addAll(provider.getBinding().getHandlerChain());
+ handlerChain.add(new SOAP12ClientHandler());
+ provider.getBinding().setHandlerChain(handlerChain);
+ ((SOAPBinding)provider.getBinding()).setMTOMEnabled(true);
+
+ DataHandler response = port.namespace(new DataHandler("Jimbo","text/plain"));
+ Object nsURI = getContent(response);
+ assertEquals(SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE, nsURI);
+ }
+
+ public void testSOAP11ClientAccess() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "/soap11?wsdl");
+ QName qname = new QName("http://org.jboss.ws/jaxws/jbws2419", "SOAP11EndpointBeanService");
+ Service service = Service.create(wsdlURL, qname);
+ SOAP11Endpoint port = (SOAP11Endpoint)service.getPort(SOAP11Endpoint.class);
+
+ BindingProvider provider = (BindingProvider)port;
+ List<Handler> handlerChain = new ArrayList<Handler>();
+ handlerChain.addAll(provider.getBinding().getHandlerChain());
+ handlerChain.add(new SOAP11ClientHandler());
+ provider.getBinding().setHandlerChain(handlerChain);
+ ((SOAPBinding)provider.getBinding()).setMTOMEnabled(true);
+
+ DataHandler response = port.namespace(new DataHandler("Jimbo","text/plain"));
+ Object nsURI = getContent(response);
+ assertEquals(SOAPConstants.URI_NS_SOAP_1_1_ENVELOPE, nsURI);
+ }
+
+ protected Object getContent(DataHandler dh) throws IOException
+ {
+ Object content = dh.getContent();
+
+ // Metro returns an ByteArrayInputStream
+ if (content instanceof InputStream)
+ {
+ try
+ {
+ BufferedReader br = new BufferedReader(new InputStreamReader((InputStream)content));
+ return br.readLine();
+ }
+ finally
+ {
+ ((InputStream)content).close();
+ }
+ }
+ return content;
+ }
+}
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/JBWS2419TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ClientHandler.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ClientHandler.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ClientHandler.java 2009-03-02 12:10:56 UTC (rev 9468)
@@ -0,0 +1,101 @@
+/*
+ * 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.jaxws.jbws2419;
+
+import javax.mail.internet.ContentType;
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
+
+/**
+ * A SOAP 1.1 client side handler
+ *
+ * @author mageshbk(a)jboss.com
+ * @since 20-Feb-2009
+ */
+public class SOAP11ClientHandler extends GenericSOAPHandler
+{
+ private static Logger log = Logger.getLogger(SOAP11ClientHandler.class);
+
+ public boolean handleInbound(MessageContext msgContext)
+ {
+ log.info("handleInbound");
+
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+
+ MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
+ String[] ct = mimeHeaders.getHeader("Content-Type");
+ ContentType contentType;
+ if (ct != null)
+ {
+ try
+ {
+ contentType = new ContentType(ct[0]);
+ log.info("contentType="+contentType);
+ String startInfo = contentType.getParameter("start-info");
+ if (startInfo.equals(SOAPConstants.SOAP_1_1_CONTENT_TYPE))
+ {
+ return true;
+ }
+ }
+ catch(Exception e)
+ {
+ throw new WebServiceException(e);
+ }
+ }
+ return false;
+ }
+
+ protected boolean handleOutbound(MessageContext msgContext)
+ {
+ log.info("handleOutbound");
+
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ soapMessage.saveChanges();
+
+ MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
+ String[] ct = mimeHeaders.getHeader("Content-Type");
+ ContentType contentType;
+ if (ct != null)
+ {
+ contentType = new ContentType(ct[0]);
+ log.info("contentType="+contentType);
+ if (contentType.getBaseType().equals(SOAPConstants.SOAP_1_1_CONTENT_TYPE))
+ return true;
+ }
+ return false;
+ }
+ catch (Exception ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+}
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ClientHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11Endpoint.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11Endpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11Endpoint.java 2009-03-02 12:10:56 UTC (rev 9468)
@@ -0,0 +1,41 @@
+/*
+ * 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.jaxws.jbws2419;
+
+import static javax.xml.ws.soap.SOAPBinding.SOAP11HTTP_MTOM_BINDING;
+
+import javax.activation.DataHandler;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+import javax.xml.bind.annotation.XmlMimeType;
+import javax.xml.ws.BindingType;
+
+@WebService(name = "SOAP11Endpoint", targetNamespace = "http://org.jboss.ws/jaxws/jbws2419")
+@SOAPBinding(style = Style.RPC)
+@BindingType(SOAP11HTTP_MTOM_BINDING)
+
+public interface SOAP11Endpoint
+{
+ @XmlMimeType("text/plain")
+ public DataHandler namespace(@XmlMimeType("text/plain") DataHandler data);
+}
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11Endpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11EndpointBean.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11EndpointBean.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11EndpointBean.java 2009-03-02 12:10:56 UTC (rev 9468)
@@ -0,0 +1,82 @@
+/*
+ * 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.jaxws.jbws2419;
+
+import static javax.xml.ws.soap.SOAPBinding.SOAP11HTTP_MTOM_BINDING;
+
+import java.io.IOException;
+
+import javax.activation.DataHandler;
+import javax.annotation.Resource;
+import javax.jws.HandlerChain;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlMimeType;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.BindingType;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+import javax.xml.ws.soap.MTOM;
+
+import org.jboss.logging.Logger;
+
+@WebService(name="SOAP11Endpoint", targetNamespace="http://org.jboss.ws/jaxws/jbws2419",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws2419.SOAP11Endpoint")
+@BindingType(SOAP11HTTP_MTOM_BINDING)
+@HandlerChain(file = "jaxws-server-handlers1.xml")
+public class SOAP11EndpointBean implements SOAP11Endpoint
+{
+ private static Logger log = Logger.getLogger(SOAP11EndpointBean.class);
+
+ @Resource
+ public WebServiceContext context;
+
+ @XmlMimeType("text/plain")
+ public DataHandler namespace(@XmlMimeType("text/plain") DataHandler data)
+ {
+ try
+ {
+ String name = (String)data.getContent();
+ String type = (String)data.getContentType();
+ log.info("User " + name + " requested namespace with content type ["+ type +"]");
+
+ SOAPMessageContext msgContext = (SOAPMessageContext)context.getMessageContext();
+ SOAPMessage soapMessage = msgContext.getMessage();
+ SOAPEnvelope soapEnvelope = (SOAPEnvelope)soapMessage.getSOAPPart().getEnvelope();
+ String nsURI = soapEnvelope.getNamespaceURI();
+
+ log.info(nsURI);
+
+ return new DataHandler(nsURI, "text/plain");
+ }
+ catch (IOException e)
+ {
+ throw new WebServiceException(e);
+ }
+ catch (SOAPException ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+}
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11EndpointBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java 2009-03-02 12:10:56 UTC (rev 9468)
@@ -0,0 +1,101 @@
+/*
+ * 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.jaxws.jbws2419;
+
+import javax.mail.internet.ContentType;
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
+
+/**
+ * A SOAP 1.1 server side handler
+ *
+ * @author mageshbk(a)jboss.com
+ * @since 20-Feb-2009
+ */
+public class SOAP11ServerHandler extends GenericSOAPHandler
+{
+ private static Logger log = Logger.getLogger(SOAP11ServerHandler.class);
+
+ public boolean handleInbound(MessageContext msgContext)
+ {
+ log.info("handleInbound");
+
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+
+ MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
+ String[] ct = mimeHeaders.getHeader("Content-Type");
+ ContentType contentType;
+ if (ct != null)
+ {
+ try
+ {
+ contentType = new ContentType(ct[0]);
+ log.info("contentType="+contentType);
+ String startInfo = contentType.getParameter("start-info");
+ if (startInfo.equals(SOAPConstants.SOAP_1_1_CONTENT_TYPE))
+ {
+ return true;
+ }
+ }
+ catch(Exception e)
+ {
+ throw new WebServiceException(e);
+ }
+ }
+ return false;
+ }
+
+ protected boolean handleOutbound(MessageContext msgContext)
+ {
+ log.info("handleOutbound");
+
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ soapMessage.saveChanges();
+
+ MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
+ String[] ct = mimeHeaders.getHeader("Content-Type");
+ ContentType contentType;
+ if (ct != null)
+ {
+ contentType = new ContentType(ct[0]);
+ log.info("contentType="+contentType);
+ if (contentType.getBaseType().equals(SOAPConstants.SOAP_1_1_CONTENT_TYPE))
+ return true;
+ }
+ return false;
+ }
+ catch (Exception ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+}
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP11ServerHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ClientHandler.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ClientHandler.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ClientHandler.java 2009-03-02 12:10:56 UTC (rev 9468)
@@ -0,0 +1,101 @@
+/*
+ * 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.jaxws.jbws2419;
+
+import javax.mail.internet.ContentType;
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
+
+/**
+ * A SOAP 1.2 client side handler
+ *
+ * @author mageshbk(a)jboss.com
+ * @since 20-Feb-2009
+ */
+public class SOAP12ClientHandler extends GenericSOAPHandler
+{
+ private static Logger log = Logger.getLogger(SOAP12ClientHandler.class);
+
+ public boolean handleInbound(MessageContext msgContext)
+ {
+ log.info("handleInbound");
+
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+
+ MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
+ String[] ct = mimeHeaders.getHeader("Content-Type");
+ ContentType contentType;
+ if (ct != null)
+ {
+ try
+ {
+ contentType = new ContentType(ct[0]);
+ log.info("contentType="+contentType);
+ String startInfo = contentType.getParameter("start-info");
+ if (startInfo.equals(SOAPConstants.SOAP_1_2_CONTENT_TYPE))
+ {
+ return true;
+ }
+ }
+ catch(Exception e)
+ {
+ throw new WebServiceException(e);
+ }
+ }
+ return false;
+ }
+
+ protected boolean handleOutbound(MessageContext msgContext)
+ {
+ log.info("handleOutbound");
+
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ soapMessage.saveChanges();
+
+ MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
+ String[] ct = mimeHeaders.getHeader("Content-Type");
+ ContentType contentType;
+ if (ct != null)
+ {
+ contentType = new ContentType(ct[0]);
+ log.info("contentType="+contentType);
+ if (contentType.getBaseType().equals(SOAPConstants.SOAP_1_2_CONTENT_TYPE))
+ return true;
+ }
+ return false;
+ }
+ catch (Exception ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+}
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ClientHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12Endpoint.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12Endpoint.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12Endpoint.java 2009-03-02 12:10:56 UTC (rev 9468)
@@ -0,0 +1,41 @@
+/*
+ * 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.jaxws.jbws2419;
+
+import static javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_MTOM_BINDING;
+
+import javax.activation.DataHandler;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+import javax.jws.soap.SOAPBinding.Style;
+import javax.xml.bind.annotation.XmlMimeType;
+import javax.xml.ws.BindingType;
+
+@WebService(name = "SOAP12Endpoint", targetNamespace = "http://org.jboss.ws/jaxws/jbws2419")
+@SOAPBinding(style = Style.RPC)
+@BindingType(SOAP12HTTP_MTOM_BINDING)
+
+public interface SOAP12Endpoint
+{
+ @XmlMimeType("text/plain")
+ public DataHandler namespace(@XmlMimeType("text/plain") DataHandler data);
+}
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12Endpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12EndpointBean.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12EndpointBean.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12EndpointBean.java 2009-03-02 12:10:56 UTC (rev 9468)
@@ -0,0 +1,82 @@
+/*
+ * 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.jaxws.jbws2419;
+
+import static javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_MTOM_BINDING;
+
+import java.io.IOException;
+
+import javax.activation.DataHandler;
+import javax.annotation.Resource;
+import javax.jws.HandlerChain;
+import javax.jws.WebService;
+import javax.xml.bind.annotation.XmlMimeType;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.BindingType;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+import javax.xml.ws.soap.MTOM;
+
+import org.jboss.logging.Logger;
+
+@WebService(name="SOAP12Endpoint", targetNamespace="http://org.jboss.ws/jaxws/jbws2419",
+ endpointInterface = "org.jboss.test.ws.jaxws.jbws2419.SOAP12Endpoint")
+@BindingType(SOAP12HTTP_MTOM_BINDING)
+@HandlerChain(file = "jaxws-server-handlers2.xml")
+public class SOAP12EndpointBean implements SOAP12Endpoint
+{
+ private static Logger log = Logger.getLogger(SOAP12EndpointBean.class);
+
+ @Resource
+ public WebServiceContext context;
+
+ @XmlMimeType("text/plain")
+ public DataHandler namespace(@XmlMimeType("text/plain") DataHandler data)
+ {
+ try
+ {
+ String name = (String)data.getContent();
+ String type = (String)data.getContentType();
+ log.info("User " + name + " requested namespace with content type ["+ type +"]");
+
+ SOAPMessageContext msgContext = (SOAPMessageContext)context.getMessageContext();
+ SOAPMessage soapMessage = msgContext.getMessage();
+ SOAPEnvelope soapEnvelope = (SOAPEnvelope)soapMessage.getSOAPPart().getEnvelope();
+ String nsURI = soapEnvelope.getNamespaceURI();
+
+ log.info(nsURI);
+
+ return new DataHandler(nsURI, "text/plain");
+ }
+ catch (IOException e)
+ {
+ throw new WebServiceException(e);
+ }
+ catch (SOAPException ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+}
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12EndpointBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java 2009-03-02 12:10:56 UTC (rev 9468)
@@ -0,0 +1,106 @@
+/*
+ * 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.jaxws.jbws2419;
+
+import javax.mail.internet.ContentType;
+import javax.mail.internet.ParseException;
+import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPConstants;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.core.jaxws.handler.GenericSOAPHandler;
+
+/**
+ * A SOAP 1.2 server side handler
+ *
+ * @author mageshbk(a)jboss.com
+ * @since 20-Feb-2009
+ */
+public class SOAP12ServerHandler extends GenericSOAPHandler
+{
+ private static Logger log = Logger.getLogger(SOAP12ServerHandler.class);
+
+ public boolean handleInbound(MessageContext msgContext)
+ {
+ log.info("handleInbound");
+
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+
+ MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
+ String[] ct = mimeHeaders.getHeader("Content-Type");
+ ContentType contentType;
+ if (ct != null)
+ {
+ try
+ {
+ contentType = new ContentType(ct[0]);
+ log.info("contentType="+contentType);
+ String startInfo = contentType.getParameter("start-info");
+ if (startInfo.equals(SOAPConstants.SOAP_1_2_CONTENT_TYPE))
+ {
+ return true;
+ }
+ }
+ catch(Exception e)
+ {
+ throw new WebServiceException(e);
+ }
+ }
+ return false;
+ }
+
+ protected boolean handleOutbound(MessageContext msgContext)
+ {
+ log.info("handleOutbound");
+
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ soapMessage.saveChanges();
+
+ MimeHeaders mimeHeaders = soapMessage.getMimeHeaders();
+ String[] ct = mimeHeaders.getHeader("Content-Type");
+ ContentType contentType;
+ if (ct != null)
+ {
+ contentType = new ContentType(ct[0]);
+ log.info("contentType="+contentType);
+ if (contentType.getBaseType().equals(SOAPConstants.SOAP_1_2_CONTENT_TYPE))
+ return true;
+ }
+ return false;
+ }
+ catch (ParseException e)
+ {
+ throw new WebServiceException(e);
+ }
+ catch (SOAPException ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+}
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/SOAP12ServerHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers1.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers1.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers1.xml 2009-03-02 12:10:56 UTC (rev 9468)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+ <handler-chain>
+ <handler>
+ <handler-name> SOAP11ServerHandler </handler-name>
+ <handler-class> org.jboss.test.ws.jaxws.jbws2419.SOAP11ServerHandler </handler-class>
+ </handler>
+ </handler-chain>
+
+</handler-chains>
\ No newline at end of file
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers1.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers2.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers2.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers2.xml 2009-03-02 12:10:56 UTC (rev 9468)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<handler-chains xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ns1="http://org.jboss.ws/jaxws/handlerscope"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd">
+
+ <handler-chain>
+ <handler>
+ <handler-name> SOAP12ServerHandler </handler-name>
+ <handler-class> org.jboss.test.ws.jaxws.jbws2419.SOAP12ServerHandler </handler-class>
+ </handler>
+ </handler-chain>
+
+</handler-chains>
\ No newline at end of file
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/java/org/jboss/test/ws/jaxws/jbws2419/jaxws-server-handlers2.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/resources/jaxws/jbws2419/WEB-INF/web.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/resources/jaxws/jbws2419/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/resources/jaxws/jbws2419/WEB-INF/web.xml 2009-03-02 12:10:56 UTC (rev 9468)
@@ -0,0 +1,29 @@
+<?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>TestSOAP12Service</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2419.SOAP12EndpointBean</servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>TestSOAP11Service</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2419.SOAP11EndpointBean</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestSOAP12Service</servlet-name>
+ <url-pattern>/soap12/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>TestSOAP11Service</servlet-name>
+ <url-pattern>/soap11/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Property changes on: stack/native/branches/jbossws-native-2.0.1.SP2_CP05_JBPAPP-1730/src/test/resources/jaxws/jbws2419/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 10 months
- 1
- 0
JBossWS SVN: r9467 - stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/umdm.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2009-03-02 06:31:40 -0500 (Mon, 02 Mar 2009)
New Revision: 9467
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
Log:
[JBPAPP-1743] Correct WeakReference handling in ConfigObservable to remove cleared WeakReferences.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2009-03-02 10:09:06 UTC (rev 9466)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2009-03-02 11:31:40 UTC (rev 9467)
@@ -21,8 +21,12 @@
*/
package org.jboss.ws.metadata.umdm;
+
// $Id$
+
+import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -640,6 +644,7 @@
if (retParam != null)
createAccessor(retParam, jaxbCtx);
}
+
}
private void eagerInitializeJAXBContextCache()
@@ -843,6 +848,7 @@
class ConfigObservable extends Observable
{
+ private ReferenceQueue<WeakReference<Observer>> queue = new ReferenceQueue<WeakReference<Observer>>();
private List<WeakReference<Observer>> observer = new ArrayList<WeakReference<Observer>>();
public void doNotify(Object object)
@@ -853,15 +859,17 @@
public synchronized void addObserver(Observer o)
{
- observer.add(new WeakReference(o));
+ clearCollected();
+ observer.add(new WeakReference(o, queue));
}
public synchronized void deleteObserver(Observer o)
{
+ clearCollected();
for (WeakReference<Observer> w : observer)
{
Observer tmp = w.get();
- if (tmp.equals(o))
+ if (tmp != null && tmp.equals(o))
{
observer.remove(o);
break;
@@ -877,16 +885,29 @@
public void notifyObservers(Object arg)
{
+ clearCollected();
if (hasChanged())
{
for (WeakReference<Observer> w : observer)
{
Observer tmp = w.get();
- tmp.update(this, arg);
-
+ if (tmp != null)
+ {
+ tmp.update(this, arg);
+ }
}
}
}
+
+ private void clearCollected()
+ {
+ Reference ref;
+ while ((ref = queue.poll()) != null)
+ {
+ observer.remove(ref);
+ }
+
+ }
}
public List<UnifiedPortComponentRefMetaData> getServiceRefContrib()
15 years, 10 months
- 1
- 0
JBossWS SVN: r9466 - in stack/metro: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-02 05:09:06 -0500 (Mon, 02 Mar 2009)
New Revision: 9466
Added:
stack/metro/tags/jbossws-metro-3.1.0.GA/
Removed:
stack/metro/branches/jbossws-metro-3.1.0/
Log:
[JBWS-2541] Tagging jbossws-metro-3.1.0.GA
Copied: stack/metro/tags/jbossws-metro-3.1.0.GA (from rev 9465, stack/metro/branches/jbossws-metro-3.1.0)
15 years, 10 months
- 1
- 0
JBossWS SVN: r9465 - in stack/cxf: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-02 04:48:52 -0500 (Mon, 02 Mar 2009)
New Revision: 9465
Added:
stack/cxf/tags/jbossws-cxf-3.1.0.GA/
Removed:
stack/cxf/branches/jbossws-cxf-3.1.0/
Log:
[JBWS-2540] Tagging jbossws-cxf-3.1.0.GA
Copied: stack/cxf/tags/jbossws-cxf-3.1.0.GA (from rev 9464, stack/cxf/branches/jbossws-cxf-3.1.0)
15 years, 10 months
- 1
- 0
JBossWS SVN: r9464 - in stack/native: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-02 04:40:30 -0500 (Mon, 02 Mar 2009)
New Revision: 9464
Added:
stack/native/tags/jbossws-native-3.1.0.GA/
Removed:
stack/native/branches/jbossws-native-3.1.0/
Log:
[JBWS-2542] Tagging jbossws-native-3.1.0.GA
Copied: stack/native/tags/jbossws-native-3.1.0.GA (from rev 9463, stack/native/branches/jbossws-native-3.1.0)
15 years, 10 months
- 1
- 0
JBossWS SVN: r9463 - stack/native/branches/jbossws-native-3.1.0.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-03-02 04:35:17 -0500 (Mon, 02 Mar 2009)
New Revision: 9463
Modified:
stack/native/branches/jbossws-native-3.1.0/pom.xml
Log:
Fixing SCM references
Modified: stack/native/branches/jbossws-native-3.1.0/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.0/pom.xml 2009-03-01 00:38:00 UTC (rev 9462)
+++ stack/native/branches/jbossws-native-3.1.0/pom.xml 2009-03-02 09:35:17 UTC (rev 9463)
@@ -29,9 +29,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/branches/jbos...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/branches/jbossws-na...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url>
</scm>
<!-- Modules -->
15 years, 10 months
- 1
- 0