You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/05/25 20:07:41 UTC
svn commit: r1127606 - in /cxf/trunk/systests:
jaxws/src/test/java/org/apache/cxf/systest/dispatch/
transport-jms/src/test/java/org/apache/cxf/systest/jms/
transports/src/test/java/org/apache/cxf/systest/http/auth/
uncategorized/src/test/java/org/apach...
Author: dkulp
Date: Wed May 25 18:07:40 2011
New Revision: 1127606
URL: http://svn.apache.org/viewvc?rev=1127606&view=rev
Log:
Update recently added tests to use dynamic ports
Modified:
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/GzipServer.java
cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthTest.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/Server.java
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/Server.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Server.java
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/client.xml
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/dispatch/DispatchClientServerTest.java Wed May 25 18:07:40 2011
@@ -555,7 +555,7 @@ public class DispatchClientServerTest ex
assertNotNull(wsdl);
String bindingId = "http://schemas.xmlsoap.org/wsdl/soap/";
- String endpointUrl = "http://localhost:9006/SOAPDispatchService/SoapDispatchPort";
+ String endpointUrl = "http://localhost:" + greeterPort + "/SOAPDispatchService/SoapDispatchPort";
Service service = Service.create(wsdl, SERVICE_NAME);
service.addPort(PORT_NAME, bindingId, endpointUrl);
Modified: cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/GzipServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/GzipServer.java?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/GzipServer.java (original)
+++ cxf/trunk/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/GzipServer.java Wed May 25 18:07:40 2011
@@ -28,7 +28,7 @@ import org.apache.cxf.testutil.common.Em
public class GzipServer extends AbstractBusTestServerBase {
- public static final String PORT = "9000"; //allocatePort(GzipServer.class);
+ public static final String PORT = allocatePort(GzipServer.class);
protected void run() {
Object impleDoc = new GreeterImplDoc();
Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthTest.java?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthTest.java (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestAuthTest.java Wed May 25 18:07:40 2011
@@ -39,6 +39,7 @@ import org.junit.Test;
public class DigestAuthTest extends AbstractBusClientServerTestBase {
+ public static final String PORT = allocatePort(DigestServer.class);
private final QName serviceName =
new QName("http://apache.org/hello_world", "SOAPService");
@@ -63,7 +64,7 @@ public class DigestAuthTest extends Abst
Greeter mortimer = service.getPort(mortimerQ, Greeter.class);
assertNotNull("Port is null", mortimer);
- setAddress(mortimer, "http://localhost:9000/digestauth/greeter");
+ setAddress(mortimer, "http://localhost:" + PORT + "/digestauth/greeter");
Client client = ClientProxy.getClient(mortimer);
@@ -92,7 +93,7 @@ public class DigestAuthTest extends Abst
Greeter mortimer = service.getPort(mortimerQ, Greeter.class);
assertNotNull("Port is null", mortimer);
- setAddress(mortimer, "http://localhost:9000/digestauth/greeter");
+ setAddress(mortimer, "http://localhost:" + PORT + "/digestauth/greeter");
try {
String answer = mortimer.sayHi();
Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverAddressOverrideTest.java Wed May 25 18:07:40 2011
@@ -53,15 +53,23 @@ import org.junit.Test;
* Tests failover within a static cluster.
*/
public class FailoverAddressOverrideTest extends AbstractBusClientServerTestBase {
-
+ public static final String PORT_0 = allocatePort(Server.class, 0);
+ public static final String PORT_A = allocatePort(Server.class, 1);
+ public static final String PORT_B = allocatePort(Server.class, 2);
+ public static final String PORT_C = allocatePort(Server.class, 3);
+ public static final String PORT_D = allocatePort(Server.class, 4);
+ public static final String PORT_EXTRA = allocatePort(Server.class, 99);
+
+
protected static final String REPLICA_A =
- "http://localhost:9051/SoapContext/ReplicatedPortA";
+ "http://localhost:" + PORT_A + "/SoapContext/ReplicatedPortA";
protected static final String REPLICA_B =
- "http://localhost:9052/SoapContext/ReplicatedPortB";
+ "http://localhost:" + PORT_B + "/SoapContext/ReplicatedPortB";
protected static final String REPLICA_C =
- "http://localhost:9053/SoapContext/ReplicatedPortC";
+ "http://localhost:" + PORT_C + "/SoapContext/ReplicatedPortC";
protected static final String REPLICA_D =
- "http://localhost:9054/SoapContext/ReplicatedPortD";
+ "http://localhost:" + PORT_D + "/SoapContext/ReplicatedPortD";
+
private static final Logger LOG =
LogUtils.getLogger(FailoverAddressOverrideTest.class);
private static final String FAILOVER_CONFIG =
@@ -147,18 +155,22 @@ public class FailoverAddressOverrideTest
while (cause.getCause() != null) {
cause = cause.getCause();
}
- assertTrue("should revert to original exception when no failover: "
- + cause,
- cause instanceof ConnectException);
- verifyCurrentEndpoint(REPLICA_B.replaceFirst("9052", "15555"));
+ if (!(cause instanceof ConnectException)) {
+ if (cause.getMessage() != null
+ && cause.getMessage().contains("404")) {
+ return;
+ }
+ throw e;
+ }
}
stopTarget(REPLICA_A);
}
- protected void startTarget(String address) {
+ protected void startTarget(String address) throws Exception {
ControlService cs = new ControlService();
control = cs.getControlPort();
+ updateAddressPort(control, PORT_0);
LOG.info("starting replicated target: " + address);
System.out.println("starting replicated target: " + address);
@@ -185,18 +197,21 @@ public class FailoverAddressOverrideTest
return ClientProxy.getClient(proxy).getEndpoint().getEndpointInfo().getAddress();
}
- protected void setupGreeterA() {
+ protected void setupGreeterA() throws Exception {
greeter = new ClusteredGreeterService().getReplicatedPortA();
+ updateAddressPort(greeter, PORT_A);
verifyConduitSelector(greeter);
}
- protected void setupGreeterB() {
+ protected void setupGreeterB() throws Exception {
greeter = new ClusteredGreeterService().getReplicatedPortB();
+ updateAddressPort(greeter, PORT_B);
verifyConduitSelector(greeter);
}
- protected void setupGreeterC() {
+ protected void setupGreeterC() throws Exception {
greeter = new ClusteredGreeterService().getReplicatedPortC();
+ updateAddressPort(greeter, PORT_C);
verifyConduitSelector(greeter);
}
Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/FailoverTest.java Wed May 25 18:07:40 2011
@@ -22,8 +22,14 @@ package org.apache.cxf.systest.clusterin
import java.net.ConnectException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.logging.Logger;
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.Service;
+import javax.wsdl.extensions.soap.SOAPAddress;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -42,6 +48,7 @@ import org.apache.cxf.greeter_control.Pi
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
import org.apache.cxf.ws.addressing.MAPAggregator;
import org.apache.cxf.ws.addressing.soap.MAPCodec;
+import org.apache.cxf.wsdl.WSDLManager;
import org.junit.After;
import org.junit.Before;
@@ -53,19 +60,27 @@ import org.junit.Test;
* Tests failover within a static cluster.
*/
public class FailoverTest extends AbstractBusClientServerTestBase {
-
+ public static final String PORT_0 = allocatePort(Server.class, 0);
+ public static final String PORT_A = allocatePort(Server.class, 1);
+ public static final String PORT_B = allocatePort(Server.class, 2);
+ public static final String PORT_C = allocatePort(Server.class, 3);
+ public static final String PORT_D = allocatePort(Server.class, 4);
+ public static final String PORT_EXTRA = allocatePort(Server.class, 99);
+
+
protected static final String REPLICA_A =
- "http://localhost:9051/SoapContext/ReplicatedPortA";
+ "http://localhost:" + PORT_A + "/SoapContext/ReplicatedPortA";
protected static final String REPLICA_B =
- "http://localhost:9052/SoapContext/ReplicatedPortB";
+ "http://localhost:" + PORT_B + "/SoapContext/ReplicatedPortB";
protected static final String REPLICA_C =
- "http://localhost:9053/SoapContext/ReplicatedPortC";
+ "http://localhost:" + PORT_C + "/SoapContext/ReplicatedPortC";
protected static final String REPLICA_D =
- "http://localhost:9054/SoapContext/ReplicatedPortD";
+ "http://localhost:" + PORT_D + "/SoapContext/ReplicatedPortD";
private static final Logger LOG =
LogUtils.getLogger(FailoverTest.class);
private static final String FAILOVER_CONFIG =
"org/apache/cxf/systest/clustering/failover.xml";
+ private static String wsdlLocation = ClusteredGreeterService.WSDL_LOCATION.toString();
protected Bus bus;
protected Greeter greeter;
@@ -91,6 +106,10 @@ public class FailoverTest extends Abstra
SpringBusFactory bf = new SpringBusFactory();
bus = bf.createBus(getConfig());
BusFactory.setDefaultBus(bus);
+
+ updateWsdlExtensors("9051", PORT_A);
+ updateWsdlExtensors("9052", PORT_B);
+ updateWsdlExtensors("9053", PORT_C);
}
@After
@@ -148,7 +167,7 @@ public class FailoverTest extends Abstra
cause instanceof ConnectException);
// similarly the current endpoint referenced by the client
- // should also revert back to the origianl replica A
+ // should also revert back to the original replica A
//
verifyCurrentEndpoint(REPLICA_A);
}
@@ -159,7 +178,6 @@ public class FailoverTest extends Abstra
startTarget(REPLICA_C);
setupGreeter();
String response = null;
-
response = greeter.greetMe("fred");
assertNotNull("expected non-null response", response);
assertTrue("response from unexpected target: " + response,
@@ -299,21 +317,33 @@ public class FailoverTest extends Abstra
public void testRandomStrategy() throws Exception {
strategyTest(REPLICA_A, REPLICA_B, REPLICA_C, true);
}
-
+ protected Greeter getGreeter(String type) throws Exception {
+ if (REPLICA_A.equals(type)) {
+ Greeter g = new ClusteredGreeterService().getReplicatedPortA();
+ updateAddressPort(g, PORT_A);
+ updateWsdlExtensors("9051", PORT_A);
+ return g;
+ } else if (REPLICA_B.equals(type)) {
+ Greeter g = new ClusteredGreeterService().getReplicatedPortB();
+ updateAddressPort(g, PORT_B);
+ updateWsdlExtensors("9052", PORT_B);
+ return g;
+ }
+ Greeter g = new ClusteredGreeterService().getReplicatedPortC();
+ updateAddressPort(g, PORT_C);
+ updateWsdlExtensors("9053", PORT_C);
+ return g;
+ }
protected void strategyTest(String activeReplica1,
String activeReplica2,
String inactiveReplica,
- boolean expectRandom) {
+ boolean expectRandom) throws Exception {
startTarget(activeReplica1);
startTarget(activeReplica2);
boolean randomized = false;
String prevEndpoint = null;
for (int i = 0; i < 20; i++) {
- Greeter g = REPLICA_A.equals(inactiveReplica)
- ? new ClusteredGreeterService().getReplicatedPortA()
- : REPLICA_B.equals(inactiveReplica)
- ? new ClusteredGreeterService().getReplicatedPortB()
- : new ClusteredGreeterService().getReplicatedPortC();
+ Greeter g = getGreeter(inactiveReplica);
verifyStrategy(g, expectRandom
? RandomStrategy.class
: SequentialStrategy.class);
@@ -332,9 +362,10 @@ public class FailoverTest extends Abstra
randomized);
}
- protected void startTarget(String address) {
+ protected void startTarget(String address) throws Exception {
ControlService cs = new ControlService();
control = cs.getControlPort();
+ updateAddressPort(control, PORT_0);
LOG.info("starting replicated target: " + address);
assertTrue("Failed to start greeter", control.startGreeter(address));
@@ -360,15 +391,20 @@ public class FailoverTest extends Abstra
return ClientProxy.getClient(proxy).getEndpoint().getEndpointInfo().getAddress();
}
- protected void setupGreeter() {
+ protected void setupGreeter() throws Exception {
ClusteredGreeterService cs = new ClusteredGreeterService();
// REVISIT: why doesn't the generic (i.e. non-Port-specific)
// Service.getPort() load the <jaxws:client> configuration?
greeter = cs.getReplicatedPortA();
+ updateAddressPort(greeter, PORT_A);
assertTrue("unexpected conduit selector: "
+ ClientProxy.getClient(greeter).getConduitSelector().getClass().getName(),
ClientProxy.getClient(greeter).getConduitSelector()
instanceof FailoverTargetSelector);
+
+ updateWsdlExtensors("9051", PORT_A);
+ updateWsdlExtensors("9052", PORT_B);
+ updateWsdlExtensors("9053", PORT_C);
}
protected void verifyStrategy(Object proxy, Class clz) {
@@ -414,4 +450,36 @@ public class FailoverTest extends Abstra
&& provider.getOutFaultInterceptors().contains(mapCodec);
return enabledIn && enabledOut;
}
+
+
+ private void updateWsdlExtensors(String port1, String port2) {
+ try {
+ Definition def = bus.getExtension(WSDLManager.class)
+ .getDefinition(wsdlLocation);
+ Map map = def.getAllServices();
+ for (Object o : map.values()) {
+ Service service = (Service)o;
+ Map ports = service.getPorts();
+ for (Object p : ports.values()) {
+ Port port = (Port)p;
+ List<?> l = port.getExtensibilityElements();
+ for (Object e : l) {
+ if (e instanceof SOAPAddress) {
+ String add = ((SOAPAddress)e).getLocationURI();
+ int idx = add.indexOf(":" + port1);
+ if (idx != -1) {
+ add = add.substring(0, idx) + ":" + port2
+ + add.substring(idx + port1.length() + 1);
+ ((SOAPAddress)e).setLocationURI(add);
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+
}
Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/Server.java?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/Server.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/Server.java Wed May 25 18:07:40 2011
@@ -28,9 +28,10 @@ import org.apache.cxf.bus.spring.SpringB
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
public class Server extends AbstractBusTestServerBase {
-
+ public static final String PORT = allocatePort(Server.class, 0);
+
private static final String ADDRESS =
- "http://localhost:9001/SoapContext/ControlPort";
+ "http://localhost:" + PORT + "/SoapContext/ControlPort";
private static final String TARGETS_CONFIG =
"org/apache/cxf/systest/clustering/targets.xml";
Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/failover_address_override.xml Wed May 25 18:07:40 2011
@@ -26,11 +26,12 @@
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<util:list id="addressList">
- <value>http://localhost:9051/SoapContext/ReplicatedPortA</value>
- <value>http://localhost:9052/SoapContext/ReplicatedPortB</value>
- <value>http://localhost:9053/SoapContext/ReplicatedPortC</value>
+ <value>http://localhost:${testutil.ports.Server.1}/SoapContext/ReplicatedPortA</value>
+ <value>http://localhost:${testutil.ports.Server.2}/SoapContext/ReplicatedPortB</value>
+ <value>http://localhost:${testutil.ports.Server.3}/SoapContext/ReplicatedPortC</value>
</util:list>
<bean id="SequentialAddresses" class="org.apache.cxf.clustering.SequentialStrategy">
@@ -48,8 +49,8 @@ http://www.springframework.org/schema/ut
<bean id="UnreachableAddresses" class="org.apache.cxf.clustering.SequentialStrategy">
<property name="alternateAddresses">
<list>
- <value>http://localhost:9050/SoapContext/ReplicatedPortA</value>
- <value>http://localhost:9053/SoapContext/ReplicatedPortC</value>
+ <value>http://localhost:${testutil.ports.Server.0}/SoapContext/ReplicatedPortA</value>
+ <value>http://localhost:${testutil.ports.Server.3}/SoapContext/ReplicatedPortC</value>
</list>
</property>
</bean>
@@ -77,7 +78,7 @@ http://www.springframework.org/schema/ut
</jaxws:client>
<jaxws:client name="{http://cxf.apache.org/greeter_control}ReplicatedPortB"
- address="http://localhost:15555/SoapContext/ReplicatedPortB"
+ address="http://localhost:${testutil.ports.Server.99}/SoapContext/ReplicatedPortB"
createdFromAPI="true">
<jaxws:features>
<clustering:failover>
Modified: cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/load_distributor_address_override.xml Wed May 25 18:07:40 2011
@@ -26,11 +26,14 @@
http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
<util:list id="addressList">
- <value>http://localhost:9051/SoapContext/ReplicatedPortA</value>
- <value>http://localhost:9052/SoapContext/ReplicatedPortB</value>
- <value>http://localhost:9053/SoapContext/ReplicatedPortC</value>
+ <value>http://localhost:${testutil.ports.Server.1}/SoapContext/ReplicatedPortA</value>
+ <value>http://localhost:${testutil.ports.Server.2}/SoapContext/ReplicatedPortB</value>
+ <value>http://localhost:${testutil.ports.Server.3}/SoapContext/ReplicatedPortC</value>
</util:list>
<bean id="SequentialAddresses" class="org.apache.cxf.clustering.SequentialStrategy">
@@ -48,8 +51,8 @@ http://www.springframework.org/schema/ut
<bean id="UnreachableAddresses" class="org.apache.cxf.clustering.SequentialStrategy">
<property name="alternateAddresses">
<list>
- <value>http://localhost:9050/SoapContext/ReplicatedPortA</value>
- <value>http://localhost:9053/SoapContext/ReplicatedPortC</value>
+ <value>http://localhost:${testutil.ports.Server.99}/SoapContext/ReplicatedPortA</value>
+ <value>http://localhost:${testutil.ports.Server.99}/SoapContext/ReplicatedPortC</value>
</list>
</property>
</bean>
@@ -77,7 +80,7 @@ http://www.springframework.org/schema/ut
</jaxws:client>
<jaxws:client name="{http://cxf.apache.org/greeter_control}ReplicatedPortB"
- address="http://localhost:15555/SoapContext/ReplicatedPortB"
+ address="http://localhost:${testutil.ports.Server.99}/SoapContext/ReplicatedPortB"
createdFromAPI="true">
<jaxws:features>
<clustering:loadDistributor>
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java Wed May 25 18:07:40 2011
@@ -43,7 +43,9 @@ import wssec.saml.DoubleItService;
* A set of tests for SAML Tokens.
*/
public class SamlTokenTest extends AbstractBusClientServerTestBase {
-
+ static final String PORT = allocatePort(Server.class);
+ static final String PORT2 = allocatePort(Server.class, 2);
+
private boolean unrestrictedPoliciesInstalled = checkUnrestrictedPoliciesInstalled();
@BeforeClass
@@ -69,6 +71,7 @@ public class SamlTokenTest extends Abstr
DoubleItService service = new DoubleItService();
DoubleItPortType saml1Port = service.getDoubleItSaml1TransportPort();
+ updateAddressPort(saml1Port, PORT2);
try {
saml1Port.doubleIt(BigInteger.valueOf(25));
@@ -110,6 +113,7 @@ public class SamlTokenTest extends Abstr
DoubleItService service = new DoubleItService();
DoubleItPortType saml2Port = service.getDoubleItSaml2SymmetricPort();
+ updateAddressPort(saml2Port, PORT);
try {
saml2Port.doubleIt(BigInteger.valueOf(25));
@@ -169,7 +173,8 @@ public class SamlTokenTest extends Abstr
DoubleItService service = new DoubleItService();
DoubleItPortType saml2Port = service.getDoubleItSaml2SymmetricSupportingPort();
-
+ updateAddressPort(saml2Port, PORT);
+
((BindingProvider)saml2Port).getRequestContext().put(
"ws-security.saml-callback-handler", new SamlCallbackHandler()
);
@@ -199,7 +204,8 @@ public class SamlTokenTest extends Abstr
DoubleItService service = new DoubleItService();
DoubleItPortType saml2Port = service.getDoubleItSaml2AsymmetricPort();
-
+ updateAddressPort(saml2Port, PORT);
+
try {
saml2Port.doubleIt(BigInteger.valueOf(25));
fail("Expected failure on an invocation with no SAML Assertion");
@@ -237,6 +243,7 @@ public class SamlTokenTest extends Abstr
DoubleItService service = new DoubleItService();
DoubleItPortType saml1Port = service.getDoubleItSaml1SelfSignedTransportPort();
+ updateAddressPort(saml1Port, PORT2);
((BindingProvider)saml1Port).getRequestContext().put(
"ws-security.saml-callback-handler", new SamlCallbackHandler(false)
@@ -262,6 +269,7 @@ public class SamlTokenTest extends Abstr
DoubleItService service = new DoubleItService();
DoubleItPortType saml2Port = service.getDoubleItSaml2SymmetricProtectionPort();
+ updateAddressPort(saml2Port, PORT);
((BindingProvider)saml2Port).getRequestContext().put(
"ws-security.saml-callback-handler", new SamlCallbackHandler()
@@ -286,6 +294,7 @@ public class SamlTokenTest extends Abstr
DoubleItService service = new DoubleItService();
DoubleItPortType saml2Port = service.getDoubleItSaml2SymmetricSignedElementsPort();
+ updateAddressPort(saml2Port, PORT);
((BindingProvider)saml2Port).getRequestContext().put(
"ws-security.saml-callback-handler", new SamlCallbackHandler()
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/Server.java?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/Server.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/server/Server.java Wed May 25 18:07:40 2011
@@ -27,6 +27,8 @@ import org.apache.cxf.bus.spring.SpringB
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
public class Server extends AbstractBusTestServerBase {
+ static final String PORT = allocatePort(Server.class);
+ static final String PORT2 = allocatePort(Server.class, 2);
public Server() {
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java Wed May 25 18:07:40 2011
@@ -36,7 +36,8 @@ import wssec.ut.DoubleItService;
* A set of tests for Username Tokens over the Transport Binding.
*/
public class UsernameTokenTest extends AbstractBusClientServerTestBase {
-
+ static final String PORT = allocatePort(Server.class);
+
@BeforeClass
public static void startServers() throws Exception {
assertTrue(
@@ -60,7 +61,7 @@ public class UsernameTokenTest extends A
DoubleItService service = new DoubleItService();
DoubleItPortType utPort = service.getDoubleItPlaintextPort();
-
+ updateAddressPort(utPort, PORT);
utPort.doubleIt(BigInteger.valueOf(25));
}
@@ -77,6 +78,7 @@ public class UsernameTokenTest extends A
DoubleItService service = new DoubleItService();
DoubleItPortType utPort = service.getDoubleItPlaintextCreatedPort();
+ updateAddressPort(utPort, PORT);
utPort.doubleIt(BigInteger.valueOf(25));
}
@@ -94,6 +96,7 @@ public class UsernameTokenTest extends A
DoubleItService service = new DoubleItService();
DoubleItPortType utPort = service.getDoubleItHashedPort();
+ updateAddressPort(utPort, PORT);
utPort.doubleIt(BigInteger.valueOf(25));
}
@@ -111,6 +114,7 @@ public class UsernameTokenTest extends A
DoubleItService service = new DoubleItService();
DoubleItPortType utPort = service.getDoubleItNoPasswordPort();
+ updateAddressPort(utPort, PORT);
utPort.doubleIt(BigInteger.valueOf(25));
}
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/server/Server.java Wed May 25 18:07:40 2011
@@ -27,6 +27,7 @@ import org.apache.cxf.bus.spring.SpringB
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
public class Server extends AbstractBusTestServerBase {
+ static final String PORT = allocatePort(Server.class);
public Server() {
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/server/Server.java Wed May 25 18:07:40 2011
@@ -118,7 +118,7 @@ public class Server extends AbstractBusT
public static void main(String args[]) throws Exception {
new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssc/server/server.xml");
- new Server("http://localhost:9001/");
+ new Server("http://localhost:" + PORT + "/");
System.out.println("Server ready...");
Thread.sleep(60 * 60 * 10000);
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java Wed May 25 18:07:40 2011
@@ -40,7 +40,8 @@ import wssec.x509.DoubleItService;
* A set of tests for X.509 Tokens.
*/
public class X509TokenTest extends AbstractBusClientServerTestBase {
-
+ static final String PORT = allocatePort(Server.class);
+
private boolean unrestrictedPoliciesInstalled = checkUnrestrictedPoliciesInstalled();
@BeforeClass
@@ -68,6 +69,7 @@ public class X509TokenTest extends Abstr
DoubleItService service = new DoubleItService();
DoubleItPortType x509Port = service.getDoubleItKeyIdentifierPort();
+ updateAddressPort(x509Port, PORT);
x509Port.doubleIt(BigInteger.valueOf(25));
}
@@ -86,6 +88,7 @@ public class X509TokenTest extends Abstr
DoubleItService service = new DoubleItService();
DoubleItPortType x509Port = service.getDoubleItIssuerSerialPort();
+ updateAddressPort(x509Port, PORT);
x509Port.doubleIt(BigInteger.valueOf(25));
}
@@ -104,6 +107,7 @@ public class X509TokenTest extends Abstr
DoubleItService service = new DoubleItService();
DoubleItPortType x509Port = service.getDoubleItThumbprintPort();
+ updateAddressPort(x509Port, PORT);
x509Port.doubleIt(BigInteger.valueOf(25));
}
@@ -122,6 +126,7 @@ public class X509TokenTest extends Abstr
DoubleItService service = new DoubleItService();
DoubleItPortType x509Port = service.getDoubleItAsymmetricIssuerSerialPort();
+ updateAddressPort(x509Port, PORT);
x509Port.doubleIt(BigInteger.valueOf(25));
}
Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Server.java?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Server.java (original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/server/Server.java Wed May 25 18:07:40 2011
@@ -27,6 +27,7 @@ import org.apache.cxf.bus.spring.SpringB
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
public class Server extends AbstractBusTestServerBase {
+ static final String PORT = allocatePort(Server.class);
public Server() {
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/client/client.xml Wed May 25 18:07:40 2011
@@ -32,6 +32,8 @@
http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd"
>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
<cxf:bus>
<cxf:features>
<p:policies/>
@@ -39,7 +41,7 @@
</cxf:features>
</cxf:bus>
- <http:conduit name="https://localhost:9009/.*">
+ <http:conduit name="https://localhost.*">
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Morpit.jks"/>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml Wed May 25 18:07:40 2011
@@ -51,7 +51,7 @@
<!-- Transport Layer Security (TLS) settings -->
<!-- -->
<httpj:engine-factory id="tls-settings">
- <httpj:engine port="9009">
+ <httpj:engine port="${testutil.ports.Server.2}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
@@ -73,7 +73,7 @@
<jaxws:endpoint
id="Saml1TokenOverTransport"
- address="https://localhost:9009/DoubleItSaml1Transport"
+ address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml1Transport"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml1TransportPort"
xmlns:s="http://WSSec/saml"
@@ -88,7 +88,7 @@
<jaxws:endpoint
id="Saml2TokenOverSymmetric"
- address="http://localhost:9001/DoubleItSaml2Symmetric"
+ address="http://localhost:${testutil.ports.Server}/DoubleItSaml2Symmetric"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml2SymmetricPort"
xmlns:s="http://WSSec/saml"
@@ -108,7 +108,7 @@
<jaxws:endpoint
id="Saml2TokenOverAsymmetric"
- address="http://localhost:9001/DoubleItSaml2Asymmetric"
+ address="http://localhost:${testutil.ports.Server}/DoubleItSaml2Asymmetric"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml2AsymmetricPort"
xmlns:s="http://WSSec/saml"
@@ -132,7 +132,7 @@
<jaxws:endpoint
id="Saml1SelfSignedTokenOverTransport"
- address="https://localhost:9009/DoubleItSaml1SelfSignedTransport"
+ address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml1SelfSignedTransport"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml1SelfSignedTransportPort"
xmlns:s="http://WSSec/saml"
@@ -150,7 +150,7 @@
<jaxws:endpoint
id="Saml2TokenOverSymmetricProtection"
- address="http://localhost:9001/DoubleItSaml2SymmetricProtection"
+ address="http://localhost:${testutil.ports.Server}/DoubleItSaml2SymmetricProtection"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml2SymmetricProtectionPort"
xmlns:s="http://WSSec/saml"
@@ -170,7 +170,7 @@
<jaxws:endpoint
id="Saml2TokenOverSymmetricSignedElements"
- address="http://localhost:9001/DoubleItSaml2SymmetricSignedElements"
+ address="http://localhost:${testutil.ports.Server}/DoubleItSaml2SymmetricSignedElements"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml2SymmetricSignedElementsPort"
xmlns:s="http://WSSec/saml"
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml Wed May 25 18:07:40 2011
@@ -39,7 +39,7 @@
</cxf:features>
</cxf:bus>
- <http:conduit name="https://localhost:9009/.*">
+ <http:conduit name="https://localhost:.*">
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Morpit.jks"/>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml Wed May 25 18:07:40 2011
@@ -51,7 +51,7 @@
<!-- Transport Layer Security (TLS) settings -->
<!-- -->
<httpj:engine-factory id="tls-settings">
- <httpj:engine port="9009">
+ <httpj:engine port="${testutil.ports.Server}">
<httpj:tlsServerParameters>
<sec:keyManagers keyPassword="password">
<sec:keyStore type="jks" password="password" resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
@@ -73,7 +73,7 @@
<jaxws:endpoint
id="Plaintext"
- address="https://localhost:9009/DoubleItUTPlaintext"
+ address="https://localhost:${testutil.ports.Server}/DoubleItUTPlaintext"
serviceName="s:DoubleItService"
endpointName="s:DoubleItPlaintextPort"
xmlns:s="http://WSSec/ut"
@@ -90,7 +90,7 @@
<jaxws:endpoint
id="PlaintextCreated"
- address="https://localhost:9009/DoubleItUTPlaintextCreated"
+ address="https://localhost:${testutil.ports.Server}/DoubleItUTPlaintextCreated"
serviceName="s:DoubleItService"
endpointName="s:DoubleItPlaintextCreatedPort"
xmlns:s="http://WSSec/ut"
@@ -107,7 +107,7 @@
<jaxws:endpoint
id="Hashed"
- address="https://localhost:9009/DoubleItUTHashed"
+ address="https://localhost:${testutil.ports.Server}/DoubleItUTHashed"
serviceName="s:DoubleItService"
endpointName="s:DoubleItHashedPort"
xmlns:s="http://WSSec/ut"
@@ -124,7 +124,7 @@
<jaxws:endpoint
id="NoPassword"
- address="https://localhost:9009/DoubleItUTNoPassword"
+ address="https://localhost:${testutil.ports.Server}/DoubleItUTNoPassword"
serviceName="s:DoubleItService"
endpointName="s:DoubleItNoPasswordPort"
xmlns:s="http://WSSec/ut"
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/client.xml?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/client/client.xml Wed May 25 18:07:40 2011
@@ -39,7 +39,6 @@
</cxf:features>
</cxf:bus>
-
<jaxws:client name="{http://WSSec/wssc}SecureConversation_UserNameOverTransport_IPingService" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.username.sct" value="Alice"/>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml?rev=1127606&r1=1127605&r2=1127606&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml Wed May 25 18:07:40 2011
@@ -48,7 +48,7 @@
<jaxws:endpoint
id="KeyIdentifier"
- address="http://localhost:9001/DoubleItX509KeyIdentifier"
+ address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifier"
serviceName="s:DoubleItService"
endpointName="s:DoubleItKeyIdentifierPort"
xmlns:s="http://WSSec/x509"
@@ -66,7 +66,7 @@
<jaxws:endpoint
id="IssuerSerial"
- address="http://localhost:9001/DoubleItX509IssuerSerial"
+ address="http://localhost:${testutil.ports.Server}/DoubleItX509IssuerSerial"
serviceName="s:DoubleItService"
endpointName="s:DoubleItIssuerSerialPort"
xmlns:s="http://WSSec/x509"
@@ -84,7 +84,7 @@
<jaxws:endpoint
id="Thumbprint"
- address="http://localhost:9001/DoubleItX509Thumbprint"
+ address="http://localhost:${testutil.ports.Server}/DoubleItX509Thumbprint"
serviceName="s:DoubleItService"
endpointName="s:DoubleItThumbprintPort"
xmlns:s="http://WSSec/x509"
@@ -102,7 +102,7 @@
<jaxws:endpoint
id="Asymmetric"
- address="http://localhost:9001/DoubleItX509Asymmetric"
+ address="http://localhost:${testutil.ports.Server}/DoubleItX509Asymmetric"
serviceName="s:DoubleItService"
endpointName="s:DoubleItAsymmetricIssuerSerialPort"
xmlns:s="http://WSSec/x509"