http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
index 62a335f..3d2610d 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml
@@ -25,7 +25,7 @@
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BodyTimestamp" 
address="http://localhost:${testutil.ports.Server}/DoubleItBodyTimestamp"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BodyTimestamp" 
address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItBodyTimestamp";
 serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
         <jaxws:inInterceptors>
             <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
                 <constructor-arg>
@@ -40,7 +40,7 @@
             <bean 
class="org.apache.cxf.ws.security.wss4j.DefaultCryptoCoverageChecker"/>
         </jaxws:inInterceptors>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BodyTimestampSoap12" 
address="http://localhost:${testutil.ports.Server}/DoubleItBodyTimestampSoap12"; 
serviceName="s:DoubleItService" 
endpointName="s:DoubleItBodyTimestampSoap12Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BodyTimestampSoap12" 
address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItBodyTimestampSoap12";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItBodyTimestampSoap12Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
         <jaxws:inInterceptors>
             <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
                 <constructor-arg>
@@ -57,7 +57,7 @@
             </bean>
         </jaxws:inInterceptors>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedEncryptedBody" 
address="http://localhost:${testutil.ports.Server}/DoubleItSignedEncrypted"; 
serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedEncryptedBodyPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedEncryptedBody" 
address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItSignedEncrypted";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedEncryptedBodyPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
         <jaxws:inInterceptors>
             <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
                 <constructor-arg>
@@ -76,7 +76,7 @@
             </bean>
         </jaxws:inInterceptors>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="WSA" address="http://localhost:${testutil.ports.Server}/DoubleItWSA"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItWSAPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="WSA" 
address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItWSA";
 serviceName="s:DoubleItService" endpointName="s:DoubleItWSAPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
         <jaxws:inInterceptors>
             <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
                 <constructor-arg>
@@ -93,7 +93,7 @@
             <wsa:addressing xmlns:wsa="http://cxf.apache.org/ws/addressing"/>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="ClientChecker" 
address="http://localhost:${testutil.ports.Server}/DoubleItClientChecker"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItClientCheckerPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="ClientChecker" 
address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItClientChecker";
 serviceName="s:DoubleItService" endpointName="s:DoubleItClientCheckerPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
         <jaxws:outInterceptors>
             <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
                 <constructor-arg>
@@ -107,7 +107,7 @@
             </bean>
         </jaxws:outInterceptors>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="ClientChecker2" 
address="http://localhost:${testutil.ports.Server}/DoubleItClientChecker2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItClientCheckerPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="ClientChecker2" 
address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItClientChecker2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItClientCheckerPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
         <jaxws:outInterceptors>
             <bean class="org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor">
                 <constructor-arg>
@@ -133,7 +133,7 @@
             </bean>
         </jaxws:outFaultInterceptors>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedUsernameToken" 
address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedUsernameToken";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedUsernameTokenPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedUsernameToken" 
address="http://localhost:${testutil.ports.coverage_checker.Server}/DoubleItEncryptedUsernameToken";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedUsernameTokenPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
         <jaxws:inInterceptors>
             <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
                 <constructor-arg>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
index 3015616..0cff896 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml
@@ -25,7 +25,7 @@
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BodyTimestamp" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItBodyTimestamp"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BodyTimestamp" 
address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItBodyTimestamp";
 serviceName="s:DoubleItService" endpointName="s:DoubleItBodyTimestampPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
         <jaxws:inInterceptors>
             <bean 
class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
                 <constructor-arg>
@@ -40,7 +40,7 @@
             <bean 
class="org.apache.cxf.ws.security.wss4j.StaxCryptoCoverageChecker"/>
         </jaxws:inInterceptors>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BodyTimestampSoap12" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItBodyTimestampSoap12";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItBodyTimestampSoap12Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BodyTimestampSoap12" 
address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItBodyTimestampSoap12";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItBodyTimestampSoap12Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
         <jaxws:inInterceptors>
             <bean 
class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
                 <constructor-arg>
@@ -57,7 +57,7 @@
             </bean>
         </jaxws:inInterceptors>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedEncryptedBody" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedEncrypted"; 
serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedEncryptedBodyPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedEncryptedBody" 
address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItSignedEncrypted";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedEncryptedBodyPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
         <jaxws:inInterceptors>
             <bean 
class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
                 <constructor-arg>
@@ -76,7 +76,7 @@
             </bean>
         </jaxws:inInterceptors>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="WSA" address="http://localhost:${testutil.ports.StaxServer}/DoubleItWSA"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItWSAPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="WSA" 
