You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/02 11:47:52 UTC
[1/3] cxf git commit: Fixing WS-Addressing + WS-Security test
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 3f57636a4 -> 211a8fb43
Fixing WS-Addressing + WS-Security test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ec7484e1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ec7484e1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ec7484e1
Branch: refs/heads/3.1.x-fixes
Commit: ec7484e1af89f822eee103e24916ca560a7c5756
Parents: 3f57636
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 2 11:05:27 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 2 11:06:29 2017 +0000
----------------------------------------------------------------------
.../policyvalidators/AbstractSupportingTokenPolicyValidator.java | 3 ++-
.../wss4j/policyvalidators/SecuredPartsPolicyValidator.java | 4 ++--
.../test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java | 1 -
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ec7484e1/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
index 3e79904..fcc5c8f 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractSupportingTokenPolicyValidator.java
@@ -58,6 +58,7 @@ import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerResult;
import org.apache.wss4j.dom.message.token.KerberosSecurity;
import org.apache.wss4j.policy.SPConstants;
+import org.apache.wss4j.policy.model.AbstractSecuredParts;
import org.apache.wss4j.policy.model.AbstractSecurityAssertion;
import org.apache.wss4j.policy.model.EncryptedElements;
import org.apache.wss4j.policy.model.EncryptedParts;
@@ -611,7 +612,7 @@ public abstract class AbstractSupportingTokenPolicyValidator extends AbstractSec
* Validate the SignedParts or EncryptedParts policies
*/
private boolean validateSignedEncryptedParts(
- SignedParts parts,
+ AbstractSecuredParts parts,
boolean content,
List<WSSecurityEngineResult> protResults,
List<WSSecurityEngineResult> tokenResults,
http://git-wip-us.apache.org/repos/asf/cxf/blob/ec7484e1/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredPartsPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredPartsPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredPartsPolicyValidator.java
index a9a0346..523a9bf 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredPartsPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecuredPartsPolicyValidator.java
@@ -35,9 +35,9 @@ import org.apache.wss4j.dom.WSDataRef;
import org.apache.wss4j.policy.SP11Constants;
import org.apache.wss4j.policy.SP12Constants;
import org.apache.wss4j.policy.SPConstants;
+import org.apache.wss4j.policy.model.AbstractSecuredParts;
import org.apache.wss4j.policy.model.Attachments;
import org.apache.wss4j.policy.model.Header;
-import org.apache.wss4j.policy.model.SignedParts;
/**
* Validate either a SignedParts or EncryptedParts policy
@@ -86,7 +86,7 @@ public class SecuredPartsPolicyValidator implements SecurityPolicyValidator {
// they are a child of a SupportingToken
continue;
}
- SignedParts p = (SignedParts)ai.getAssertion();
+ AbstractSecuredParts p = (AbstractSecuredParts)ai.getAssertion();
ai.setAsserted(true);
if (p.isBody()) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/ec7484e1/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
index a958d3b..f902fe6 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
@@ -1572,7 +1572,6 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
}
@org.junit.Test
- @org.junit.Ignore
public void testSymmetricWithOptionalAddressing() throws Exception {
SpringBusFactory bf = new SpringBusFactory();
[3/3] cxf git commit: Fixing Karaf features file
Posted by co...@apache.org.
Fixing Karaf features file
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/211a8fb4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/211a8fb4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/211a8fb4
Branch: refs/heads/3.1.x-fixes
Commit: 211a8fb4365714b26025f6964f7542e669931969
Parents: 57304ea
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 2 11:47:33 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 2 11:47:33 2017 +0000
----------------------------------------------------------------------
osgi/karaf/features/src/main/resources/features.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/211a8fb4/osgi/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 1e38acc..a70a9a7 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -231,7 +231,7 @@
<feature name="cxf-jackson" version="${project.version}" resolver="(obr)">
<!-- Required by jackson-dataformat-yaml -->
<feature version="${project.version}">cxf-specs</feature>
- <bundle start-level="35" depdendency="true">mvn:org.yaml/snakeyaml/1.17</bundle>
+ <bundle start-level="35" dependency="true">mvn:org.yaml/snakeyaml/1.17</bundle>
<bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}</bundle>
<bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}</bundle>
<bundle start-level="35">mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.version}</bundle>
[2/3] cxf git commit: Updating to SNAPSHOT version of WSS4J
Posted by co...@apache.org.
Updating to SNAPSHOT version of WSS4J
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/57304ea7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/57304ea7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/57304ea7
Branch: refs/heads/3.1.x-fixes
Commit: 57304ea74a3d79d4084c4402913b3008a53322ef
Parents: ec7484e
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 2 11:06:38 2017 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 2 11:06:38 2017 +0000
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/57304ea7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7f408ac..201e916 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -156,7 +156,7 @@
<cxf.woodstox.core.version>4.4.1</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
<cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
- <cxf.wss4j.version>2.1.8</cxf.wss4j.version>
+ <cxf.wss4j.version>2.1.9-SNAPSHOT</cxf.wss4j.version>
<cxf.xerces.version>2.11.0</cxf.xerces.version>
<cxf.xmlbeans.version>2.6.0</cxf.xmlbeans.version>
<cxf.xmlschema.version>2.2.1</cxf.xmlschema.version>