You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/06/19 13:29:09 UTC
[1/2] cxf git commit: Fixing build following WSS4J changes
Repository: cxf
Updated Branches:
refs/heads/master e25a917dd -> 99f4092de
Fixing build following WSS4J changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/99f4092d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/99f4092d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/99f4092d
Branch: refs/heads/master
Commit: 99f4092de01d60b8369ff84036d543e9d20ecefc
Parents: ff95690
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jun 19 12:28:51 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Jun 19 12:29:05 2015 +0100
----------------------------------------------------------------------
.../cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java | 4 ++--
.../java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/99f4092d/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
index 8bc0849..342ba5a 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JOutInterceptor.java
@@ -137,10 +137,10 @@ public class PolicyBasedWSS4JOutInterceptor extends AbstractPhaseInterceptor<Soa
}
if (binding != null) {
- WSSecHeader secHeader = new WSSecHeader(actor, mustUnderstand);
+ WSSecHeader secHeader = new WSSecHeader(actor, mustUnderstand, saaj.getSOAPPart());
Element el = null;
try {
- el = secHeader.insertSecurityHeader(saaj.getSOAPPart());
+ el = secHeader.insertSecurityHeader();
} catch (WSSecurityException e) {
throw new SoapFault(
new Message("SECURITY_FAILED", LOG), e, message.getVersion().getSender()
http://git-wip-us.apache.org/repos/asf/cxf/blob/99f4092d/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
----------------------------------------------------------------------
diff --git a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
index 82d650a..75ae9f6 100644
--- a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
+++ b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/token/renewer/SAMLTokenRenewer.java
@@ -189,7 +189,7 @@ public class SAMLTokenRenewer extends AbstractSAMLTokenProvider implements Token
// Validate the Assertion
validateAssertion(assertion, tokenToRenew, cachedToken, tokenParameters);
- SamlAssertionWrapper renewedAssertion = new SamlAssertionWrapper(assertion.getXmlObject());
+ SamlAssertionWrapper renewedAssertion = new SamlAssertionWrapper(assertion.getSamlObject());
String oldId = createNewId(renewedAssertion);
// Remove the previous token (now expired) from the cache
tokenStore.remove(oldId);
[2/2] cxf git commit: Using newer crypto syntax
Posted by co...@apache.org.
Using newer crypto syntax
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ff956909
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ff956909
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ff956909
Branch: refs/heads/master
Commit: ff956909f7e8d107407f7eb11e5459e7c658f5ab
Parents: e25a917
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jun 19 11:16:32 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Jun 19 12:29:05 2015 +0100
----------------------------------------------------------------------
.../src/test/resources/alice-enc.properties | 10 +++++-----
.../ws-security/src/test/resources/alice.properties | 10 +++++-----
.../src/test/resources/bob-enc.properties | 10 +++++-----
.../ws-security/src/test/resources/bob.properties | 10 +++++-----
.../ws-security/src/test/resources/cxfca.properties | 10 +++++-----
.../src/test/resources/morpit.properties | 10 +++++-----
.../apache/cxf/systest/ws/security/alice.properties | 10 +++++-----
.../apache/cxf/systest/ws/security/bob.properties | 10 +++++-----
.../cxf/systest/ws/security/revocation.properties | 16 ++++++++--------
9 files changed, 48 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/alice-enc.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/alice-enc.properties b/systests/ws-security/src/test/resources/alice-enc.properties
index bd65b62..41744da 100644
--- a/systests/ws-security/src/test/resources/alice-enc.properties
+++ b/systests/ws-security/src/test/resources/alice-enc.properties
@@ -14,8 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=ENC(mC9pTqoZ9n1dW2wETrJEpHHDmgXn1e7T)
-org.apache.ws.security.crypto.merlin.keystore.alias=alice
-org.apache.ws.security.crypto.merlin.keystore.file=certs/alice.jks
+org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
+org.apache.wss4j.crypto.merlin.keystore.type=jks
+org.apache.wss4j.crypto.merlin.keystore.password=ENC(mC9pTqoZ9n1dW2wETrJEpHHDmgXn1e7T)
+org.apache.wss4j.crypto.merlin.keystore.alias=alice
+org.apache.wss4j.crypto.merlin.keystore.file=certs/alice.jks
http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/alice.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/alice.properties b/systests/ws-security/src/test/resources/alice.properties
index 1b9111d..2cff960 100644
--- a/systests/ws-security/src/test/resources/alice.properties
+++ b/systests/ws-security/src/test/resources/alice.properties
@@ -14,8 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.keystore.alias=alice
-org.apache.ws.security.crypto.merlin.keystore.file=certs/alice.jks
+org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
+org.apache.wss4j.crypto.merlin.keystore.type=jks
+org.apache.wss4j.crypto.merlin.keystore.password=password
+org.apache.wss4j.crypto.merlin.keystore.alias=alice
+org.apache.wss4j.crypto.merlin.keystore.file=certs/alice.jks
http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/bob-enc.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/bob-enc.properties b/systests/ws-security/src/test/resources/bob-enc.properties
index c26bb02..d017be7 100644
--- a/systests/ws-security/src/test/resources/bob-enc.properties
+++ b/systests/ws-security/src/test/resources/bob-enc.properties
@@ -14,8 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=ENC(eAsmYazOvgvygJmuMzWG5uvRBmkvXf5G)
-org.apache.ws.security.crypto.merlin.keystore.alias=bob
-org.apache.ws.security.crypto.merlin.keystore.file=certs/bob.jks
+org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
+org.apache.wss4j.crypto.merlin.keystore.type=jks
+org.apache.wss4j.crypto.merlin.keystore.password=ENC(eAsmYazOvgvygJmuMzWG5uvRBmkvXf5G)
+org.apache.wss4j.crypto.merlin.keystore.alias=bob
+org.apache.wss4j.crypto.merlin.keystore.file=certs/bob.jks
http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/bob.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/bob.properties b/systests/ws-security/src/test/resources/bob.properties
index 8df0ee0..6be229b 100644
--- a/systests/ws-security/src/test/resources/bob.properties
+++ b/systests/ws-security/src/test/resources/bob.properties
@@ -14,8 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.keystore.alias=bob
-org.apache.ws.security.crypto.merlin.keystore.file=certs/bob.jks
+org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
+org.apache.wss4j.crypto.merlin.keystore.type=jks
+org.apache.wss4j.crypto.merlin.keystore.password=password
+org.apache.wss4j.crypto.merlin.keystore.alias=bob
+org.apache.wss4j.crypto.merlin.keystore.file=certs/bob.jks
http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/cxfca.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/cxfca.properties b/systests/ws-security/src/test/resources/cxfca.properties
index 50d1d48..3869bb0 100644
--- a/systests/ws-security/src/test/resources/cxfca.properties
+++ b/systests/ws-security/src/test/resources/cxfca.properties
@@ -14,10 +14,10 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.keystore.alias=cxfca
-org.apache.ws.security.crypto.merlin.keystore.file=certs/cxfca.jks
+org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
+org.apache.wss4j.crypto.merlin.keystore.type=jks
+org.apache.wss4j.crypto.merlin.keystore.password=password
+org.apache.wss4j.crypto.merlin.keystore.alias=cxfca
+org.apache.wss4j.crypto.merlin.keystore.file=certs/cxfca.jks
http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/morpit.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/morpit.properties b/systests/ws-security/src/test/resources/morpit.properties
index a955507..25732d9 100644
--- a/systests/ws-security/src/test/resources/morpit.properties
+++ b/systests/ws-security/src/test/resources/morpit.properties
@@ -14,8 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.keystore.alias=morpit
-org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/Morpit.jks
+org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
+org.apache.wss4j.crypto.merlin.keystore.type=jks
+org.apache.wss4j.crypto.merlin.keystore.password=password
+org.apache.wss4j.crypto.merlin.keystore.alias=morpit
+org.apache.wss4j.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/Morpit.jks
http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties
index 20b2bbf..74b56e2 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/alice.properties
@@ -16,8 +16,8 @@
# specific language governing permissions and limitations
# under the License.
#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.keystore.alias=alice
-org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/alice.jks
+org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
+org.apache.wss4j.crypto.merlin.keystore.type=jks
+org.apache.wss4j.crypto.merlin.keystore.password=password
+org.apache.wss4j.crypto.merlin.keystore.alias=alice
+org.apache.wss4j.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/alice.jks
http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties
index edd3f27..0a2c4d1 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/bob.properties
@@ -16,8 +16,8 @@
# specific language governing permissions and limitations
# under the License.
#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.keystore.alias=bob
-org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/bob.jks
+org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
+org.apache.wss4j.crypto.merlin.keystore.type=jks
+org.apache.wss4j.crypto.merlin.keystore.password=password
+org.apache.wss4j.crypto.merlin.keystore.alias=bob
+org.apache.wss4j.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/bob.jks
http://git-wip-us.apache.org/repos/asf/cxf/blob/ff956909/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties
index e29d2e6..dd76fe4 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties
@@ -16,11 +16,11 @@
# specific language governing permissions and limitations
# under the License.
#
-org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
-org.apache.ws.security.crypto.merlin.keystore.password=security
-org.apache.ws.security.crypto.merlin.keystore.alias=wss40rev
-org.apache.ws.security.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/wss40rev.jks
-org.apache.ws.security.crypto.merlin.truststore.password=security
-org.apache.ws.security.crypto.merlin.truststore.file=org/apache/cxf/systest/ws/security/wss40CA.jks
-org.apache.ws.security.crypto.merlin.x509crl.file=org/apache/cxf/systest/ws/security/wss40CACRL.pem
+org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
+org.apache.wss4j.crypto.merlin.keystore.type=jks
+org.apache.wss4j.crypto.merlin.keystore.password=security
+org.apache.wss4j.crypto.merlin.keystore.alias=wss40rev
+org.apache.wss4j.crypto.merlin.keystore.file=org/apache/cxf/systest/ws/security/wss40rev.jks
+org.apache.wss4j.crypto.merlin.truststore.password=security
+org.apache.wss4j.crypto.merlin.truststore.file=org/apache/cxf/systest/ws/security/wss40CA.jks
+org.apache.wss4j.crypto.merlin.x509crl.file=org/apache/cxf/systest/ws/security/wss40CACRL.pem