address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItWSA";
 serviceName="s:DoubleItService" endpointName="s:DoubleItWSAPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
         <jaxws:inInterceptors>
             <bean 
class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
                 <constructor-arg>
@@ -93,7 +93,7 @@
             <wsa:addressing xmlns:wsa="http://cxf.apache.org/ws/addressing"/>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedUsernameToken" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedUsernameToken";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedUsernameTokenPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedUsernameToken" 
address="http://localhost:${testutil.ports.coverage_checker.StaxServer}/DoubleItEncryptedUsernameToken";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedUsernameTokenPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/coverage_checker/DoubleItCoverageChecker.wsdl">
         <jaxws:inInterceptors>
             <bean 
class="org.apache.cxf.ws.security.wss4j.WSS4JStaxInInterceptor">
                 <constructor-arg>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
index 8650e48..574b929 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml
@@ -25,19 +25,19 @@
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="Soap11" address="http://localhost:${testutil.ports.Server}/DoubleItSoap11"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSoap11Port" 
implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="Soap11" 
address="http://localhost:${testutil.ports.fault.Server}/DoubleItSoap11"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSoap11Port" 
implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="Soap12" address="http://localhost:${testutil.ports.Server}/DoubleItSoap12"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSoap12Port" 
implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="Soap12" 
address="http://localhost:${testutil.ports.fault.Server}/DoubleItSoap12"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSoap12Port" 
implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="Soap12Dispatch" 
address="http://localhost:${testutil.ports.Server}/DoubleItSoap12Dispatch"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSoap12DispatchPort" 
implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="Soap12Dispatch" 
address="http://localhost:${testutil.ports.fault.Server}/DoubleItSoap12Dispatch";
 serviceName="s:DoubleItService" endpointName="s:DoubleItSoap12DispatchPort" 
implementor="org.apache.cxf.systest.ws.fault.DoubleItPortTypeImpl" 
wsdlLocation="org/apache/cxf/systest/ws/fault/DoubleItFault.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
index d9b72c9..322bb89 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml
@@ -25,7 +25,7 @@
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="GCM128" address="http://localhost:${testutil.ports.Server}/DoubleItGCM128"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItGCM128Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="GCM128" 
address="http://localhost:${testutil.ports.gcm.Server}/DoubleItGCM128"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItGCM128Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -33,7 +33,7 @@
             <entry key="ws-security.subject.cert.constraints" 
value=".*O=apache.org.*"/>
         </jaxws:properties>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="GCM192" address="http://localhost:${testutil.ports.Server}/DoubleItGCM192"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItGCM192Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="GCM192" 
address="http://localhost:${testutil.ports.gcm.Server}/DoubleItGCM192"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItGCM192Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -42,7 +42,7 @@
             <entry key="ws-security.is-bsp-compliant" value="false"/>
         </jaxws:properties>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="GCM256" address="http://localhost:${testutil.ports.Server}/DoubleItGCM256"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="GCM256" 
address="http://localhost:${testutil.ports.gcm.Server}/DoubleItGCM256"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
index e142120..96a358d 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml
@@ -25,7 +25,7 @@
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="GCM128" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItGCM128"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItGCM128Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="GCM128" 
address="http://localhost:${testutil.ports.gcm.StaxServer}/DoubleItGCM128"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItGCM128Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -34,7 +34,7 @@
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="GCM192" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItGCM192"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItGCM192Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="GCM192" 
address="http://localhost:${testutil.ports.gcm.StaxServer}/DoubleItGCM192"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItGCM192Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -44,7 +44,7 @@
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="GCM256" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItGCM256"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="GCM256" 
address="http://localhost:${testutil.ports.gcm.StaxServer}/DoubleItGCM256"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItGCM256Port" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
index f92db5f..e0f724c 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml
@@ -25,13 +25,13 @@
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="KeyIdentifier" 
address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifier"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/httpget/DoubleItHTTPGet.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="KeyIdentifier" 
address="http://localhost:${testutil.ports.httpget.Server}/DoubleItX509KeyIdentifier";
 serviceName="s:DoubleItService" endpointName="s:DoubleItKeyIdentifierPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/httpget/DoubleItHTTPGet.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignBody" 
address="http://localhost:${testutil.ports.Server}/DoubleItSignBody"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignBodyPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/httpget/DoubleItHTTPGet.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignBody" 
address="http://localhost:${testutil.ports.httpget.Server}/DoubleItSignBody"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignBodyPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/httpget/DoubleItHTTPGet.wsdl">
         <jaxws:inInterceptors>
             <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
                 <constructor-arg>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
