JBossWS SVN: r12900 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-03 08:07:43 -0400 (Fri, 03 Sep 2010)
New Revision: 12900
Modified:
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
Log:
[JBWS-2957] excluding tests - have been fixed on AS 6 series only
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-03 12:02:45 UTC (rev 12899)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-03 12:07:43 UTC (rev 12900)
@@ -52,3 +52,5 @@
# [JBWS-3086] This have been merged to AS 600M3 and upstream only
org/jboss/test/ws/jaxws/samples/jmsendpoints/**
+# [JBWS-2957] EJB3 webservices in web archives (fixed on AS 6 series only)
+org/jboss/test/ws/jaxws/jbws2957/**
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-03 12:02:45 UTC (rev 12899)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-03 12:07:43 UTC (rev 12900)
@@ -51,4 +51,6 @@
# [JBWS-3086] This have been merged to AS 600M3 and upstream only
org/jboss/test/ws/jaxws/samples/jmsendpoints/**
-
+
+# [JBWS-2957] EJB3 webservices in web archives (fixed on AS 6 series only)
+org/jboss/test/ws/jaxws/jbws2957/**
13 years, 8 months
JBossWS SVN: r12899 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-03 08:02:45 -0400 (Fri, 03 Sep 2010)
New Revision: 12899
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
Excluding legacy artifacts from testsuite dependency:tree
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2010-09-03 12:02:25 UTC (rev 12898)
+++ stack/native/trunk/modules/testsuite/pom.xml 2010-09-03 12:02:45 UTC (rev 12899)
@@ -511,6 +511,14 @@
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-services</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxrpc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
<!-- Exclusions for preventing http://www.slf4j.org/codes.html#multiple_bindings -->
<exclusion>
<groupId>org.jboss.slf4j</groupId>
@@ -603,6 +611,14 @@
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-services</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxrpc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
<!-- Exclusions for preventing http://www.slf4j.org/codes.html#multiple_bindings -->
<exclusion>
<groupId>org.jboss.slf4j</groupId>
13 years, 8 months
JBossWS SVN: r12898 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-03 08:02:25 -0400 (Fri, 03 Sep 2010)
New Revision: 12898
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
Log:
[JBWS-2957] fixing tests to be aligned with new URL pattern scheme
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2010-09-03 12:00:43 UTC (rev 12897)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2010-09-03 12:02:25 UTC (rev 12898)
@@ -52,7 +52,7 @@
super.setUp();
if (port == null)
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws981/EJB3Bean?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws981/EndpointService/EJB3Bean?wsdl");
QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws981", "EndpointService");
Service.create(wsdlURL, serviceName);
Service service = Service.create(wsdlURL, serviceName);
13 years, 8 months
JBossWS SVN: r12897 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-03 08:00:43 -0400 (Fri, 03 Sep 2010)
New Revision: 12897
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Excluding legacy artifacts from testsuite dependency:tree
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2010-09-03 11:47:58 UTC (rev 12896)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2010-09-03 12:00:43 UTC (rev 12897)
@@ -586,6 +586,14 @@
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-services</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxrpc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
<!-- Exclusions for preventing http://www.slf4j.org/codes.html#multiple_bindings -->
<exclusion>
<groupId>org.jboss.slf4j</groupId>
@@ -688,6 +696,14 @@
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-services</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxrpc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
<!-- Exclusions for preventing http://www.slf4j.org/codes.html#multiple_bindings -->
<exclusion>
<groupId>org.jboss.slf4j</groupId>
13 years, 8 months
JBossWS SVN: r12896 - in stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws: jbws2206 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-03 07:47:58 -0400 (Fri, 03 Sep 2010)
New Revision: 12896
Modified:
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/JBWS2087TestCase.java
stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/JBWS2206TestCase.java
Log:
[JBWS-2957] fixing tests to be aligned with new URL pattern scheme
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/JBWS2087TestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/JBWS2087TestCase.java 2010-09-03 11:37:17 UTC (rev 12895)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2087/JBWS2087TestCase.java 2010-09-03 11:47:58 UTC (rev 12896)
@@ -41,7 +41,7 @@
public void testClientProxy() throws Exception
{
Service service = Service.create(
- new URL("http://"+getServerHost()+":8080/jaxws-jbws2087/MetroTestServiceBean?wsdl"),
+ new URL("http://"+getServerHost()+":8080/jaxws-jbws2087/MetroTestService/MetroTestServiceBean?wsdl"),
new QName("http://com.acme.metroexceptiontest/", "MetroTestService")
);
MetroTestPortType port = service.getPort(MetroTestPortType.class);
Modified: stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/JBWS2206TestCase.java
===================================================================
--- stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/JBWS2206TestCase.java 2010-09-03 11:37:17 UTC (rev 12895)
+++ stack/metro/trunk/modules/testsuite/metro-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2206/JBWS2206TestCase.java 2010-09-03 11:47:58 UTC (rev 12896)
@@ -51,7 +51,7 @@
public void testClientProxy() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2206/MetroTestServiceBean?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2206/MetroTestService/MetroTestServiceBean?wsdl");
Service service = Service.create(wsdlURL, new QName("http://com.acme.metroexceptiontest/", "MetroTestService"));
MetroTestPortType port = service.getPort(MetroTestPortType.class);
@@ -61,7 +61,7 @@
public void testImportedDocument() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2206/MetroTestServiceBean?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2206/MetroTestService/MetroTestServiceBean?wsdl");
WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString());
assertNotNull(wsdlDefinition);
@@ -80,8 +80,7 @@
String schemaLocation = schemaImport.getSchemaLocationURI();
assertNotNull(schemaLocation);
assertTrue(schemaLocation.startsWith("http://" + getServerHost())); //check absolute url
-
-
+
HttpURLConnection con = (HttpURLConnection)new URL(schemaLocation).openConnection();
BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream()));
String s = isr.readLine();
13 years, 8 months
JBossWS SVN: r12895 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-03 07:37:17 -0400 (Fri, 03 Sep 2010)
New Revision: 12895
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
Log:
[JBWS-2957] excluding EJB3 webservices in web archives test for AS 5x series
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-03 11:34:53 UTC (rev 12894)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-03 11:37:17 UTC (rev 12895)
@@ -84,3 +84,6 @@
# [JBWS-3107] Review org.jboss.test.ws.jaxws.endpoint tests
org/jboss/test/ws/jaxws/endpoint/jse/**
+
+# [JBWS-2957] EJB3 webservices in web archives (fixed on AS 6 series only)
+org/jboss/test/ws/jaxws/jbws2957/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-03 11:34:53 UTC (rev 12894)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-03 11:37:17 UTC (rev 12895)
@@ -84,3 +84,6 @@
# [JBWS-3107] Review org.jboss.test.ws.jaxws.endpoint tests
org/jboss/test/ws/jaxws/endpoint/jse/**
+
+# [JBWS-2957] EJB3 webservices in web archives (fixed on AS 6 series only)
+org/jboss/test/ws/jaxws/jbws2957/**
13 years, 8 months
JBossWS SVN: r12894 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-03 07:34:53 -0400 (Fri, 03 Sep 2010)
New Revision: 12894
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
Log:
[JBWS-2957] excluding EJB3 webservices in web archives test for AS 5x series
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-03 10:49:37 UTC (rev 12893)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-09-03 11:34:53 UTC (rev 12894)
@@ -11,3 +11,6 @@
org/jboss/test/ws/jaxws/jbws3008/**
org/jboss/test/ws/jaxws/endpointReference/**
org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.*
+
+# [JBWS-2957] EJB3 webservices in web archives (fixed on AS 6 series only)
+org/jboss/test/ws/jaxws/jbws2957/**
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-03 10:49:37 UTC (rev 12893)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-09-03 11:34:53 UTC (rev 12894)
@@ -11,3 +11,6 @@
org/jboss/test/ws/jaxws/jbws3008/**
org/jboss/test/ws/jaxws/endpointReference/**
org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.*
+
+# [JBWS-2957] EJB3 webservices in web archives (fixed on AS 6 series only)
+org/jboss/test/ws/jaxws/jbws2957/**
13 years, 8 months
JBossWS SVN: r12893 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws1422 and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-03 06:49:37 -0400 (Fri, 03 Sep 2010)
New Revision: 12893
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2257/AddressingTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/RetailSampleTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl
framework/trunk/testsuite/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl
framework/trunk/testsuite/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl
Log:
[JBWS-2838] updating tests to be aligned with new URL pattern mapping algorithm
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1283/JBWS1283TestCase.java 2010-09-03 10:49:37 UTC (rev 12893)
@@ -60,7 +60,7 @@
super.setUp();
QName serviceName = new QName(targetNS, "JBWS1283Service");
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1283/JBWS1283EndpointImpl?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1283/JBWS1283Service/JBWS1283EndpointImpl?wsdl");
Service service = Service.create(wsdlURL, serviceName);
port = (JBWS1283Endpoint)service.getPort(JBWS1283Endpoint.class);
@@ -68,40 +68,38 @@
public void testAttachmentResponse() throws Exception
{
- // Add a client-side handler that verifes existence of the attachment
- BindingProvider bindingProvider = (BindingProvider)port;
+ // Add a client-side handler that verifes existence of the attachment
+ BindingProvider bindingProvider = (BindingProvider)port;
List<Handler> handlerChain = new ArrayList<Handler>();
handlerChain.add(new VerifyAttachmentHandler());
bindingProvider.getBinding().setHandlerChain(handlerChain);
- port.requestAttachmentData();
+ port.requestAttachmentData();
}
- // handler that verifies the attachment that have been added on the server-side
- static class VerifyAttachmentHandler extends GenericSOAPHandler
- {
+ // handler that verifies the attachment that have been added on the server-side
+ static class VerifyAttachmentHandler extends GenericSOAPHandler
+ {
+ protected boolean handleInbound(MessageContext msgContext)
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ Iterator it = soapMessage.getAttachments();
+ while(it.hasNext())
+ {
+ try
+ {
+ AttachmentPart attachment = (AttachmentPart)it.next();
+ System.out.println("Recv " + attachment.getContentType() + " attachment:");
+ System.out.println("'"+attachment.getContent()+"'");
+ return true;
+ }
+ catch (SOAPException e)
+ {
+ throw new RuntimeException("Failed to access attachment data");
+ }
+ }
- protected boolean handleInbound(MessageContext msgContext)
- {
- SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
- Iterator it = soapMessage.getAttachments();
- while(it.hasNext())
- {
- try
- {
- AttachmentPart attachment = (AttachmentPart)it.next();
- System.out.println("Recv " + attachment.getContentType() + " attachment:");
- System.out.println("'"+attachment.getContent()+"'");
- return true;
- }
- catch (SOAPException e)
- {
- throw new RuntimeException("Failed to access attachment data");
- }
- }
-
- throw new IllegalStateException("Missing attachment on the client side");
- }
- }
-
+ throw new IllegalStateException("Missing attachment on the client side");
+ }
+ }
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvc.java 2010-09-03 10:49:37 UTC (rev 12893)
@@ -29,7 +29,5 @@
@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
public interface IWebsvc
{
-
- String cancel(@WebParam(name = "nBarFoo")
- String myfoobar);
+ String cancel(@WebParam(name = "nBarFoo")String myfoobar);
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/IWebsvcImpl.java 2010-09-03 10:49:37 UTC (rev 12893)
@@ -28,7 +28,6 @@
@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1422.IWebsvc", serviceName = "JBWS1422Service")
public class IWebsvcImpl implements IWebsvc
{
-
public String cancel(String myfoobar)
{
return "Cancelled-" + myfoobar;
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1422/JBWS1422TestCase.java 2010-09-03 10:49:37 UTC (rev 12893)
@@ -53,7 +53,7 @@
if (port == null)
{
QName serviceName = new QName(TARGET_NAMESPACE, "JBWS1422Service");
- wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1422/IWebsvcImpl?wsdl");
+ wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1422/JBWS1422Service/IWebsvcImpl?wsdl");
Service service = Service.create(wsdlURL, serviceName);
port = service.getPort(IWebsvc.class);
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1505/JBWS1505TestCase.java 2010-09-03 10:49:37 UTC (rev 12893)
@@ -39,9 +39,9 @@
{
private String targetNS = "http://org.jboss.test.ws/jbws1505";
private Interface2 port;
- private URL wsdlURL;
+ private URL wsdlURL;
- public static Test suite()
+ public static Test suite()
{
return new JBossWSTestSetup(JBWS1505TestCase.class, "jaxws-jbws1505.jar");
}
@@ -52,38 +52,37 @@
super.setUp();
QName serviceName = new QName(targetNS, "JBWS1505Service");
- wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1505/JBWS1505EndpointImpl?wsdl");
+ wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1505/JBWS1505Service/JBWS1505EndpointImpl?wsdl");
Service service = Service.create(wsdlURL, serviceName);
port = service.getPort(Interface2.class);
}
- /**
- * All methods on the SEI should be mapped.
- *
- * @throws Exception
- */
- public void testWSDLGeneration() throws Exception
- {
- Definition wsdl = WSDLFactory.newInstance().newWSDLReader().readWSDL(wsdlURL.toString());
- Map services = wsdl.getAllServices();
- assertTrue(services.size() == 1); // a simple port
+ /**
+ * All methods on the SEI should be mapped.
+ *
+ * @throws Exception
+ */
+ public void testWSDLGeneration() throws Exception
+ {
+ Definition wsdl = WSDLFactory.newInstance().newWSDLReader().readWSDL(wsdlURL.toString());
+ Map services = wsdl.getAllServices();
+ assertTrue(services.size() == 1); // a simple port
javax.wsdl.Service service = (javax.wsdl.Service)services.values().iterator().next();
javax.wsdl.Port port = (javax.wsdl.Port)service.getPorts().values().iterator().next();
- assertTrue(port.getBinding().getBindingOperations().size() == 5); // with five op's
- }
+ assertTrue(port.getBinding().getBindingOperations().size() == 5); // with five op's
+ }
- /**
- * Complex types that inherit from a SEI hirarchy shold expose
- * all members in xml schema.
- *
- * @throws Exception
- */
- public void testTypeInheritance() throws Exception
- {
+ /**
+ * Complex types that inherit from a SEI hirarchy shold expose
+ * all members in xml schema.
+ *
+ * @throws Exception
+ */
+ public void testTypeInheritance() throws Exception
+ {
CustomType ct = port.getCustomType();
assertTrue(ct.getMember1() == 1);
- assertTrue(ct.getMember2() == 2);
- }
-
+ assertTrue(ct.getMember2() == 2);
+ }
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2010-09-03 10:49:37 UTC (rev 12893)
@@ -31,7 +31,7 @@
import java.net.URL;
/**
- * Serviceref thorugh ejb3 deployment descriptor.
+ * Serviceref through ejb3 deployment descriptor.
*
* http://jira.jboss.org/jira/browse/JBWS-1841
*
@@ -39,7 +39,7 @@
*/
public class JBWS1841TestCase extends JBossWSTest
{
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1841/EJB3Bean";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-jbws1841/EndpointService/EJB3Bean";
private static EndpointInterface port;
private static StatelessRemote remote;
@@ -57,21 +57,15 @@
QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "EndpointService");
port = Service.create(wsdlURL, serviceName).getPort(EndpointInterface.class);
-
InitialContext ctx = new InitialContext();
remote = (StatelessRemote)ctx.lookup("/StatelessBean/remote");
}
}
- /**
- * Check if the servce was deploed correctly
- * @throws Exception
- */
public void testDirectWSInvocation() throws Exception
{
String result = port.echo("DirectWSInvocation");
assertEquals("DirectWSInvocation", result);
-
}
public void testEJBRelay1() throws Exception
@@ -86,7 +80,6 @@
assertEquals("Relay2", result);
}
-
public void testEJBRelay3() throws Exception
{
String result = remote.echo3("Relay3");
@@ -98,6 +91,4 @@
String result = remote.echo4("Relay4");
assertEquals("Relay4", result);
}
-
-
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2257/AddressingTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2257/AddressingTestCase.java 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2257/AddressingTestCase.java 2010-09-03 10:49:37 UTC (rev 12893)
@@ -32,14 +32,13 @@
import org.jboss.wsf.test.JBossWSTestSetup;
/**
- *
* @author alessio.soldano(a)jboss.com
* @since 25-Nov-2008
*/
public final class AddressingTestCase extends JBossWSTest
{
- private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-jbws2257/ServiceImpl";
-
+ private final String serviceURL = "http://" + getServerHost() + ":8080/jaxws-jbws2257/AddressingService/ServiceImpl";
+
public static Test suite()
{
return new JBossWSTestSetup(AddressingTestCase.class, "jaxws-jbws2257.jar");
@@ -53,5 +52,4 @@
ServiceIface proxy = (ServiceIface)service.getPort(ServiceIface.class);
assertEquals("Hello World!", proxy.sayHello());
}
-
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2701/JBWS2701TestCase.java 2010-09-03 10:49:37 UTC (rev 12893)
@@ -35,19 +35,19 @@
/**
* [JBWS-2701] @XmlSeeAlso and generated wsdl
- *
+ *
* @author alessio.soldano(a)jboss.com
* @since 30-Sep-2009
*/
public class JBWS2701TestCase extends JBossWSTest
{
- private String endpointAddress = "http://" + this.getServerHost() + ":8080/jaxws-jbws2701/EndpointImpl";
+ private String endpointAddress = "http://" + this.getServerHost() + ":8080/jaxws-jbws2701/EndpointService/EndpointImpl";
public static Test suite()
{
return new JBossWSTestSetup(JBWS2701TestCase.class, "jaxws-jbws2701.jar");
}
-
+
public void testWSDL() throws Exception
{
URL url = new URL(endpointAddress + "?wsdl");
@@ -65,7 +65,7 @@
}
assertTrue(sb.toString().contains("classA"));
}
-
+
public void testEndpoint() throws Exception
{
URL url = new URL(endpointAddress + "?wsdl");
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.java 2010-09-03 10:49:37 UTC (rev 12893)
@@ -33,13 +33,12 @@
/**
* [JBWS-2999] cxf webservices.xml override with jaxws
- *
+ *
* @author alessio.soldano(a)jboss.com
* @since 15-Apr-2010
*/
public class JBWS2999TestCase extends JBossWSTest
{
-
public static Test suite() throws Exception
{
return new JBossWSTestSetup(JBWS2999TestCase.class, "jaxws-jbws2999.jar");
@@ -47,12 +46,10 @@
private Hello getPort() throws Exception
{
-
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2999/HelloBean?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2999/JunkServiceName/HelloBean?wsdl");
QName serviceName = new QName("http://Hello.org", "HelloService");
Service service = Service.create(wsdlURL, serviceName);
-
return service.getPort(Hello.class);
}
@@ -62,5 +59,4 @@
String response = getPort().helloEcho(message);
assertEquals(message, response);
}
-
}
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/RetailSampleTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/RetailSampleTestCase.java 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/advanced/retail/RetailSampleTestCase.java 2010-09-03 10:49:37 UTC (rev 12893)
@@ -37,7 +37,7 @@
*/
public class RetailSampleTestCase extends JBossWSTest {
- public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-retail/OrderMgmtBean";
+ public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-retail/OrderMgmtService/OrderMgmtBean";
private OrderMgmt orderMgmtWS;
@@ -65,7 +65,7 @@
Order order = new Order(customer);
order.setOrderNum(12345);
order.getItems().add( new OrderItem("Introduction to Web Services", 39.99) );
-
+
OrderStatus result = orderMgmtWS.prepareOrder(order);
assertNotNull("Result was null", result);
assertEquals("Prepared", result.getStatus());
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2010-09-03 10:49:37 UTC (rev 12893)
@@ -52,7 +52,7 @@
public void testEJB3Endpoint() throws Exception
{
- String soapAddress = "http://" + getServerHost() + ":8080/earejb3/Endpoint";
+ String soapAddress = "http://" + getServerHost() + ":8080/earejb3/EndpointService/Endpoint";
QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService");
Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName);
Endpoint port = service.getPort(Endpoint.class);
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/WSDLPublishTestCase.java 2010-09-03 10:49:37 UTC (rev 12893)
@@ -55,7 +55,7 @@
public void testEJB3Endpoint() throws Exception
{
- String soapAddress = "http://" + getServerHost() + ":8080/earejb3/Endpoint";
+ String soapAddress = "http://" + getServerHost() + ":8080/earejb3/EndpointService/Endpoint";
QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService");
File file = new File(getWsdlFileDir().getAbsolutePath() + File.separator + "jaxws-samples-eardeployment.ear" + File.separator
Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java
===================================================================
--- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/swaref/SWARefTestCase.java 2010-09-03 10:49:37 UTC (rev 12893)
@@ -32,17 +32,16 @@
import java.net.URL;
/**
- * Test SwARef with different binding styles and @XmlAttachmentRef locations.
+ * Test SwARef with different binding styles and @XmlAttachmentRef locations.
*
* @author Heiko.Braun(a)jboss.com
*/
public class SWARefTestCase extends JBossWSTest
{
+ private String bareEndpointURL = "http://" + getServerHost() + ":8080/jaxws-swaref/BareEndpointService/BareEndpoint";
+ private String wrappedEndpointURL = "http://" + getServerHost() + ":8080/jaxws-swaref/WrappedEndpointService/WrappedEndpoint";
+ private String rpclitEndpointURL = "http://" + getServerHost() + ":8080/jaxws-swaref/RpcLitEndpointService/RpcLitEndpoint";
- private String bareEndpointURL = "http://" + getServerHost() + ":8080/jaxws-swaref/BareEndpoint";
- private String wrappedEndpointURL = "http://" + getServerHost() + ":8080/jaxws-swaref/WrappedEndpoint";
- private String rpclitEndpointURL = "http://" + getServerHost() + ":8080/jaxws-swaref/RpcLitEndpoint";
-
private QName bareServiceQName = new QName("http://swaref.samples.jaxws.ws.test.jboss.org/", "BareEndpointService");
private QName wrappedServiceQName = new QName("http://swaref.samples.jaxws.ws.test.jboss.org/", "WrappedEndpointService");
private QName rpcLitServiceQName = new QName("http://swaref.samples.jaxws.ws.test.jboss.org/", "RpcLitEndpointService");
@@ -69,7 +68,6 @@
DocumentPayload response = port.beanAnnotation(new DocumentPayload(data), "Wrapped test");
assertTrue(response.getData().getContent().equals("Server data"));
-
}
public void testParameterAnnotationWithWrapped() throws Exception
@@ -90,7 +88,6 @@
DocumentPayload response = port.beanAnnotation( new DocumentPayload(data));
assertNotNull("Response was null", response);
assertTrue(response.getData().getContent().equals("Server data"));
-
}
public void testListAnnotationWithWrapped() throws Exception
@@ -103,7 +100,5 @@
DocumentPayloadWithList response = port.listAnnotation(payload, "Wrapped test");
assertTrue(response.getData().get(0).getContent().equals("Server data"));
-
}
-
}
Modified: framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl 2010-09-03 10:49:37 UTC (rev 12893)
@@ -33,7 +33,7 @@
<service name='EndpointService'>
<port binding='tns:EndpointInterfaceBinding' name='EJB3BeanPort'>
- <soap:address location='http://@jboss.bind.address@:8080/jaxws-jbws1841/EJB3Bean'/>
+ <soap:address location='http://@jboss.bind.address@:8080/jaxws-jbws1841/EndpointService/EJB3Bean'/>
</port>
</service>
</definitions>
\ No newline at end of file
Modified: framework/trunk/testsuite/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl 2010-09-03 10:49:37 UTC (rev 12893)
@@ -59,7 +59,7 @@
</binding>
<service name="OrderMgmtService">
<port binding="tns:OrderMgmtBinding" name="OrderMgmtPort">
- <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-retail/OrderMgmtBean"/>
+ <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-retail/OrderMgmtService/OrderMgmtBean"/>
</port>
</service>
</definitions>
Modified: framework/trunk/testsuite/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl
===================================================================
--- framework/trunk/testsuite/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl 2010-09-03 10:09:05 UTC (rev 12892)
+++ framework/trunk/testsuite/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl 2010-09-03 10:49:37 UTC (rev 12893)
@@ -1,7 +1,5 @@
<definitions name='ProfileMgmtService' targetNamespace='http://org.jboss.ws/samples/retail/profile' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.ws/samples/retail' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/retail/profile' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
-
<types>
-
<xs:schema targetNamespace='http://org.jboss.ws/samples/retail' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
<xs:complexType name='customer'>
<xs:sequence>
@@ -11,7 +9,6 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
-
<xs:schema targetNamespace='http://org.jboss.ws/samples/retail/profile' version='1.0' xmlns:ns1='http://org.jboss.ws/samples/retail' xmlns:tns='http://org.jboss.ws/samples/retail/profile' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
<xs:import namespace='http://org.jboss.ws/samples/retail'/>
<xs:element name='getCustomerDiscount' nillable='true' type='tns:discountRequest'/>
@@ -19,7 +16,6 @@
<xs:complexType name='discountRequest'>
<xs:sequence>
<xs:element minOccurs='0' name='customer' type='ns1:customer'/>
-
</xs:sequence>
</xs:complexType>
<xs:complexType name='discountResponse'>
@@ -29,9 +25,7 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
-
</types>
-
<message name='ProfileMgmt_getCustomerDiscount'>
<part element='tns:getCustomerDiscount' name='getCustomerDiscount'/>
</message>
@@ -40,7 +34,6 @@
</message>
<portType name='ProfileMgmt'>
<operation name='getCustomerDiscount' parameterOrder='getCustomerDiscount'>
-
<input message='tns:ProfileMgmt_getCustomerDiscount'/>
<output message='tns:ProfileMgmt_getCustomerDiscountResponse'/>
</operation>
@@ -50,7 +43,6 @@
<operation name='getCustomerDiscount'>
<soap:operation soapAction=''/>
<input>
-
<soap:body use='literal'/>
</input>
<output>
@@ -60,8 +52,7 @@
</binding>
<service name='ProfileMgmtService'>
<port binding='tns:ProfileMgmtBinding' name='ProfileMgmtPort'>
-
- <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-retail/ProfileMgmtBean'/>
+ <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-retail/ProfileMgmtService/ProfileMgmtBean'/>
</port>
</service>
</definitions>
13 years, 8 months
JBossWS SVN: r12892 - in stack/cxf/trunk: modules/resources/src/main/resources/resources and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-09-03 06:09:05 -0400 (Fri, 03 Sep 2010)
New Revision: 12892
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-3117] Avoid installing saaj apis and removing references in tool scripts
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-09-03 09:14:11 UTC (rev 12891)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2010-09-03 10:09:05 UTC (rev 12892)
@@ -80,7 +80,6 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-context.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-core.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-expression.jar
-set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/XmlSchema.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-09-03 09:14:11 UTC (rev 12891)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2010-09-03 10:09:05 UTC (rev 12892)
@@ -122,7 +122,6 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-context.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-core.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-expression.jar"
-WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/saaj-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/stax-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/velocity.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/XmlSchema.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-09-03 09:14:11 UTC (rev 12891)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.bat 2010-09-03 10:09:05 UTC (rev 12892)
@@ -101,7 +101,6 @@
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-context.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-core.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/spring-expression.jar
-set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/saaj-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar
set WSRUNCLIENT_CLASSPATH=%WSRUNCLIENT_CLASSPATH%;%JBOSS_HOME%/client/XmlSchema.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-09-03 09:14:11 UTC (rev 12891)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsrunclient.sh 2010-09-03 10:09:05 UTC (rev 12892)
@@ -121,7 +121,6 @@
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-context.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-core.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/spring-expression.jar"
-WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/saaj-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/stax-api.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/velocity.jar"
WSRUNCLIENT_CLASSPATH="$WSRUNCLIENT_CLASSPATH:$JBOSS_HOME/client/XmlSchema.jar"
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-09-03 09:14:11 UTC (rev 12891)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-09-03 10:09:05 UTC (rev 12892)
@@ -43,7 +43,6 @@
<include name="**/jbossws-cxf-transports-httpserver.jar"/>
<include name="**/jdom.jar"/>
<include name="**/neethi.jar"/>
- <include name="**/saaj-api.jar"/>
<include name="**/stax-api.jar"/>
<include name="**/velocity.jar"/>
<include name="**/wsdl4j.jar"/>
@@ -81,7 +80,6 @@
<include name="**/jbossws-spi.jar"/>
<include name="**/jdom.jar"/>
<include name="**/neethi.jar"/>
- <include name="**/saaj-api.jar"/>
<include name="**/XmlSchema.jar"/>
<include name="**/xmlsec.jar"/>
<include name="**/wsdl4j.jar"/>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-09-03 09:14:11 UTC (rev 12891)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2010-09-03 10:09:05 UTC (rev 12892)
@@ -56,29 +56,20 @@
<include>org.codehaus.woodstox:wstx-lgpl:jar</include>
</includes>
</dependencySet>
-
<dependencySet>
- <outputFileNameMapping>jaxb-api.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputFileNameMapping>saaj-api.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar</include>
- </includes>
- </dependencySet>
-
+ <outputFileNameMapping>jaxb-api.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</binaries>
</moduleSet>
13 years, 8 months
JBossWS SVN: r12891 - in stack/native/trunk/modules/testsuite/native-tests/src/test: java/org/jboss/test/ws/jaxws/jbws1909 and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2010-09-03 05:14:11 -0400 (Fri, 03 Sep 2010)
New Revision: 12891
Modified:
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws771/binding.xml
Log:
[JBWS-2838] fixing tests to be alligned with new URL pattern scheme
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java 2010-09-03 09:07:12 UTC (rev 12890)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java 2010-09-03 09:14:11 UTC (rev 12891)
@@ -55,7 +55,7 @@
public void testSimple() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-epr/TestEndpoint?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-epr/TestEndpointService/TestEndpoint?wsdl");
QName serviceName = new QName("http://org.jboss.ws/epr", "TestEndpointService");
Service service = Service.create(wsdlURL, serviceName);
TestEndpoint port = service.getPort(TestEndpoint.class);
@@ -66,7 +66,7 @@
public void testEndpointReference() throws Exception
{
- String address = "http://" + getServerHost() + ":8080/jaxws-epr/TestEndpoint";
+ String address = "http://" + getServerHost() + ":8080/jaxws-epr/TestEndpointService/TestEndpoint";
URL wsdlURL = new URL(address + "?wsdl");
QName serviceName = new QName("http://org.jboss.ws/epr", "TestEndpointService");
@@ -86,7 +86,7 @@
public void testEndpointReferenceFromSource() throws Exception
{
- String address = "http://" + getServerHost() + ":8080/jaxws-epr/TestEndpoint";
+ String address = "http://" + getServerHost() + ":8080/jaxws-epr/TestEndpointService/TestEndpoint";
URL wsdlURL = new URL(address + "?wsdl");
QName serviceName = new QName("http://org.jboss.ws/epr", "TestEndpointService");
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java 2010-09-03 09:07:12 UTC (rev 12890)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1909/JBWS1909TestCase.java 2010-09-03 09:14:11 UTC (rev 12891)
@@ -48,7 +48,7 @@
public void testWSDLSchema() throws Exception
{
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1909/TestEndpoint?wsdl");
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1909/TestEndpointService/TestEndpoint?wsdl");
QName serviceName = new QName("http://org.jboss.ws/jbws1909", "TestEndpointService");
Service service = Service.create(wsdlURL, serviceName);
TestEndpoint port = service.getPort(TestEndpoint.class);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java 2010-09-03 09:07:12 UTC (rev 12890)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2565/JBWS2565TestCase.java 2010-09-03 09:14:11 UTC (rev 12891)
@@ -49,7 +49,7 @@
final ServiceFactory factory = ServiceFactory.newInstance();
final Service service = factory.createService(new QName("http://my.services.web", "MyWebServiceName"));
final Call call = service.createCall(new QName("http://my.services.web", "MyWebServicePort"));
- call.setTargetEndpointAddress("http://" + getServerHost() + ":8080/jaxws-jbws2565/MyWebService?wsdl");
+ call.setTargetEndpointAddress("http://" + getServerHost() + ":8080/jaxws-jbws2565/MyWebServiceName/MyWebService?wsdl");
call.setOperationName(new QName("http://my.services.web", "doStuff"));
final QName QNAME_TYPE_STRING = new QName("http://www.w3.org/2001/XMLSchema", "string");
call.setReturnType(QNAME_TYPE_STRING);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2010-09-03 09:07:12 UTC (rev 12890)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws771/JBWS771TestCase.java 2010-09-03 09:14:11 UTC (rev 12891)
@@ -72,7 +72,7 @@
if (port == null)
{
QName serviceName = new QName(TARGET_NAMESPACE, "JBWS771Service");
- wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws771/IWebsvcImpl?wsdl");
+ wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws771/JBWS771Service/IWebsvcImpl?wsdl");
Service service = Service.create(wsdlURL, serviceName);
port = service.getPort(IWebsvc.class);
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws771/binding.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws771/binding.xml 2010-09-03 09:07:12 UTC (rev 12890)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/jbws771/binding.xml 2010-09-03 09:14:11 UTC (rev 12891)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<jaxws:bindings
- wsdlLocation="http://localhost:8080/jaxws-jbws771/IWebsvcImpl?wsdl"
+ wsdlLocation="http://localhost:8080/jaxws-jbws771/JBWS771Service/IWebsvcImpl?wsdl"
xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
>
13 years, 8 months