JBossWS SVN: r5306 - stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-12-13 11:12:38 -0500 (Thu, 13 Dec 2007)
New Revision: 5306
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
Log:
[JBWS-1904] Fixing issue
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-12-13 16:06:07 UTC (rev 5305)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2007-12-13 16:12:38 UTC (rev 5306)
@@ -75,6 +75,7 @@
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.ParameterStyle;
import javax.jws.soap.SOAPMessageHandlers;
+import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
import javax.xml.rpc.ParameterMode;
import javax.xml.ws.BindingType;
@@ -297,7 +298,12 @@
name = anWebFault.name();
if (anWebFault.targetNamespace().length() > 0)
+ {
namespace = anWebFault.targetNamespace();
+ XmlType anXmlType = exception.getAnnotation(XmlType.class);
+ if (anXmlType != null)
+ xmlType = new QName(anXmlType.namespace(), exception.getSimpleName());
+ }
if (anWebFault.faultBean().length() > 0)
faultBean = anWebFault.faultBean();
17 years, 1 month
- 1
- 0
JBossWS SVN: r5305 - in stack/native/trunk: src/test/java/org/jboss/test/ws/jaxws and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2007-12-13 11:06:07 -0500 (Thu, 13 Dec 2007)
New Revision: 5305
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java
Modified:
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
Log:
[JBWS-1904] Adding test
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-12-13 14:30:22 UTC (rev 5304)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-12-13 16:06:07 UTC (rev 5305)
@@ -538,6 +538,14 @@
<include name="jboss-service.xml"/>
</metainf>
</jar>
+
+ <!-- jaxws-jbws1904 -->
+ <jar destfile="${tests.output.dir}/libs/jaxws-jbws1904.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1904/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws1904/*TestCase.class"/>
+ </fileset>
+ </jar>
<!-- jaxws namespace -->
<war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml">
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java 2007-12-13 16:06:07 UTC (rev 5305)
@@ -0,0 +1,64 @@
+/*
+ * 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.jbws1904;
+
+import java.net.URL;
+
+import junit.framework.Test;
+
+import org.apache.xerces.xs.XSTypeDefinition;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.WSDLUtils;
+import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
+import org.jboss.ws.tools.wsdl.WSDLDefinitionsFactory;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-1904] Explicitly set the namespace of a WebFault
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1904
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 13-Dec-2007
+ */
+public class JBWS1904TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS1904TestCase.class, "jaxws-jbws1904.jar");
+ }
+
+ public void testWSDLSchema() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1904?wsdl");
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlURL);
+ JBossXSModel xsModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
+ XSTypeDefinition typeDefinition = xsModel.getTypeDefinition("TestException", "http://org.jboss.ws/jbws1904/exceptions");
+ assertNotNull(typeDefinition);
+ typeDefinition = xsModel.getTypeDefinition("TestException", "http://org.jboss.ws/jbws1904");
+ assertNull(typeDefinition);
+ typeDefinition = xsModel.getTypeDefinition("TestException", "http://org.jboss.ws/jbws1904/faults");
+ assertNull(typeDefinition);
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/JBWS1904TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java 2007-12-13 16:06:07 UTC (rev 5305)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws1904;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1904")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
+public interface TestEndpoint
+{
+ String echo(String input) throws TestException;
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java 2007-12-13 16:06:07 UTC (rev 5305)
@@ -0,0 +1,42 @@
+/*
+ * 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.jbws1904;
+
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.wsf.spi.annotation.WebContext;
+
+@WebService(serviceName = "TestEndpointService", name = "TestEndpoint", targetNamespace = "http://org.jboss.ws/jbws1904")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
+@Stateless
+@WebContext(contextRoot="jaxws-jbws1904", urlPattern="/*")
+public class TestEndpointImpl implements TestEndpoint
+{
+ @WebMethod
+ public String echo(String input) throws TestException
+ {
+ return input;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java 2007-12-13 16:06:07 UTC (rev 5305)
@@ -0,0 +1,21 @@
+package org.jboss.test.ws.jaxws.jbws1904;
+
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.ws.WebFault;
+
+@WebFault(name="TestExceptionFault", targetNamespace="http://org.jboss.ws/jbws1904/faults")
+@XmlType(name = "TestException", namespace = "http://org.jboss.ws/jbws1904/exceptions", propOrder = {"message"})
+public class TestException extends Exception
+{
+ private String message;
+
+ public String getMessage()
+ {
+ return message;
+ }
+
+ public void setMessage(String message)
+ {
+ this.message = message;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1904/TestException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 1 month
- 1
- 0
JBossWS SVN: r5304 - in legacy/branches/jbossws-1.2.1.GA_CP: jbossws-tests and 11 other directories.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2007-12-13 09:30:22 -0500 (Thu, 13 Dec 2007)
New Revision: 5304
Added:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml
Modified:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/ant-import/build-samples-jaxrpc.xml
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml
Log:
[JBPAPP-493] Document/Literal addressing endpoint fails when retrieving Outbound Action
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-12-13 14:28:36 UTC (rev 5303)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-core/src/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-12-13 14:30:22 UTC (rev 5304)
@@ -21,7 +21,7 @@
*/
package org.jboss.ws.metadata.builder;
-// $Id$
+// $Id: $
import java.io.IOException;
import java.net.MalformedURLException;
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/ant-import/build-samples-jaxrpc.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-12-13 14:28:36 UTC (rev 5303)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-12-13 14:30:22 UTC (rev 5304)
@@ -525,6 +525,55 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
+
+ <!-- jaxrpc-samples-wsaddr-hello.war -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-hello.war"
+ webxml="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-replyto.war"
+ webxml="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF">
+ <include name="replyto-jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-hello-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF">
+ <include name="replyto-jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
<!-- jaxrpc-samples-wsbpel -->
<war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml 2007-12-13 14:28:36 UTC (rev 5303)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/build.xml 2007-12-13 14:30:22 UTC (rev 5304)
@@ -326,6 +326,9 @@
<move todir="${tests.output.dir}/wstools/java">
<fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" includes="org/**"/>
</move>
+ <move todir="${tests.output.dir}/wstools/java">
+ <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/>
+ </move>
<!-- Copy generated resources -->
<copy todir="${tests.output.dir}/resources">
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2007-12-13 14:30:22 UTC (rev 5304)
@@ -0,0 +1,107 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto;
+
+// $Id$
+
+import java.io.ByteArrayInputStream;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Service;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPConnection;
+import javax.xml.soap.SOAPConnectionFactory;
+import javax.xml.soap.SOAPMessage;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+
+/**
+ * Test endpoint using ws-addressing
+ *
+ * @author mageshbk(a)jboss.com
+ * @since 12-Dec-2007
+ */
+public class AddressingReplyToTestCase extends JBossWSTest
+{
+ private static Hello initial;
+ private static ReplyTo replyto;
+
+ public static Test suite()
+ {
+ return JBossWSTestSetup.newTestSetup(AddressingReplyToTestCase.class,
+ "jaxrpc-samples-wsaddr-hello.war, jaxrpc-samples-wsaddr-replyto.war," +
+ "jaxrpc-samples-wsaddr-hello-client.jar");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ if (initial == null)
+ {
+ Service replytoService = (Service)getInitialContext("jaxrpc-addressing-replyto-client").lookup("java:comp/env/service/ReplyToService");
+ replyto = (ReplyTo)replytoService.getPort(ReplyTo.class);
+ Service initialService = (Service)getInitialContext("jaxrpc-addressing-replyto-client").lookup("java:comp/env/service/HelloService");
+ initial = (Hello)initialService.getPort(Hello.class);
+ }
+ }
+
+ /** This sends a valid message to the ReplyTo endpoint and verfies whether we can read it of again.
+ */
+ public void testReplyToMessage() throws Exception
+ {
+ String reqEnv =
+ "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ " <env:Header/>" +
+ " <env:Body>" +
+ " <ns1:sayHelloResponse xmlns:ns1='http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto/types'>" +
+ " <result>ReplyTo</result>" +
+ " </ns1:sayHelloResponse>" +
+ " </env:Body>" +
+ "</env:Envelope>";
+
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
+ SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
+
+ URL epURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-samples-wsaddr-replyto");
+ con.call(reqMsg, epURL);
+
+ assertEquals("ReplyTo", replyto.getLastMessage());
+ }
+
+ public void testInital() throws Exception
+ {
+ String message = initial.sayHello("Addressing TestCase");
+ assertNull("Expected null, but was: " + message, message);
+ }
+
+ public void testReplyTo() throws Exception
+ {
+ String message = replyto.getLastMessage();
+ assertEquals("Hello Addressing TestCase", message);
+ }
+}
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java 2007-12-13 14:30:22 UTC (rev 5304)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.MessageContext;
+
+import javax.xml.ws.addressing.AddressingBuilder;
+import javax.xml.ws.addressing.EndpointReference;
+import javax.xml.ws.addressing.JAXWSAConstants;
+import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
+import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
+
+import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC;
+
+
+import org.jboss.logging.Logger;
+
+/**
+ * A client side handler for the ws-addressing
+ *
+ * @author mageshbk(a)jboss.com
+ * @since 12-Dec-2007
+ */
+public class ClientHandler extends GenericHandler
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(ClientHandler.class);
+ protected QName[] headers;
+
+ public boolean handleRequest(MessageContext context)
+ {
+ log.info("enter handleRequest");
+
+ try
+ {
+ AddressingBuilder builder = SOAPAddressingBuilder.getAddressingBuilder();
+ SOAPAddressingProperties outProps = (SOAPAddressingProperties)builder.newAddressingProperties();
+ outProps.setTo(builder.newURI("http://localhost:8080/jaxrpc-samples-wsaddr-hello"));
+ outProps.setAction(builder.newURI("http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto/sayHello"));
+ EndpointReference rp = builder.newEndpointReference(new URI("http://localhost:8080/jaxrpc-samples-wsaddr-replyto"));
+ outProps.setReplyTo(rp);
+ outProps.setMessageID(builder.newURI("123456"));
+ context.setProperty(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, outProps);
+ }
+ catch(URISyntaxException e)
+ {
+ e.printStackTrace();
+ }
+ log.info("exit handleRequest");
+ return true;
+ }
+
+ public QName[] getHeaders()
+ {
+ return headers;
+ }
+
+}
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java 2007-12-13 14:30:22 UTC (rev 5304)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ * JAXRPC WS-Addressing service endpoint interface
+ *
+ * @author mageshbk(a)jboss.com
+ *
+ * @since 12-Dec-2007
+ */
+public interface Hello extends Remote
+{
+ String sayHello(String str) throws RemoteException;
+}
\ No newline at end of file
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java 2007-12-13 14:30:22 UTC (rev 5304)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto;
+
+import org.jboss.logging.Logger;
+
+/**
+ * JAXRPC WS-Addressing service endpoint
+ *
+ * @author mageshbk(a)jboss.com
+ *
+ * @since 12-Dec-2007
+ */
+public class HelloEndpointJSE implements Hello
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(HelloEndpointJSE.class);
+
+ public String sayHello(String str)
+ {
+ log.info("sayHello: " + str);
+ return "Hello " + str;
+ }
+}
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java 2007-12-13 14:30:22 UTC (rev 5304)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ * JAXRPC WS-Addressing service endpoint interface
+ *
+ * @author mageshbk(a)jboss.com
+ *
+ * @since 12-Dec-2007
+ */
+public interface ReplyTo extends Remote
+{
+ void sayHelloResponse(String str) throws RemoteException;
+
+ String getLastMessage() throws RemoteException;
+}
\ No newline at end of file
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java 2007-12-13 14:30:22 UTC (rev 5304)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto;
+
+import org.jboss.logging.Logger;
+
+/**
+ * JAXRPC WS-Addressing service endpoint
+ *
+ * @author mageshbk(a)jboss.com
+ *
+ * @since 12-Dec-2007
+ */
+public class ReplyToEndpointJSE implements ReplyTo
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(ReplyToEndpointJSE.class);
+
+ private static String lastMessage;
+
+ public void sayHelloResponse(String str)
+ {
+ log.info("sayHelloResponse: " + str);
+ lastMessage = str;
+ }
+
+ public String getLastMessage()
+ {
+ log.info("getLastMessage: " + lastMessage);
+ return lastMessage;
+ }
+}
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml 2007-12-13 14:30:22 UTC (rev 5304)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+ version="1.4">
+
+ <display-name>HelloService</display-name>
+
+ <service-ref>
+ <service-ref-name>service/HelloService</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.Hello</service-endpoint-interface>
+ </port-component-ref>
+ <handler>
+ <handler-name>ClientHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.ClientHandler</handler-class>
+ </handler>
+ <handler>
+ <handler-name>WSAddressingHandler</handler-name>
+ <handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingClientHandler</handler-class>
+ </handler>
+ </service-ref>
+
+ <service-ref>
+ <service-ref-name>service/ReplyToService</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/ReplyToService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/replyto-jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.ReplyTo</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml 2007-12-13 14:30:22 UTC (rev 5304)
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
+<jboss-client>
+ <jndi-name>jaxrpc-addressing-replyto-client</jndi-name>
+
+ <service-ref>
+ <service-ref-name>service/HelloService</service-ref-name>
+ <config-name>Standard WSAddressing Client</config-name>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-wsaddr-hello?wsdl</wsdl-override>
+ </service-ref>
+
+ <service-ref>
+ <service-ref-name>service/ReplyToService</service-ref-name>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-wsaddr-replyto?wsdl</wsdl-override>
+ </service-ref>
+</jboss-client>
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml 2007-12-13 14:30:22 UTC (rev 5304)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<jboss-web>
+ <context-root>/jaxrpc-samples-wsaddr-hello</context-root>
+</jboss-web>
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml 2007-12-13 14:30:22 UTC (rev 5304)
@@ -0,0 +1,24 @@
+<?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">
+
+ <context-param>
+ <param-name>jbossws-config-name</param-name>
+ <param-value>Standard WSAddressing Endpoint</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>HelloService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.HelloEndpointJSE</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>HelloService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml 2007-12-13 14:30:22 UTC (rev 5304)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../output/classes -config wstools-config.xml
+-->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+ <java-wsdl>
+ <service name="HelloService" style="document" endpoint="org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.Hello">
+ <operation name="sayHello" one-way="false" return-xml-name="result">
+ <parameter type="java.lang.String" xml-name="String_1"/>
+ </operation>
+ </service>
+ <namespaces target-namespace="http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto" type-namespace="http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="HelloService"/>
+ </java-wsdl>
+</configuration>
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml 2007-12-13 14:30:22 UTC (rev 5304)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<jboss-web>
+ <context-root>/jaxrpc-samples-wsaddr-replyto</context-root>
+</jboss-web>
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml 2007-12-13 14:30:22 UTC (rev 5304)
@@ -0,0 +1,19 @@
+<?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>ReplyToService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.ReplyToEndpointJSE</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ReplyToService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml 2007-12-13 14:30:22 UTC (rev 5304)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../output/classes -config wstools-config.xml
+-->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+ <java-wsdl>
+ <service name="ReplyToService" style="document" parameter-style="wrapped" endpoint="org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.ReplyTo">
+ <operation name="sayHelloResponse" one-way="true">
+ <parameter type="java.lang.String" xml-name="result"/>
+ </operation>
+ <operation name="getLastMessage" one-way="false" return-xml-name="result"/>
+ </service>
+ <namespaces target-namespace="http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto" type-namespace="http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto/types"/>
+ <mapping file="replyto-jaxrpc-mapping.xml"/>
+ <webservices servlet-link="ReplyToService"/>
+ </java-wsdl>
+</configuration>
Property changes on: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 1 month
- 1
- 0
JBossWS SVN: r5303 - legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/ant-import.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2007-12-13 09:28:36 -0500 (Thu, 13 Dec 2007)
New Revision: 5303
Modified:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/ant-import/build-samples-jaxrpc.xml
Log:
Reverted changes to update with new JIRA ID
Modified: legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/ant-import/build-samples-jaxrpc.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-12-13 14:19:32 UTC (rev 5302)
+++ legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-12-13 14:28:36 UTC (rev 5303)
@@ -525,55 +525,6 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
-
- <!-- jaxrpc-samples-wsaddr-hello.war -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-hello.war"
- webxml="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-replyto.war"
- webxml="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.class"/>
- </classes>
- <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF">
- <include name="replyto-jaxrpc-mapping.xml"/>
- <include name="webservices.xml"/>
- <include name="wsdl/**"/>
- </webinf>
- </war>
- <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-hello-client.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/>
- <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/>
- </fileset>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/META-INF">
- <include name="application-client.xml"/>
- <include name="jboss-client.xml"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF">
- <include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF">
- <include name="replyto-jaxrpc-mapping.xml"/>
- <include name="wsdl/**"/>
- </metainf>
- </jar>
<!-- jaxrpc-samples-wsbpel -->
<war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
17 years, 1 month
- 1
- 0
JBossWS SVN: r5302 - in stack/native/trunk/src: main/java/org/jboss/ws/core/server and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-12-13 09:19:32 -0500 (Thu, 13 Dec 2007)
New Revision: 5302
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractOneWayTest.properties
stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractReqResTest.properties
Log:
replacing endpoints emulator with real RM enabled endpoints
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-12-13 14:12:51 UTC (rev 5301)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-12-13 14:19:32 UTC (rev 5302)
@@ -418,7 +418,8 @@
// R2714 For one-way operations, an INSTANCE MUST NOT return a HTTP response that contains a SOAP envelope.
// Specifically, the HTTP response entity-body must be empty.
- if (opMetaData.isOneWay())
+ boolean isWsrmMessage = msgContext.get(RMConstant.RESPONSE_CONTEXT) != null;
+ if (opMetaData.isOneWay() && (false == isWsrmMessage))
{
resMessage.getSOAPPart().setContent(null);
return resMessage;
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-12-13 14:12:51 UTC (rev 5301)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2007-12-13 14:19:32 UTC (rev 5302)
@@ -62,6 +62,8 @@
import org.jboss.ws.core.soap.MessageContextAssociation;
import org.jboss.ws.core.soap.SOAPBodyImpl;
import org.jboss.ws.core.soap.SOAPMessageImpl;
+import org.jboss.ws.extensions.wsrm.RMConstant;
+import org.jboss.ws.extensions.wsrm.server.RMInvocationHandler;
import org.jboss.ws.extensions.xop.XOPContext;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
import org.jboss.ws.metadata.umdm.OperationMetaData;
@@ -255,7 +257,7 @@
msgContext.setMessageAbstraction(resMessage);
}
- if (oneway == false)
+ if ((oneway == false) || (msgContext.get(RMConstant.RESPONSE_CONTEXT) != null)) // RM hack
{
// call the response handler chain, removing the fault type entry will not call handleFault for that chain
handlersPass = callResponseHandlerChain(sepMetaData, handlerType[2]);
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java 2007-12-13 14:12:51 UTC (rev 5301)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/common/RMHelper.java 2007-12-13 14:19:32 UTC (rev 5302)
@@ -82,7 +82,7 @@
}
}
- public static RMServerSequence getServerSequence(String seqId, List<RMServerSequence> sequences)
+ public static RMServerSequence getServerSequenceByInboundId(String seqId, List<RMServerSequence> sequences)
{
for (RMServerSequence seq : sequences)
{
@@ -95,20 +95,17 @@
return null;
}
- public static AddressingProperties createAddressingProperties(AddressingProperties reqAddrProps, List<QName> rmMessages)
+ public static RMServerSequence getServerSequenceByOutboundId(String seqId, List<RMServerSequence> sequences)
{
- AddressingProperties retVal = null;
-
- if (rmMessages.contains(rmConstants.getCreateSequenceQName()))
+ for (RMServerSequence seq : sequences)
{
- String wsaTo = reqAddrProps.getReplyTo().getAddress().getURI().toString();
- retVal = AddressingClientUtil.createDefaultProps(RMConstant.CREATE_SEQUENCE_RESPONSE_WSA_ACTION, wsaTo);
- retVal.setMessageID(null);
- AddressingBuilder addrBuilder = AddressingBuilder.getAddressingBuilder();
- retVal.setRelatesTo(new Relationship[] {addrBuilder.newRelationship(addrBuilder.newURI(reqAddrProps.getMessageID().getURI()).getURI())});
+ if (seq.getOutboundId().equals(seqId))
+ {
+ return seq;
+ }
}
- return retVal;
+ return null;
}
public static boolean isCreateSequence(Map<String, Object> rmMsgContext)
@@ -129,6 +126,18 @@
return protocolMessages.contains(rmConstants.getTerminateSequenceQName());
}
+ public static boolean isSequence(Map<String, Object> rmMsgContext)
+ {
+ List<QName> protocolMessages = (List<QName>)rmMsgContext.get(RMConstant.PROTOCOL_MESSAGES);
+ return protocolMessages.contains(rmConstants.getSequenceQName());
+ }
+
+ public static boolean isSequenceAcknowledgement(Map<String, Object> rmMsgContext)
+ {
+ List<QName> protocolMessages = (List<QName>)rmMsgContext.get(RMConstant.PROTOCOL_MESSAGES);
+ return protocolMessages.contains(rmConstants.getSequenceAcknowledgementQName());
+ }
+
public static Duration stringToDuration(String s)
{
return factory.newDuration(s);
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java 2007-12-13 14:12:51 UTC (rev 5301)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/jaxws/RMHandler.java 2007-12-13 14:19:32 UTC (rev 5302)
@@ -228,16 +228,16 @@
// try to serialize SequenceAcknowledgement to message
RMSequenceAcknowledgement sequenceAcknowledgement = rmFactory.newSequenceAcknowledgement();
sequenceAcknowledgement.setIdentifier(sequenceImpl.getInboundId());
- Iterator<Long> receivedInboudMessages = sequenceImpl.getReceivedInboundMessages().iterator();
- if (false == receivedInboudMessages.hasNext())
+ Iterator<Long> receivedMessages = sequenceImpl.getReceivedInboundMessages().iterator();
+ if (false == receivedMessages.hasNext())
{
sequenceAcknowledgement.setNone();
}
else
{
- while (receivedInboudMessages.hasNext())
+ while (receivedMessages.hasNext())
{
- long messageNo = receivedInboudMessages.next();
+ long messageNo = receivedMessages.next();
RMSequenceAcknowledgement.RMAcknowledgementRange range = sequenceAcknowledgement.newAcknowledgementRange();
range.setLower(messageNo);
range.setUpper(messageNo);
@@ -249,7 +249,7 @@
log.debug(msgQName.getLocalPart() + " WSRM message was serialized to payload");
}
- if (data.size() == 0)
+ if ((outMsgs.size() != 0) && (data.size() == 0))
throw new RMException("RM handler did not serialize WS-RM message to the payload");
// TODO: implement SequenceFault serialization
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-13 14:12:51 UTC (rev 5301)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMInvocationHandler.java 2007-12-13 14:19:32 UTC (rev 5302)
@@ -21,26 +21,32 @@
*/
package org.jboss.ws.extensions.wsrm.server;
+import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import javax.xml.namespace.QName;
+import javax.xml.ws.addressing.AddressingBuilder;
import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.addressing.JAXWSAConstants;
+import javax.xml.ws.addressing.Relationship;
+import javax.xml.ws.handler.MessageContext.Scope;
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.soap.MessageContextAssociation;
+import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl;
import org.jboss.ws.extensions.wsrm.RMConstant;
import org.jboss.ws.extensions.wsrm.api.RMException;
-import org.jboss.ws.extensions.wsrm.api.RMSequence;
import org.jboss.ws.extensions.wsrm.common.RMHelper;
import org.jboss.ws.extensions.wsrm.spi.RMConstants;
import org.jboss.ws.extensions.wsrm.spi.RMProvider;
import org.jboss.ws.extensions.wsrm.spi.protocol.RMCloseSequence;
+import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequence;
+import org.jboss.ws.extensions.wsrm.spi.protocol.RMSequenceAcknowledgement;
import org.jboss.ws.extensions.wsrm.spi.protocol.RMSerializable;
import org.jboss.ws.extensions.wsrm.spi.protocol.RMTerminateSequence;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -102,11 +108,11 @@
Map<String, Object> rmReqProps = (Map<String, Object>)msgContext.get(RMConstant.REQUEST_CONTEXT);
if (rmReqProps == null)
throw new RMException("WS-RM specific data not found in server request");
- Map<String, Object> rmResProps = new HashMap<String, Object>();
List<QName> protocolMessages = new LinkedList<QName>();
Map<String, Object> rmResponseContext = new HashMap<String, Object>();
- AddressingProperties respAddrProps = null;
List<RMServerSequence> sequences = (List<RMServerSequence>)ep.getAttachment(RMServerSequence.class);
+ rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES, protocolMessages);
+ msgContext.remove(RMConstant.RESPONSE_CONTEXT);
RMServerSequence sequence = null;
if (RMHelper.isCreateSequence(rmReqProps))
@@ -114,9 +120,7 @@
sequence = new RMServerSequence();
sequences.add(sequence);
protocolMessages.add(rmConstants.getCreateSequenceResponseQName());
- rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES, protocolMessages);
rmResponseContext.put(RMConstant.SEQUENCE_REFERENCE, sequence);
- msgContext.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext);
}
if (RMHelper.isCloseSequence(rmReqProps))
@@ -124,40 +128,94 @@
Map<QName, RMSerializable> data = (Map<QName, RMSerializable>)rmReqProps.get(RMConstant.PROTOCOL_MESSAGES_MAPPING);
RMCloseSequence payload = (RMCloseSequence)data.get(rmConstants.getCloseSequenceQName());
String seqIdentifier = payload.getIdentifier();
- sequence = RMHelper.getServerSequence(seqIdentifier, sequences);
+ sequence = RMHelper.getServerSequenceByInboundId(seqIdentifier, sequences);
if (sequence == null)
{
- throw new NotImplementedException("TODO: implement unknown sequence fault generation");
+ throw new NotImplementedException("TODO: implement unknown sequence fault" + seqIdentifier);
}
sequence.close();
protocolMessages.add(rmConstants.getCloseSequenceResponseQName());
protocolMessages.add(rmConstants.getSequenceAcknowledgementQName());
- rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES, protocolMessages);
rmResponseContext.put(RMConstant.SEQUENCE_REFERENCE, sequence);
- msgContext.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext);
}
+ if (RMHelper.isSequenceAcknowledgement(rmReqProps))
+ {
+ Map<QName, RMSerializable> data = (Map<QName, RMSerializable>)rmReqProps.get(RMConstant.PROTOCOL_MESSAGES_MAPPING);
+ RMSequenceAcknowledgement payload = (RMSequenceAcknowledgement)data.get(rmConstants.getSequenceAcknowledgementQName());
+ String seqIdentifier = payload.getIdentifier();
+ sequence = RMHelper.getServerSequenceByOutboundId(seqIdentifier, sequences);
+ if (sequence == null)
+ {
+ throw new NotImplementedException("TODO: implement unknown sequence fault" + seqIdentifier);
+ }
+
+ for (RMSequenceAcknowledgement.RMAcknowledgementRange range : payload.getAcknowledgementRanges())
+ {
+ for (long i = range.getLower(); i <= range.getUpper(); i++)
+ {
+ sequence.addReceivedOutboundMessage(i);
+ }
+ }
+ }
+
if (RMHelper.isTerminateSequence(rmReqProps))
{
Map<QName, RMSerializable> data = (Map<QName, RMSerializable>)rmReqProps.get(RMConstant.PROTOCOL_MESSAGES_MAPPING);
RMTerminateSequence payload = (RMTerminateSequence)data.get(rmConstants.getTerminateSequenceQName());
String seqIdentifier = payload.getIdentifier();
- sequence = RMHelper.getServerSequence(seqIdentifier, sequences);
+ sequence = RMHelper.getServerSequenceByInboundId(seqIdentifier, sequences);
if (sequence == null)
{
- throw new NotImplementedException("TODO: implement unknown sequence fault generation");
+ throw new NotImplementedException("TODO: implement unknown sequence fault" + seqIdentifier);
}
sequences.remove(sequence);
protocolMessages.add(rmConstants.getTerminateSequenceResponseQName());
protocolMessages.add(rmConstants.getSequenceAcknowledgementQName());
- rmResponseContext.put(RMConstant.PROTOCOL_MESSAGES, protocolMessages);
rmResponseContext.put(RMConstant.SEQUENCE_REFERENCE, sequence);
- msgContext.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext);
}
+
+ if (RMHelper.isSequence(rmReqProps))
+ {
+ Map<QName, RMSerializable> data = (Map<QName, RMSerializable>)rmReqProps.get(RMConstant.PROTOCOL_MESSAGES_MAPPING);
+ RMSequence payload = (RMSequence)data.get(rmConstants.getSequenceQName());
+ String seqIdentifier = payload.getIdentifier();
+ sequence = RMHelper.getServerSequenceByInboundId(seqIdentifier, sequences);
+ if (sequence == null)
+ {
+ throw new NotImplementedException("TODO: implement unknown sequence fault" + seqIdentifier);
+ }
+
+ sequence.addReceivedInboundMessage(payload.getMessageNumber());
+ protocolMessages.add(rmConstants.getSequenceAcknowledgementQName());
+ rmResponseContext.put(RMConstant.SEQUENCE_REFERENCE, sequence);
- // TODO: implement
+ boolean retTypeIsVoid = inv.getJavaMethod().getReturnType().equals(Void.class) || inv.getJavaMethod().getReturnType().equals(Void.TYPE);
+ if (false == retTypeIsVoid)
+ {
+ protocolMessages.add(rmConstants.getSequenceQName());
+ protocolMessages.add(rmConstants.getAckRequestedQName());
+ }
+ else
+ {
+ AddressingBuilder builder = AddressingBuilder.getAddressingBuilder();
+ AddressingProperties addressingProps = builder.newAddressingProperties();
+ addressingProps.setTo(builder.newURI(addrProps.getReplyTo().getAddress().getURI()));
+ addressingProps.setRelatesTo(new Relationship[] {builder.newRelationship(addrProps.getMessageID().getURI())});
+ try
+ {
+ addressingProps.setAction(builder.newURI(RMConstant.SEQUENCE_ACKNOWLEDGEMENT_WSA_ACTION));
+ }
+ catch (URISyntaxException ignore)
+ {
+ }
+ msgContext.put(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND, addressingProps);
+ }
+ }
+
+ msgContext.put(RMConstant.RESPONSE_CONTEXT, rmResponseContext);
}
/**
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java 2007-12-13 14:12:51 UTC (rev 5301)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/wsrm/server/RMServerSequence.java 2007-12-13 14:19:32 UTC (rev 5302)
@@ -23,7 +23,10 @@
import java.util.Set;
import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import org.jboss.logging.Logger;
import org.jboss.ws.extensions.addressing.AddressingClientUtil;
import org.jboss.ws.extensions.wsrm.RMSequenceIface;
@@ -36,24 +39,22 @@
*/
public class RMServerSequence implements RMSequenceIface
{
+ private static final Logger logger = Logger.getLogger(RMServerSequence.class);
private final String inboundId = AddressingClientUtil.generateMessageID().toString();
private final String outboundId = AddressingClientUtil.generateMessageID().toString();
private final long duration = 10 * 60 * 1000L; // 10 minutes duration
- private final Set receivedInboundMessages = new TreeSet<Long>();
+ private final Set<Long> acknowledgedOutboundMessages = new TreeSet<Long>();
+ private final Set<Long> receivedInboundMessages = new TreeSet<Long>();
private boolean closed;
+ private AtomicBoolean inboundMessageAckRequested = new AtomicBoolean();
+ private AtomicLong messageNumber = new AtomicLong();
public String getInboundId()
{
return this.inboundId;
}
- public long getLastMessageNumber()
- {
- // TODO Auto-generated method stub
- return 0;
- }
-
public long getDuration()
{
return this.duration;
@@ -64,17 +65,46 @@
return this.outboundId;
}
- public Set<Long> getReceivedInboundMessages()
+ public final void addReceivedInboundMessage(long messageId)
{
- return this.receivedInboundMessages;
+ this.receivedInboundMessages.add(messageId);
+ logger.debug("Inbound Sequence: " + this.inboundId + ", received message no. " + messageId);
}
- public long newMessageNumber()
+ public final void addReceivedOutboundMessage(long messageId)
{
- // TODO Auto-generated method stub
- return 0;
+ this.acknowledgedOutboundMessages.add(messageId);
+ logger.debug("Outbound Sequence: " + this.outboundId + ", message no. " + messageId + " acknowledged by server");
}
+ public final void ackRequested(boolean requested)
+ {
+ this.inboundMessageAckRequested.set(requested);
+ logger.debug("Inbound Sequence: " + this.inboundId + ", ack requested. Messages in the queue: " + this.receivedInboundMessages);
+ }
+
+ public final long newMessageNumber()
+ {
+ // no need for synchronization
+ return this.messageNumber.incrementAndGet();
+ }
+
+ public final long getLastMessageNumber()
+ {
+ // no need for synchronization
+ return this.messageNumber.get();
+ }
+
+ public final boolean isAckRequested()
+ {
+ return this.inboundMessageAckRequested.get();
+ }
+
+ public Set<Long> getReceivedInboundMessages()
+ {
+ return this.receivedInboundMessages;
+ }
+
public void close()
{
this.closed = true;
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java 2007-12-13 14:12:51 UTC (rev 5301)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceIface.java 2007-12-13 14:19:32 UTC (rev 5302)
@@ -6,8 +6,6 @@
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.Style;
import javax.xml.ws.addressing.Action;
import javax.xml.ws.AsyncHandler;
@@ -16,7 +14,6 @@
import org.jboss.ws.annotation.EndpointConfig;
@WebService(name = "ReqRes", targetNamespace = "http://org.jboss.ws/jaxws/wsrm")
-@SOAPBinding(style = Style.RPC)
@EndpointConfig
(
configName = "Standard WSRM Client",
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-12-13 14:12:51 UTC (rev 5301)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/ReqResServiceImpl.java 2007-12-13 14:19:32 UTC (rev 5302)
@@ -4,8 +4,6 @@
import javax.jws.WebParam;
import javax.jws.WebResult;
import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.Style;
import javax.xml.ws.addressing.Action;
import org.jboss.logging.Logger;
@@ -20,10 +18,6 @@
serviceName = "ReqResService",
targetNamespace = "http://org.jboss.ws/jaxws/wsrm"
)
-@SOAPBinding
-(
- style = Style.RPC
-)
@PolicyAttachment
(
@Policy
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-13 14:12:51 UTC (rev 5301)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/oneway/RMAbstractOneWayTest.java 2007-12-13 14:19:32 UTC (rev 5302)
@@ -46,7 +46,6 @@
public abstract class RMAbstractOneWayTest extends JBossWSTest
{
private static final Properties props = new Properties();
- private final boolean emulatorOn = Boolean.parseBoolean((String)props.get("emulator"));
private final String serviceURL = "http://" + getServerHost() + ":" + props.getProperty("port") + props.getProperty("path");
private String targetNS = "http://wsrm.jaxws.ws.test.jboss.org/";
@@ -82,23 +81,14 @@
public void testOneWayMethods() throws Exception
{
- if (true) return; // disable WS-RM tests - they cause regression in hudson
-
- RMSequence sequence = null;
- if (emulatorOn)
- {
- sequence = ((RMProvider)proxy).createSequence(isClientAddressable());
- }
+ RMSequence sequence = ((RMProvider)proxy).createSequence(isClientAddressable());
setAddrProps(proxy, "http://useless/action1", serviceURL);
proxy.method1();
setAddrProps(proxy, "http://useless/action2", serviceURL);
proxy.method2("Hello World");
setAddrProps(proxy, "http://useless/action3", serviceURL);
proxy.method3(new String[] {"Hello","World"});
- if (emulatorOn)
- {
- sequence.close();
- }
+ sequence.close();
}
public static String getClasspath()
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2007-12-13 14:12:51 UTC (rev 5301)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/wsrm/reqres/RMAbstractReqResTest.java 2007-12-13 14:19:32 UTC (rev 5302)
@@ -57,7 +57,6 @@
private static final String TARGET_NS = "http://org.jboss.ws/jaxws/wsrm";
private static final Properties props = new Properties();
private final String serviceURL = "http://" + getServerHost() + ":" + props.getProperty("port") + props.getProperty("path");
- private final boolean emulatorOn = Boolean.parseBoolean((String)props.get("emulator"));
private Exception handlerException;
private boolean asyncHandlerCalled;
private ReqResServiceIface proxy;
@@ -173,23 +172,14 @@
private void doReliableMessageExchange(Object proxyObject, InvocationType invocationType) throws Exception
{
- if (true) return; // disable WS-RM tests - they cause regression in hudson
-
- RMSequence sequence = null;
- if (emulatorOn)
- {
- sequence = ((RMProvider)proxyObject).createSequence(isClientAddressable());
- }
+ RMSequence sequence = ((RMProvider)proxyObject).createSequence(isClientAddressable());
setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
setAddrProps(proxy, "http://useless/action", serviceURL);
invokeWebServiceMethod(invocationType);
- if (emulatorOn)
- {
- sequence.close();
- }
+ sequence.close();
}
public static String getClasspath()
Modified: stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractOneWayTest.properties
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractOneWayTest.properties 2007-12-13 14:12:51 UTC (rev 5301)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractOneWayTest.properties 2007-12-13 14:19:32 UTC (rev 5302)
@@ -1,7 +1,5 @@
port=8080
-#path=/jaxws-wsrm/OneWayService
-path=/jaxws-wsrm-one-way-emulator/OneWayService
-#archives=jaxws-wsrm.war, jaxws-wsrm-client.jar
-archives=jaxws-wsrm-one-way-emulator.war, jaxws-wsrm-client.jar
-emulator=true
-
+path=/jaxws-wsrm/OneWayService
+#path=/jaxws-wsrm-one-way-emulator/OneWayService
+archives=jaxws-wsrm.war, jaxws-wsrm-client.jar
+#archives=jaxws-wsrm-one-way-emulator.war, jaxws-wsrm-client.jar
Modified: stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractReqResTest.properties
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractReqResTest.properties 2007-12-13 14:12:51 UTC (rev 5301)
+++ stack/native/trunk/src/test/resources/jaxws/wsrm/properties/RMAbstractReqResTest.properties 2007-12-13 14:19:32 UTC (rev 5302)
@@ -1,7 +1,5 @@
port=8080
-#path=/jaxws-wsrm/ReqResService
-path=/jaxws-wsrm-req-res-emulator/ReqResService
-#archives=jaxws-wsrm.war, jaxws-wsrm-client.jar
-archives=jaxws-wsrm-req-res-emulator.war, jaxws-wsrm-client.jar
-emulator=true
-
+path=/jaxws-wsrm/ReqResService
+#path=/jaxws-wsrm-req-res-emulator/ReqResService
+archives=jaxws-wsrm.war, jaxws-wsrm-client.jar
+#archives=jaxws-wsrm-req-res-emulator.war, jaxws-wsrm-client.jar
17 years, 1 month
- 1
- 0
JBossWS SVN: r5301 - in stack/native/trunk: src/main/java/org/jboss/ws/metadata/builder and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2007-12-13 09:12:51 -0500 (Thu, 13 Dec 2007)
New Revision: 5301
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java
stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/
stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/
stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/
stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml
stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml
stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/
stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml
stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml
stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml
stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/
stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/
stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml
stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml
stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml
Modified:
stack/native/trunk/ant-import-tests/build-samples-jaxrpc.xml
stack/native/trunk/ant-import-tests/build-testsuite.xml
stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
Log:
[JBWS-1937] Document/Literal addressing endpoint fails when retrieving Outbound Action
Modified: stack/native/trunk/ant-import-tests/build-samples-jaxrpc.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-samples-jaxrpc.xml 2007-12-13 13:47:56 UTC (rev 5300)
+++ stack/native/trunk/ant-import-tests/build-samples-jaxrpc.xml 2007-12-13 14:12:51 UTC (rev 5301)
@@ -578,6 +578,55 @@
<include name="jaxrpc-mapping.xml"/>
</metainf>
</jar>
+
+ <!-- jaxrpc-samples-wsaddr-hello.war -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-hello.war"
+ webxml="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-replyto.war"
+ webxml="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF">
+ <include name="replyto-jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${tests.output.dir}/libs/jaxrpc-samples-wsaddr-hello-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/hello/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF">
+ <include name="replyto-jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
<!-- jaxrpc-samples-wsbpel -->
<war warfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-testsuite.xml 2007-12-13 13:47:56 UTC (rev 5300)
+++ stack/native/trunk/ant-import-tests/build-testsuite.xml 2007-12-13 14:12:51 UTC (rev 5301)
@@ -145,11 +145,19 @@
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${tests.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/hello/wstools-config.xml"/>
+ <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/wstools-config.xml"/>
<wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/>
<move todir="${tests.output.dir}/wstools/java">
<fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/>
</move>
+ <move todir="${tests.output.dir}/wstools/java">
+ <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" includes="org/**"/>
+ </move>
+ <move todir="${tests.output.dir}/wstools/java">
+ <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/>
+ </move>
<!-- Copy generated resources -->
<copy todir="${tests.output.dir}/resources">
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-12-13 13:47:56 UTC (rev 5300)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-12-13 14:12:51 UTC (rev 5301)
@@ -481,7 +481,14 @@
else
{
WSDLProperty messageName = wsdlOperation.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_IN);
- addrExt.setInboundAction(tns + "/" + portTypeName + "/" + messageName);
+ if (messageName != null)
+ {
+ addrExt.setInboundAction(tns + "/" + portTypeName + "/" + messageName.getValue());
+ }
+ else
+ {
+ addrExt.setInboundAction(tns + "/" + portTypeName + "/IN");
+ }
}
// outbound action
@@ -493,7 +500,14 @@
else
{
WSDLProperty messageName = wsdlOperation.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_OUT);
- addrExt.setOutboundAction(tns + "/" + portTypeName + "/" + messageName);
+ if (messageName != null)
+ {
+ addrExt.setOutboundAction(tns + "/" + portTypeName + "/" + messageName.getValue());
+ }
+ else
+ {
+ addrExt.setOutboundAction(tns + "/" + portTypeName + "/OUT");
+ }
}
opMetaData.addExtension(addrExt);
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java 2007-12-13 14:12:51 UTC (rev 5301)
@@ -0,0 +1,107 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto;
+
+// $Id$
+
+import java.io.ByteArrayInputStream;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.Service;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPConnection;
+import javax.xml.soap.SOAPConnectionFactory;
+import javax.xml.soap.SOAPMessage;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test endpoint using ws-addressing
+ *
+ * @author mageshbk(a)jboss.com
+ * @since 12-Dec-2007
+ */
+public class AddressingReplyToTestCase extends JBossWSTest
+{
+ private static Hello initial;
+ private static ReplyTo replyto;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(AddressingReplyToTestCase.class,
+ "jaxrpc-samples-wsaddr-hello.war, jaxrpc-samples-wsaddr-replyto.war," +
+ "jaxrpc-samples-wsaddr-hello-client.jar");
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ if (initial == null)
+ {
+ Service replytoService = (Service)getInitialContext("jaxrpc-addressing-replyto-client").lookup("java:comp/env/service/ReplyToService");
+ replyto = (ReplyTo)replytoService.getPort(ReplyTo.class);
+ Service initialService = (Service)getInitialContext("jaxrpc-addressing-replyto-client").lookup("java:comp/env/service/HelloService");
+ initial = (Hello)initialService.getPort(Hello.class);
+ }
+ }
+
+ /** This sends a valid message to the ReplyTo endpoint and verfies whether we can read it of again.
+ */
+ public void testReplyToMessage() throws Exception
+ {
+ String reqEnv =
+ "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ " <env:Header/>" +
+ " <env:Body>" +
+ " <ns1:sayHelloResponse xmlns:ns1='http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto/types'>" +
+ " <result>ReplyTo</result>" +
+ " </ns1:sayHelloResponse>" +
+ " </env:Body>" +
+ "</env:Envelope>";
+
+ MessageFactory msgFactory = MessageFactory.newInstance();
+ SOAPConnection con = SOAPConnectionFactory.newInstance().createConnection();
+ SOAPMessage reqMsg = msgFactory.createMessage(null, new ByteArrayInputStream(reqEnv.getBytes()));
+
+ URL epURL = new URL("http://" + getServerHost() + ":8080/jaxrpc-samples-wsaddr-replyto");
+ con.call(reqMsg, epURL);
+
+ assertEquals("ReplyTo", replyto.getLastMessage());
+ }
+
+ public void testInital() throws Exception
+ {
+ String message = initial.sayHello("Addressing TestCase");
+ assertNull("Expected null, but was: " + message, message);
+ }
+
+ public void testReplyTo() throws Exception
+ {
+ String message = replyto.getLastMessage();
+ assertEquals("Hello Addressing TestCase", message);
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java 2007-12-13 14:12:51 UTC (rev 5301)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.handler.GenericHandler;
+import javax.xml.rpc.handler.MessageContext;
+
+import javax.xml.ws.addressing.AddressingBuilder;
+import javax.xml.ws.addressing.EndpointReference;
+import javax.xml.ws.addressing.JAXWSAConstants;
+import javax.xml.ws.addressing.soap.SOAPAddressingBuilder;
+import javax.xml.ws.addressing.soap.SOAPAddressingProperties;
+
+import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC;
+
+
+import org.jboss.logging.Logger;
+
+/**
+ * A client side handler for the ws-addressing
+ *
+ * @author mageshbk(a)jboss.com
+ * @since 12-Dec-2007
+ */
+public class ClientHandler extends GenericHandler
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(ClientHandler.class);
+ protected QName[] headers;
+
+ public boolean handleRequest(MessageContext context)
+ {
+ log.info("enter handleRequest");
+
+ try
+ {
+ AddressingBuilder builder = SOAPAddressingBuilder.getAddressingBuilder();
+ SOAPAddressingProperties outProps = (SOAPAddressingProperties)builder.newAddressingProperties();
+ outProps.setTo(builder.newURI("http://localhost:8080/jaxrpc-samples-wsaddr-hello"));
+ outProps.setAction(builder.newURI("http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto/sayHello"));
+ EndpointReference rp = builder.newEndpointReference(new URI("http://localhost:8080/jaxrpc-samples-wsaddr-replyto"));
+ outProps.setReplyTo(rp);
+ outProps.setMessageID(builder.newURI("123456"));
+ context.setProperty(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, outProps);
+ }
+ catch(URISyntaxException e)
+ {
+ e.printStackTrace();
+ }
+ log.info("exit handleRequest");
+ return true;
+ }
+
+ public QName[] getHeaders()
+ {
+ return headers;
+ }
+
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java 2007-12-13 14:12:51 UTC (rev 5301)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ * JAXRPC WS-Addressing service endpoint interface
+ *
+ * @author mageshbk(a)jboss.com
+ *
+ * @since 12-Dec-2007
+ */
+public interface Hello extends Remote
+{
+ String sayHello(String str) throws RemoteException;
+}
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java 2007-12-13 14:12:51 UTC (rev 5301)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto;
+
+import org.jboss.logging.Logger;
+
+/**
+ * JAXRPC WS-Addressing service endpoint
+ *
+ * @author mageshbk(a)jboss.com
+ *
+ * @since 12-Dec-2007
+ */
+public class HelloEndpointJSE implements Hello
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(HelloEndpointJSE.class);
+
+ public String sayHello(String str)
+ {
+ log.info("sayHello: " + str);
+ return "Hello " + str;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java 2007-12-13 14:12:51 UTC (rev 5301)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ * JAXRPC WS-Addressing service endpoint interface
+ *
+ * @author mageshbk(a)jboss.com
+ *
+ * @since 12-Dec-2007
+ */
+public interface ReplyTo extends Remote
+{
+ void sayHelloResponse(String str) throws RemoteException;
+
+ String getLastMessage() throws RemoteException;
+}
\ No newline at end of file
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java 2007-12-13 14:12:51 UTC (rev 5301)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto;
+
+import org.jboss.logging.Logger;
+
+/**
+ * JAXRPC WS-Addressing service endpoint
+ *
+ * @author mageshbk(a)jboss.com
+ *
+ * @since 12-Dec-2007
+ */
+public class ReplyToEndpointJSE implements ReplyTo
+{
+ // Provide logging
+ private static Logger log = Logger.getLogger(ReplyToEndpointJSE.class);
+
+ private static String lastMessage;
+
+ public void sayHelloResponse(String str)
+ {
+ log.info("sayHelloResponse: " + str);
+ lastMessage = str;
+ }
+
+ public String getLastMessage()
+ {
+ log.info("getLastMessage: " + lastMessage);
+ return lastMessage;
+ }
+}
Property changes on: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml 2007-12-13 14:12:51 UTC (rev 5301)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+ version="1.4">
+
+ <display-name>HelloService</display-name>
+
+ <service-ref>
+ <service-ref-name>service/HelloService</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/HelloService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.Hello</service-endpoint-interface>
+ </port-component-ref>
+ <handler>
+ <handler-name>ClientHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.ClientHandler</handler-class>
+ </handler>
+ <handler>
+ <handler-name>WSAddressingHandler</handler-name>
+ <handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingClientHandler</handler-class>
+ </handler>
+ </service-ref>
+
+ <service-ref>
+ <service-ref-name>service/ReplyToService</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/ReplyToService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/replyto-jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.ReplyTo</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Property changes on: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml 2007-12-13 14:12:51 UTC (rev 5301)
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
+<jboss-client>
+ <jndi-name>jaxrpc-addressing-replyto-client</jndi-name>
+
+ <service-ref>
+ <service-ref-name>service/HelloService</service-ref-name>
+ <config-name>Standard WSAddressing Client</config-name>
+ <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-wsaddr-hello?wsdl</wsdl-override>
+ </service-ref>
+
+ <service-ref>
+ <service-ref-name>service/ReplyToService</service-ref-name>
+ <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-samples-wsaddr-replyto?wsdl</wsdl-override>
+ </service-ref>
+</jboss-client>
Property changes on: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/META-INF/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml 2007-12-13 14:12:51 UTC (rev 5301)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<jboss-web>
+ <context-root>/jaxrpc-samples-wsaddr-hello</context-root>
+</jboss-web>
Property changes on: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml 2007-12-13 14:12:51 UTC (rev 5301)
@@ -0,0 +1,24 @@
+<?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">
+
+ <context-param>
+ <param-name>jbossws-config-name</param-name>
+ <param-value>Standard WSAddressing Endpoint</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>HelloService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.HelloEndpointJSE</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>HelloService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Property changes on: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml 2007-12-13 14:12:51 UTC (rev 5301)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../output/classes -config wstools-config.xml
+-->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+ <java-wsdl>
+ <service name="HelloService" style="document" endpoint="org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.Hello">
+ <operation name="sayHello" one-way="false" return-xml-name="result">
+ <parameter type="java.lang.String" xml-name="String_1"/>
+ </operation>
+ </service>
+ <namespaces target-namespace="http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto" type-namespace="http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="HelloService"/>
+ </java-wsdl>
+</configuration>
Property changes on: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/hello/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml 2007-12-13 14:12:51 UTC (rev 5301)
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<jboss-web>
+ <context-root>/jaxrpc-samples-wsaddr-replyto</context-root>
+</jboss-web>
Property changes on: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml 2007-12-13 14:12:51 UTC (rev 5301)
@@ -0,0 +1,19 @@
+<?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>ReplyToService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.ReplyToEndpointJSE</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>ReplyToService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Property changes on: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml 2007-12-13 14:12:51 UTC (rev 5301)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../output/classes -config wstools-config.xml
+-->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+ <java-wsdl>
+ <service name="ReplyToService" style="document" parameter-style="wrapped" endpoint="org.jboss.test.ws.jaxrpc.samples.wsaddr.replyto.ReplyTo">
+ <operation name="sayHelloResponse" one-way="true">
+ <parameter type="java.lang.String" xml-name="result"/>
+ </operation>
+ <operation name="getLastMessage" one-way="false" return-xml-name="result"/>
+ </service>
+ <namespaces target-namespace="http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto" type-namespace="http://org.jboss.ws/jaxrpc/samples/wsaddr/replyto/types"/>
+ <mapping file="replyto-jaxrpc-mapping.xml"/>
+ <webservices servlet-link="ReplyToService"/>
+ </java-wsdl>
+</configuration>
Property changes on: stack/native/trunk/src/test/resources/jaxrpc/samples/wsaddr/replyto/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 1 month
- 1
- 0
JBossWS SVN: r5300 - in legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src: resources/jaxrpc/samples and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2007-12-13 08:47:56 -0500 (Thu, 13 Dec 2007)
New Revision: 5300
Removed:
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples-override/wsaddr/
legacy/branches/jbossws-1.2.1.GA_CP/jbossws-tests/src/resources/jaxrpc/samples/wsaddr/
Log:
Reverted changes to update with new JIRA ID
17 years, 1 month
- 1
- 0
JBossWS SVN: r5299 - framework/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-13 07:19:59 -0500 (Thu, 13 Dec 2007)
New Revision: 5299
Modified:
framework/trunk/ant-import/build-hudson.xml
Log:
-Djava.awt.headless=true
Modified: framework/trunk/ant-import/build-hudson.xml
===================================================================
--- framework/trunk/ant-import/build-hudson.xml 2007-12-13 12:02:17 UTC (rev 5298)
+++ framework/trunk/ant-import/build-hudson.xml 2007-12-13 12:19:59 UTC (rev 5299)
@@ -132,7 +132,7 @@
<mkdir dir="${framework.dir}/output"/>
<exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${framework.dir}/output/hudson.log">
- <env key="CATALINA_OPTS" value="-Xmx512m"/>
+ <env key="CATALINA_OPTS" value="-Xmx512m -Djava.awt.headless=true"/>
<arg line="start"/>
</exec>
17 years, 1 month
- 1
- 0
JBossWS SVN: r5298 - in stack/cxf/trunk/src: test/resources and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-13 07:02:17 -0500 (Thu, 13 Dec 2007)
New Revision: 5298
Modified:
stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
Log:
Fix Provider<MESSAGE>
Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
===================================================================
--- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2007-12-13 11:37:30 UTC (rev 5297)
+++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2007-12-13 12:02:17 UTC (rev 5298)
@@ -85,8 +85,16 @@
MethodDispatcher md = (MethodDispatcher)exchange.get(Service.class).get(MethodDispatcher.class.getName());
Method m = md.getMethod(bop);
- List<Object> paramList = CastUtils.cast((List<?>)o);
- Object[] params = paramList.toArray();
+ Object[] params;
+ if (o instanceof List<?>)
+ {
+ List<Object> paramList = CastUtils.cast((List<?>)o);
+ params = paramList.toArray();
+ }
+ else
+ {
+ params = new Object[]{o};
+ }
Endpoint ep = EndpointAssociation.getEndpoint();
InvocationHandler invHandler = ep.getInvocationHandler();
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2007-12-13 11:37:30 UTC (rev 5297)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss422.txt 2007-12-13 12:02:17 UTC (rev 5298)
@@ -34,7 +34,8 @@
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/httpbinding/**
-org/jboss/test/ws/jaxws/samples/provider/**
+org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
+org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/**
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2007-12-13 11:37:30 UTC (rev 5297)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss423.txt 2007-12-13 12:02:17 UTC (rev 5298)
@@ -34,7 +34,8 @@
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/httpbinding/**
-org/jboss/test/ws/jaxws/samples/provider/**
+org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
+org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/**
Modified: stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt
===================================================================
--- stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-12-13 11:37:30 UTC (rev 5297)
+++ stack/cxf/trunk/src/test/resources/test-excludes-jboss500.txt 2007-12-13 12:02:17 UTC (rev 5298)
@@ -31,7 +31,8 @@
# [CXF-1252] Provider PAYLOAD endpoint expects SOAP Envelope
org/jboss/test/ws/jaxws/samples/httpbinding/**
-org/jboss/test/ws/jaxws/samples/provider/**
+org/jboss/test/ws/jaxws/samples/provider/ProviderJAXBTestCase.*
+org/jboss/test/ws/jaxws/samples/provider/ProviderPayloadTestCase.*
# [CXF-1253] CXF does not respect @HandlerChain on client SEI
org/jboss/test/ws/jaxws/samples/logicalhandler/**
17 years, 1 month
- 1
- 0
JBossWS SVN: r5297 - in framework/trunk/src/test: resources/jaxws/samples/provider and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-12-13 06:37:30 -0500 (Thu, 13 Dec 2007)
New Revision: 5297
Added:
framework/trunk/src/test/resources/jaxws/samples/provider/jaxb/WEB-INF/wsdl/
framework/trunk/src/test/resources/jaxws/samples/provider/jaxb/WEB-INF/wsdl/Provider.wsdl
framework/trunk/src/test/resources/jaxws/samples/provider/message/WEB-INF/wsdl/
framework/trunk/src/test/resources/jaxws/samples/provider/message/WEB-INF/wsdl/Provider.wsdl
framework/trunk/src/test/resources/jaxws/samples/provider/payload/WEB-INF/wsdl/
framework/trunk/src/test/resources/jaxws/samples/provider/payload/WEB-INF/wsdl/Provider.wsdl
Removed:
framework/trunk/src/test/resources/jaxws/samples/provider/shared/
Modified:
framework/trunk/src/test/ant-import/build-jars-jaxws.xml
Log:
Use http:binding
Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2007-12-13 11:37:28 UTC (rev 5296)
+++ framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2007-12-13 11:37:30 UTC (rev 5297)
@@ -168,7 +168,7 @@
<include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/>
<include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF">
<include name="wsdl/Provider.wsdl"/>
</webinf>
</war>
@@ -176,7 +176,7 @@
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF">
<include name="wsdl/Provider.wsdl"/>
</webinf>
</war>
@@ -186,7 +186,7 @@
<include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/>
<include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/>
</classes>
- <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/shared">
+ <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF">
<include name="wsdl/Provider.wsdl"/>
</webinf>
</war>
Added: framework/trunk/src/test/resources/jaxws/samples/provider/jaxb/WEB-INF/wsdl/Provider.wsdl
===================================================================
--- framework/trunk/src/test/resources/jaxws/samples/provider/jaxb/WEB-INF/wsdl/Provider.wsdl (rev 0)
+++ framework/trunk/src/test/resources/jaxws/samples/provider/jaxb/WEB-INF/wsdl/Provider.wsdl 2007-12-13 11:37:30 UTC (rev 5297)
@@ -0,0 +1,44 @@
+<?xml version='1.0'?>
+<definitions name='ProviderService' targetNamespace='http://org.jboss.ws/provider' xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:http='http://schemas.xmlsoap.org/wsdl/http/' xmlns:mime='http://schemas.xmlsoap.org/wsdl/mime/' xmlns:tns='http://org.jboss.ws/provider' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://org.jboss.ws/provider' xmlns:tns='http://org.jboss.ws/provider' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:element name='user' type='tns:UserType'/>
+ <xs:complexType name='UserType'>
+ <xs:sequence>
+ <xs:element name='string' type='xs:string'/>
+ <xs:element name='qname' type='xs:QName'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='echo'>
+ <part element='tns:user' name='user'/>
+ </message>
+ <message name='echoResponse'>
+ <part element='tns:user' name='user'/>
+ </message>
+ <portType name='Provider'>
+ <operation name='echo'>
+ <input message='tns:echo'/>
+ <output message='tns:echoResponse'/>
+ </operation>
+ </portType>
+ <binding name='ProviderBinding' type='tns:Provider'>
+ <http:binding verb='POST'/>
+ <operation name='echo'>
+ <http:operation location='echo'/>
+ <input>
+ <mime:content type="text/xml"/>
+ </input>
+ <output>
+ <mime:content type="text/xml"/>
+ </output>
+ </operation>
+ </binding>
+ <service name='ProviderService'>
+ <port binding='tns:ProviderBinding' name='ProviderPort'>
+ <http:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: framework/trunk/src/test/resources/jaxws/samples/provider/jaxb/WEB-INF/wsdl/Provider.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/src/test/resources/jaxws/samples/provider/message/WEB-INF/wsdl/Provider.wsdl
===================================================================
--- framework/trunk/src/test/resources/jaxws/samples/provider/message/WEB-INF/wsdl/Provider.wsdl (rev 0)
+++ framework/trunk/src/test/resources/jaxws/samples/provider/message/WEB-INF/wsdl/Provider.wsdl 2007-12-13 11:37:30 UTC (rev 5297)
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<definitions name='ProviderService' targetNamespace='http://org.jboss.ws/provider' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/provider' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://org.jboss.ws/provider' xmlns:tns='http://org.jboss.ws/provider' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:element name='user' type='tns:UserType'/>
+ <xs:complexType name='UserType'>
+ <xs:sequence>
+ <xs:element name='string' type='xs:string'/>
+ <xs:element name='qname' type='xs:QName'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='echo'>
+ <part element='tns:user' name='user'/>
+ </message>
+ <message name='echoResponse'>
+ <part element='tns:user' name='user'/>
+ </message>
+ <portType name='Provider'>
+ <operation name='echo'>
+ <input message='tns:echo'/>
+ <output message='tns:echoResponse'/>
+ </operation>
+ </portType>
+ <binding name='ProviderBinding' type='tns:Provider'>
+ <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='ProviderService'>
+ <port binding='tns:ProviderBinding' name='ProviderPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
Property changes on: framework/trunk/src/test/resources/jaxws/samples/provider/message/WEB-INF/wsdl/Provider.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: framework/trunk/src/test/resources/jaxws/samples/provider/payload/WEB-INF/wsdl/Provider.wsdl
===================================================================
--- framework/trunk/src/test/resources/jaxws/samples/provider/payload/WEB-INF/wsdl/Provider.wsdl (rev 0)
+++ framework/trunk/src/test/resources/jaxws/samples/provider/payload/WEB-INF/wsdl/Provider.wsdl 2007-12-13 11:37:30 UTC (rev 5297)
@@ -0,0 +1,44 @@
+<?xml version='1.0'?>
+<definitions name='ProviderService' targetNamespace='http://org.jboss.ws/provider' xmlns='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:http='http://schemas.xmlsoap.org/wsdl/http/' xmlns:mime='http://schemas.xmlsoap.org/wsdl/mime/' xmlns:tns='http://org.jboss.ws/provider' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://org.jboss.ws/provider' xmlns:tns='http://org.jboss.ws/provider' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+ <xs:element name='user' type='tns:UserType'/>
+ <xs:complexType name='UserType'>
+ <xs:sequence>
+ <xs:element name='string' type='xs:string'/>
+ <xs:element name='qname' type='xs:QName'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='echo'>
+ <part element='tns:user' name='user'/>
+ </message>
+ <message name='echoResponse'>
+ <part element='tns:user' name='user'/>
+ </message>
+ <portType name='Provider'>
+ <operation name='echo'>
+ <input message='tns:echo'/>
+ <output message='tns:echoResponse'/>
+ </operation>
+ </portType>
+ <binding name='ProviderBinding' type='tns:Provider'>
+ <http:binding verb='POST'/>
+ <operation name='echo'>
+ <http:operation location='echo'/>
+ <input>
+ <mime:content type="text/xml"/>
+ </input>
+ <output>
+ <mime:content type="text/xml"/>
+ </output>
+ </operation>
+ </binding>
+ <service name='ProviderService'>
+ <port binding='tns:ProviderBinding' name='ProviderPort'>
+ <http:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: framework/trunk/src/test/resources/jaxws/samples/provider/payload/WEB-INF/wsdl/Provider.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 1 month
- 1
- 0