index 0aa832a..1c86b64 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml
@@ -30,7 +30,7 @@
     <!-- Transport Layer Security (TLS) settings -->
     <!-- -->
     <httpj:engine-factory id="tls-settings">
-        <httpj:engine port="${testutil.ports.Server}">
+        <httpj:engine port="${testutil.ports.https.Server}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
                     <sec:keyStore type="jks" password="password" 
resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
@@ -42,28 +42,28 @@
             </httpj:tlsServerParameters>
         </httpj:engine>
     </httpj:engine-factory>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequireClientCert" 
address="https://localhost:${testutil.ports.Server}/DoubleItRequireClientCert"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequireClientCert" 
address="https://localhost:${testutil.ports.https.Server}/DoubleItRequireClientCert";
 serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
         <jaxws:features>
             <p:policies>
                 <wsp:PolicyReference 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
URI="classpath:/org/apache/cxf/systest/ws/https/req-client-cert-policy.xml"/>
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequireClientCert2" 
address="https://localhost:${testutil.ports.Server}/DoubleItRequireClientCert2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequireClientCert2" 
address="https://localhost:${testutil.ports.https.Server}/DoubleItRequireClientCert2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItRequireClientCertPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
         <jaxws:features>
             <p:policies>
                 <wsp:PolicyReference 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
URI="classpath:/org/apache/cxf/systest/ws/https/req-client-cert-policy.xml"/>
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BasicAuth" 
address="https://localhost:${testutil.ports.Server}/DoubleItBasicAuth"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BasicAuth" 
address="https://localhost:${testutil.ports.https.Server}/DoubleItBasicAuth"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
         <jaxws:features>
             <p:policies>
                 <wsp:PolicyReference 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
URI="classpath:/org/apache/cxf/systest/ws/https/basic-auth-policy.xml"/>
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BasicAuth2" 
address="https://localhost:${testutil.ports.Server}/DoubleItBasicAuth2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BasicAuth2" 
address="https://localhost:${testutil.ports.https.Server}/DoubleItBasicAuth2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
         <jaxws:features>
             <p:policies>
                 <wsp:PolicyReference 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
URI="classpath:/org/apache/cxf/systest/ws/https/basic-auth-policy.xml"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
index 148439d..06e4e87 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml
@@ -30,7 +30,7 @@
     <!-- Transport Layer Security (TLS) settings -->
     <!-- -->
     <httpj:engine-factory id="tls-settings">
-        <httpj:engine port="${testutil.ports.StaxServer}">
+        <httpj:engine port="${testutil.ports.https.StaxServer}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
                     <sec:keyStore type="jks" password="password" 
resource="org/apache/cxf/systest/ws/security/Bethal.jks"/>
@@ -42,7 +42,7 @@
             </httpj:tlsServerParameters>
         </httpj:engine>
     </httpj:engine-factory>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequireClientCert" 
address="https://localhost:${testutil.ports.StaxServer}/DoubleItRequireClientCert";
 serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequireClientCert" 
address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItRequireClientCert";
 serviceName="s:DoubleItService" endpointName="s:DoubleItRequireClientCertPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
         <jaxws:features>
             <p:policies>
                 <wsp:PolicyReference 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
URI="classpath:/org/apache/cxf/systest/ws/https/req-client-cert-policy.xml"/>
@@ -52,7 +52,7 @@
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequireClientCert2" 
address="https://localhost:${testutil.ports.StaxServer}/DoubleItRequireClientCert2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItRequireClientCertPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequireClientCert2" 
address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItRequireClientCert2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItRequireClientCertPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
         <jaxws:features>
             <p:policies>
                 <wsp:PolicyReference 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
URI="classpath:/org/apache/cxf/systest/ws/https/req-client-cert-policy.xml"/>
@@ -62,7 +62,7 @@
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BasicAuth" 
address="https://localhost:${testutil.ports.StaxServer}/DoubleItBasicAuth"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BasicAuth" 
address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItBasicAuth";
 serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
         <jaxws:features>
             <p:policies>
                 <wsp:PolicyReference 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
URI="classpath:/org/apache/cxf/systest/ws/https/basic-auth-policy.xml"/>
@@ -72,7 +72,7 @@
             <entry key="ws-security.enable.streaming" value="true"/>
         </jaxws:properties>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BasicAuth2" 
address="https://localhost:${testutil.ports.StaxServer}/DoubleItBasicAuth2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="BasicAuth2" 
address="https://localhost:${testutil.ports.https.StaxServer}/DoubleItBasicAuth2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItBasicAuthPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/https/DoubleItHttps.wsdl" 
depends-on="tls-settings">
         <jaxws:features>
             <p:policies>
                 <wsp:PolicyReference 
