cxf git commit: [CXF-6327] - Invalid Policy exception for EndorsingSupportingTokens with more than one token assertions

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 790012b2b - aaad96fdf


[CXF-6327] - Invalid Policy exception for EndorsingSupportingTokens with more 
than one token assertions


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

Branch: refs/heads/master
Commit: aaad96fdf931cdc619a60fbffe3c9c894ae8ea43
Parents: 790012b
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 13:41:13 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 13:41:13 2015 +0100

--
 .../policyhandlers/AbstractBindingBuilder.java  | 57 
 .../AbstractStaxBindingHandler.java |  9 ++--
 .../AsymmetricBindingHandler.java   | 15 +++---
 .../StaxAsymmetricBindingHandler.java   |  4 +-
 .../StaxSymmetricBindingHandler.java|  4 +-
 .../StaxTransportBindingHandler.java|  4 +-
 .../policyhandlers/SymmetricBindingHandler.java | 11 ++--
 .../policyhandlers/TransportBindingHandler.java | 12 +++--
 .../sts/transport/TransportBindingTest.java |  7 ++-
 .../cxf/systest/sts/transport/DoubleIt.wsdl |  3 +-
 .../cxf/systest/sts/transport/cxf-service.xml   |  3 +-
 .../systest/sts/transport/cxf-stax-service.xml  |  3 +-
 12 files changed, 64 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/aaad96fd/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index bb4aa46..9379c49 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -118,7 +118,6 @@ import 
org.apache.wss4j.policy.model.AbstractSecurityAssertion;
 import org.apache.wss4j.policy.model.AbstractSymmetricAsymmetricBinding;
 import org.apache.wss4j.policy.model.AbstractToken;
 import org.apache.wss4j.policy.model.AbstractToken.DerivedKeys;
-import org.apache.wss4j.policy.model.AbstractTokenWrapper;
 import org.apache.wss4j.policy.model.AlgorithmSuite.AlgorithmSuiteType;
 import org.apache.wss4j.policy.model.AsymmetricBinding;
 import org.apache.wss4j.policy.model.Attachments;
