You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/06/16 10:45:52 UTC
[1/2] cxf git commit: Fixing ports
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 23408fdbb -> 5fd91a935
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/02246545
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/02246545
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/02246545
Branch: refs/heads/3.0.x-fixes
Commit: 02246545d12758cf56181f2092eea227df07b621
Parents: 23408fd
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jun 16 11:37:25 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Jun 16 11:41:20 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/02246545/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 9a5f870..b04caab 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(
@@ -105,7 +105,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);
@@ -117,7 +117,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/02246545/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 4f367ab..8072526 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="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
<entry key="ws-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="servicestore.jks"/>
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5fd91a93
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5fd91a93
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5fd91a93
Branch: refs/heads/3.0.x-fixes
Commit: 5fd91a935960dd66ba0f28f3662b617ca23d9439
Parents: 0224654
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jun 16 11:41:21 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Jun 16 11:41:21 2017 +0100
----------------------------------------------------------------------
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5fd91a93/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index bea97f4..a32b43e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -785,6 +785,7 @@ B 6eaa2bd9f48718d241ef6e779285c65a800862a8
B 6ec0e90dc12c2384612f201f54d1e6e7e7f45724
B 6ef5be5869eb0c076f8bc8ed30775028a0b314c7
B 6efe475ad57f042ffc9547f1bb258ab4e16a3f3e
+B 6f07ef7b6c5ab9a8c88dd8e4b4d60dac0d2adb6e
B 6f2a98efabe16b6e129ca86b292b74d006093541
B 6f31130c52c4f328795c71f7f3891e3b7c899daf
B 6f3e4aa162c2ec1c78256b57d98f735cfb15a2fb
@@ -1777,6 +1778,7 @@ M 00b626af504d3d59419ec2d1eb5e39943ec5b8aa
M 011725e4de2026bbebb6a732764a86d9a2ae4109
M 01860c78f6fd7554cf89a9bc912ca78d2b304efe
M 02221113b4c85bc643f18c82a7d59e0179d400ac
+M 022c89df45b88284b26286559673fb8de95a0315
M 049fe48c0489cf0e4df632a73bb91a76343d2639
M 0529afb26222feaf5e3954518a8e3bfacd857829
M 05383ffcfc3fe16c6acadf1a343375c00fa1116c