xmlns:wsp="http://www.w3.org/ns/ws-policy"; 
URI="classpath:/org/apache/cxf/systest/ws/https/basic-auth-policy.xml"/>

http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
index b4ea76e..ebc4f6e 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml
@@ -27,7 +27,7 @@
     </cxf:bus>
 
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedMTOM" 
-        
address="http://localhost:${testutil.ports.Server}/DoubleItSignedMTOMInline"; 
+        
address="http://localhost:${testutil.ports.mtom.Server}/DoubleItSignedMTOMInline";
 
         serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedMTOMInlinePort" 
         implementor="org.apache.cxf.systest.ws.mtom.DoubleIt4Impl" 
         wsdlLocation="org/apache/cxf/systest/ws/mtom/DoubleItMtom.wsdl">
@@ -60,7 +60,7 @@
     </jaxws:endpoint>
     
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedMTOMSwA" 
-        
address="http://localhost:${testutil.ports.Server}/DoubleItSignedMTOMSwA"; 
+        
address="http://localhost:${testutil.ports.mtom.Server}/DoubleItSignedMTOMSwA"; 
         serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedMTOMSwAPort" 
         implementor="org.apache.cxf.systest.ws.mtom.DoubleIt4Impl" 
         wsdlLocation="org/apache/cxf/systest/ws/mtom/DoubleItMtom.wsdl">

http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
index 40f10f1..67639c6 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml
@@ -25,7 +25,7 @@
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredParts" 
address="http://localhost:${testutil.ports.Server}/DoubleItRequiredParts"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredParts" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItRequiredParts"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -38,7 +38,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredParts2" 
address="http://localhost:${testutil.ports.Server}/DoubleItRequiredParts2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredParts2" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItRequiredParts2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -51,7 +51,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredElements" 
address="http://localhost:${testutil.ports.Server}/DoubleItRequiredElements"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredElements" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItRequiredElements";
 serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -64,7 +64,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredElements2" 
address="http://localhost:${testutil.ports.Server}/DoubleItRequiredElements2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredElements2" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItRequiredElements2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -77,7 +77,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedParts" 
address="http://localhost:${testutil.ports.Server}/DoubleItSignedParts"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedParts" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedParts"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -90,7 +90,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedParts2" 
address="http://localhost:${testutil.ports.Server}/DoubleItSignedParts2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedParts2" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedParts2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -103,7 +103,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedParts3" 
address="http://localhost:${testutil.ports.Server}/DoubleItSignedParts3"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedParts3" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedParts3"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -116,7 +116,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedElements" 
address="http://localhost:${testutil.ports.Server}/DoubleItSignedElements"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedElements" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedElements";
 serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -129,7 +129,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedElements2" 
address="http://localhost:${testutil.ports.Server}/DoubleItSignedElements2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedElements2" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedElements2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -142,7 +142,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedParts" 
address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedParts"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedParts" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedParts";
 serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -156,7 +156,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedParts2" 
address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedParts2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedParts2" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedParts2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -170,7 +170,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedParts3" 
address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedParts3"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedParts3" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedParts3";
 serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -184,7 +184,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedElements" 
address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedElements"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedElements" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedElements";
 serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -198,7 +198,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedElements2" 
address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedElements2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedElements2" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedElements2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -212,7 +212,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedElements3" 
address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedElements3"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedElements3" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedElements3";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedElementsPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -226,7 +226,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="ContentEncryptedElements" 
address="http://localhost:${testutil.ports.Server}/DoubleItContentEncryptedElements";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItContentEncryptedElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="ContentEncryptedElements" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItContentEncryptedElements";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItContentEncryptedElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -240,7 +240,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="ContentEncryptedElements2" 
address="http://localhost:${testutil.ports.Server}/DoubleItContentEncryptedElements2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItContentEncryptedElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="ContentEncryptedElements2" 
address="http://localhost:${testutil.ports.parts.Server}/DoubleItContentEncryptedElements2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItContentEncryptedElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -256,7 +256,7 @@
     </jaxws:endpoint>
     
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedAttachments" 
-         
address="http://localhost:${testutil.ports.Server}/DoubleItSignedAttachments"; 
+         
address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedAttachments";
 
          serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedAttachmentsPort" 
          implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl" 
          wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
