[jbossws-commits] JBossWS SVN: r12893 - in framework/trunk/testsuite/test: java/org/jboss/test/ws/jaxws/jbws1422 and 10 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Sep 3 06:49:37 EDT 2010
Author: richard.opalka at 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 at 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 at 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 at 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 at 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>
More information about the jbossws-commits
mailing list