cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/2] cxf git commit: Fixing ports
Date Fri, 16 Jun 2017 10:41:08 GMT
Fixing ports

# Conflicts:
#	services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/022c89df
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/022c89df
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/022c89df

Branch: refs/heads/3.1.x-fixes
Commit: 022c89df45b88284b26286559673fb8de95a0315
Parents: 0e83d4a
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Jun 16 11:37:25 2017 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Jun 16 11:38:29 2017 +0100

----------------------------------------------------------------------
 .../IntermediaryTransformationCachingTest.java          | 12 ++++++------
 .../cxf-intermediary-caching.xml                        |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/022c89df/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
index d83de84..53bda69 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
@@ -40,7 +40,7 @@ import org.junit.BeforeClass;
  * service provider. The intermediary service provider validates the token, and then the
  * Intermediary client uses delegation to dispatch the received token (via OnBehalfOf) to
another
  * STS instance. The retrieved token is sent to the service provider via (2-way) TLS. The
STSClient is disabled
- * after two invocations, meaning that the Intermediary client must rely on its cache to
get tokens. 
+ * after two invocations, meaning that the Intermediary client must rely on its cache to
get tokens.
  */
 public class IntermediaryTransformationCachingTest extends AbstractBusClientServerTestBase
{
     
@@ -51,9 +51,9 @@ public class IntermediaryTransformationCachingTest extends AbstractBusClientServ
     
     private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt";
     private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService");
-    
-    private static final String PORT = allocatePort(Intermediary.class);
-    
+
+    private static final String PORT = allocatePort(IntermediaryCaching.class);
+
     @BeforeClass
     public static void startServers() throws Exception {
         assertTrue(
@@ -102,7 +102,7 @@ public class IntermediaryTransformationCachingTest extends AbstractBusClientServ
 
         // Make initial successful invocation (for "alice")
         doubleIt(alicePort, 25);
-        
+
         // Make another successful invocation for "bob"
         DoubleItPortType bobPort = service.getPort(portQName, DoubleItPortType.class);
         updateAddressPort(bobPort, PORT);
@@ -114,7 +114,7 @@ public class IntermediaryTransformationCachingTest extends AbstractBusClientServ
         // Make another invocation for "bob" - this should work as the intermediary caches
the token
         // even though its STSClient is disabled after the second invocation
         doubleIt(bobPort, 35);
-        
+
         // Make another invocation for "alice" - this should work as the intermediary caches
the token
         // even though its STSClient is disabled after the first invocation
         doubleIt(alicePort, 40);

http://git-wip-us.apache.org/repos/asf/cxf/blob/022c89df/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
index 2e51b3d..7a0baba 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/intermediary_transformation/cxf-intermediary-caching.xml
@@ -24,7 +24,7 @@
             <cxf:logging/>
         </cxf:features>
     </cxf:bus>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1endorsing"
implementor="org.apache.cxf.systest.sts.intermediary_transformation.IntermediaryCachingPortTypeImpl"
endpointName="s:DoubleItTransportSAML1EndorsingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings"
address="https://localhost:${testutil.ports.intermediary_transformation.Intermediary}/doubleit/services/doubleittransportsaml1endorsing"
wsdlLocation="org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl">
+    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1endorsing"
implementor="org.apache.cxf.systest.sts.intermediary_transformation.IntermediaryCachingPortTypeImpl"
endpointName="s:DoubleItTransportSAML1EndorsingPort" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings"
address="https://localhost:${testutil.ports.intermediary_transformation.IntermediaryCaching}/doubleit/services/doubleittransportsaml1endorsing"
wsdlLocation="org/apache/cxf/systest/sts/intermediary_transformation/DoubleIt.wsdl">
         <jaxws:properties>
             <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
             <entry key="security.signature.properties" value="serviceKeystore.properties"/>
@@ -32,7 +32,7 @@
         </jaxws:properties>
     </jaxws:endpoint>
     <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
-        <httpj:engine port="${testutil.ports.intermediary_transformation.Intermediary}">
+        <httpj:engine port="${testutil.ports.intermediary_transformation.IntermediaryCaching}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="skpass">
                     <sec:keyStore type="jks" password="sspass" resource="keys/servicestore.jks"/>


Mime
View raw message