[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
Authored: Fri Jun 16 11:37:25 2017 +0100
Committer: Colm O hEigeartaigh
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
[2/2] cxf git commit: Fixing ports
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
Authored: Fri Jun 16 11:37:25 2017 +0100
Committer: Colm O hEigeartaigh
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 @@
-http://www.example.org/contract/DoubleI
cxf git commit: Fixing ports
Repository: cxf
Updated Branches:
refs/heads/master 77e0ffed1 -> 3d02791f0
Fixing ports
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3d02791f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3d02791f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3d02791f
Branch: refs/heads/master
Commit: 3d02791f001faf35ea585ce67d3f4564f5c25c1b
Parents: 77e0ffe
Author: Colm O hEigeartaigh
Authored: Fri Jun 16 11:37:25 2017 +0100
Committer: Colm O hEigeartaigh
Committed: Fri Jun 16 11:37:25 2017 +0100
--
.../IntermediaryTransformationCachingTest.java | 8
.../intermediary_transformation/cxf-intermediary-caching.xml | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/3d02791f/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 ef90341..b42f3f7 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
@@ -41,7 +41,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 {
@@ -53,7 +53,7 @@ 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 {
@@ -103,7 +103,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);
@@ -115,7 +115,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/3d02791f/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 3748f56..ddd9dd2 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 @@
-http://www.example.org/contract/DoubleIt";
id="doubleittransportsaml1endorsing"
implementor="org.apache.cxf.systest.sts.intermediary_transformation.IntermediaryCachi
