Author: heiko.braun(a)jboss.com
Date: 2007-02-20 05:18:40 -0500 (Tue, 20 Feb 2007)
New Revision: 2408
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/SignTestCase.java
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitB/META-INF/scenarios.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitW/META-INF/scenarios.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesRpcLit/META-INF/scenarios.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/wsa/META-INF/scenarios.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/wsse/encrypt/META-INF/scenarios.xml
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/wsse/sign/META-INF/scenarios.xml
Log:
Test public interop endpoints
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2007-02-20
09:42:09 UTC (rev 2407)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitb/BaseDataTypesDocLitBTestCase.java 2007-02-20
10:18:40 UTC (rev 2408)
@@ -57,7 +57,8 @@
URL wsdlLocation = new
File("resources/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl").toURL();
Service service = Service.create(wsdlLocation, new QName("",
"BaseDataTypesDocLitBService") );
targetPort = service.getPort(IBaseDataTypesDocLitB.class);
-
((BindingProvider)targetPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://"+getServerHost()+":8080/basedoclitb/endpoint");
+
((BindingProvider)targetPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://jbossws.demo.jboss.com:8080/basedoclitb/endpoint");
proxy = (BaseDataTypesSEI)BaseDataTypesProxy.newInstance(targetPort);
}
}
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-02-20
09:42:09 UTC (rev 2407)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/basedoclitw/BaseDataTypesDocLitWTestCase.java 2007-02-20
10:18:40 UTC (rev 2408)
@@ -56,7 +56,9 @@
URL wsdlLocation = new
File("resources/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl").toURL();
Service service = Service.create(wsdlLocation, new QName("",
"BaseDataTypesDocLitWService") );
BaseDataTypesDocLitWTestCase.targetPort =
service.getPort(IBaseDataTypesDocLitW.class);
-
((BindingProvider)BaseDataTypesDocLitWTestCase.targetPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://"+getServerHost()+":8080/basedoclitw/endpoint");
+
((BindingProvider)BaseDataTypesDocLitWTestCase.targetPort).getRequestContext().put(
+ BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://jbossws.demo.jboss.com:8080/basedoclitw/endpoint");
BaseDataTypesDocLitWTestCase.proxy = (BaseDataTypesSEI)
BaseDataTypesProxy.newInstance(BaseDataTypesDocLitWTestCase.targetPort);
}
}
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java 2007-02-20
09:42:09 UTC (rev 2407)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/soapwsdl/baserpclit/BaseDataTypesRpcLitTestCase.java 2007-02-20
10:18:40 UTC (rev 2408)
@@ -58,7 +58,9 @@
URL wsdlLocation = new
File("resources/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl").toURL();
Service service = Service.create(wsdlLocation, new QName("",
"BaseDataTypesRpcLitService") );
targetPort = service.getPort(IBaseDataTypesRpcLit.class);
-
((BindingProvider)targetPort).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://"+getServerHost()+":8080/baserpclit/endpoint");
+ ((BindingProvider)targetPort).getRequestContext().put(
+ BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://jbossws.demo.jboss.com:8080/baserpclit/endpoint");
proxy = (BaseDataTypesSEI)BaseDataTypesProxy.newInstance(targetPort);
}
}
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-02-20
09:42:09 UTC (rev 2407)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsa/AddressingTestCase.java 2007-02-20
10:18:40 UTC (rev 2408)
@@ -24,6 +24,8 @@
import junit.framework.Test;
import org.jboss.test.ws.JBossWSTest;
import org.jboss.test.ws.JBossWSTestSetup;
+import org.jboss.test.ws.interop.ClientScenario;
+import org.jboss.test.ws.interop.InteropConfigFactory;
import org.jboss.ws.core.StubExt;
import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.extensions.addressing.AddressingClientUtil;
@@ -105,21 +107,38 @@
private void configureClient() {
+ ((BindingProvider)echoPort).getRequestContext().put(
+
BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://jbossws.demo.jboss.com:8080/wsa10/echo"
+ );
+
+ ((BindingProvider)notifyPort).getRequestContext().put(
+ BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://jbossws.demo.jboss.com:8080/wsa10/notify"
+ );
+
/*
- TODO: allow scenario loading from TestCase class loader
- InteropConfigFactory factory = InteropConfigFactory.newInstance();
- ClientScenario scenario =
factory.createClientScenario(System.getProperty("client.scenario"));
- if(scenario!=null)
- {
- log.info("Using scenario: " + scenario);
- AddressingTestCase.setTargetAddress((BindingProvider)notifyPort,
scenario.getTargetEndpoint().toString());
- AddressingTestCase.setTargetAddress((BindingProvider)echoPort,
scenario.getParameter("echoPort"));
- }
- else
- {
- throw new IllegalStateException("Failed to load client scenario");
- }
- */
+ TODO: Fix scenario DD loading
+ IteropConfigFactory factory = InteropConfigFactory.newInstance();
+ ClientScenario scenario =
factory.createClientScenario(System.getProperty("client.scenario"));
+ if(scenario!=null)
+ {
+ String notifyEndpoint = scenario.getTargetEndpoint().toString();
+ log.info("Using scenario: " + scenario);
+ log.info("Endpoint at: " + notifyEndpoint);
+
+ ((BindingProvider)echoPort).getRequestContext().put(
+ BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ scenario.getParameter("echoPort")
+ );
+
+ ((BindingProvider)notifyPort).getRequestContext().put(
+ BindingProvider.ENDPOINT_ADDRESS_PROPERTY, notifyEndpoint
+ );
+
+ }
+ else
+ {
+ throw new IllegalStateException("Failed to load client scenario");
+ } */
}
/**
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-02-20
09:42:09 UTC (rev 2407)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/EncryptTestCase.java 2007-02-20
10:18:40 UTC (rev 2408)
@@ -38,7 +38,7 @@
}
String getEndpointURL() {
- return
"http://"+getServerHost()+":8080//wsse10Encrypt/endpoint";
+ return "http://jbossws.demo.jboss.com:8080/wsse10Encrypt/endpoint";
}
// Scenario 3.3. X509 Mutual Authentication, Sign Then Encrypt
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/SignTestCase.java
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-02-20
09:42:09 UTC (rev 2407)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/interop/wsse/SignTestCase.java 2007-02-20
10:18:40 UTC (rev 2408)
@@ -37,7 +37,7 @@
}
String getEndpointURL() {
- return "http://"+getServerHost()+":8080//wsse10Sign/endpoint";
+ return "http://jbossws.demo.jboss.com:8080/wsse10Sign/endpoint";
}
// Scenario 3.2. X509 Mutual Authentication, Sign Only
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitB/META-INF/scenarios.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitB/META-INF/scenarios.xml 2007-02-20
09:42:09 UTC (rev 2407)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitB/META-INF/scenarios.xml 2007-02-20
10:18:40 UTC (rev 2408)
@@ -1,6 +1,6 @@
<client-scenarios>
<scenario name="default" description="Testing local WSA
endpoints">
-
<target-endpoint>http://localhost:8080/BaseDataTypesDocLitB_Service/endpoint</target-endpoint>
+
<target-endpoint>http://jbossws.demo.jboss.com:8080/basedoclitb/endpoint</target-endpoint>
<detour/>
</scenario>
<scenario name="msft-public" decsription="Testing MSFT public
interop endpoints">
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitW/META-INF/scenarios.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitW/META-INF/scenarios.xml 2007-02-20
09:42:09 UTC (rev 2407)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesDocLitW/META-INF/scenarios.xml 2007-02-20
10:18:40 UTC (rev 2408)
@@ -1,6 +1,6 @@
<client-scenarios>
<scenario name="default" description="Testing local WSA
endpoints">
-
<target-endpoint>http://localhost:8080/BaseDataTypesDocLitW_Service/endpoint</target-endpoint>
+
<target-endpoint>http://jbossws.demo.jboss.com:8080/basedoclitw/endpoint</target-endpoint>
<detour/>
</scenario>
<scenario name="msft-public" decsription="Testing MSFT public
interop endpoints">
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesRpcLit/META-INF/scenarios.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesRpcLit/META-INF/scenarios.xml 2007-02-20
09:42:09 UTC (rev 2407)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/soapwsdl/BaseDataTypesRpcLit/META-INF/scenarios.xml 2007-02-20
10:18:40 UTC (rev 2408)
@@ -1,6 +1,6 @@
<client-scenarios>
<scenario name="default" description="Testing local WSA
endpoints">
-
<target-endpoint>http://localhost:8080/BaseDataTypesRpcLit_Service/endpoint</target-endpoint>
+
<target-endpoint>http://jbossws.demo.jboss.com:8080/baserpclit/endpoint</target-endpoint>
<detour/>
</scenario>
<scenario name="msft-public" decsription="Testing MSFT public
interop endpoints">
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/wsa/META-INF/scenarios.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/wsa/META-INF/scenarios.xml 2007-02-20
09:42:09 UTC (rev 2407)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/wsa/META-INF/scenarios.xml 2007-02-20
10:18:40 UTC (rev 2408)
@@ -1,7 +1,7 @@
<client-scenarios>
<scenario name="default" description="Testing local WSA
endpoints">
-
<target-endpoint>http://localhost:8080/wsa10_sep06/notify</target-endpoint>
- <param name="echoPort"
value="http://localhost:8080/wsa10_sep06/echo"/>
+
<target-endpoint>http://jbossws.demo.jboss.com:8080/wsa10/notify</target-endpoint>
+ <param name="echoPort"
value="http://jbossws.demo.jboss.com:8080/wsa10/echo"/>
</scenario>
<scenario name="debug-local" description="Testing local WSA
endpoints">
<target-endpoint>http://localhost:8081/wsa10_sep06/notify</target-endpoint>
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/wsse/encrypt/META-INF/scenarios.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/wsse/encrypt/META-INF/scenarios.xml 2007-02-20
09:42:09 UTC (rev 2407)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/wsse/encrypt/META-INF/scenarios.xml 2007-02-20
10:18:40 UTC (rev 2408)
@@ -1,6 +1,6 @@
<client-scenarios>
<scenario name="default" description="Testing local WSSE
endpoints">
-
<target-endpoint>http://localhost:8080/wsse10Encrypt/endpoint</target-endpoint>
+
<target-endpoint>http://jbossws.demo.jboss.com:8080/wsse10Encrypt/endpoint</target-endpoint>
</scenario>
<scenario name="debug-local" decsription="Testing local WSSE
endpoints through packet logger">
<target-endpoint>http://localhost:8081/wsse10Encrypt/endpoint</target-endpoint>
Modified:
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/wsse/sign/META-INF/scenarios.xml
===================================================================
---
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/wsse/sign/META-INF/scenarios.xml 2007-02-20
09:42:09 UTC (rev 2407)
+++
branches/jbossws-1.2.0/jbossws-tests/src/main/resources/interop/wsse/sign/META-INF/scenarios.xml 2007-02-20
10:18:40 UTC (rev 2408)
@@ -1,6 +1,6 @@
<client-scenarios>
<scenario name="default" description="Testing local WSA
endpoints">
-
<target-endpoint>http://localhost:8080/wsse10Sign/endpoint</target-endpoint>
+
<target-endpoint>http://jbossws.demo.jboss.com:8080/wsse10Sign/endpoint</target-endpoint>
</scenario>
<scenario name="debug-local" description="Testing local WSA
endpoints">
<target-endpoint>http://localhost:8081/wsse10Sign/endpoint</target-endpoint>