@@ -500,7 +499,8 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 
 } else if (token instanceof X509Token) {
 //We have to use a cert. Prepare X509 signature
-WSSecSignature sig = getSignatureBuilder(suppTokens, token, 
endorse);
+WSSecSignature sig = getSignatureBuilder(token, false, 
endorse);
+assertPolicy(suppTokens);
 Element bstElem = sig.getBinarySecurityTokenElement();
 if (bstElem != null) {
 if (lastEncryptedKeyElement != null) {
@@ -521,7 +521,8 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 }
 ret.add(new SupportingToken(token, sig, 
getSignedParts(suppTokens)));
 } else if (token instanceof KeyValueToken) {
-WSSecSignature sig = getSignatureBuilder(suppTokens, token, 
endorse);
+WSSecSignature sig = getSignatureBuilder(token, false, 
endorse);
+assertPolicy(suppTokens);
 if (suppTokens.isEncryptedToken()) {
 WSEncryptionPart part = new 
WSEncryptionPart(sig.getBSTTokenId(), Element);
 encryptedTokensList.add(part);
@@ -865,7 +866,7 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 }
 Crypto crypto = samlCallback.getIssuerCrypto();
 if (crypto == null) {
-crypto = getSignatureCrypto(null);
+crypto = getSignatureCrypto();
 }
 
 assertion.signAssertion(
@@ -1358,14 +1359,14 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 return null;
 }
 
-protected WSSecEncryptedKey getEncryptedKeyBuilder(AbstractTokenWrapper 
wrapper, 
-   AbstractToken token) 
throws WSSecurityException {
+protected WSSecEncryptedKey getEncryptedKeyBuilder(AbstractToken token) 
throws WSSecurityException {
 WSSecEncryptedKey 

[1/3] cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 97682e60c - f7c0e6279


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/7f33d150
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7f33d150
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7f33d150

Branch: refs/heads/3.0.x-fixes
Commit: 7f33d150ad3f4502da1e2c03e2415e9e6fc1a7c5
Parents: 7f00148
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 13:43:18 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 13:43:18 2015 +0100

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7f33d150/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1e10dfc..ba2b855 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -328,6 +328,7 @@ M a3bf2a80bafa95ec2ccdd2b28ead26c13866acd7
 M a64ded455c40169665e438ae7a25f17bd4f8047a
 M a9555675b829acdfb1672bc2157d6f3c08fdd652
 M a97f886f36c8aea2a49860ec8cd33b0021b7b9e2
+M aaad96fdf931cdc619a60fbffe3c9c894ae8ea43
 M af2f7d3a52076f60d0f98a2635e2adef256a9efe
 M bc5e828cd8a25c4c4107c76e1582f807e75c9a77
 M bd1d31f195caab56fbe565fbfb63d9170a0c9406

[3/3] cxf git commit: Fixing build

[coheigea]

Fixing build


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

Branch: refs/heads/3.0.x-fixes
Commit: f7c0e627926961d63d6710076dc0d82bd1817be2
Parents: 7f33d15
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 14:48:41 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 14:48:41 2015 +0100

--
 parent/pom.xml  |  2 +-
 .../grants/jwt/AbstractJwtHandlerTest.java  |  1 +
 .../policyhandlers/AbstractBindingBuilder.java  | 28 +++-
 .../policyhandlers/TransportBindingHandler.java |  7 -
 .../systest/ws/algsuite/AlgorithmSuiteTest.java |  2 --
 5 files changed, 5 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/f7c0e627/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 540bbad..eff3914 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -160,7 +160,7 @@
 cxf.woodstox.core.version4.4.1/cxf.woodstox.core.version
 cxf.woodstox.stax2-api.version3.1.4/cxf.woodstox.stax2-api.version
 cxf.wsdl4j.version1.6.3/cxf.wsdl4j.version
-cxf.wss4j.version2.0.3/cxf.wss4j.version
+cxf.wss4j.version2.0.4-SNAPSHOT/cxf.wss4j.version
 cxf.xerces.version2.11.0/cxf.xerces.version
 cxf.xmlbeans.version2.6.0/cxf.xmlbeans.version
 cxf.xmlschema.version2.2.1/cxf.xmlschema.version

http://git-wip-us.apache.org/repos/asf/cxf/blob/f7c0e627/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
 
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
index 5ee0145..33d593c 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/test/java/org/apache/cxf/rs/security/oauth2/grants/jwt/AbstractJwtHandlerTest.java
@@ -82,6 +82,7 @@ public class AbstractJwtHandlerTest {
 handler.validateSignature(headers, UNSIGNED_TEXT, SIGNATURE);
 fail(OAuthServiceException expected);
 } catch (OAuthServiceException expected) {
+// expected
 }
 verify(signatureVerifier);
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/f7c0e627/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index a996944..8f7c118 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -1373,18 +1373,9 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 return null;
 }
 
- HEAD
-protected WSSecEncryptedKey getEncryptedKeyBuilder(AbstractTokenWrapper 
wrapper, 
-   AbstractToken token) 
throws WSSecurityException {
-WSSecEncryptedKey encrKey = new WSSecEncryptedKey(wssConfig);
-Crypto crypto = getEncryptionCrypto(wrapper);
-===
 protected WSSecEncryptedKey getEncryptedKeyBuilder(AbstractToken token) 
throws WSSecurityException {
-WSSecEncryptedKey encrKey = new WSSecEncryptedKey();
-encrKey.setIdAllocator(wssConfig.getIdAllocator());
-encrKey.setCallbackLookup(callbackLookup);
+WSSecEncryptedKey encrKey = new WSSecEncryptedKey(wssConfig);
 Crypto crypto = getEncryptionCrypto();
- aaad96f... [CXF-6327] - Invalid Policy exception for 
EndorsingSupportingTokens with more than one token assertions
 message.getExchange().put(SecurityConstants.ENCRYPT_CRYPTO, crypto);
 setKeyIdentifierType(encrKey, token);
 
@@ -1435,24 +1426,11 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 return getCrypto(SecurityConstants.SIGNATURE_CRYPTO, 
SecurityConstants.SIGNATURE_PROPERTIES);
 }
 
- HEAD
-
-public 

[2/3] cxf git commit: [CXF-6327] - Invalid Policy exception for EndorsingSupportingTokens with more than one token assertions

[coheigea]

[CXF-6327] - Invalid Policy exception for EndorsingSupportingTokens with more 
than one token assertions

Conflicts:

rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java

rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java


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

Branch: refs/heads/3.0.x-fixes
Commit: 7f0014828b9201e0f32a7ebe3bd02ef3ccfb760b
Parents: 97682e6
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 13:41:13 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 13:43:18 2015 +0100

--
 .../policyhandlers/AbstractBindingBuilder.java  | 65 
 .../AbstractStaxBindingHandler.java |  9 ++-
 .../AsymmetricBindingHandler.java   | 15 ++---
 .../StaxAsymmetricBindingHandler.java   |  4 +-
 .../StaxSymmetricBindingHandler.java|  4 +-
 .../StaxTransportBindingHandler.java|  4 +-
 .../policyhandlers/SymmetricBindingHandler.java | 11 ++--
 .../policyhandlers/TransportBindingHandler.java | 17 +++--
 .../sts/transport/TransportBindingTest.java |  7 ++-
 .../cxf/systest/sts/transport/DoubleIt.wsdl |  3 +-
 .../cxf/systest/sts/transport/cxf-service.xml   |  3 +-
 .../systest/sts/transport/cxf-stax-service.xml  |  3 +-
 12 files changed, 85 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7f001482/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
--
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index fec27e8..a996944 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -113,7 +113,6 @@ import 
org.apache.wss4j.policy.model.AbstractSecurityAssertion;
 import org.apache.wss4j.policy.model.AbstractSymmetricAsymmetricBinding;
 import org.apache.wss4j.policy.model.AbstractToken;
 import org.apache.wss4j.policy.model.AbstractToken.DerivedKeys;
-import org.apache.wss4j.policy.model.AbstractTokenWrapper;
 import org.apache.wss4j.policy.model.AlgorithmSuite.AlgorithmSuiteType;
 import org.apache.wss4j.policy.model.AsymmetricBinding;
 import org.apache.wss4j.policy.model.Attachments;
@@ -492,7 +491,8 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 
 } else if (token instanceof X509Token) {
 //We have to use a cert. Prepare X509 signature
-WSSecSignature sig = getSignatureBuilder(suppTokens, token, 
endorse);
+WSSecSignature sig = getSignatureBuilder(token, false, 
endorse);
+assertPolicy(suppTokens);
 Element bstElem = sig.getBinarySecurityTokenElement();
 if (bstElem != null) {
 if (lastEncryptedKeyElement != null) {
@@ -513,7 +513,8 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 }
 ret.add(new SupportingToken(token, sig, 
getSignedParts(suppTokens)));
 } else if (token instanceof KeyValueToken) {
-WSSecSignature sig = getSignatureBuilder(suppTokens, token, 
endorse);
+WSSecSignature sig = getSignatureBuilder(token, false, 
endorse);
+assertPolicy(suppTokens);
 if (suppTokens.isEncryptedToken()) {
 WSEncryptionPart part = new 
WSEncryptionPart(sig.getBSTTokenId(), Element);
 encryptedTokensList.add(part);
@@ -860,7 +861,7 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 }
 Crypto crypto = samlCallback.getIssuerCrypto();
 if (crypto == null) {
-crypto = getSignatureCrypto(null);
+crypto = getSignatureCrypto();
 }
 
 assertion.signAssertion(
@@ -1372,12 +1373,21 @@ public abstract class AbstractBindingBuilder extends 
AbstractCommonBindingHandle
 return null;
 }
 
+ HEAD
 protected WSSecEncryptedKey getEncryptedKeyBuilder(AbstractTokenWrapper 
wrapper, 

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 9d402cbc9 - 23fa7d17a


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/23fa7d17
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/23fa7d17
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/23fa7d17

Branch: refs/heads/2.7.x-fixes
Commit: 23fa7d17a1e37e7def4acb198ddd3b8354ca4e3d
Parents: 9d402cb
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 14:50:14 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 14:50:14 2015 +0100

--
 .gitmergeinfo | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/23fa7d17/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9fe6f4e..b0445ba 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -957,7 +957,9 @@ B 7e13cf2af586861c937bca78f4e1b9a5357f40d1
 B 7e204b565715bd02a23263c1689e371bc9090e3a
 B 7e2f8ba3b8e5a3622bcaf3977e3bc59deb0aa405
 B 7e9a8235d3a6ea97e23e931e486a5feccb6072c2
+B 7f0014828b9201e0f32a7ebe3bd02ef3ccfb760b
 B 7f069520125ecf0b759dcc7d76be72d22d966689
+B 7f33d150ad3f4502da1e2c03e2415e9e6fc1a7c5
 B 7f717e81f99c50175d5fcd5dcef42ac9a4ff4618
 B 7febe61987bf6e93a721883de4154ae5d570b297
 B 800598fd38d09b3a85984cc9638ef882600ccbf8
@@ -2664,6 +2666,7 @@ M f69d6b69fcb2f9677070d12b6ada8cba2c0945fc
 M f73a8780a2856a2df8f0d8499232b59845b8582a
 M f77a9ebf0d9ee8b2e5cf4ba1c2c38f2e33460759
 M f78c3622442b753cb49d47193a1ffa015f49af9b
+M f7c0e627926961d63d6710076dc0d82bd1817be2
 M f825cb0e1f9fa69333028ca126a95dc1b5f330f3
 M f8d90c7acbba15be25d6fb75d167e1aa68bba0a2
 M f8ed98e684c1a67a77ae8726db05a04a4978a445

cxf git commit: Add initial support for a SAML SSO Metadata service

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes f7c0e6279 - 06696d589


Add initial support for a SAML SSO Metadata service

Conflicts:

rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java


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

Branch: refs/heads/3.0.x-fixes
Commit: 06696d589fbba7af84994392ffb67def0096c2a3
Parents: f7c0e62
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Tue Apr 14 17:16:16 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 16:35:39 2015 +0100

--
 .../security/saml/sso/AbstractSSOSpHandler.java |  19 ++
 .../saml/sso/AbstractServiceProviderFilter.java |  18 --
 .../rs/security/saml/sso/MetadataService.java   | 104 
 .../rs/security/saml/sso/MetadataWriter.java| 263 +++
 .../cxf/rs/security/saml/sso/SSOConstants.java  |   6 +
 5 files changed, 392 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/06696d58/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
index f839620..84c34ee 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractSSOSpHandler.java
@@ -50,6 +50,7 @@ public class AbstractSSOSpHandler {
 private String signaturePropertiesFile;
 private CallbackHandler callbackHandler;
 private String callbackHandlerClass;
+private String signatureUsername;
 
 static {
 OpenSAMLUtil.initSamlEngine();
@@ -243,4 +244,22 @@ public class AbstractSSOSpHandler {
 }
 return handler;
 }
+
+/**
+ * Set the username/alias to use to sign any request
+ * @param signatureUsername the username/alias to use to sign any request
+ */
+public void setSignatureUsername(String signatureUsername) {
+this.signatureUsername = signatureUsername;
+LOG.fine(Setting signatureUsername:  + signatureUsername);
+}
+ 
+/**
+ * Get the username/alias to use to sign any request
+ * @return the username/alias to use to sign any request
+ */
+public String getSignatureUsername() {
+return signatureUsername;
+}
+
 }

http://git-wip-us.apache.org/repos/asf/cxf/blob/06696d58/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
index e96566a..2ab978d 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/AbstractServiceProviderFilter.java
@@ -78,7 +78,6 @@ public abstract class AbstractServiceProviderFilter extends 
AbstractSSOSpHandler
 private String assertionConsumerServiceAddress;
 private AuthnRequestBuilder authnRequestBuilder = new 
DefaultAuthnRequestBuilder();
 private boolean signRequest;
-private String signatureUsername;
 
 private String webAppDomain;
 private boolean addWebAppContext = true;
@@ -117,23 +116,6 @@ public abstract class AbstractServiceProviderFilter 
extends AbstractSSOSpHandler
 return idpServiceAddress;
 }
 
-/**
- * Set the username/alias to use to sign any request
- * @param signatureUsername the username/alias to use to sign any request
- */
-public void setSignatureUsername(String signatureUsername) {
-this.signatureUsername = signatureUsername;
-LOG.fine(Setting signatureUsername:  + signatureUsername);
-}
-
-/**
- * Get the username/alias to use to sign any request
- * @return the username/alias to use to sign any request
- */
-public String getSignatureUsername() {
-return signatureUsername;
-}
-
 @PreDestroy
 public void close() {
 super.close();

cxf git commit: Adding accessors

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master aaad96fdf - 04fdfc691


Adding accessors


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

Branch: refs/heads/master
Commit: 04fdfc691b7a164e2c522c81541ee31c58d12fa3
Parents: aaad96f
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 16:37:38 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 16:37:38 2015 +0100

--
 .../cxf/rs/security/saml/sso/MetadataService.java   | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/04fdfc69/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
index 37b5623..fc7a424 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
@@ -100,5 +100,21 @@ public class MetadataService extends AbstractSSOSpHandler {
 LOG.warning(errorMsg.toString());
 }
 
+public String getServiceAddress() {
+return serviceAddress;
+}
+
+public void setServiceAddress(String serviceAddress) {
+this.serviceAddress = serviceAddress;
+}
+
+public String getLogoutServiceAddress() {
+return logoutServiceAddress;
+}
+
+public void setLogoutServiceAddress(String logoutServiceAddress) {
+this.logoutServiceAddress = logoutServiceAddress;
+}
+
 
 }

cxf git commit: Also adding in redirect URL

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 9a11665bd - 318bd5fbe


Also adding in redirect URL


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

Branch: refs/heads/3.0.x-fixes
Commit: 318bd5fbeae474aaca1073a05ce784685a4c5b04
Parents: 9a11665
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 16:50:31 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 16:51:01 2015 +0100

--
 .../org/apache/cxf/rs/security/saml/sso/MetadataWriter.java   | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/318bd5fb/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
index 1a9c8be..ce18576 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
@@ -148,6 +148,13 @@ public class MetadataWriter {
 writer.writeAttribute(Binding, 
urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST);
 writer.writeEndElement(); // AssertionConsumerService
 
+writer.writeStartElement(md, AssertionConsumerService, 
SSOConstants.SAML2_METADATA_NS);
+writer.writeAttribute(Location, serviceURL);
+writer.writeAttribute(index, 0);
+writer.writeAttribute(isDefault, true);
+writer.writeAttribute(Binding, 
urn:oasis:names:tc:SAML:2.0:bindings:HTTP-REDIRECT);
+writer.writeEndElement(); // AssertionConsumerService
+
 /*
 if (protocol.getClaimTypesRequested() != null  
!protocol.getClaimTypesRequested().isEmpty()) {
 writer.writeStartElement(md, AttributeConsumingService, 
SSOConstants.SAML2_METADATA_NS);

cxf git commit: Adding accessors

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 06696d589 - 9a11665bd


Adding accessors


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

Branch: refs/heads/3.0.x-fixes
Commit: 9a11665bd02756889217151872f4e0d8d2a2
Parents: 06696d5
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 16:37:38 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 16:38:05 2015 +0100

--
 .../cxf/rs/security/saml/sso/MetadataService.java   | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9a11665b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
index 37b5623..fc7a424 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataService.java
@@ -100,5 +100,21 @@ public class MetadataService extends AbstractSSOSpHandler {
 LOG.warning(errorMsg.toString());
 }
 
+public String getServiceAddress() {
+return serviceAddress;
+}
+
+public void setServiceAddress(String serviceAddress) {
+this.serviceAddress = serviceAddress;
+}
+
+public String getLogoutServiceAddress() {
+return logoutServiceAddress;
+}
+
+public void setLogoutServiceAddress(String logoutServiceAddress) {
+this.logoutServiceAddress = logoutServiceAddress;
+}
+
 
 }

cxf git commit: Another fix

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master a1d5b1b76 - d86e6ae25


Another fix


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

Branch: refs/heads/master
Commit: d86e6ae2548142ffb0a2a9a493ab031405440697
Parents: a1d5b1b
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 16:57:27 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 16:57:27 2015 +0100

--
 .../java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java| 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d86e6ae2/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
index b738899..27c8d10 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
@@ -151,7 +151,6 @@ public class MetadataWriter {
 writer.writeStartElement(md, AssertionConsumerService, 
SSOConstants.SAML2_METADATA_NS);
 writer.writeAttribute(Location, serviceURL);
 writer.writeAttribute(index, 1);
-writer.writeAttribute(isDefault, true);
 writer.writeAttribute(Binding, 
urn:oasis:names:tc:SAML:2.0:bindings:HTTP-REDIRECT);
 writer.writeEndElement(); // AssertionConsumerService
 

cxf git commit: Also adding in redirect URL

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 04fdfc691 - 8af5f562d


Also adding in redirect URL


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

Branch: refs/heads/master
Commit: 8af5f562d3275ed581bad92c8306eb7bbdfc982d
Parents: 04fdfc6
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 16:50:31 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 16:50:31 2015 +0100

--
 .../org/apache/cxf/rs/security/saml/sso/MetadataWriter.java   | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/8af5f562/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
index 1a9c8be..ce18576 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
@@ -148,6 +148,13 @@ public class MetadataWriter {
 writer.writeAttribute(Binding, 
urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST);
 writer.writeEndElement(); // AssertionConsumerService
 
+writer.writeStartElement(md, AssertionConsumerService, 
SSOConstants.SAML2_METADATA_NS);
+writer.writeAttribute(Location, serviceURL);
+writer.writeAttribute(index, 0);
+writer.writeAttribute(isDefault, true);
+writer.writeAttribute(Binding, 
urn:oasis:names:tc:SAML:2.0:bindings:HTTP-REDIRECT);
+writer.writeEndElement(); // AssertionConsumerService
+
 /*
 if (protocol.getClaimTypesRequested() != null  
!protocol.getClaimTypesRequested().isEmpty()) {
 writer.writeStartElement(md, AttributeConsumingService, 
SSOConstants.SAML2_METADATA_NS);

cxf git commit: Another fix

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes a39eda505 - 64a95b669


Another fix


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

Branch: refs/heads/3.0.x-fixes
Commit: 64a95b669dfd31536b0790d2758097c95c469d4c
Parents: a39eda5
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 16:57:27 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 16:57:50 2015 +0100

--
 .../java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java| 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/64a95b66/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
index b738899..27c8d10 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
@@ -151,7 +151,6 @@ public class MetadataWriter {
 writer.writeStartElement(md, AssertionConsumerService, 
SSOConstants.SAML2_METADATA_NS);
 writer.writeAttribute(Location, serviceURL);
 writer.writeAttribute(index, 1);
-writer.writeAttribute(isDefault, true);
 writer.writeAttribute(Binding, 
urn:oasis:names:tc:SAML:2.0:bindings:HTTP-REDIRECT);
 writer.writeEndElement(); // AssertionConsumerService
 

cxf git commit: Fixing last commit

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 318bd5fbe - a39eda505


Fixing last commit


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

Branch: refs/heads/3.0.x-fixes
Commit: a39eda50574dfc986e30a217e5b172ed107bedd2
Parents: 318bd5f
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 16:54:33 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 16:55:26 2015 +0100

--
 .../java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a39eda50/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
index ce18576..b738899 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
@@ -150,7 +150,7 @@ public class MetadataWriter {
 
 writer.writeStartElement(md, AssertionConsumerService, 
SSOConstants.SAML2_METADATA_NS);
 writer.writeAttribute(Location, serviceURL);
-writer.writeAttribute(index, 0);
+writer.writeAttribute(index, 1);
 writer.writeAttribute(isDefault, true);
 writer.writeAttribute(Binding, 
urn:oasis:names:tc:SAML:2.0:bindings:HTTP-REDIRECT);
 writer.writeEndElement(); // AssertionConsumerService

cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 23fa7d17a - 59721a543


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/59721a54
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/59721a54
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/59721a54

Branch: refs/heads/2.7.x-fixes
Commit: 59721a54346e8803f4aef141bdd0701d2b2ebd26
Parents: 23fa7d1
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 17:04:41 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 17:04:41 2015 +0100

--
 .gitmergeinfo | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/59721a54/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index b0445ba..9be32b8 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -48,6 +48,7 @@ B 04b535bbb4667e43492515718a061553d50644d8
 B 05935e926a50cdd5f3a9db57b2f3772f628b1929
 B 0646fdbf971885ca605cd27d5b46a413bc0e8f84
 B 0652be3b049bb06e90f93eaac8cbe6baf0db785d
+B 06696d589fbba7af84994392ffb67def0096c2a3
 B 06bb3853d7e5998dbebd8d042114a06f4827d76f
 B 06cff924029e5bf9454fb8e3a5d07f5587268b64
 B 0709775589ac5310bf6a68689f89db8f33463645
@@ -389,6 +390,7 @@ B 3120b9373f272d5f962c01c577bf08369c390dac
 B 313c40705b0bec3e506e8cbb56ebdc371f4a7568
 B 3158ccb445fbec6ca408c22b4e32ab054ab792b4
 B 3163a3671b112b7846c8408dc57cb927f08bfdbc
+B 318bd5fbeae474aaca1073a05ce784685a4c5b04
 B 3194eb13b90803f262dc53a241abaff6a7f5a6d7
 B 31c6342bef1eb5921c247002a60a37b925c1059a
 B 31cf9c76f6d1be4b901bf06514a9717d936da2fb
@@ -769,6 +771,7 @@ B 6463da84d21e77d4fb0f7814902c1f70ea1c2940
 B 646618cb1a65427846f28ff9ef432e3bb10b702e
 B 648bd64e5de7429cc6563413785d9b35d6b79225
 B 64a23c3044b21ce4acd722ceafae7997d0c3d841
+B 64a95b669dfd31536b0790d2758097c95c469d4c
 B 64f746bdd2f653d2a984edf29548e926a8417530
 B 6502de3d212a182cd256aa54787c4a834195ff2d
 B 65083f36540277b7b64f708c63ccfc48dbc74375
@@ -1178,6 +1181,7 @@ B 99c47519ffbf30335559f8c32d222314ff6ea438
 B 99ce97ea9c976d5e57cc79b4b26d9b10a3bb4eaa
 B 99f64eb11dbe0699d8174d77c4e50c9163234d88
 B 99fc7e1e5d5900a547a0c992102c100f69e918bd
+B 9a11665bd02756889217151872f4e0d8d2a2
 B 9a20282e40c3d60d03871440d0b14ee02d3f0a32
 B 9a258338bef4c952db0fed6dfa108279c34a4630
 B 9a2fe574c337173cf02bb87aca33bb232a544f70
@@ -1242,6 +1246,7 @@ B a312f2a028a3b085ef4401cc26d930de7ffeeab0
 B a33670388cd4314a75bde41d98336446ea073d4e
 B a34df25e3a78d3a4cf5bb6fa8c51e82e489b614e
 B a3505225ee53bf7d25b25ac68687976f01347863
+B a39eda50574dfc986e30a217e5b172ed107bedd2
 B a3d605568fb31fd5edf5de844a3aa503f3a91558
 B a3e071687de318c17e7543a56c773849b5fa1442
 B a3f3df042f158b67426700c95a7be09bb764f3a7

cxf git commit: Fixing last commit

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 8af5f562d - a1d5b1b76


Fixing last commit


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

Branch: refs/heads/master
Commit: a1d5b1b760305f1c7ed6c501fdec0cfa082f6752
Parents: 8af5f56
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 16:54:33 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 16:54:33 2015 +0100

--
 .../java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/a1d5b1b7/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
--
diff --git 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
index ce18576..b738899 100644
--- 
a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
+++ 
b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
@@ -150,7 +150,7 @@ public class MetadataWriter {
 
 writer.writeStartElement(md, AssertionConsumerService, 
SSOConstants.SAML2_METADATA_NS);
 writer.writeAttribute(Location, serviceURL);
-writer.writeAttribute(index, 0);
+writer.writeAttribute(index, 1);
 writer.writeAttribute(isDefault, true);
 writer.writeAttribute(Binding, 
urn:oasis:names:tc:SAML:2.0:bindings:HTTP-REDIRECT);
 writer.writeEndElement(); // AssertionConsumerService

[1/2] cxf git commit: Restore teh original bus, not set it to null

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 64a95b669 - 0b29878b9


Restore teh original bus, not set it to null


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

Branch: refs/heads/3.0.x-fixes
Commit: c1e3d655db0244c115297328d1296ddfc7fdc3e7
Parents: 64a95b6
Author: Daniel Kulp dk...@apache.org
Authored: Wed Apr 15 13:35:45 2015 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Apr 15 13:40:06 2015 -0400

--
 .../java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c1e3d655/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
index c224cd7..5fba47b 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
@@ -171,7 +171,7 @@ public class CXFNonSpringServlet extends 
AbstractHTTPServlet {
 controller.invoke(request, response);
 } finally {
 if (origBus != bus) {
-BusFactory.setThreadDefaultBus(null);
+BusFactory.setThreadDefaultBus(origBus);
 }
 if (origLoader != null) {
 origLoader.reset();

[6/6] cxf git commit: Recording .gitmergeinfo Changes

[dkulp]

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/41967da2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/41967da2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/41967da2

Branch: refs/heads/2.7.x-fixes
Commit: 41967da2fc4e052fbe27d30980b121e56edb4d75
Parents: cda90e0
Author: Daniel Kulp dk...@apache.org
Authored: Wed Apr 15 14:22:22 2015 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Apr 15 14:23:11 2015 -0400

--
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/41967da2/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 11d80f6..055edb7 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1967,6 +1967,7 @@ M 0a2e01f228890abba0bde43a545ea046c9c46119
 M 0a5fc9a53bad9e95d927b8f2730ba5067f2f4c6c
 M 0ad59e8757cd183484053ae7d61995266b2f4760
 M 0b21c66dc0486643f481c9cf31757e2b3293de23
+M 0b29878b914c1f1f3d52dae6ba57702085e348ca
 M 0b3894f57388b9955f2c33b2295223f2835cd7b3
 M 0bbd3da675bd37691bb5bb247fa9ec186dcec45c
 M 0c402ce8092cd9bf9f3390434c56414140267c16

[4/6] cxf git commit: Recording .gitmergeinfo Changes

[dkulp]

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/2ce2eae4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2ce2eae4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2ce2eae4

Branch: refs/heads/2.7.x-fixes
Commit: 2ce2eae43d9b071763b040145e3a6ef9bc1b0ff8
Parents: 13c80cf
Author: Daniel Kulp dk...@apache.org
Authored: Wed Apr 15 14:22:10 2015 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Apr 15 14:22:10 2015 -0400

--
 .gitmergeinfo | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/2ce2eae4/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 9be32b8..11d80f6 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -107,6 +107,7 @@ B 0e5b958dfc41d7debd5ee68b9eb8ba117ea6db75
 B 0e7bb9cdbb5f335147e2f2f82881e66f7d2000cd
 B 0e8b0570cfae8ffb7d8e0678cea09ae8d68b018c
 B 0e8efba29ee1b2151645a3714436d9546007f382
+B 0ec15341e8dde3ebf8956da8587a95bc0028a564
 B 0ed845dbe70783e0311ef934ed144525e7f3f705
 B 0ed88c54f0f9e0be0d6054f9cd56f0d07b4827d3
 B 0ee29500ca1d031490bbc245908cf3a44b42730e
@@ -513,6 +514,7 @@ B 40a2c68f02fc3f33ab3ca897879c91970382048b
 B 40a67be30f406ab11f28aefb6636fd8895054b75
 B 40b898684f18b5e4f0873d133a9deae618c576fa
 B 40bc1bdf29cf4e8ea3fdaeb948671f1e019031f6
+B 40c2449428409e01188948206fdf7a1a78ce63a1
 B 40e0f9319b575932d5f07081eb1a6d1bf8318e32
 B 4110c8eae0c6cb404697df1972e0aa368eeaefe3
 B 41267161bff1dcec36c2978fe863efdcf5947ebc
@@ -564,6 +566,7 @@ B 4604c9fe25da4be126b54c0eb458f8f32503ac71
 B 46193f6de59dd7d3780a62a8f46dfac46476c5f1
 B 461b3e98681c758fb5dc1e4e48c4fc98bcf177d9
 B 461f8d739a22fa5caaac3552244a693f4bde136b
+B 46617e66bf125dc660302350a0d04cbc6e09487c
 B 467a9d93355e8e87dc0b47d96499512bcee1b52b
 B 467d320553527adb9208bc22ff3938c9830378c4
 B 4681cb3b58270c4ce5a58a196afffd5fe3d14321
@@ -608,6 +611,7 @@ B 4ccaa6d5e605ea65978b493dc7bf673ba72a8ed9
 B 4d0254adf94a0c73569161a3ed011e53319bce31
 B 4d170b09fb600db59fe7dc92c8e3d08bf6c1c3de
 B 4d718903a14bd6b197473014334d6ba294ecd897
+B 4d7bae9997a89d470271f090a93f43a573a48c42
 B 4daa8a05d1851dc1b479b7c3b13e3a892b167f91
 B 4daba03ba3ad0f97032c1cebe5547ce6799decdc
 B 4dc42da1d3621024ba6d9a139367b91a6671f45e
@@ -753,6 +757,7 @@ B 61f520d3a83182ec2c8fe789b6a897fbddeb67fb
 B 62144e297cfd175addf57671e71773cc6a602340
 B 621622e3bc47cced4bcd887cdc5d2372460571fe
 B 6241186c4e4ec1c14ff467884f83716fe6e2e2c7
+B 624bb36e46cfd47f4443245ba476ac96e41e0877
 B 625e54cb8ef4bd4c06f3c25d9cbb1b0bc53e83c1
 B 6276add292e682e77601bd2ec3d8e545e5618b13
 B 627a47eb65a2e8cb3e9ebb6894f29d8fcc407daf
@@ -904,6 +909,7 @@ B 762719c29c74b78b70789d232b6602d09414789f
 B 76313002a3149d7fa0445baf11489ce7a5388ff1
 B 764404893044c6b11491eb083b220bdf575ed2a1
 B 7686ddb3ce2663c2f6923b41ce3948371e17103d
+B 76996bab569a769217519b1689055037462c3a80
 B 76a91535fe0cf6109e14472a4b3eff9fad0011c3
 B 76bba771d3ef1234d1f90807789c0a59da1e175b
 B 76e65e78624d6040f6fa77a6a5ea8804e10087c3
@@ -929,6 +935,7 @@ B 79a1d5ae953de1d6e3e55501097a8224ab64948a
 B 79b95e94bbfa19e53fadfaffc91153a5976e02ad
 B 79bd4f37f7fea32346195180566d1c2562d79871
 B 79be65ac292c636427922f61e85de6737c7b4975
+B 7a2608611dd2a1702ea161601fd609ff7bab491c
 B 7a5d8184f175e461a508270b5620a9702adda18f
 B 7a9039c7a6d001974b70cbd1df064991c8f291a1
 B 7aa84abd4385996d32f0c5cd945843c7ca1e35c6
@@ -953,6 +960,7 @@ B 7d30cc4af87f0e33ffbc6754c8551e46343916c1
 B 7d45890daa100aaece18da05aab7b1d065f306fa
 B 7d4f8ea0ca7f66cea41ae8bb52aedfeefa66bbfc
 B 7d5f8b519fd02633eb0d40b017a747b3ce7b0321
+B 7d74ef5cc9ab500d7bb35495af2928ccb5a6e9bb
 B 7d801fa5faec894c755d9e831fe6d76656233a96
 B 7dc270e8415ba6fdf3decb2d3a9f23722711bcae
 B 7dd5c51d7457908a176978e24ae58ded342b9b98
@@ -1027,6 +1035,7 @@ B 858314e5a8468f3eac749222af948fe064699e8f
 B 85c6cb558cabc1248fca9711b66a0dc15e3e6f83
 B 85ecae5551365fa8a11a5245db2b84ada543107f
 B 8601456b5f8725458c34c81a7a48d3f18497ae32
+B 864161a16c634a22fbec77dfe9d68b47fcf2535f
 B 865036b9e1576360b34798c5fc89e81af96fbfe6
 B 866935dcebda0e462759c2b24f1719b897d17908
 B 866b9cc093e22071996013f773207d118bd767df
@@ -1396,6 +1405,7 @@ B b89704d67dc4a9eb5cd59890956ebdcac0584123
 B b8a7ca3f4ffc962f28fa4a3d9a4cf9a458c25f24
 B b8c8ff2740307c7c7a874ac7dbbeac7b22959a81
 B b8f68b6ef1794e32e1a1b36b7347fe42bd0af7bf
+B b906f99c54d58756f31f1a58663e139331c0dbbb
 B b9071a45eb2ea0a06f8ce8ca4b1783c49064e79f
 B b91d4c69e23ed7935655a8c78670df407b11bf51
 B b92558cba08bb94781174dcd6c9a025bdec519a2
@@ -1444,6 +1454,7 @@ B bfd4a8c6fa96616883b8fee7c56a9e84e1e16f93
 B bfd50e974ed07f49bf8f981fae30cb80b213db37
 B c015b609bc41b8095e1bc83a443cf9d2e44000ab
 B c03492dca099f5b5827ee4a27b01b5a1c9fbf00d
+B c0698e5ef5bc51da7599ca2774854c979e258c41
 B 

[5/6] cxf git commit: Use a ByteArrayInputStream not wrapped in a reader so the parser can get the enocding from the bytes instead of assuming system encoding. This closes #65

[dkulp]

Use a ByteArrayInputStream not wrapped in a reader so the parser can get the 
enocding from the bytes instead of assuming system encoding.
This closes #65


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

Branch: refs/heads/2.7.x-fixes
Commit: cda90e0fe57d930188615181d6d933dedee67309
Parents: 2ce2eae
Author: Daniel Kulp dk...@apache.org
Authored: Wed Apr 15 13:36:10 2015 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Apr 15 14:22:46 2015 -0400

--
 .../main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java   | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/cda90e0f/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
--
diff --git a/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java 
b/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
index c2fc67a..b315206 100644
--- a/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
+++ b/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
@@ -21,7 +21,6 @@ package org.apache.cxf.wsdl;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 import java.net.MalformedURLException;
@@ -230,9 +229,7 @@ public final class EndpointReferenceUtils {
 LSInputImpl impl = new LSInputImpl();
 impl.setSystemId(newId);
 impl.setBaseURI(newId);
-impl.setCharacterStream(
-new InputStreamReader(
-new ByteArrayInputStream(value)));
+impl.setByteStream(new ByteArrayInputStream(value));
 return impl;
 }
 }

[2/6] cxf git commit: Properties passed into the ExtensionManagerBus at creation time aren't actually used.

[dkulp]

Properties passed into the ExtensionManagerBus at creation time aren't actually 
used.


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

Branch: refs/heads/2.7.x-fixes
Commit: 7552cae3c4f23e97104a96eba320ebc32c5d32c8
Parents: 2c701fc
Author: Daniel Kulp dk...@apache.org
Authored: Tue Apr 7 15:02:34 2015 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Apr 15 14:20:42 2015 -0400

--
 .../java/org/apache/cxf/bus/extension/ExtensionManagerBus.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7552cae3/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
--
diff --git 
a/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java 
b/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
index 002c24e..4c37e7c 100644
--- 
a/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
+++ 
b/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerBus.java
@@ -56,9 +56,10 @@ public class ExtensionManagerBus extends CXFBusImpl {
 public ExtensionManagerBus(MapClass?, Object e, MapString, Object 
properties,
   ClassLoader extensionClassLoader) {
 super(e);
-
 if (null == properties) {
 properties = new HashMapString, Object();
+} else {
+setProperties(properties);
 }
 
 Configurer configurer = (Configurer)extensions.get(Configurer.class);

[2/2] cxf git commit: Use a ByteArrayInputStream not wrapped in a reader so the parser can get the enocding from the bytes instead of assuming system encoding.

[dkulp]

Use a ByteArrayInputStream not wrapped in a reader so the parser can get the 
enocding from the bytes instead of assuming system encoding.


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

Branch: refs/heads/master
Commit: 5539f332bbee355c6d7caaa12221ded5eaeab207
Parents: b3143a7
Author: Daniel Kulp dk...@apache.org
Authored: Wed Apr 15 13:36:10 2015 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Apr 15 13:36:10 2015 -0400

--
 .../org/apache/cxf/ws/addressing/EndpointReferenceUtils.java| 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/5539f332/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java 
b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
index 4ab5910..6155c50 100644
--- 
a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
+++ 
b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
@@ -21,7 +21,6 @@ package org.apache.cxf.ws.addressing;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 import java.net.MalformedURLException;
@@ -218,9 +217,7 @@ public final class EndpointReferenceUtils {
 LSInputImpl impl = new LSInputImpl();
 impl.setSystemId(newId);
 impl.setBaseURI(newId);
-impl.setCharacterStream(
-new InputStreamReader(
-new ByteArrayInputStream(value)));
+impl.setByteStream(new ByteArrayInputStream(value));
 return impl;
 }
 }

[1/2] cxf git commit: Restore teh original bus, not set it to null

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/master d86e6ae25 - 5539f332b


Restore teh original bus, not set it to null


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

Branch: refs/heads/master
Commit: b3143a70907c0fabd46e06193f8e6241904edd59
Parents: d86e6ae
Author: Daniel Kulp dk...@apache.org
Authored: Wed Apr 15 13:35:45 2015 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Apr 15 13:35:45 2015 -0400

--
 .../java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/b3143a70/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
--
diff --git 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
index c224cd7..5fba47b 100644
--- 
a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
+++ 
b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFNonSpringServlet.java
@@ -171,7 +171,7 @@ public class CXFNonSpringServlet extends 
AbstractHTTPServlet {
 controller.invoke(request, response);
 } finally {
 if (origBus != bus) {
-BusFactory.setThreadDefaultBus(null);
+BusFactory.setThreadDefaultBus(origBus);
 }
 if (origLoader != null) {
 origLoader.reset();

cxf git commit: Recording .gitmergeinfo Changes

[dkulp]

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 0b29878b9 - c0698e5ef


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/c0698e5e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c0698e5e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c0698e5e

Branch: refs/heads/3.0.x-fixes
Commit: c0698e5ef5bc51da7599ca2774854c979e258c41
Parents: 0b29878
Author: Daniel Kulp dk...@apache.org
Authored: Wed Apr 15 13:56:56 2015 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Apr 15 13:56:56 2015 -0400

--
 .gitmergeinfo | 42 ++
 1 file changed, 42 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/c0698e5e/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index ba2b855..d8ebe9b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -13,6 +13,7 @@ B 0ab9416fda31298e485f2a6864c263447e4b32de
 B 0ba19453f17be19aa2e46848b1908f776a6abb64
 B 0c0555f4ac850ec8e38302d73207170affe4376a
 B 0de0309f28e1543660c763c158f4353d6d2189be
+B 0e639399027b2b43ece5b21f73effa6381a5bf0c
 B 11243052a6e1656657776bc3a0c586cba962c49f
 B 131c3fdba9c4825b739adc3d149d0297175b8a86
 B 13b9b012a31fdf1a7e35757a336fecc3c688848e
@@ -36,15 +37,19 @@ B 222137cb2ee577e6582a644b7ae73bbc0a75d4d1
 B 237ace40ea2c204f68848309b9483c322499b524
 B 23849faa6058427381cd3a737d2f37b551db9938
 B 2426a0879b06cf6dea32004af16f96f793d568eb
+B 24b4ed27bf096d657f11320b83ef8449ca366f63
 B 24e330c8b6be65c98cd3914f6fe7498e980f4568
 B 2616fd04151e5bb7b8a31428f8a9fd0c957dfb48
+B 26762a780f4dd498d9304f70072f1bd339223d8a
 B 27c2c25dc3c2c3019543e31afdca7b166911f278
 B 28e185b27e8c80cd773cac46d1b9b19529c4fab0
+B 28e8f04af96d3e353f0da5018a4531d45592c663
 B 29f0620a9a025afcd2057cdf97c7d93caf6c179f
 B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a
 B 2ba77327488a8446e6a92af137f644eaf3b06e2e
 B 2cb99eed19d1a8f097c4ae54967c6e45a7c03d67
 B 2cfa9011aaada9fe68bd0d9aad7ec86991ede43c
+B 2e19b7549462aa8aafc9df7684327375fd4cd673
 B 2f0b3e38212674883d610cfcfbd76b901bd3d997
 B 2f164ec218a1e850d8cc4a6a9ffdb6dba248895f
 B 2fd8103535c1246a3a243e0fd7bcea86947e6b14
@@ -70,6 +75,7 @@ B 43babb8fc1bfd034657eb44fe82fab960034c85d
 B 43c65b07658b8041f6689d16a34ff98132b8a424
 B 441cd2cecdd8a88d42e41324643f06a2fccf5a25
 B 449a10ca63d5b3507861eb4da9f56c215eddccfb
+B 4534b29556a1da628c920c36e4245d0d35ca6905
 B 46838d8a346687e9f8ff2f6e279e3ba83f99c5f3
 B 46ce1778d9a4d6a30e38b393a08dd4ecae2dbb09
 B 46f0d5fff8a4d846831b5e9d7ac0405fe06d2ccd
@@ -81,6 +87,7 @@ B 494ff7640d78b1667547c8aacfc1d517fff00ef8
 B 49c35937c3a0813ed4ccf34dd03fd5fa2f41b86c
 B 4b44512d8c3fe76620dbac37d220038435c75ba5
 B 4b4a5151c83113bb53d65e0304b8c9fee524d28a
+B 4c9cc32f7bba136b3970c91f15a7f24c94c94c89
 B 4d49814ba85310599ee76e41742208383f3f6450
 B 4eec754b1bbd46e0142412cd37dbaf189c47f905
 B 4f61ca801deed173c648b2d424ac231663acd704
@@ -88,10 +95,12 @@ B 4f70bdf4199a666829cf9c6c62c508d12afbe251
 B 4fe7844935f9b4ad797760613d143949f9448905
 B 504b427081cfc2213ce0a5c050b16af67ca7ff46
 B 51f433d54a1d11eac25c32b0dd69f12fef62c060
+B 54508131155cc71099f6f54c5ee531e159d79ca2
 B 55bda33699ea1c2e84a125253edd594cc2a32ea3
 B 577ccc51c269c66e7810eb4aad9f93cb23c78f8e
 B 5891c0d23b776d41be02e74a3b98a3881970d08f
 B 593525139909e081ae809278d301688c0ba03697
+B 59b7fd7072a71498aecb1b5da6ec51ea89f7381b
 B 5b26ab08f19f6c55a45c0f1f7ddccd09b0a2ed23
 B 5bac26a132e7999bf0bd108d4cffb674873a56ca
 B 5c678face89e4d38b2879bc4679ce3b92ac3aeb0
@@ -103,6 +112,8 @@ B 5fc6229a6d289a6a4f23fac4f1d7750285c85d1a
 B 6168d90fab71f2a8811640bfbbf88bfd1eed1848
 B 6256b7c7c42bb01d2cc0d16d659ba1aa3042e7ae
 B 6359c930bb27b0ea589c7c2d7ed552babe4897ed
+B 6400b3cd1d87e52723fac2641b34a5f0289b908c
+B 64eee11a907d724373f80e38db24b7474ede7164
 B 64f232307444269286b7f14fc3838b07187d4c03
 B 652d821683f12031258f7727d33157f3ab6ccbe6
 B 665eb259fced741f65de061bb026c3ab65a8d99c
@@ -111,6 +122,8 @@ B 67432aef1adb8e330c054431de9d0955e3993472
 B 68a567632a063c6f9bb27a73c151d21f6e855f50
 B 69176e3dd7c69901d03f6d93bb365df784f06525
 B 698cd0483b99f9638ce05557e1137ffce86d4185
+B 6994a35eaf0a71dc392dcb094a6f418ef37a12f4
+B 6bdc9257b691e140f435a567e0b4f566c71be6cf
 B 6d637dcb21bb4a17b9c581748e85bf5a82f6c9f8
 B 6e4f0f60785de1f5774644323edafb4741b9e4a4
 B 6efe475ad57f042ffc9547f1bb258ab4e16a3f3e
@@ -154,6 +167,7 @@ B 9344b093b8081a68c9f83f0c740d60508e99fd5e
 B 944eb0ba1043bd4daf9cf087b66bc9cab10b8ff2
 B 94cfe7e48a50104b22457aa47b39d06329d16d32
 B 9511cd40a9701ee1b46ba28b61154f6f0833b7d9
+B 95c3d899174e39263a773e89a22efbd40be77d4b
 B 96ed80508cf15f7dc8c2d5a73225a36dbc096ee2
 B 970feeed0db20bfe9df5095b6b335146344c222c
 B 9896b920035a1d1be1aef28a1d1a5eb876445c82
@@ -223,16 +237,21 @@ B d50ffd09c30e606524fb6ed92119d85ccfa13491
 B 

[2/2] cxf git commit: Use a ByteArrayInputStream not wrapped in a reader so the parser can get the enocding from the bytes instead of assuming system encoding.

[dkulp]

Use a ByteArrayInputStream not wrapped in a reader so the parser can get the 
enocding from the bytes instead of assuming system encoding.


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

Branch: refs/heads/3.0.x-fixes
Commit: 0b29878b914c1f1f3d52dae6ba57702085e348ca
Parents: c1e3d65
Author: Daniel Kulp dk...@apache.org
Authored: Wed Apr 15 13:36:10 2015 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Wed Apr 15 13:40:08 2015 -0400

--
 .../org/apache/cxf/ws/addressing/EndpointReferenceUtils.java| 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/0b29878b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java 
b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
index 4ab5910..6155c50 100644
--- 
a/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
+++ 
b/core/src/main/java/org/apache/cxf/ws/addressing/EndpointReferenceUtils.java
@@ -21,7 +21,6 @@ package org.apache.cxf.ws.addressing;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 import java.net.MalformedURLException;
@@ -218,9 +217,7 @@ public final class EndpointReferenceUtils {
 LSInputImpl impl = new LSInputImpl();
 impl.setSystemId(newId);
 impl.setBaseURI(newId);
-impl.setCharacterStream(
-new InputStreamReader(
-new ByteArrayInputStream(value)));
+impl.setByteStream(new ByteArrayInputStream(value));
 return impl;
 }
 }

[2/2] cxf git commit: [CXF-6327] - Adding @Ignore'd test

[coheigea]

[CXF-6327] - Adding @Ignore'd test


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

Branch: refs/heads/3.0.x-fixes
Commit: 6a41413eaf53441ad56d10bfa28867bc2ad553de
Parents: 1d03ca5
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 10:13:25 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 10:15:22 2015 +0100

--
 .../sts/transport/TransportBindingTest.java | 31 +++
 .../cxf/systest/sts/transport/DoubleIt.wsdl | 97 
 .../cxf/systest/sts/transport/cxf-client.xml|  8 ++
 .../cxf/systest/sts/transport/cxf-service.xml   |  6 ++
 .../systest/sts/transport/cxf-stax-service.xml  |  8 ++
 5 files changed, 150 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6a41413e/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
index 33076b5..ba23de9 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
@@ -378,6 +378,37 @@ public class TransportBindingTest extends 
AbstractBusClientServerTestBase {
 bus.shutdown(true);
 }
 
+// TODO Not supported for now
+@org.junit.Test
+@org.junit.Ignore
+public void testSAML2EndorsingX509() throws Exception {
+
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile = TransportBindingTest.class.getResource(cxf-client.xml);
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL wsdl = TransportBindingTest.class.getResource(DoubleIt.wsdl);
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE, 
DoubleItTransportSAML2X509EndorsingPort);
+DoubleItPortType transportSaml1Port = 
+service.getPort(portQName, DoubleItPortType.class);
+updateAddressPort(transportSaml1Port, test.getPort());
+
+TokenTestUtils.updateSTSPort((BindingProvider)transportSaml1Port, 
test.getStsPort());
+
+if (test.isStreaming()) {
+SecurityTestUtil.enableStreaming(transportSaml1Port);
+}
+
+doubleIt(transportSaml1Port, 25);
+
+((java.io.Closeable)transportSaml1Port).close();
+bus.shutdown(true);
+}
+
 private DOMSource createDOMRequest() throws ParserConfigurationException {
 // Creating a DOMSource Object for the request
 DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();

http://git-wip-us.apache.org/repos/asf/cxf/blob/6a41413e/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
index 2f0e12a..d08b102 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
@@ -64,6 +64,21 @@
 /wsdl:output
 /wsdl:operation
 /wsdl:binding
+wsdl:binding name=DoubleItTransportSAML2X509EndorsingBinding 
type=tns:DoubleItPortType
+wsp:PolicyReference 
URI=#DoubleItBindingTransportSAML2X509EndorsingPolicy/
+soap:binding style=document 
transport=http://schemas.xmlsoap.org/soap/http/
+wsdl:operation name=DoubleIt
+soap:operation soapAction=/
+wsdl:input
+soap:body use=literal/
+wsp:PolicyReference 
URI=#DoubleItBinding_DoubleIt_Input_Policy/
+/wsdl:input
+wsdl:output
+soap:body use=literal/
+wsp:PolicyReference 
URI=#DoubleItBinding_DoubleIt_Output_Policy/
+/wsdl:output
+/wsdl:operation
+/wsdl:binding
 wsdl:service name=DoubleItService
 wsdl:port name=DoubleItTransportSAML1Port 
binding=tns:DoubleItTransportSAML1Binding
 

cxf git commit: [CXF-6327] - Adding @Ignore'd test

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/master 18b46a409 - 790012b2b


[CXF-6327] - Adding @Ignore'd test


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

Branch: refs/heads/master
Commit: 790012b2bd6b00134ba844827bf32bdbf5e64d06
Parents: 18b46a4
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 10:13:25 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 10:13:25 2015 +0100

--
 .../sts/transport/TransportBindingTest.java | 31 +++
 .../cxf/systest/sts/transport/DoubleIt.wsdl | 97 
 .../cxf/systest/sts/transport/cxf-client.xml|  8 ++
 .../cxf/systest/sts/transport/cxf-service.xml   |  6 ++
 .../systest/sts/transport/cxf-stax-service.xml  |  8 ++
 5 files changed, 150 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/790012b2/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
index 33076b5..ba23de9 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
@@ -378,6 +378,37 @@ public class TransportBindingTest extends 
AbstractBusClientServerTestBase {
 bus.shutdown(true);
 }
 
+// TODO Not supported for now
+@org.junit.Test
+@org.junit.Ignore
+public void testSAML2EndorsingX509() throws Exception {
+
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile = TransportBindingTest.class.getResource(cxf-client.xml);
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL wsdl = TransportBindingTest.class.getResource(DoubleIt.wsdl);
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE, 
DoubleItTransportSAML2X509EndorsingPort);
+DoubleItPortType transportSaml1Port = 
+service.getPort(portQName, DoubleItPortType.class);
+updateAddressPort(transportSaml1Port, test.getPort());
+
+TokenTestUtils.updateSTSPort((BindingProvider)transportSaml1Port, 
test.getStsPort());
+
+if (test.isStreaming()) {
+SecurityTestUtil.enableStreaming(transportSaml1Port);
+}
+
+doubleIt(transportSaml1Port, 25);
+
+((java.io.Closeable)transportSaml1Port).close();
+bus.shutdown(true);
+}
+
 private DOMSource createDOMRequest() throws ParserConfigurationException {
 // Creating a DOMSource Object for the request
 DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();

http://git-wip-us.apache.org/repos/asf/cxf/blob/790012b2/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
--
diff --git 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
index 2f0e12a..d08b102 100644
--- 
a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
+++ 
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl
@@ -64,6 +64,21 @@
 /wsdl:output
 /wsdl:operation
 /wsdl:binding
+wsdl:binding name=DoubleItTransportSAML2X509EndorsingBinding 
type=tns:DoubleItPortType
+wsp:PolicyReference 
URI=#DoubleItBindingTransportSAML2X509EndorsingPolicy/
+soap:binding style=document 
transport=http://schemas.xmlsoap.org/soap/http/
+wsdl:operation name=DoubleIt
+soap:operation soapAction=/
+wsdl:input
+soap:body use=literal/
+wsp:PolicyReference 
URI=#DoubleItBinding_DoubleIt_Input_Policy/
+/wsdl:input
+wsdl:output
+soap:body use=literal/
+wsp:PolicyReference 
URI=#DoubleItBinding_DoubleIt_Output_Policy/
+/wsdl:output
+/wsdl:operation
+/wsdl:binding
 wsdl:service name=DoubleItService
 wsdl:port 

[2/3] cxf git commit: Recording .gitmergeinfo Changes

[coheigea]

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/1b5d1452
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1b5d1452
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1b5d1452

Branch: refs/heads/2.7.x-fixes
Commit: 1b5d1452f7bed163cf7908fd6d7e47a0332bbc66
Parents: fcbb360
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 10:16:47 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 10:16:47 2015 +0100

--
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1b5d1452/.gitmergeinfo
--
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 1f8465f..9fe6f4e 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1153,6 +1153,7 @@ B 96e4336334842ce599ca821319f56813b5036486
 B 96e6fa6b664d8dfb1f5a5662a0907cfb60682da5
 B 97204118297f76cc48ee2acb154ad2761b725f19
 B 97251de37cbc9e0035af3c90eb2b2d248211e052
+B 97682e60cadb251ea47fd89917fc03a6b1ffd020
 B 9792971587e7aec6fc0f452d05803813fb2a30d4
 B 97a38ec2966efc4ba8daf916304ba9a70536eac9
 B 97dab3da95f4d833888b30ceb553af6436116e9d
@@ -2246,6 +2247,7 @@ M 68d79ef59b53b24e35c18055a9272fd7ee21e119
 M 6940c5f35041d81151c80c8b3ce06edf5bb0f0a4
 M 69bc8b32faebee6b68c545fd281a460bcedad1b7
 M 69eada2cd44097d11c3bf1be613befdf3be451cd
+M 6a41413eaf53441ad56d10bfa28867bc2ad553de
 M 6a705cbb8a516df07c02bef7bb7398186fccbec6
 M 6a9eec6adec3bd08dac318ad51df10959e919bac
 M 6ad6cca54710c50c8f565c94c65f29182d1be021

[3/3] cxf git commit: Fixing test

[coheigea]

Fixing test


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

Branch: refs/heads/2.7.x-fixes
Commit: 9d402cbc9c4657a53f3cae5d112df5ea4429520d
Parents: 1b5d145
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 11:27:52 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 11:27:52 2015 +0100

--
 .../sts/transport/TransportBindingTest.java | 139 +-
 .../cxf/systest/sts/transport/DoubleIt.wsdl | 464 ---
 .../cxf/systest/sts/transport/cxf-client.xml|  66 +--
 .../cxf/systest/sts/transport/cxf-service.xml   |  69 +--
 .../systest/sts/transport/cxf-stax-service.xml  |  72 ---
 5 files changed, 115 insertions(+), 695 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/9d402cbc/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
index 8026dcb..0e62598 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
@@ -227,94 +227,8 @@ public class TransportBindingTest extends 
AbstractBusClientServerTestBase {
 bus.shutdown(true);
 }
 
- HEAD
-===
-SpringBusFactory bf = new SpringBusFactory();
-URL busFile = TransportBindingTest.class.getResource(cxf-client.xml);
-
-Bus bus = bf.createBus(busFile.toString());
-SpringBusFactory.setDefaultBus(bus);
-SpringBusFactory.setThreadDefaultBus(bus);
-
-URL wsdl = TransportBindingTest.class.getResource(DoubleIt.wsdl);
-Service service = Service.create(wsdl, SERVICE_QNAME);
-QName portQName = new QName(NAMESPACE, DoubleItTransportSAML2Port);
-   
-DispatchDOMSource dispatch = 
-service.createDispatch(portQName, DOMSource.class, 
Service.Mode.PAYLOAD);
-updateAddressPort(dispatch, test.getPort());
-
-// Setup STSClient
-STSClient stsClient = createDispatchSTSClient(bus);
-String wsdlLocation = https://localhost:; + test.getStsPort() + 
/SecurityTokenService/Transport?wsdl;
-stsClient.setWsdlLocation(wsdlLocation);
-
-// Creating a DOMSource Object for the request
-DOMSource request = createDOMRequest();
-
-// Make a successful request
-Client client = ((DispatchImplDOMSource) dispatch).getClient();
-client.getRequestContext().put(ws-security.username, alice);
-client.getRequestContext().put(ws-security.sts.client, stsClient);
-
-if (test.isStreaming()) {
-
client.getRequestContext().put(SecurityConstants.ENABLE_STREAMING_SECURITY, 
true);
-
client.getResponseContext().put(SecurityConstants.ENABLE_STREAMING_SECURITY, 
true);
-}
-
-DOMSource response = dispatch.invoke(request);
-assertNotNull(response);
-
-bus.shutdown(true);
-}
-
-@org.junit.Test
-public void testSAML2DispatchLocation() throws Exception {
-
-SpringBusFactory bf = new SpringBusFactory();
-URL busFile = TransportBindingTest.class.getResource(cxf-client.xml);
-
-Bus bus = bf.createBus(busFile.toString());
-SpringBusFactory.setDefaultBus(bus);
-SpringBusFactory.setThreadDefaultBus(bus);
-
-URL wsdl = TransportBindingTest.class.getResource(DoubleIt.wsdl);
-Service service = Service.create(wsdl, SERVICE_QNAME);
-QName portQName = new QName(NAMESPACE, DoubleItTransportSAML2Port);
-   
-DispatchDOMSource dispatch = 
-service.createDispatch(portQName, DOMSource.class, 
Service.Mode.PAYLOAD);
-updateAddressPort(dispatch, test.getPort());
-
-// Setup STSClient
-STSClient stsClient = createDispatchSTSClient(bus);
-String location = https://localhost:; + test.getStsPort() + 
/SecurityTokenService/Transport;
-stsClient.setLocation(location);
-
stsClient.setPolicy(classpath:/org/apache/cxf/systest/sts/issuer/sts-transport-policy.xml);
-
-// Creating a DOMSource Object for the request
-DOMSource request = createDOMRequest();
-
-// Make a successful request
-Client client = 

[1/3] cxf git commit: [CXF-6327] - Adding @Ignore'd test

[coheigea]

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 837ed4c4a - 9d402cbc9


[CXF-6327] - Adding @Ignore'd test

Conflicts:

services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java

services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/DoubleIt.wsdl

services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-client.xml

services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-service.xml

services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/transport/cxf-stax-service.xml


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

Branch: refs/heads/2.7.x-fixes
Commit: fcbb360b0ac771128fd614825be986280892c2c7
Parents: 837ed4c
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Wed Apr 15 10:13:25 2015 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Wed Apr 15 10:16:46 2015 +0100

--
 .../sts/transport/TransportBindingTest.java | 147 +++
 .../cxf/systest/sts/transport/DoubleIt.wsdl | 406 +++
 .../cxf/systest/sts/transport/cxf-client.xml|  55 +++
 .../cxf/systest/sts/transport/cxf-service.xml   |  50 +++
 .../systest/sts/transport/cxf-stax-service.xml  |  72 
 5 files changed, 730 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fcbb360b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
--
diff --git 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
index bc9fb7e..8026dcb 100644
--- 
a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
+++ 
b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java
@@ -227,6 +227,153 @@ public class TransportBindingTest extends 
AbstractBusClientServerTestBase {
 bus.shutdown(true);
 }
 
+ HEAD
+===
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile = TransportBindingTest.class.getResource(cxf-client.xml);
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL wsdl = TransportBindingTest.class.getResource(DoubleIt.wsdl);
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE, DoubleItTransportSAML2Port);
+   
+DispatchDOMSource dispatch = 
+service.createDispatch(portQName, DOMSource.class, 
Service.Mode.PAYLOAD);
+updateAddressPort(dispatch, test.getPort());
+
+// Setup STSClient
+STSClient stsClient = createDispatchSTSClient(bus);
+String wsdlLocation = https://localhost:; + test.getStsPort() + 
/SecurityTokenService/Transport?wsdl;
+stsClient.setWsdlLocation(wsdlLocation);
+
+// Creating a DOMSource Object for the request
+DOMSource request = createDOMRequest();
+
+// Make a successful request
+Client client = ((DispatchImplDOMSource) dispatch).getClient();
+client.getRequestContext().put(ws-security.username, alice);
+client.getRequestContext().put(ws-security.sts.client, stsClient);
+
+if (test.isStreaming()) {
+
client.getRequestContext().put(SecurityConstants.ENABLE_STREAMING_SECURITY, 
true);
+
client.getResponseContext().put(SecurityConstants.ENABLE_STREAMING_SECURITY, 
true);
+}
+
+DOMSource response = dispatch.invoke(request);
+assertNotNull(response);
+
+bus.shutdown(true);
+}
+
+@org.junit.Test
+public void testSAML2DispatchLocation() throws Exception {
+
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile = TransportBindingTest.class.getResource(cxf-client.xml);
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL wsdl = TransportBindingTest.class.getResource(DoubleIt.wsdl);
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE, DoubleItTransportSAML2Port);
+   
+DispatchDOMSource dispatch = 
+