@@ -274,7 +274,7 @@
         </jaxws:features>
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedAttachments2" 
-         
address="http://localhost:${testutil.ports.Server}/DoubleItSignedAttachments2"; 
+         
address="http://localhost:${testutil.ports.parts.Server}/DoubleItSignedAttachments2";
 
          serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedAttachmentsPort2" 
          implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl" 
          wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
@@ -292,7 +292,7 @@
         </jaxws:features>
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedAttachments" 
-         
address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedAttachments";
 
+         
address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedAttachments";
 
          serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedAttachmentsPort" 
          implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl" 
          wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
@@ -310,7 +310,7 @@
         </jaxws:features>
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedAttachments2" 
-         
address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedAttachments2";
 
+         
address="http://localhost:${testutil.ports.parts.Server}/DoubleItEncryptedAttachments2";
 
          serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedAttachmentsPort2" 
          implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl" 
          wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">

http://git-wip-us.apache.org/repos/asf/cxf/blob/d43cf7de/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
----------------------------------------------------------------------
diff --git 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
index 5c3b577..ff7ba89 100644
--- 
a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
+++ 
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml
@@ -25,7 +25,7 @@
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredParts" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItRequiredParts"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredParts" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItRequiredParts";
 serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -39,7 +39,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredParts2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItRequiredParts2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredParts2" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItRequiredParts2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -53,7 +53,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredElements" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItRequiredElements";
 serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredElements" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItRequiredElements";
 serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -67,7 +67,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredElements2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItRequiredElements2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="RequiredElements2" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItRequiredElements2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -81,7 +81,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedParts" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedParts"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedParts" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedParts";
 serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -95,7 +95,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedParts2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedParts2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedParts2" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedParts2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -109,7 +109,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedParts3" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedParts3"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedParts3" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedParts3";
 serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -123,7 +123,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedElements" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedElements"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedElements" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedElements";
 serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -137,7 +137,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedElements2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedElements2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedElements2" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedElements2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -151,7 +151,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedParts" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedParts"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedParts" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedParts";
 serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -166,7 +166,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedParts2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedParts2"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedParts2" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedParts2";
 serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -181,7 +181,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedParts3" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedParts3"; 
serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedParts3" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedParts3";
 serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort3" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -196,7 +196,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedElements" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedElements";
 serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedElements" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedElements";
 serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -211,7 +211,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedElements2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedElements2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedElements2" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedElements2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -226,7 +226,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="ContentEncryptedElements" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItContentEncryptedElements";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItContentEncryptedElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="ContentEncryptedElements" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItContentEncryptedElements";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItContentEncryptedElementsPort" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -241,7 +241,7 @@
             </p:policies>
         </jaxws:features>
     </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="ContentEncryptedElements2" 
address="http://localhost:${testutil.ports.StaxServer}/DoubleItContentEncryptedElements2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItContentEncryptedElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="ContentEncryptedElements2" 
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItContentEncryptedElements2";
 serviceName="s:DoubleItService" 
endpointName="s:DoubleItContentEncryptedElementsPort2" 
implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" 
wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" 
value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/>
             <entry key="ws-security.signature.properties" 
value="bob.properties"/>
@@ -258,7 +258,7 @@
     </jaxws:endpoint>
     
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedAttachments" 
-         
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedAttachments";
 
+         
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedAttachments";
 
          serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedAttachmentsPort" 
          implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl" 
          wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
@@ -277,7 +277,7 @@
         </jaxws:features>
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="SignedAttachments2" 
-         
address="http://localhost:${testutil.ports.StaxServer}/DoubleItSignedAttachments2";
 
+         
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItSignedAttachments2";
 
          serviceName="s:DoubleItService" 
endpointName="s:DoubleItSignedAttachmentsPort2" 
          implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl" 
          wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
@@ -296,7 +296,7 @@
         </jaxws:features>
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedAttachments" 
-         
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedAttachments";
 
+         
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedAttachments";
 
          serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedAttachmentsPort" 
          implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl" 
          wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">
@@ -315,7 +315,7 @@
         </jaxws:features>
     </jaxws:endpoint>
     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; 
id="EncryptedAttachments2" 
-         
address="http://localhost:${testutil.ports.StaxServer}/DoubleItEncryptedAttachments2";
 
+         
address="http://localhost:${testutil.ports.parts.StaxServer}/DoubleItEncryptedAttachments2";
 
          serviceName="s:DoubleItService" 
endpointName="s:DoubleItEncryptedAttachmentsPort2" 
          implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl" 
          wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl">

Reply via email to