JBossWS SVN: r7862 - stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-07-18 18:57:58 -0400 (Fri, 18 Jul 2008)
New Revision: 7862
Modified:
stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/JBWS2187TestCase.java
Log:
Three tests to expose the different ways ports conflict.
Modified: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/JBWS2187TestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/JBWS2187TestCase.java 2008-07-18 17:01:37 UTC (rev 7861)
+++ stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/JBWS2187TestCase.java 2008-07-18 22:57:58 UTC (rev 7862)
@@ -48,31 +48,67 @@
return new JBossWSTestSetup(JBWS2187TestCase.class, "jaxws-jbws2187.war");
}
- public void testGetPort() throws Exception
+ public void testSetBothPorts() throws Exception
{
Service service = getService();
+ TestEndpoint original = service.getPort(TestEndpoint.class);
- TestEndpoint port = service.getPort(TestEndpoint.class);
+ setConfigName(original);
+ performTest(original, 1);
- File config = getResourceFile("jaxws/jbws2187/META-INF/jbws2187-client-config.xml");
- ((StubExt)port).setConfigName("JBWS2187 Config", config.getAbsolutePath());
+ TestEndpoint subsequent = service.getPort(TestEndpoint.class);
- TestHandler.clear();
- assertEquals("Av it", port.echo("Av it"));
- assertEquals("Call Count", 1, TestHandler.getCallCount());
+ setConfigName(subsequent);
+ performTest(subsequent, 1);
- TestHandler.clear();
- port = service.getPort(TestEndpoint.class);
- ((StubExt)port).setConfigName("JBWS2187 Config", config.getAbsolutePath());
- assertEquals("Av it", port.echo("Av it"));
- assertEquals("Call Count", 1, TestHandler.getCallCount());
+ performTest(original, 1);
+ }
+ public void testSetFirstPort() throws Exception
+ {
+ Service service = getService();
+ TestEndpoint original = service.getPort(TestEndpoint.class);
+
+ setConfigName(original);
+ performTest(original, 1);
+
+ TestEndpoint subsequent = service.getPort(TestEndpoint.class);
+
+ //setConfigName(subsequent);
+ performTest(subsequent, 0);
+
+ performTest(original, 1);
+ }
+
+ public void testSetSecondPort() throws Exception
+ {
+ Service service = getService();
+ TestEndpoint original = service.getPort(TestEndpoint.class);
+
+ //setConfigName(original);
+ performTest(original, 0);
+
+ TestEndpoint subsequent = service.getPort(TestEndpoint.class);
+
+ setConfigName(subsequent);
+ performTest(subsequent, 1);
+
+ performTest(original, 0);
+ }
+
+ void performTest(TestEndpoint port, int expected) throws Exception
+ {
TestHandler.clear();
- port = service.getPort(TestEndpoint.class);
assertEquals("Av it", port.echo("Av it"));
- assertEquals("Call Count", 0, TestHandler.getCallCount());
+ assertEquals("Call Count", expected, TestHandler.getCallCount());
}
+ void setConfigName(TestEndpoint port)
+ {
+ File config = getResourceFile("jaxws/jbws2187/META-INF/jbws2187-client-config.xml");
+ ((StubExt)port).setConfigName("JBWS2187 Config", config.getAbsolutePath());
+ }
+
Service getService() throws Exception
{
URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2187?wsdl");
16 years, 5 months
- 1
- 0
JBossWS SVN: r7861 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-18 13:01:37 -0400 (Fri, 18 Jul 2008)
New Revision: 7861
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/Endpoint.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/EndpointImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/JBWS2221TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2221/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2221/META-INF/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2221/META-INF/wsdl/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2221/META-INF/wsdl/TestService.wsdl
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2221/META-INF/wsdl/TestService.xsd
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBWS-2221] Adding test case
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-07-18 16:46:40 UTC (rev 7860)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-07-18 17:01:37 UTC (rev 7861)
@@ -317,6 +317,17 @@
</metainf>
</jar>
+ <!-- jaxws-jbws2221 -->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2221.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2221/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2221/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2221/META-INF">
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/Endpoint.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/Endpoint.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/Endpoint.java 2008-07-18 17:01:37 UTC (rev 7861)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.jbws2221;
+
+import javax.jws.WebService;
+
+@WebService(name = "Endpoint", targetNamespace = "http://org.jboss.ws/jbws2221?abc")
+public interface Endpoint
+{
+ String echo(String input);
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/Endpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/EndpointImpl.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/EndpointImpl.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/EndpointImpl.java 2008-07-18 17:01:37 UTC (rev 7861)
@@ -0,0 +1,46 @@
+/*
+ * 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.jbws2221;
+
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+import org.jboss.wsf.spi.annotation.WebContext;
+
+@Stateless
+@WebService
+(
+ name = "Endpoint",
+ serviceName = "EndpointService",
+ wsdlLocation = "/META-INF/wsdl/TestService.wsdl",
+ targetNamespace = "http://org.jboss.ws/jbws2221?abc"
+)
+@WebContext(contextRoot="jaxws-jbws2221", urlPattern="/*")
+public class EndpointImpl implements Endpoint
+{
+ @WebMethod
+ public String echo(String input)
+ {
+ return input;
+ }
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/EndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/JBWS2221TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/JBWS2221TestCase.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/JBWS2221TestCase.java 2008-07-18 17:01:37 UTC (rev 7861)
@@ -0,0 +1,61 @@
+/*
+ * 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.jbws2221;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2221]
+ *
+ * @author alessio.soldano(a)jboss.com
+ */
+public class JBWS2221TestCase extends JBossWSTest
+{
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS2221TestCase.class, "jaxws-jbws2221.jar");
+ }
+
+ public void test() throws Exception
+ {
+ Endpoint port = getPort();
+ String par = "Bye";
+ String result = port.echo(par);
+ assertEquals(par, result);
+ }
+
+ private Endpoint getPort() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2221?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/jbws2221?abc", "EndpointService");
+ Endpoint port = Service.create(wsdlURL, serviceName).getPort(Endpoint.class);
+ return port;
+ }
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2221/JBWS2221TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2221/META-INF/wsdl/TestService.wsdl
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2221/META-INF/wsdl/TestService.wsdl (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2221/META-INF/wsdl/TestService.wsdl 2008-07-18 17:01:37 UTC (rev 7861)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="EndpointService"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://org.jboss.ws/jbws2221?abc"
+ targetNamespace="http://org.jboss.ws/jbws2221?abc">
+
+ <types>
+ <xsd:schema>
+ <xsd:import namespace="http://org.jboss.ws/jbws2221?abc" schemaLocation="TestService.xsd" />
+ </xsd:schema>
+ </types>
+
+ <message name='Endpoint_echo'>
+ <part element='tns:echo' name='echo'></part>
+ </message>
+ <message name='Endpoint_echoResponse'>
+ <part element='tns:echoResponse' name='echoResponse'></part>
+ </message>
+ <portType name='Endpoint'>
+ <operation name='echo' parameterOrder='echo'>
+ <input message='tns:Endpoint_echo'></input>
+ <output message='tns:Endpoint_echoResponse'></output>
+ </operation>
+ </portType>
+ <binding name='EndpointBinding' type='tns:Endpoint'>
+ <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='EndpointService'>
+ <port binding='tns:EndpointBinding' name='EndpointPort'>
+ <soap:address location='http://127.0.0.1:8080/jaxws-jbws2221'/>
+ </port>
+ </service>
+</definitions>
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2221/META-INF/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2221/META-INF/wsdl/TestService.xsd
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2221/META-INF/wsdl/TestService.xsd (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2221/META-INF/wsdl/TestService.xsd 2008-07-18 17:01:37 UTC (rev 7861)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema version="1.0" xmlns="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified" attributeFormDefault="unqualified"
+ targetNamespace="http://org.jboss.ws/jbws2221"
+ xmlns:tns="http://org.jboss.ws/jbws2221">
+
+ <element name='echo' type='tns:echo'/>
+ <element name='echoResponse' type='tns:echoResponse'/>
+ <complexType name='echo'>
+ <sequence>
+ <element minOccurs='0' name='arg0' type='string'/>
+ </sequence>
+ </complexType>
+ <complexType name='echoResponse'>
+ <sequence>
+ <element minOccurs='0' name='return' type='string'/>
+ </sequence>
+ </complexType>
+</schema>
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2221/META-INF/wsdl/TestService.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 5 months
- 1
- 0
JBossWS SVN: r7860 - in stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-07-18 12:46:40 -0400 (Fri, 18 Jul 2008)
New Revision: 7860
Added:
stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/
stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/JBWS2187TestCase.java
stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestEndpoint.java
stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestEndpointImpl.java
stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestHandler.java
stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/
stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/META-INF/
stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/META-INF/jbws2187-client-config.xml
stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/WEB-INF/
stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/WEB-INF/jboss-web.xml
stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/WEB-INF/web.xml
Modified:
stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
Added test case.
Modified: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-07-18 15:39:55 UTC (rev 7859)
+++ stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-07-18 16:46:40 UTC (rev 7860)
@@ -316,7 +316,18 @@
<include name="wsse.keystore"/>
</metainf>
</jar>
-
+
+ <!-- jaxws-jbws2187 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2187.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2187/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2187/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws2187/TestEndpointImpl.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2187/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
<!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/JBWS2187TestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/JBWS2187TestCase.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/JBWS2187TestCase.java 2008-07-18 16:46:40 UTC (rev 7860)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.jbws2187;
+
+import java.io.File;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [JBWS-2187] Handler Chain Management Prevents Service Re-Use
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 18th July 2008
+ * @see https://jira.jboss.org/jira/browse/JBWS-2187
+ */
+public class JBWS2187TestCase extends JBossWSTest
+{
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS2187TestCase.class, "jaxws-jbws2187.war");
+ }
+
+ public void testGetPort() throws Exception
+ {
+ Service service = getService();
+
+ TestEndpoint port = service.getPort(TestEndpoint.class);
+
+ File config = getResourceFile("jaxws/jbws2187/META-INF/jbws2187-client-config.xml");
+ ((StubExt)port).setConfigName("JBWS2187 Config", config.getAbsolutePath());
+
+ TestHandler.clear();
+ assertEquals("Av it", port.echo("Av it"));
+ assertEquals("Call Count", 1, TestHandler.getCallCount());
+
+ TestHandler.clear();
+ port = service.getPort(TestEndpoint.class);
+ ((StubExt)port).setConfigName("JBWS2187 Config", config.getAbsolutePath());
+ assertEquals("Av it", port.echo("Av it"));
+ assertEquals("Call Count", 1, TestHandler.getCallCount());
+
+ TestHandler.clear();
+ port = service.getPort(TestEndpoint.class);
+ assertEquals("Av it", port.echo("Av it"));
+ assertEquals("Call Count", 0, TestHandler.getCallCount());
+ }
+
+ Service getService() throws Exception
+ {
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2187?wsdl");
+ QName serviceName = new QName("http://ws.jboss.org/jbws2187", "TestService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+
+ return service;
+ }
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/JBWS2187TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestEndpoint.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestEndpoint.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestEndpoint.java 2008-07-18 16:46:40 UTC (rev 7860)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.jbws2187;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * [JBWS-2187] Handler Chain Management Prevents Service Re-Use
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 18th July 2008
+ * @see https://jira.jboss.org/jira/browse/JBWS-2187
+ */
+@WebService(targetNamespace = "http://ws.jboss.org/jbws2187")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL)
+public interface TestEndpoint
+{
+
+ public String echo(final String message);
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestEndpointImpl.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestEndpointImpl.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestEndpointImpl.java 2008-07-18 16:46:40 UTC (rev 7860)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.jbws2187;
+
+import javax.jws.WebService;
+
+/**
+ * [JBWS-2187] Handler Chain Management Prevents Service Re-Use
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 18th July 2008
+ * @see https://jira.jboss.org/jira/browse/JBWS-2187
+ */
+@WebService(name = "TestEndpoint", targetNamespace = "http://ws.jboss.org/jbws2187", serviceName = "TestService")
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ public String echo(String message)
+ {
+ return message;
+ }
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestHandler.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestHandler.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestHandler.java 2008-07-18 16:46:40 UTC (rev 7860)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.jbws2187;
+
+import javax.xml.ws.handler.MessageContext;
+
+import org.jboss.wsf.common.handler.GenericSOAPHandler;
+
+/**
+ * [JBWS-2187] Handler Chain Management Prevents Service Re-Use
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 18th July 2008
+ * @see https://jira.jboss.org/jira/browse/JBWS-2187
+ */
+public class TestHandler extends GenericSOAPHandler
+{
+
+ private static int callCount = 0;
+
+ @Override
+ protected boolean handleOutbound(MessageContext msgContext)
+ {
+ callCount++;
+ return true;
+ }
+
+ public static int getCallCount()
+ {
+ return callCount;
+ }
+
+ public static void clear()
+ {
+ callCount = 0;
+ }
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2187/TestHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/META-INF/jbws2187-client-config.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/META-INF/jbws2187-client-config.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/META-INF/jbws2187-client-config.xml 2008-07-18 16:46:40 UTC (rev 7860)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jaxws-config
+ xmlns="urn:jboss:jaxws-config:2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="urn:jboss:jaxws-config:2.0 jaxws-config_2_0.xsd">
+
+ <client-config>
+ <config-name>JBWS2187 Config</config-name>
+
+ <post-handler-chains>
+ <javaee:handler-chain>
+ <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
+ <javaee:handler>
+ <javaee:handler-name>JBWS2187 Test Handler</javaee:handler-name>
+ <javaee:handler-class>org.jboss.test.ws.jaxws.jbws2187.TestHandler</javaee:handler-class>
+ </javaee:handler>
+ </javaee:handler-chain>
+ </post-handler-chains>
+ </client-config>
+
+
+</jaxws-config>
Property changes on: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/META-INF/jbws2187-client-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/WEB-INF/jboss-web.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/WEB-INF/jboss-web.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/WEB-INF/jboss-web.xml 2008-07-18 16:46:40 UTC (rev 7860)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
+<jboss-web>
+ <context-root>/jaxws-jbws2187</context-root>
+</jboss-web>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/WEB-INF/jboss-web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/WEB-INF/web.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/WEB-INF/web.xml 2008-07-18 16:46:40 UTC (rev 7860)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws2187.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-2187/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2187/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 5 months
- 1
- 0
JBossWS SVN: r7859 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-07-18 11:39:55 -0400 (Fri, 18 Jul 2008)
New Revision: 7859
Added:
stack/native/branches/dlofthouse/JBWS-2187/
Log:
Working branch.
Copied: stack/native/branches/dlofthouse/JBWS-2187 (from rev 7858, stack/native/trunk)
16 years, 5 months
- 1
- 0
JBossWS SVN: r7858 - in stack/native/trunk/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-18 10:43:03 -0400 (Fri, 18 Jul 2008)
New Revision: 7858
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/Dto.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/Hello.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/HelloJavaBean.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/PartialEncryptionTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/META-INF/
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/META-INF/jboss-wsse-client.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/META-INF/jboss-wsse-server.xml
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/wsse.keystore
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/wsse.truststore
Modified:
stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
[JBWS-2182] Providing test case
Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-07-18 13:16:10 UTC (rev 7857)
+++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2008-07-18 14:43:03 UTC (rev 7858)
@@ -296,6 +296,27 @@
</metainf>
</jar>
+ <!-- jaxws-jbws2182-->
+ <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2182.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws2182/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws2182/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2182/META-INF">
+ <include name="jboss-wsse-server.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2182/">
+ <include name="wsse.truststore"/>
+ <include name="wsse.keystore"/>
+ </metainf>
+ </jar>
+ <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2182-client.jar">
+ <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2182">
+ <include name="wsse.truststore"/>
+ <include name="wsse.keystore"/>
+ </metainf>
+ </jar>
+
<!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
@@ -560,4 +581,4 @@
</target>
-</project>
\ No newline at end of file
+</project>
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/Dto.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/Dto.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/Dto.java 2008-07-18 14:43:03 UTC (rev 7858)
@@ -0,0 +1,31 @@
+package org.jboss.test.ws.jaxws.jbws2182;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+(a)XmlAccessorType(XmlAccessType.FIELD)
+public class Dto
+{
+ @XmlElement(namespace="http://org.jboss.ws/jbws2182")
+ private String par1;
+ @XmlElement(namespace="http://org.jboss.ws/jbws2182")
+ private String par2;
+
+ public String getPar1()
+ {
+ return par1;
+ }
+ public void setPar1(String par1)
+ {
+ this.par1 = par1;
+ }
+ public String getPar2()
+ {
+ return par2;
+ }
+ public void setPar2(String par2)
+ {
+ this.par2 = par2;
+ }
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/Dto.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/Hello.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/Hello.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/Hello.java 2008-07-18 14:43:03 UTC (rev 7858)
@@ -0,0 +1,34 @@
+/*
+ * 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.jbws2182;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService(name = "Hello")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
+public interface Hello
+{
+ @WebMethod
+ public Dto echo(Dto dto);
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/Hello.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/HelloJavaBean.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/HelloJavaBean.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/HelloJavaBean.java 2008-07-18 14:43:03 UTC (rev 7858)
@@ -0,0 +1,45 @@
+/*
+ * 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.jbws2182;
+
+import javax.ejb.Stateless;
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+import org.jboss.ws.annotation.EndpointConfig;
+import org.jboss.wsf.spi.annotation.WebContext;
+
+
+@Stateless
+@WebService(name = "Hello", serviceName = "HelloService", targetNamespace = "http://org.jboss.ws/jbws2182")
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT)
+@WebContext(contextRoot = "/jaxws-jbws2182", urlPattern = "/*")
+@EndpointConfig(configName = "Standard WSSecurity Endpoint")
+public class HelloJavaBean
+{
+ @WebMethod
+ public Dto echo(Dto dto)
+ {
+ return dto;
+ }
+}
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/HelloJavaBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/PartialEncryptionTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/PartialEncryptionTestCase.java (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/PartialEncryptionTestCase.java 2008-07-18 14:43:03 UTC (rev 7858)
@@ -0,0 +1,78 @@
+/*
+ * 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.jbws2182;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.ws.core.StubExt;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * http://jira.jboss.org/jira/browse/JBWS-2182
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 18-07-2008
+ */
+public class PartialEncryptionTestCase extends JBossWSTest
+{
+ private String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws2182";
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(PartialEncryptionTestCase.class, "jaxws-jbws2182-client.jar,jaxws-jbws2182.jar");
+ }
+
+ public void testAuth() throws Exception
+ {
+ Hello port = getPort();
+ Dto dto = new Dto();
+ dto.setPar1("first parameter");
+ dto.setPar2("second parameter");
+ try
+ {
+ Dto result = port.echo(dto);
+ assertEquals(dto.getPar1(), result.getPar1());
+ assertEquals(dto.getPar2(), result.getPar2());
+ }
+ catch (Exception e)
+ {
+ fail();
+ }
+ }
+
+ private Hello getPort() throws Exception
+ {
+ URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl");
+ QName serviceName = new QName("http://org.jboss.ws/jbws2182", "HelloService");
+ Hello port = Service.create(wsdlURL, serviceName).getPort(Hello.class);
+ URL securityURL = getResourceURL("jaxws/jbws2182/META-INF/jboss-wsse-client.xml");
+ ((StubExt)port).setSecurityConfig(securityURL.toExternalForm());
+ ((StubExt)port).setConfigName("Standard WSSecurity Client");
+ return port;
+ }
+}
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2182/PartialEncryptionTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/META-INF/jboss-wsse-client.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/META-INF/jboss-wsse-client.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/META-INF/jboss-wsse-client.xml 2008-07-18 14:43:03 UTC (rev 7858)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <key-store-file>META-INF/wsse.keystore</key-store-file>
+ <key-store-password>jbossws</key-store-password>
+ <trust-store-file>META-INF/wsse.truststore</trust-store-file>
+ <trust-store-password>jbossws</trust-store-password>
+ <config>
+ <encrypt type="x509v3" alias="wsse">
+ <targets>
+ <target type="qname" contentOnly="true">{http://org.jboss.ws/jbws2182}par1</target>
+ </targets>
+ </encrypt>
+ <requires>
+ <encryption>
+ <targets>
+ <target type="qname" contentOnly="true">{http://org.jboss.ws/jbws2182}par2</target>
+ </targets>
+ </encryption>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/META-INF/jboss-wsse-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/META-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/META-INF/jboss-wsse-server.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/META-INF/jboss-wsse-server.xml 2008-07-18 14:43:03 UTC (rev 7858)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <key-store-file>META-INF/wsse.keystore</key-store-file>
+ <key-store-password>jbossws</key-store-password>
+ <trust-store-file>META-INF/wsse.truststore</trust-store-file>
+ <trust-store-password>jbossws</trust-store-password>
+ <config>
+ <encrypt type="x509v3" alias="wsse">
+ <targets>
+ <target type="qname" contentOnly="true">{http://org.jboss.ws/jbws2182}par2</target>
+ </targets>
+ </encrypt>
+ <requires>
+ <encryption>
+ <targets>
+ <target type="qname" contentOnly="true">{http://org.jboss.ws/jbws2182}par1</target>
+ </targets>
+ </encryption>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/META-INF/jboss-wsse-server.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/wsse.keystore
===================================================================
(Binary files differ)
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/wsse.keystore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/wsse.truststore
===================================================================
(Binary files differ)
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2182/wsse.truststore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 5 months
- 1
- 0
JBossWS SVN: r7857 - in stack/metro/trunk: modules/testsuite and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-07-18 09:16:10 -0400 (Fri, 18 Jul 2008)
New Revision: 7857
Modified:
stack/metro/trunk/modules/testsuite/pom.xml
stack/metro/trunk/pom.xml
Log:
[JBWS-2255] upgrading to JAXR 1.2.0.SP2
Modified: stack/metro/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/metro/trunk/modules/testsuite/pom.xml 2008-07-18 13:12:14 UTC (rev 7856)
+++ stack/metro/trunk/modules/testsuite/pom.xml 2008-07-18 13:16:10 UTC (rev 7857)
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.jboss.jaxr</groupId>
<artifactId>juddi-saaj</artifactId>
- <version>1.2.0.SP2-SNAPSHOT</version>
+ <version>${jboss.jaxr.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2008-07-18 13:12:14 UTC (rev 7856)
+++ stack/metro/trunk/pom.xml 2008-07-18 13:16:10 UTC (rev 7857)
@@ -59,7 +59,7 @@
<jaxb.api.version>2.1</jaxb.api.version>
<jaxb.impl.version>2.1.6</jaxb.impl.version>
<jaxrpc.api.version>1.1</jaxrpc.api.version>
- <juddi.service.version>1.2.0.SP2-SNAPSHOT</juddi.service.version>
+ <jboss.jaxr.version>1.2.0.SP2-SNAPSHOT</jboss.jaxr.version>
<sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
<sun.sjsxp.version>SNAPSHOT</sun.sjsxp.version>
<sun.jaxws.version>2.1.3</sun.jaxws.version>
@@ -268,7 +268,7 @@
<dependency>
<groupId>org.jboss.jaxr</groupId>
<artifactId>juddi-service</artifactId>
- <version>${juddi.service.version}</version>
+ <version>${jboss.jaxr.version}</version>
<type>sar</type>
</dependency>
<dependency>
16 years, 5 months
- 1
- 0
JBossWS SVN: r7856 - in stack/native/trunk: modules/testsuite and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-07-18 09:12:14 -0400 (Fri, 18 Jul 2008)
New Revision: 7856
Modified:
stack/native/trunk/modules/testsuite/pom.xml
stack/native/trunk/pom.xml
Log:
[JBWS-2255] upgrading to JAXR 1.2.0.SP2
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2008-07-18 10:56:17 UTC (rev 7855)
+++ stack/native/trunk/modules/testsuite/pom.xml 2008-07-18 13:12:14 UTC (rev 7856)
@@ -93,7 +93,7 @@
<dependency>
<groupId>org.jboss.jaxr</groupId>
<artifactId>juddi-saaj</artifactId>
- <version>1.2.0.SP2-SNAPSHOT</version>
+ <version>${jboss.jaxr.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-07-18 10:56:17 UTC (rev 7855)
+++ stack/native/trunk/pom.xml 2008-07-18 13:12:14 UTC (rev 7856)
@@ -70,7 +70,7 @@
<jboss.logging.version>2.0.5.GA</jboss.logging.version>
<jboss.microcontainer.version>2.0.0.Beta11</jboss.microcontainer.version>
<jboss.remoting.version>2.4.0.CR1</jboss.remoting.version>
- <juddi.service.version>1.2.0.SP2-SNAPSHOT</juddi.service.version>
+ <jboss.jaxr.version>1.2.0.SP2</jboss.jaxr.version>
<sun.fastinfoset.version>1.2.2</sun.fastinfoset.version>
<sun.jaxws.version>2.1.3</sun.jaxws.version>
<woodstox.version>3.1.1</woodstox.version>
@@ -307,7 +307,7 @@
<dependency>
<groupId>org.jboss.jaxr</groupId>
<artifactId>juddi-service</artifactId>
- <version>${juddi.service.version}</version>
+ <version>${jboss.jaxr.version}</version>
<type>sar</type>
</dependency>
<dependency>
16 years, 5 months
- 1
- 0
JBossWS SVN: r7855 - in legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989: jbossws-tests/ant-import and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-07-18 06:56:17 -0400 (Fri, 18 Jul 2008)
New Revision: 7855
Added:
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/EchoType.java
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/JBWS1974TestCase.java
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpoint.java
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpointImpl.java
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/application-client.xml
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/jboss-client.xml
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/jboss-wsse-client.xml
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/jaxrpc-mapping.xml
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/jboss-wsse-server.xml
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/web.xml
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/webservices.xml
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/wsdl/
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/wsdl/TestService.wsdl
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wsse.keystore
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wsse.truststore
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wstools-config.xml
Removed:
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/EchoType.java
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/JBWS1974TestCase.java
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpoint.java
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpointImpl.java
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/application-client.xml
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/jboss-client.xml
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/jboss-wsse-client.xml
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/jaxrpc-mapping.xml
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/jboss-wsse-server.xml
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/web.xml
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/webservices.xml
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/wsdl/
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/wsdl/TestService.wsdl
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wsse.keystore
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wsse.truststore
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wstools-config.xml
Modified:
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/ant-import/build-jars-jaxrpc.xml
Log:
[JBPAPP-989] Using signature as security in a webservice throws an error when loglevel not Debug.
Modified: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java 2008-07-18 10:26:53 UTC (rev 7854)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-core/src/java/org/jboss/ws/core/soap/SOAPContentElement.java 2008-07-18 10:56:17 UTC (rev 7855)
@@ -518,8 +518,22 @@
return super.hasAttributes();
}
+ public org.w3c.dom.Node getPreviousSibling()
+ {
+ log.trace("getPreviousSibling");
+ expandToDOM();
+ return super.getPreviousSibling();
+ }
+
+ public org.w3c.dom.Node getNextSibling()
+ {
+ log.trace("getNextSibling");
+ expandToDOM();
+ return super.getNextSibling();
+ }
+
// END Node interface ***********************************************************************************************
-
+
public void writeElement(Writer writer) throws IOException
{
// JMS transport hot fix
Modified: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/ant-import/build-jars-jaxrpc.xml
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2008-07-18 10:26:53 UTC (rev 7854)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -2540,11 +2540,42 @@
<include name="wsdl/**"/>
</metainf>
</jar>
+
+ <!-- jaxrpc-jbws1974 -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-jbws1974.war" webxml="${tests.output.dir}/resources/jaxrpc/jbws1974/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1974/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1974/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1974/EchoType.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1974/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${tests.output.dir}/resources/jaxrpc/jbws1974">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </webinf>
+ </war>
+ <jar destfile="${tests.output.dir}/libs/jaxrpc-jbws1974-client.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1974/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1974/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ <metainf dir="${tests.output.dir}/resources/jaxrpc/jbws1974/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
-
- <!-- jaxrpc-marshall-doclit.war -->
- <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war"
- webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
+ <!-- jaxrpc-marshall-doclit.war -->
+ <war warfile="${tests.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/>
<include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/>
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974 (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1974)
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/EchoType.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1974/EchoType.java 2008-06-20 13:38:17 UTC (rev 7725)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/EchoType.java 2008-07-18 10:56:17 UTC (rev 7855)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, 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.jbws1974;
-
-/**
- * @author darran.lofthouse(a)jboss.com
- * @since June 20, 2008
- */
-public class EchoType
-{
-
- private String message_1;
-
- private String message_2;
-
- private String message_3;
-
- public EchoType(final String message_1, final String message_2, final String message_3)
- {
- super();
- this.message_1 = message_1;
- this.message_2 = message_2;
- this.message_3 = message_3;
- }
-
- public String getMessage_1()
- {
- return message_1;
- }
-
- public void setMessage_1(String message_1)
- {
- this.message_1 = message_1;
- }
-
- public String getMessage_2()
- {
- return message_2;
- }
-
- public void setMessage_2(String message_2)
- {
- this.message_2 = message_2;
- }
-
- public String getMessage_3()
- {
- return message_3;
- }
-
- public void setMessage_3(String message_3)
- {
- this.message_3 = message_3;
- }
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/EchoType.java (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1974/EchoType.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/EchoType.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/EchoType.java 2008-07-18 10:56:17 UTC (rev 7855)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.jbws1974;
+
+/**
+ * @author darran.lofthouse(a)jboss.com
+ * @since June 20, 2008
+ */
+public class EchoType
+{
+
+ private String message_1;
+
+ private String message_2;
+
+ private String message_3;
+
+ public EchoType(final String message_1, final String message_2, final String message_3)
+ {
+ super();
+ this.message_1 = message_1;
+ this.message_2 = message_2;
+ this.message_3 = message_3;
+ }
+
+ public String getMessage_1()
+ {
+ return message_1;
+ }
+
+ public void setMessage_1(String message_1)
+ {
+ this.message_1 = message_1;
+ }
+
+ public String getMessage_2()
+ {
+ return message_2;
+ }
+
+ public void setMessage_2(String message_2)
+ {
+ this.message_2 = message_2;
+ }
+
+ public String getMessage_3()
+ {
+ return message_3;
+ }
+
+ public void setMessage_3(String message_3)
+ {
+ this.message_3 = message_3;
+ }
+
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/JBWS1974TestCase.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1974/JBWS1974TestCase.java 2008-06-20 13:38:17 UTC (rev 7725)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/JBWS1974TestCase.java 2008-07-18 10:56:17 UTC (rev 7855)
@@ -1,47 +0,0 @@
-package org.jboss.test.ws.jaxrpc.jbws1974;
-
-import java.io.File;
-import java.net.URL;
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.wsf.test.JBossWSTest;
-import org.jboss.wsf.test.JBossWSTestSetup;
-
-public class JBWS1974TestCase extends JBossWSTest
-{
-
- private static TestEndpoint port;
-
- public static Test suite() throws Exception
- {
- return new JBossWSTestSetup(JBWS1974TestCase.class, "jaxrpc-jbws1974.war, jaxrpc-jbws1974-client.jar");
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
- }
-
- public void testCall() throws Exception
- {
- // It is the null value that is required to trigger the failure.
- EchoType toEcho = new EchoType("A", "b", null);
-
- EchoType response = port.echo(toEcho);
-
- assertEquals(toEcho.getMessage_1(), response.getMessage_1());
- assertEquals(toEcho.getMessage_2(), response.getMessage_2());
- assertEquals(toEcho.getMessage_3(), response.getMessage_3());
- }
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/JBWS1974TestCase.java (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1974/JBWS1974TestCase.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/JBWS1974TestCase.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/JBWS1974TestCase.java 2008-07-18 10:56:17 UTC (rev 7855)
@@ -0,0 +1,44 @@
+package org.jboss.test.ws.jaxrpc.jbws1974;
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+
+public class JBWS1974TestCase extends JBossWSTest
+{
+
+ private static TestEndpoint port;
+
+ public static Test suite() throws Exception
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1974TestCase.class, "jaxrpc-jbws1974.war, jaxrpc-jbws1974-client.jar");
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ }
+ }
+
+ public void testCall() throws Exception
+ {
+ // It is the null value that is required to trigger the failure.
+ EchoType toEcho = new EchoType("A", "b", null);
+
+ EchoType response = port.echo(toEcho);
+
+ assertEquals(toEcho.getMessage_1(), response.getMessage_1());
+ assertEquals(toEcho.getMessage_2(), response.getMessage_2());
+ assertEquals(toEcho.getMessage_3(), response.getMessage_3());
+ }
+
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpoint.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpoint.java 2008-06-20 13:38:17 UTC (rev 7725)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpoint.java 2008-07-18 10:56:17 UTC (rev 7855)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, 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.jbws1974;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * @author darran.lofthouse(a)jboss.com
- * @since June 20, 2008
- */
-public interface TestEndpoint extends Remote
-{
-
- public EchoType echo(final EchoType echoType) throws RemoteException;
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpoint.java (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpoint.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpoint.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpoint.java 2008-07-18 10:56:17 UTC (rev 7855)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.jbws1974;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ * @author darran.lofthouse(a)jboss.com
+ * @since June 20, 2008
+ */
+public interface TestEndpoint extends Remote
+{
+
+ public EchoType echo(final EchoType echoType) throws RemoteException;
+
+}
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpointImpl.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpointImpl.java 2008-06-20 13:38:17 UTC (rev 7725)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpointImpl.java 2008-07-18 10:56:17 UTC (rev 7855)
@@ -1,36 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, 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.jbws1974;
-
-/**
- * @author darran.lofthouse(a)jboss.com
- * @since June 20, 2008
- */
-public class TestEndpointImpl implements TestEndpoint
-{
-
- public EchoType echo(final EchoType echoType)
- {
- return echoType;
- }
-
-}
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpointImpl.java (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpointImpl.java)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpointImpl.java (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/jbws1974/TestEndpointImpl.java 2008-07-18 10:56:17 UTC (rev 7855)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.jbws1974;
+
+/**
+ * @author darran.lofthouse(a)jboss.com
+ * @since June 20, 2008
+ */
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ public EchoType echo(final EchoType echoType)
+ {
+ return echoType;
+ }
+
+}
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974 (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974)
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/META-INF)
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/application-client.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/META-INF/application-client.xml 2008-06-20 13:38:17 UTC (rev 7725)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/application-client.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>TestService</display-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1974.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/application-client.xml (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/META-INF/application-client.xml)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/application-client.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/application-client.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+ version="1.4">
+
+ <display-name>TestService</display-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1974.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/jboss-client.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/META-INF/jboss-client.xml 2008-06-20 13:38:17 UTC (rev 7725)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/jboss-client.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <config-name>Standard WSSecurity Client</config-name>
- <wsdl-override>http://@jboss.bind.address@:8080/jaxrpc-jbws1974/TestEndpoint?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/jboss-client.xml (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/META-INF/jboss-client.xml)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/jboss-client.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/jboss-client.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-client PUBLIC
+ "-//JBoss//DTD Application Client 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
+<jboss-client>
+ <jndi-name>jbossws-client</jndi-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <config-name>Standard WSSecurity Client</config-name>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1974/TestEndpoint?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/jboss-wsse-client.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/META-INF/jboss-wsse-client.xml 2008-06-20 13:38:17 UTC (rev 7725)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/jboss-wsse-client.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
- <config>
- <sign type="x509v3" alias="wsse"/>
- <requires>
- <signature/>
- </requires>
- </config>
-</jboss-ws-security>
\ No newline at end of file
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/jboss-wsse-client.xml (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/META-INF/jboss-wsse-client.xml)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/jboss-wsse-client.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/META-INF/jboss-wsse-client.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <config>
+ <sign type="x509v3" alias="wsse"/>
+ <requires>
+ <signature/>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/WEB-INF)
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/WEB-INF/jaxrpc-mapping.xml 2008-06-20 13:38:17 UTC (rev 7725)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/jaxrpc-mapping.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -1,54 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.jbws1974</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1974/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.jbws1974.EchoType</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1974/types'>typeNS:EchoType</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>message_1</java-variable-name>
- <xml-element-name>message_1</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>message_2</java-variable-name>
- <xml-element-name>message_2</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>message_3</java-variable-name>
- <xml-element-name>message_3</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.jbws1974.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1974'>serviceNS:TestService</wsdl-service-name>
- <port-mapping>
- <port-name>TestEndpointPort</port-name>
- <java-port-name>TestEndpointPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1974.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1974'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1974'>bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echo</java-method-name>
- <wsdl-operation>echo</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxrpc.jbws1974.EchoType</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1974'>wsdlMsgNS:TestEndpoint_echo</wsdl-message>
- <wsdl-message-part-name>EchoType_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxrpc.jbws1974.EchoType</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1974'>wsdlMsgNS:TestEndpoint_echoResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/jaxrpc-mapping.xml (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/WEB-INF/jaxrpc-mapping.xml)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/jaxrpc-mapping.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/jaxrpc-mapping.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jaxrpc.jbws1974</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1974/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jaxrpc.jbws1974.EchoType</java-type>
+ <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1974/types'>typeNS:EchoType</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>message_1</java-variable-name>
+ <xml-element-name>message_1</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>message_2</java-variable-name>
+ <xml-element-name>message_2</xml-element-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>message_3</java-variable-name>
+ <xml-element-name>message_3</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jaxrpc.jbws1974.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1974'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1974.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1974'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1974'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echo</java-method-name>
+ <wsdl-operation>echo</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jaxrpc.jbws1974.EchoType</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1974'>wsdlMsgNS:TestEndpoint_echo</wsdl-message>
+ <wsdl-message-part-name>EchoType_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jaxrpc.jbws1974.EchoType</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1974'>wsdlMsgNS:TestEndpoint_echoResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/jboss-wsse-server.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/WEB-INF/jboss-wsse-server.xml 2008-06-20 13:38:17 UTC (rev 7725)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/jboss-wsse-server.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
- <key-store-file>WEB-INF/wsse.keystore</key-store-file>
- <key-store-password>jbossws</key-store-password>
- <trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
- <trust-store-password>jbossws</trust-store-password>
- <config>
- <sign type="x509v3" alias="wsse"/>
- <requires>
- <signature/>
- </requires>
- </config>
-</jboss-ws-security>
\ No newline at end of file
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/jboss-wsse-server.xml (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/WEB-INF/jboss-wsse-server.xml)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/jboss-wsse-server.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/jboss-wsse-server.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
+ <key-store-file>WEB-INF/wsse.keystore</key-store-file>
+ <key-store-password>jbossws</key-store-password>
+ <trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
+ <trust-store-password>jbossws</trust-store-password>
+ <config>
+ <sign type="x509v3" alias="wsse"/>
+ <requires>
+ <signature/>
+ </requires>
+ </config>
+</jboss-ws-security>
\ No newline at end of file
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/web.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/WEB-INF/web.xml 2008-06-20 13:38:17 UTC (rev 7725)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/web.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <context-param>
- <param-name>jbossws-config-name</param-name>
- <param-value>Standard WSSecurity Endpoint</param-value>
- </context-param>
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>
- org.jboss.test.ws.jaxrpc.jbws1974.TestEndpointImpl
- </servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/TestEndpoint</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/web.xml (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/WEB-INF/web.xml)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/web.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/web.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -0,0 +1,26 @@
+<?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 WSSecurity Endpoint</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>
+ org.jboss.test.ws.jaxrpc.jbws1974.TestEndpointImpl
+ </servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/TestEndpoint</url-pattern>
+ </servlet-mapping>
+
+</web-app>
+
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/webservices.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/WEB-INF/webservices.xml 2008-06-20 13:38:17 UTC (rev 7725)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/webservices.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -1,15 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
- <webservice-description>
- <webservice-description-name>TestService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>TestEndpointPort</port-component-name>
- <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1974'>portNS:TestEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1974.TestEndpoint</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestEndpoint</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/webservices.xml (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/WEB-INF/webservices.xml)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/webservices.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/webservices.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -0,0 +1,15 @@
+<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>TestEndpointPort</port-component-name>
+ <wsdl-port xmlns:portNS='http://org.jboss.test.ws/jbws1974'>portNS:TestEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1974.TestEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>TestEndpoint</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/wsdl (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/WEB-INF/wsdl)
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/WEB-INF/wsdl/TestService.wsdl 2008-06-20 13:38:17 UTC (rev 7725)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/wsdl/TestService.wsdl 2008-07-18 10:56:17 UTC (rev 7855)
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1974' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1974/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1974' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://org.jboss.test.ws/jbws1974/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1974/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='EchoType'>
- <sequence>
- <element name='message_1' nillable='true' type='string'/>
- <element name='message_2' nillable='true' type='string'/>
- <element name='message_3' nillable='true' type='string'/>
- </sequence>
- </complexType>
- </schema>
- </types>
- <message name='TestEndpoint_echo' xmlns='http://schemas.xmlsoap.org/wsdl/'>
- <part name='EchoType_1' type='ns1:EchoType'/>
- </message>
- <message name='TestEndpoint_echoResponse'>
- <part name='result' type='ns1:EchoType'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='echo' parameterOrder='EchoType_1'>
- <input message='tns:TestEndpoint_echo'/>
- <output message='tns:TestEndpoint_echoResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echo'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1974' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1974' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestService'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/wsdl/TestService.wsdl (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/WEB-INF/wsdl/TestService.wsdl)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/wsdl/TestService.wsdl (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/WEB-INF/wsdl/TestService.wsdl 2008-07-18 10:56:17 UTC (rev 7855)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1974' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1974/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1974' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://org.jboss.test.ws/jbws1974/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1974/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='EchoType'>
+ <sequence>
+ <element name='message_1' nillable='true' type='string'/>
+ <element name='message_2' nillable='true' type='string'/>
+ <element name='message_3' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ </schema>
+ </types>
+ <message name='TestEndpoint_echo' xmlns='http://schemas.xmlsoap.org/wsdl/'>
+ <part name='EchoType_1' type='ns1:EchoType'/>
+ </message>
+ <message name='TestEndpoint_echoResponse'>
+ <part name='result' type='ns1:EchoType'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echo' parameterOrder='EchoType_1'>
+ <input message='tns:TestEndpoint_echo'/>
+ <output message='tns:TestEndpoint_echoResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1974' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1974' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wsse.keystore
===================================================================
(Binary files differ)
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wsse.keystore (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/wsse.keystore)
===================================================================
(Binary files differ)
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wsse.truststore
===================================================================
(Binary files differ)
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wsse.truststore (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/wsse.truststore)
===================================================================
(Binary files differ)
Deleted: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wstools-config.xml
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/wstools-config.xml 2008-06-20 13:38:17 UTC (rev 7725)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wstools-config.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools.sh -cp ../../../../../output/tests/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="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1974.TestEndpoint" style="rpc">
- </service>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1974" type-namespace="http://org.jboss.test.ws/jbws1974/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-
-</configuration>
Copied: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wstools-config.xml (from rev 7725, stack/native/branches/jbossws-native-2.0.1.SP2_CP/src/test/resources/jaxrpc/jbws1974/wstools-config.xml)
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wstools-config.xml (rev 0)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/jbossws-tests/src/resources/jaxrpc/jbws1974/wstools-config.xml 2008-07-18 10:56:17 UTC (rev 7855)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools.sh -cp ../../../../../output/tests/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="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1974.TestEndpoint" style="rpc">
+ </service>
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1974" type-namespace="http://org.jboss.test.ws/jbws1974/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices servlet-link="TestEndpoint"/>
+ </java-wsdl>
+
+</configuration>
16 years, 5 months
- 1
- 0
JBossWS SVN: r7854 - legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/build.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2008-07-18 06:26:53 -0400 (Fri, 18 Jul 2008)
New Revision: 7854
Modified:
legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/build/version.properties
Log:
[JBPAPP-989] Set version.
Modified: legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/build/version.properties
===================================================================
--- legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/build/version.properties 2008-07-18 10:26:30 UTC (rev 7853)
+++ legacy/branches/jbossws-1.2.1.GA_CP02_JBPAPP-989/build/version.properties 2008-07-18 10:26:53 UTC (rev 7854)
@@ -5,8 +5,8 @@
specification.vendor=JBoss (http://www.jboss.org)
specification.version=jbossws-1.2
-version.id=1.2.1.GA_CP02
-repository.id=1.2.1.GA_CP02
+version.id=1.2.1.GA_CP02_JBPAPP-989
+repository.id=1.2.1.GA_CP02_JBPAPP-989
implementation.title=JBoss Web Services (JBossWS)
implementation.url=http://www.jboss.org/products/jbossws
16 years, 5 months
- 1
- 0
JBossWS SVN: r7853 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-07-18 06:26:30 -0400 (Fri, 18 Jul 2008)
New Revision: 7853
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java
Log:
[JBWS-2189] Allow default nonce encoding
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2008-07-18 10:18:42 UTC (rev 7852)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2008-07-18 10:26:30 UTC (rev 7853)
@@ -95,7 +95,7 @@
{
Element elem = itNonce.next();
String encodingType = elem.getAttribute("EncodingType");
- if (encodingType != null && !Constants.BASE64_ENCODING_TYPE.equalsIgnoreCase(encodingType))
+ if (encodingType != null && encodingType.length() > 0 && !Constants.BASE64_ENCODING_TYPE.equalsIgnoreCase(encodingType))
throw new WSSecurityException("Unsupported nonce encoding type: " + encodingType);
this.nonce = XMLUtils.getFullTextChildrenFromElement(elem);
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2008-07-18 10:18:42 UTC (rev 7852)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2008-07-18 10:26:30 UTC (rev 7853)
@@ -138,6 +138,42 @@
}
}
+ public void testDecodeMessageDefaulNoncetEncoding() throws Exception
+ {
+ String envStr = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" +
+ "<env:Header>" +
+ "<wsse:Security env:mustUnderstand='1' xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...' " +
+ "xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit...'>" +
+ "<wsse:UsernameToken wsu:Id='token-1-1205341951321-19004769'>" +
+ "<wsse:Username>kermit</wsse:Username>" +
+ "<wsse:Password Type='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext...'>IEeuDaP/NTozwiyJHzTgBoCCDjg=</wsse:Password>" +
+ "<wsse:Nonce>gHGIdDEWjX1Ay/LiVd3qJ1ua8VbjXis8CJwNDQh1ySA=</wsse:Nonce>" +
+ "<wsse:Created>CREATED</wsse:Created>" +
+ "</wsse:UsernameToken>" +
+ "</wsse:Security>" +
+ "</env:Header>" +
+ "<env:Body><ns1:echo xmlns:ns1='http://org.jboss.ws/jbws1988'><arg0>Hi!</arg0></ns1:echo></env:Body>" +
+ "</env:Envelope>";
+
+ WSSecurityConfiguration configuration = WSSecurityOMFactory.newInstance().parse(new StringReader(serverConf));
+
+ //"2008-03-12T17:12:31.310Z"
+ Calendar created = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+
+ sec.decodeMessage(configuration, getMessage(created, envStr), null);
+ created.add(Calendar.MINUTE, -10);
+
+ try
+ {
+ sec.decodeMessage(configuration, getMessage(created, envStr), null);
+ fail();
+ }
+ catch (Exception e)
+ {
+ //OK
+ }
+ }
+
private SOAPMessage getMessage(Calendar created, String envStr) throws Exception
{
envStr = envStr.replaceAll("CREATED", SimpleTypeBindings.marshalDateTime(created));
16 years, 5 months
- 1
- 0