JBossWS SVN: r6594 - in stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples: wssecurity and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-21 14:58:44 -0400 (Mon, 21 Apr 2008)
New Revision: 6594
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java
Log:
Fix resource loading
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2008-04-21 18:47:17 UTC (rev 6593)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wseventing/SysmonTestCase.java 2008-04-21 18:58:44 UTC (rev 6594)
@@ -82,7 +82,7 @@
if (subscriptionPort == null || managementPort == null)
{
- URL wsdlURL = new File("resources/jaxws/samples/wseventing/WEB-INF/wsdl/sysmon.wsdl").toURL();
+ URL wsdlURL = getResourceURL("jaxws/samples/wseventing/WEB-INF/wsdl/sysmon.wsdl");
QName defaultServiceName = new QName("http://schemas.xmlsoap.org/ws/2004/08/eventing", "EventingService");
Service service = Service.create(wsdlURL, defaultServiceName);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2008-04-21 18:47:17 UTC (rev 6593)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2008-04-21 18:58:44 UTC (rev 6594)
@@ -67,8 +67,8 @@
{
if (usernameDispatch == null)
{
- URL wsdlURL = new File("resources/jaxws/samples/wssecurity/simple-username/META-INF/wsdl/UsernameService.wsdl").toURL();
- URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-username/META-INF/jboss-wsse-client.xml").toURL();
+ URL wsdlURL = getResourceURL("jaxws/samples/wssecurity/simple-username/META-INF/wsdl/UsernameService.wsdl");
+ URL securityURL = getResourceURL("jaxws/samples/wssecurity/simple-username/META-INF/jboss-wsse-client.xml");
QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "UsernameService");
QName portName = new QName("http://org.jboss.ws/samples/wssecurity", "UsernameEndpointPort");
@@ -81,7 +81,7 @@
if (encryptDispatch == null)
{
URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL();
- URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL();
+ URL securityURL = getResourceURL("jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml");
QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
QName portName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloPort");
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2008-04-21 18:47:17 UTC (rev 6593)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2008-04-21 18:58:44 UTC (rev 6594)
@@ -68,7 +68,7 @@
private Hello getPort() throws Exception
{
URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL();
- URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL();
+ URL securityURL = getResourceURL("jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml");
QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
Service service = Service.create(wsdlURL, serviceName);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2008-04-21 18:47:17 UTC (rev 6593)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2008-04-21 18:58:44 UTC (rev 6594)
@@ -76,7 +76,7 @@
private Hello getPort() throws Exception
{
URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL();
- URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml").toURL();
+ URL securityURL = getResourceURL("jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml");
QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService");
Service service = Service.create(wsdlURL, serviceName);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2008-04-21 18:47:17 UTC (rev 6593)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2008-04-21 18:58:44 UTC (rev 6594)
@@ -56,8 +56,8 @@
{
if (port == null)
{
- URL wsdlURL = new File("resources/jaxws/samples/wssecurity/simple-username/META-INF/wsdl/UsernameService.wsdl").toURL();
- URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-username/META-INF/jboss-wsse-client.xml").toURL();
+ URL wsdlURL = getResourceURL("jaxws/samples/wssecurity/simple-username/META-INF/wsdl/UsernameService.wsdl");
+ URL securityURL = getResourceURL("jaxws/samples/wssecurity/simple-username/META-INF/jboss-wsse-client.xml");
QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "UsernameService");
Service service = Service.create(wsdlURL, serviceName);
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2008-04-21 18:47:17 UTC (rev 6593)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wssecuritypolicy/SimpleEncryptTestCase.java 2008-04-21 18:58:44 UTC (rev 6594)
@@ -66,7 +66,7 @@
private Hello getPort() throws Exception
{
- URL wsdlURL = new File("resources/jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl").toURL();
+ URL wsdlURL = getResourceURL("jaxws/samples/wssecuritypolicy/WEB-INF/wsdl/HelloService.wsdl");
QName serviceName = new QName("http://org.jboss.ws/samples/wssecuritypolicy", "HelloService");
Service service = Service.create(wsdlURL, serviceName);
18 years
JBossWS SVN: r6593 - maven/parent/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-21 14:47:17 -0400 (Mon, 21 Apr 2008)
New Revision: 6593
Modified:
maven/parent/trunk/pom.xml
Log:
maven-surefire-report-plugin
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2008-04-21 18:45:17 UTC (rev 6592)
+++ maven/parent/trunk/pom.xml 2008-04-21 18:47:17 UTC (rev 6593)
@@ -71,6 +71,15 @@
</plugins>
</build>
+ <!-- Reporting -->
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
<!-- distributionManagement -->
<distributionManagement>
<repository>
18 years
JBossWS SVN: r6592 - in stack/cxf/trunk: src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-21 14:45:17 -0400 (Mon, 21 Apr 2008)
New Revision: 6592
Added:
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws/
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws/SayHello.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws/SayHelloResponse.java
Modified:
stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml
Log:
[JBWS-2100] include generated jaxws artifacts to endpoint archive too
Modified: stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-21 18:32:11 UTC (rev 6591)
+++ stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-21 18:45:17 UTC (rev 6592)
@@ -24,6 +24,7 @@
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/wsaddressing/Service*.class"/>
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws/*.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsaddressing/WEB-INF">
<include name="jbossws-cxf.xml"/>
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws/SayHello.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws/SayHello.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws/SayHello.java 2008-04-21 18:45:17 UTC (rev 6592)
@@ -0,0 +1,24 @@
+
+package org.jboss.test.ws.jaxws.samples.wsaddressing.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * This class was generated by the CXF 2.0.5-incubator
+ * Mon Apr 21 16:36:02 CEST 2008
+ * Generated source version: 2.0.5-incubator
+ *
+ */
+
+@XmlRootElement(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHello", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+
+public class SayHello {
+
+
+}
+
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws/SayHello.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws/SayHelloResponse.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws/SayHelloResponse.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws/SayHelloResponse.java 2008-04-21 18:45:17 UTC (rev 6592)
@@ -0,0 +1,35 @@
+
+package org.jboss.test.ws.jaxws.samples.wsaddressing.jaxws;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+/**
+ * This class was generated by the CXF 2.0.5-incubator
+ * Mon Apr 21 16:36:02 CEST 2008
+ * Generated source version: 2.0.5-incubator
+ *
+ */
+
+@XmlRootElement(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "sayHelloResponse", namespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing")
+
+public class SayHelloResponse {
+
+ @XmlElement(name = "return")
+ private java.lang.String _return;
+
+ public java.lang.String get_return() {
+ return this._return;
+ }
+
+ public void set_return( java.lang.String new_return ) {
+ this._return = new_return;
+ }
+
+}
+
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/jaxws/SayHelloResponse.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
JBossWS SVN: r6591 - framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-21 14:32:11 -0400 (Mon, 21 Apr 2008)
New Revision: 6591
Modified:
framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl/Endpoint.wsdl
Log:
Fix operation names
Modified: framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl/Endpoint.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl/Endpoint.wsdl 2008-04-21 18:21:50 UTC (rev 6590)
+++ framework/trunk/testsuite/test/resources/jaxws/samples/context/WEB-INF/wsdl/Endpoint.wsdl 2008-04-21 18:32:11 UTC (rev 6591)
@@ -15,22 +15,22 @@
<part name='return' type='xsd:boolean'/>
</message>
<portType name='Endpoint'>
- <operation name='GetMessageContext'>
+ <operation name='testGetMessageContext'>
<input message='tns:Endpoint_testGetMessageContext'/>
<output message='tns:Endpoint_testGetMessageContextResponse'/>
</operation>
- <operation name='GetUserPrincipal'>
+ <operation name='testGetUserPrincipal'>
<input message='tns:Endpoint_testGetUserPrincipal'/>
<output message='tns:Endpoint_testGetUserPrincipalResponse'/>
</operation>
- <operation name='IsUserInRole' parameterOrder='arg0'>
+ <operation name='testIsUserInRole' parameterOrder='arg0'>
<input message='tns:Endpoint_testIsUserInRole'/>
<output message='tns:Endpoint_testIsUserInRoleResponse'/>
</operation>
</portType>
<binding name='EndpointBinding' type='tns:Endpoint'>
<soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='GetMessageContext'>
+ <operation name='testGetMessageContext'>
<soap:operation soapAction=''/>
<input>
<soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/>
@@ -39,7 +39,7 @@
<soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/>
</output>
</operation>
- <operation name='GetUserPrincipal'>
+ <operation name='testGetUserPrincipal'>
<soap:operation soapAction=''/>
<input>
<soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/>
@@ -48,7 +48,7 @@
<soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/>
</output>
</operation>
- <operation name='IsUserInRole'>
+ <operation name='testIsUserInRole'>
<soap:operation soapAction=''/>
<input>
<soap:body namespace='http://org.jboss.ws/jaxws/context' use='literal'/>
18 years
JBossWS SVN: r6590 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-21 14:21:50 -0400 (Mon, 21 Apr 2008)
New Revision: 6590
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
Log:
Fix classpath
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2008-04-21 17:52:52 UTC (rev 6589)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2008-04-21 18:21:50 UTC (rev 6590)
@@ -90,7 +90,7 @@
String absOutput = new File("wsprovide/java/").getAbsolutePath();
- String command = JBOSS_HOME + "/bin/wsprovide.sh -k -w -o " + absOutput + " --classpath " + TEST_EXEC_DIR + "/classes " + ENDPOINT_CLASS;
+ String command = JBOSS_HOME + "/bin/wsprovide.sh -k -w -o " + absOutput + " --classpath " + TEST_EXEC_DIR + "/test-classes " + ENDPOINT_CLASS;
Process p = executeCommand(command);
// check status code
18 years
JBossWS SVN: r6589 - in stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples: wsrm/client and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-21 13:52:52 -0400 (Mon, 21 Apr 2008)
New Revision: 6589
Modified:
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingTestCase.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
Log:
removing useless imports
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingTestCase.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingTestCase.java 2008-04-21 17:50:46 UTC (rev 6588)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingTestCase.java 2008-04-21 17:52:52 UTC (rev 6589)
@@ -27,11 +27,9 @@
import javax.xml.ws.Service;
import junit.framework.Test;
import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
-import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService;
/**
* Client invoking web service using WS-Addressing
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-21 17:50:46 UTC (rev 6588)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-21 17:52:52 UTC (rev 6589)
@@ -27,7 +27,6 @@
import javax.xml.ws.Service;
import junit.framework.Test;
import org.apache.cxf.Bus;
-import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.jboss.wsf.test.JBossWSTest;
import org.jboss.wsf.test.JBossWSTestSetup;
18 years
JBossWS SVN: r6588 - in stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples: wsrm/client and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-21 13:50:46 -0400 (Mon, 21 Apr 2008)
New Revision: 6588
Modified:
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingTestCase.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
Log:
refactoring
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingTestCase.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingTestCase.java 2008-04-21 17:40:47 UTC (rev 6587)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingTestCase.java 2008-04-21 17:50:46 UTC (rev 6588)
@@ -55,7 +55,7 @@
super.setUp();
SpringBusFactory busFactory = new SpringBusFactory();
- URL cxfConfig = new File("resources/jaxws/samples/wsaddressing/cxf-client-config.xml").toURL();
+ URL cxfConfig = new File("test-resources/jaxws/samples/wsaddressing/cxf-client-config.xml").toURL();
bus = busFactory.createBus(cxfConfig);
busFactory.setDefaultBus(bus);
Modified: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-21 17:40:47 UTC (rev 6587)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsrm/client/SimpleServiceTestCase.java 2008-04-21 17:50:46 UTC (rev 6588)
@@ -55,7 +55,7 @@
super.setUp();
SpringBusFactory busFactory = new SpringBusFactory();
- URL cxfConfig = new File("resources/jaxws/samples/wsrm/wsrm-client-config.xml").toURL();
+ URL cxfConfig = new File("test-resources/jaxws/samples/wsrm/wsrm-client-config.xml").toURL();
bus = busFactory.createBus(cxfConfig);
busFactory.setDefaultBus(bus);
18 years
JBossWS SVN: r6587 - in stack/cxf/trunk: src/test/java/org/jboss/test/ws/jaxws/samples and 5 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-21 13:40:47 -0400 (Mon, 21 Apr 2008)
New Revision: 6587
Added:
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingTestCase.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServiceIface.java
stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServiceImpl.java
stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/
stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/
stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/jbossws-cxf.xml
stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml
stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/
stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/Service.wsdl
stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/cxf-client-config.xml
Modified:
stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml
Log:
[JBWS-2100] adding example based on prepared CXF WS-Addressing tutorial
Modified: stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml
===================================================================
--- stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-21 17:31:54 UTC (rev 6586)
+++ stack/cxf/trunk/ant-import-tests/build-samples-jaxws.xml 2008-04-21 17:40:47 UTC (rev 6587)
@@ -18,6 +18,21 @@
<mkdir dir="${tests.output.dir}/test-libs"/>
+ <!-- jaxws-samples-wsaddressing -->
+ <war
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsaddressing.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsaddressing/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/Service*.class"/>
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsaddressing/WEB-INF">
+ <include name="jbossws-cxf.xml"/>
+ </webinf>
+ <zipfileset
+ dir="${tests.output.dir}/test-resources/jaxws/samples/wsaddressing/WEB-INF/wsdl"
+ prefix="WEB-INF/wsdl"/>
+ </war>
+
<!-- jaxws-samples-wsrm -->
<war
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war"
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingTestCase.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingTestCase.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingTestCase.java 2008-04-21 17:40:47 UTC (rev 6587)
@@ -0,0 +1,81 @@
+/*
+ * 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.samples.wsaddressing;
+
+import java.io.File;
+import java.net.URL;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import junit.framework.Test;
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+import org.jboss.test.ws.jaxws.samples.wsrm.generated.SimpleService;
+
+/**
+ * Client invoking web service using WS-Addressing
+ *
+ * @author richard.opalka(a)jboss.com
+ */
+public final class AddressingTestCase extends JBossWSTest
+{
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-samples-wsaddressing/AddressingService";
+ private ServiceIface proxy;
+ private Bus bus;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-samples-wsaddressing.war");
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ SpringBusFactory busFactory = new SpringBusFactory();
+ URL cxfConfig = new File("resources/jaxws/samples/wsaddressing/cxf-client-config.xml").toURL();
+ bus = busFactory.createBus(cxfConfig);
+ busFactory.setDefaultBus(bus);
+
+ QName serviceName = new QName("http://www.jboss.org/jbossws/ws-extensions/wsaddressing", "AddressingService");
+ URL wsdlURL = new URL(serviceURL + "?wsdl");
+ Service service = Service.create(wsdlURL, serviceName);
+ proxy = (ServiceIface)service.getPort(ServiceIface.class);
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ bus.shutdown(true);
+
+ super.tearDown();
+ }
+
+ public void test() throws Exception
+ {
+ assertEquals("Hello World!", proxy.sayHello());
+ }
+
+}
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/AddressingTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServiceIface.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServiceIface.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServiceIface.java 2008-04-21 17:40:47 UTC (rev 6587)
@@ -0,0 +1,35 @@
+/*
+ * 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.samples.wsaddressing;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+(
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing"
+)
+public interface ServiceIface
+{
+ @WebMethod
+ String sayHello();
+}
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServiceIface.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServiceImpl.java
===================================================================
--- stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServiceImpl.java (rev 0)
+++ stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServiceImpl.java 2008-04-21 17:40:47 UTC (rev 6587)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jaxws.samples.wsaddressing;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+@WebService
+(
+ name = "AddressingServiceName",
+ portName = "AddressingServicePort",
+ serviceName = "AddressingService",
+ wsdlLocation = "WEB-INF/wsdl/Service.wsdl",
+ targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wsaddressing",
+ endpointInterface = "org.jboss.test.ws.jaxws.samples.wsaddressing.ServiceIface"
+)
+public class ServiceImpl implements ServiceIface
+{
+ @WebMethod
+ public String sayHello()
+ {
+ return "Hello World!";
+ }
+}
Property changes on: stack/cxf/trunk/src/test/java/org/jboss/test/ws/jaxws/samples/wsaddressing/ServiceImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/jbossws-cxf.xml
===================================================================
--- stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/jbossws-cxf.xml (rev 0)
+++ stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/jbossws-cxf.xml 2008-04-21 17:40:47 UTC (rev 6587)
@@ -0,0 +1,23 @@
+<beans
+ xmlns='http://www.springframework.org/schema/beans'
+ xmlns:jaxws='http://cxf.apache.org/jaxws'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xsi:schemaLocation='
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ '>
+
+ <jaxws:endpoint
+ id='ServiceImpl'
+ address='http://@jboss.bind.address@:8080/jaxws-samples-wsaddressing'
+ implementor='org.jboss.test.ws.jaxws.samples.wsaddressing.ServiceImpl'>
+ <jaxws:invoker>
+ <bean class='org.jboss.wsf.stack.cxf.InvokerJSE'/>
+ </jaxws:invoker>
+ <jaxws:features>
+ <wsa:addressing usingAddressingAdvisory="false" allowDuplicates="false"/>
+ </jaxws:features>
+ </jaxws:endpoint>
+
+</beans>
Property changes on: stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/jbossws-cxf.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml 2008-04-21 17:40:47 UTC (rev 6587)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>AddressingService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsaddressing.ServiceImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>AddressingService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Property changes on: stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/Service.wsdl
===================================================================
--- stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/Service.wsdl (rev 0)
+++ stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/Service.wsdl 2008-04-21 17:40:47 UTC (rev 6587)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="AddressingService" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+ <wsdl:types>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.jboss.org/jbossws/ws-extensions/wsaddressing" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://www.jboss.org/jbossws/ws-extensions/wsaddressing">
+<xsd:element name="sayHello" type="tns:sayHello"/>
+<xsd:complexType name="sayHello">
+<xsd:sequence/>
+</xsd:complexType>
+<xsd:element name="sayHelloResponse" type="tns:sayHelloResponse"/>
+<xsd:complexType name="sayHelloResponse">
+<xsd:sequence>
+<xsd:element minOccurs="0" name="return" type="xsd:string"/>
+</xsd:sequence>
+</xsd:complexType>
+</xsd:schema>
+ </wsdl:types>
+ <wsdl:message name="sayHelloResponse">
+ <wsdl:part name="parameters" element="tns:sayHelloResponse">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:message name="sayHello">
+ <wsdl:part name="parameters" element="tns:sayHello">
+ </wsdl:part>
+ </wsdl:message>
+ <wsdl:portType name="ServiceIface">
+ <wsdl:operation name="sayHello">
+ <wsdl:input name="sayHello" message="tns:sayHello">
+ </wsdl:input>
+ <wsdl:output name="sayHelloResponse" message="tns:sayHelloResponse">
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="AddressingServiceSoapBinding" type="tns:ServiceIface">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <wsdl:operation name="sayHello">
+ <soap:operation soapAction="" style="document"/>
+ <wsdl:input name="sayHello">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="sayHelloResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="AddressingService">
+ <wsdl:port name="AddressingServicePort" binding="tns:AddressingServiceSoapBinding">
+ <soap:address location="http://localhost:9090/hello"/>
+ <UsingAddressing xmlns="http://www.w3.org/2005/02/addressing/wsdl"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Property changes on: stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/WEB-INF/wsdl/Service.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/cxf-client-config.xml
===================================================================
--- stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/cxf-client-config.xml (rev 0)
+++ stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/cxf-client-config.xml 2008-04-21 17:40:47 UTC (rev 6587)
@@ -0,0 +1,18 @@
+<beans
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xmlns:wsa="http://cxf.apache.org/ws/addressing"
+ xsi:schemaLocation="
+ http://cxf.apache.org/core
+ http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+ <cxf:bus>
+ <cxf:features>
+ <wsa:addressing/>
+ </cxf:features>
+ </cxf:bus>
+
+</beans>
Property changes on: stack/cxf/trunk/src/test/resources/jaxws/samples/wsaddressing/cxf-client-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
JBossWS SVN: r6586 - framework/trunk/hudson.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-21 13:31:54 -0400 (Mon, 21 Apr 2008)
New Revision: 6586
Modified:
framework/trunk/hudson/ant.properties.example
framework/trunk/hudson/build.xml
Log:
Fix hudson-setup
Modified: framework/trunk/hudson/ant.properties.example
===================================================================
--- framework/trunk/hudson/ant.properties.example 2008-04-21 16:51:55 UTC (rev 6585)
+++ framework/trunk/hudson/ant.properties.example 2008-04-21 17:31:54 UTC (rev 6586)
@@ -11,13 +11,13 @@
jboss.bind.address=localhost
# JDK settings
-#java.home.jdk16=/usr/java/jdk1.6
+java.home.jdk16=/usr/java/jdk1.6
# Hudson QA Environment
hudson.username=changeme
hudson.password=changeme
-hudson.root=/home/tdiesler/workspace
+hudson.root=/usr/share/java/workspace
hudson.host=jbws.dyndns.org
hudson.admin.port=8150
hudson.http.port=8180
Modified: framework/trunk/hudson/build.xml
===================================================================
--- framework/trunk/hudson/build.xml 2008-04-21 16:51:55 UTC (rev 6585)
+++ framework/trunk/hudson/build.xml 2008-04-21 17:31:54 UTC (rev 6586)
@@ -107,7 +107,7 @@
description="Setup the Hudson QA environment">
<!-- get the svn url -->
- <exec dir="${hudson.dir}" executable="svn" failonerror="true" output="${hudson.target.dir}/svn-info.xml">
+ <exec dir="${hudson.dir}/.." executable="svn" failonerror="true" output="${hudson.target.dir}/svn-info.xml">
<arg line="info"/>
<arg line="--xml"/>
</exec>
18 years
JBossWS SVN: r6585 - stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-21 12:51:55 -0400 (Mon, 21 Apr 2008)
New Revision: 6585
Modified:
stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
Log:
fixing bug - parameterless methods can't be invoked with parameters
Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
===================================================================
--- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2008-04-21 15:47:03 UTC (rev 6584)
+++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2008-04-21 16:51:55 UTC (rev 6585)
@@ -93,7 +93,14 @@
}
else
{
- params = new Object[]{o};
+ if (m.getParameterTypes().length != 0)
+ {
+ params = new Object[]{o};
+ }
+ else
+ {
+ params = new Object[] {};
+ }
}
Endpoint ep = EndpointAssociation.getEndpoint();
18 years