You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by gi...@apache.org on 2012/10/20 16:16:19 UTC
svn commit: r1400458 [2/3] - in /webservices/wss4j/trunk:
cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/
cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/
cxf-integration/src/test/resources/integration/ polic...
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/HttpsToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/HttpsToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/HttpsToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/HttpsToken.java Sat Oct 20 14:16:13 2012
@@ -58,6 +58,7 @@ public class HttpsToken extends Abstract
parseNestedPolicy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getHttpsToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/InitiatorEncryptionToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/InitiatorEncryptionToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/InitiatorEncryptionToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/InitiatorEncryptionToken.java Sat Oct 20 14:16:13 2012
@@ -33,6 +33,7 @@ public class InitiatorEncryptionToken ex
super(version, nestedPolicy);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getInitiatorEncryptionToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/InitiatorSignatureToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/InitiatorSignatureToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/InitiatorSignatureToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/InitiatorSignatureToken.java Sat Oct 20 14:16:13 2012
@@ -33,6 +33,7 @@ public class InitiatorSignatureToken ext
super(version, nestedPolicy);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getInitiatorSignatureToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/InitiatorToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/InitiatorToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/InitiatorToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/InitiatorToken.java Sat Oct 20 14:16:13 2012
@@ -33,6 +33,7 @@ public class InitiatorToken extends Abst
super(version, nestedPolicy);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getInitiatorToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/IssuedToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/IssuedToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/IssuedToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/IssuedToken.java Sat Oct 20 14:16:13 2012
@@ -49,10 +49,12 @@ public class IssuedToken extends Abstrac
parseNestedPolicy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getIssuedToken();
}
+ @Override
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
writer.writeStartElement(getName().getPrefix(), getName().getLocalPart(), getName().getNamespaceURI());
writer.writeNamespace(getName().getPrefix(), getName().getNamespaceURI());
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/KerberosToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/KerberosToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/KerberosToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/KerberosToken.java Sat Oct 20 14:16:13 2012
@@ -57,6 +57,7 @@ public class KerberosToken extends Abstr
parseNestedPolicy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getKerberosToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/KeyValueToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/KeyValueToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/KeyValueToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/KeyValueToken.java Sat Oct 20 14:16:13 2012
@@ -41,6 +41,7 @@ public class KeyValueToken extends Abstr
parseNestedPolicy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getKeyValueToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Layout.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Layout.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Layout.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Layout.java Sat Oct 20 14:16:13 2012
@@ -63,18 +63,22 @@ public class Layout extends AbstractSecu
parseNestedPolicy(nestedPolicy, this);
}
+ @Override
public Policy getPolicy() {
return nestedPolicy;
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getLayout();
}
+ @Override
public PolicyComponent normalize() {
return super.normalize(getPolicy());
}
+ @Override
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
super.serialize(writer, getPolicy());
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/ProtectionToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/ProtectionToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/ProtectionToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/ProtectionToken.java Sat Oct 20 14:16:13 2012
@@ -33,6 +33,7 @@ public class ProtectionToken extends Abs
super(version, nestedPolicy);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getProtectionToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RecipientEncryptionToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RecipientEncryptionToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RecipientEncryptionToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RecipientEncryptionToken.java Sat Oct 20 14:16:13 2012
@@ -33,6 +33,7 @@ public class RecipientEncryptionToken ex
super(version, nestedPolicy);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getRecipientEncryptionToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RecipientSignatureToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RecipientSignatureToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RecipientSignatureToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RecipientSignatureToken.java Sat Oct 20 14:16:13 2012
@@ -33,6 +33,7 @@ public class RecipientSignatureToken ext
super(version, nestedPolicy);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getRecipientSignatureToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RecipientToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RecipientToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RecipientToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RecipientToken.java Sat Oct 20 14:16:13 2012
@@ -33,6 +33,7 @@ public class RecipientToken extends Abst
super(version, nestedPolicy);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getRecipientToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RelToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RelToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RelToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RelToken.java Sat Oct 20 14:16:13 2012
@@ -60,6 +60,7 @@ public class RelToken extends AbstractTo
parseNestedPolicy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getRelToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RequiredElements.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RequiredElements.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RequiredElements.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RequiredElements.java Sat Oct 20 14:16:13 2012
@@ -46,6 +46,7 @@ public class RequiredElements extends Ab
this.xPaths.addAll(xPaths);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getRequiredElements();
}
@@ -55,6 +56,7 @@ public class RequiredElements extends Ab
return new RequiredElements(getVersion(), getXPathVersion(), getXPaths());
}
+ @Override
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
writer.writeStartElement(getName().getPrefix(), getName().getLocalPart(), getName().getNamespaceURI());
writer.writeNamespace(getName().getPrefix(), getName().getNamespaceURI());
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RequiredParts.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RequiredParts.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RequiredParts.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/RequiredParts.java Sat Oct 20 14:16:13 2012
@@ -41,10 +41,12 @@ public class RequiredParts extends Abstr
this.headers.addAll(headers);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getRequiredParts();
}
+ @Override
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
writer.writeStartElement(getName().getPrefix(), getName().getLocalPart(), getName().getNamespaceURI());
writer.writeNamespace(getName().getPrefix(), getName().getNamespaceURI());
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SamlToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SamlToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SamlToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SamlToken.java Sat Oct 20 14:16:13 2012
@@ -61,6 +61,7 @@ public class SamlToken extends AbstractT
parseNestedPolicy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getSamlToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SecureConversationToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SecureConversationToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SecureConversationToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SecureConversationToken.java Sat Oct 20 14:16:13 2012
@@ -47,6 +47,7 @@ public class SecureConversationToken ext
parseNestedPolicy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getSecureConversationToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SecurityContextToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SecurityContextToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SecurityContextToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SecurityContextToken.java Sat Oct 20 14:16:13 2012
@@ -44,6 +44,7 @@ public class SecurityContextToken extend
parseNestedSecurityContextTokenPolicy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getSecurityContextToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SignatureToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SignatureToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SignatureToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SignatureToken.java Sat Oct 20 14:16:13 2012
@@ -33,6 +33,7 @@ public class SignatureToken extends Abst
super(version, nestedPolicy);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getSignatureToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SignedElements.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SignedElements.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SignedElements.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SignedElements.java Sat Oct 20 14:16:13 2012
@@ -34,6 +34,7 @@ public class SignedElements extends Requ
super(version, xPathVersion, xPaths);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getSignedElements();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SignedParts.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SignedParts.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SignedParts.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SignedParts.java Sat Oct 20 14:16:13 2012
@@ -45,10 +45,12 @@ public class SignedParts extends Require
this.signAllHeaders = signAllHeaders;
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getSignedParts();
}
+ @Override
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
writer.writeStartElement(getName().getPrefix(), getName().getLocalPart(), getName().getNamespaceURI());
writer.writeNamespace(getName().getPrefix(), getName().getNamespaceURI());
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SpnegoContextToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SpnegoContextToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SpnegoContextToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SpnegoContextToken.java Sat Oct 20 14:16:13 2012
@@ -44,6 +44,7 @@ public class SpnegoContextToken extends
parseNestedPolicy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getSpnegoContextToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SupportingTokens.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SupportingTokens.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SupportingTokens.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SupportingTokens.java Sat Oct 20 14:16:13 2012
@@ -54,18 +54,22 @@ public class SupportingTokens extends Ab
parseNestedPolicy(nestedPolicy, this);
}
+ @Override
public Policy getPolicy() {
return nestedPolicy;
}
+ @Override
public QName getName() {
return getSupportingTokenType().getName();
}
+ @Override
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
super.serialize(writer, getPolicy());
}
+ @Override
public PolicyComponent normalize() {
return super.normalize(getPolicy());
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SymmetricBinding.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SymmetricBinding.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SymmetricBinding.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/SymmetricBinding.java Sat Oct 20 14:16:13 2012
@@ -42,6 +42,7 @@ public class SymmetricBinding extends Ab
parseNestedPolicy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getSymmetricBinding();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/TransportBinding.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/TransportBinding.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/TransportBinding.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/TransportBinding.java Sat Oct 20 14:16:13 2012
@@ -42,6 +42,7 @@ public class TransportBinding extends Ab
parseNestedPolicy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getTransportBinding();
}
@@ -74,6 +75,7 @@ public class TransportBinding extends Ab
}
}
+ @Override
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
super.serialize(writer, getPolicy());
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/TransportToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/TransportToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/TransportToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/TransportToken.java Sat Oct 20 14:16:13 2012
@@ -33,6 +33,7 @@ public class TransportToken extends Abst
super(version, nestedPolicy);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getTransportToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Trust10.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Trust10.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Trust10.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Trust10.java Sat Oct 20 14:16:13 2012
@@ -50,18 +50,22 @@ public class Trust10 extends AbstractSec
parseNestedTrust10Policy(nestedPolicy, this);
}
+ @Override
public Policy getPolicy() {
return nestedPolicy;
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getTrust10();
}
+ @Override
public PolicyComponent normalize() {
return super.normalize(getPolicy());
}
+ @Override
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
super.serialize(writer, getPolicy());
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Trust13.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Trust13.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Trust13.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Trust13.java Sat Oct 20 14:16:13 2012
@@ -43,6 +43,7 @@ public class Trust13 extends Trust10 {
parseNestedTrust13Policy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getTrust13();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/UsernameToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/UsernameToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/UsernameToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/UsernameToken.java Sat Oct 20 14:16:13 2012
@@ -76,6 +76,7 @@ public class UsernameToken extends Abstr
parseNestedPolicy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getUsernameToken();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Wss10.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Wss10.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Wss10.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Wss10.java Sat Oct 20 14:16:13 2012
@@ -49,18 +49,22 @@ public class Wss10 extends AbstractSecur
parseNestedWss10Policy(nestedPolicy, this);
}
+ @Override
public Policy getPolicy() {
return this.nestedPolicy;
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getWss10();
}
+ @Override
public PolicyComponent normalize() {
return super.normalize(getPolicy());
}
+ @Override
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
super.serialize(writer, getPolicy());
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Wss11.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Wss11.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Wss11.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/Wss11.java Sat Oct 20 14:16:13 2012
@@ -42,6 +42,7 @@ public class Wss11 extends Wss10 {
parseNestedWss11Policy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getWss11();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/X509Token.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/X509Token.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/X509Token.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/ws/security/policy/model/X509Token.java Sat Oct 20 14:16:13 2012
@@ -67,6 +67,7 @@ public class X509Token extends AbstractT
parseNestedPolicy(nestedPolicy, this);
}
+ @Override
public QName getName() {
return getVersion().getSPConstants().getX509Token();
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoBase.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoBase.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoBase.java Sat Oct 20 14:16:13 2012
@@ -298,7 +298,7 @@ public abstract class CryptoBase impleme
protected Object createBCX509Name(String s) {
if (BC_509CLASS_CONS != null) {
try {
- return BC_509CLASS_CONS.newInstance(new Object[] {s});
+ return BC_509CLASS_CONS.newInstance(s);
} catch (Exception e) {
//ignore
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoFactory.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoFactory.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoFactory.java Sat Oct 20 14:16:13 2012
@@ -189,7 +189,7 @@ public abstract class CryptoFactory {
try {
Class<?>[] classes = new Class[]{Map.class, ClassLoader.class};
Constructor<? extends Crypto> c = cryptoClass.getConstructor(classes);
- return c.newInstance(new Object[] {map, loader});
+ return c.newInstance(map, loader);
} catch (java.lang.Exception e) {
if (LOG.isDebugEnabled()) {
LOG.debug("Unable to instantiate: " + cryptoClass.getName(), e);
@@ -218,7 +218,7 @@ public abstract class CryptoFactory {
try {
Class<?>[] classes = new Class[]{Properties.class, ClassLoader.class};
Constructor<? extends Crypto> c = cryptoClass.getConstructor(classes);
- return c.newInstance(new Object[] {map, loader});
+ return c.newInstance(map, loader);
} catch (java.lang.Exception e) {
if (LOG.isDebugEnabled()) {
LOG.debug("Unable to instantiate: " + cryptoClass.getName(), e);
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoType.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoType.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoType.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoType.java Sat Oct 20 14:16:13 2012
@@ -38,7 +38,7 @@ public class CryptoType {
*/
public enum TYPE {
ISSUER_SERIAL, THUMBPRINT_SHA1, SKI_BYTES, SUBJECT_DN, ALIAS
- };
+ }
private TYPE type;
private String issuer;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/DERDecoder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/DERDecoder.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/DERDecoder.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/DERDecoder.java Sat Oct 20 14:16:13 2012
@@ -208,7 +208,7 @@ public class DERDecoder {
throw new WSSecurityException(
WSSecurityException.ErrorCode.UNSUPPORTED_SECURITY_TOKEN,
"noSKIHandling",
- new Object[] { "Invalid DER format" }
+ "Invalid DER format"
);
} else if (length < 0) {
throw new WSSecurityException(
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/Merlin.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/Merlin.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/Merlin.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/Merlin.java Sat Oct 20 14:16:13 2012
@@ -272,7 +272,7 @@ public class Merlin extends CryptoBase {
if (loadCacerts != null) {
loadCacerts = loadCacerts.trim();
}
- if (Boolean.valueOf(loadCacerts).booleanValue()) {
+ if (Boolean.valueOf(loadCacerts)) {
String cacertsPath = System.getProperty("java.home") + "/lib/security/cacerts";
if (cacertsPath != null) {
cacertsPath = cacertsPath.trim();
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/MerlinDevice.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/MerlinDevice.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/MerlinDevice.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/MerlinDevice.java Sat Oct 20 14:16:13 2012
@@ -137,7 +137,7 @@ public class MerlinDevice extends Merlin
is.close();
}
}
- } else if (Boolean.valueOf(loadCacerts).booleanValue()) {
+ } else if (Boolean.valueOf(loadCacerts)) {
String cacertsPath = System.getProperty("java.home") + "/lib/security/cacerts";
if (cacertsPath != null) {
cacertsPath = cacertsPath.trim();
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/X509NameTokenizer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/X509NameTokenizer.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/X509NameTokenizer.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/X509NameTokenizer.java Sat Oct 20 14:16:13 2012
@@ -58,7 +58,7 @@ public class X509NameTokenizer {
public String nextToken() {
if (hasMoreTokens()) {
- return (String) tokens.get(index++);
+ return tokens.get(index++);
} else {
return "";
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/derivedKey/P_SHA1.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/derivedKey/P_SHA1.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/derivedKey/P_SHA1.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/derivedKey/P_SHA1.java Sat Oct 20 14:16:13 2012
@@ -48,6 +48,7 @@ import java.security.NoSuchAlgorithmExce
public class P_SHA1 implements DerivationAlgorithm {
+ @Override
public byte[] createKey(byte[] secret, byte[] seed, int offset, long length)
throws ConversationException {
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/saml/AssertionWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/saml/AssertionWrapper.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/saml/AssertionWrapper.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/saml/AssertionWrapper.java Sat Oct 20 14:16:13 2012
@@ -507,7 +507,7 @@ public class AssertionWrapper {
if (samlKeyInfo == null) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity",
- new Object[]{"cannot get certificate or key"}
+ "cannot get certificate or key"
);
}
SAMLSignatureProfileValidator validator = new SAMLSignatureProfileValidator();
@@ -526,7 +526,7 @@ public class AssertionWrapper {
} else {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity",
- new Object[]{"cannot get certificate or key"}
+ "cannot get certificate or key"
);
}
SignatureValidator sigValidator = new SignatureValidator(credential);
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/saml/OpenSAMLUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/saml/OpenSAMLUtil.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/saml/OpenSAMLUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/saml/OpenSAMLUtil.java Sat Oct 20 14:16:13 2012
@@ -239,7 +239,7 @@ public final class OpenSAMLUtil {
return null;
}
return
- (Signature)builder.buildObject(
+ builder.buildObject(
qName.getNamespaceURI(), qName.getLocalPart(), qName.getPrefix()
);
}
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/saml/SAMLUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/saml/SAMLUtil.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/saml/SAMLUtil.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/saml/SAMLUtil.java Sat Oct 20 14:16:13 2012
@@ -145,7 +145,7 @@ public final class SAMLUtil {
if (samlSubject == null) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "invalidSAMLToken",
- new Object[] {"for Signature (no Subject)"}
+ "for Signature (no Subject)"
);
}
@@ -188,7 +188,7 @@ public final class SAMLUtil {
if (samlSubject == null) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "invalidSAMLToken",
- new Object[]{"for Signature (no Subject)"}
+ "for Signature (no Subject)"
);
}
List<org.opensaml.saml2.core.SubjectConfirmation> subjectConfList =
@@ -277,7 +277,7 @@ public final class SAMLUtil {
if (certs == null || certs.length < 1) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "invalidSAMLsecurity",
- new Object[]{"cannot get certificate or key"}
+ "cannot get certificate or key"
);
}
return new SAMLKeyInfo(certs);
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/cache/MemoryReplayCache.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/cache/MemoryReplayCache.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/cache/MemoryReplayCache.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/cache/MemoryReplayCache.java Sat Oct 20 14:16:13 2012
@@ -33,7 +33,7 @@ public class MemoryReplayCache implement
public static final long DEFAULT_TTL = 60L * 5L;
public static final long MAX_TTL = DEFAULT_TTL * 12L;
- private Set<ReplayCacheIdentifier> cache =
+ private final Set<ReplayCacheIdentifier> cache =
Collections.synchronizedSet(new HashSet<ReplayCacheIdentifier>());
/**
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/message/token/DerivedKeyToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/message/token/DerivedKeyToken.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/message/token/DerivedKeyToken.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/message/token/DerivedKeyToken.java Sat Oct 20 14:16:13 2012
@@ -265,6 +265,7 @@ public class DerivedKeyToken {
public Map<String, String> getProperties() {
if (elementProperties != null) {
+ //todo Bug:? Contents of collection table are updated, but never queried
Map<String, String> table = new HashMap<String, String>();
Node node = elementProperties.getFirstChild();
while (node != null) {
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/str/STRParser.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/str/STRParser.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/str/STRParser.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/ws/security/dom/str/STRParser.java Sat Oct 20 14:16:13 2012
@@ -46,7 +46,7 @@ public interface STRParser {
*/
enum REFERENCE_TYPE {
ISSUER_SERIAL, THUMBPRINT_SHA1, KEY_IDENTIFIER, DIRECT_REF
- };
+ }
/**
* Parse a SecurityTokenReference element and extract credentials.
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/common/AbstractSAMLCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/common/AbstractSAMLCallbackHandler.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/common/AbstractSAMLCallbackHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/common/AbstractSAMLCallbackHandler.java Sat Oct 20 14:16:13 2012
@@ -52,7 +52,7 @@ public abstract class AbstractSAMLCallba
public enum Statement {
AUTHN, ATTR, AUTHZ
- };
+ }
protected String subjectName = null;
protected String subjectQualifier = null;
Modified: webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/common/CustomSamlAssertionValidator.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/common/CustomSamlAssertionValidator.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/common/CustomSamlAssertionValidator.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/ws/security/dom/common/CustomSamlAssertionValidator.java Sat Oct 20 14:16:13 2012
@@ -63,7 +63,7 @@ public class CustomSamlAssertionValidato
if (samlSubject == null) {
throw new WSSecurityException(
WSSecurityException.ErrorCode.FAILURE, "invalidSAMLToken",
- new Object[] {"for Signature (no Subject)"}
+ "for Signature (no Subject)"
);
}
String nameIdentifier = samlSubject.getNameIdentifier().getNameIdentifier();
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcer.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcer.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcer.java Sat Oct 20 14:16:13 2012
@@ -447,6 +447,7 @@ public class PolicyEnforcer implements S
}
//multiple threads can call this method concurrently -> synchronize access
+ @Override
public synchronized void registerSecurityEvent(SecurityEvent securityEvent) throws WSSecurityException {
if (operationSecurityEventOccured) {
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java Sat Oct 20 14:16:13 2012
@@ -45,6 +45,7 @@ public class IncludeTimeStampAssertionSt
};
}
+ @Override
public boolean assertEvent(SecurityEvent securityEvent) {
// TimestampSecurityEvent timestampSecurityEvent = (TimestampSecurityEvent) securityEvent;
boolean isIncludeTimestamp = ((AbstractBinding) getAssertion()).isIncludeTimestamp();
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/SupportingTokensTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/SupportingTokensTest.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/SupportingTokensTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/SupportingTokensTest.java Sat Oct 20 14:16:13 2012
@@ -273,8 +273,8 @@ public class SupportingTokensTest extend
usernameTokenSecurityEvent.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE);
usernameTokenSecurityEvent.setUsernameTokenProfile(WSSConstants.NS_USERNAMETOKEN_PROFILE11);
SecurityToken securityToken = new UsernameSecurityToken(
- "username", null, new Date().toString(), new byte[10], new byte[10], Long.valueOf(10),
- (WSSecurityContext) null, null, null);
+ "username", null, new Date().toString(), new byte[10], new byte[10], 10L,
+ null, null, null);
securityToken.addTokenUsage(SecurityToken.TokenUsage.SupportingTokens);
usernameTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(usernameTokenSecurityEvent);
@@ -283,8 +283,8 @@ public class SupportingTokensTest extend
usernameTokenSecurityEvent.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE);
usernameTokenSecurityEvent.setUsernameTokenProfile(WSSConstants.NS_USERNAMETOKEN_PROFILE11);
securityToken = new UsernameSecurityToken(
- "username", null, new Date().toString(), new byte[10], new byte[10], Long.valueOf(10),
- (WSSecurityContext) null, null, null);
+ "username", null, new Date().toString(), new byte[10], new byte[10], 10L,
+ null, null, null);
securityToken.addTokenUsage(SecurityToken.TokenUsage.SupportingTokens);
usernameTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(usernameTokenSecurityEvent);
@@ -315,8 +315,8 @@ public class SupportingTokensTest extend
usernameTokenSecurityEvent.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST);
usernameTokenSecurityEvent.setUsernameTokenProfile(WSSConstants.NS_USERNAMETOKEN_PROFILE11);
SecurityToken securityToken = new UsernameSecurityToken(
- "username", null, new Date().toString(), new byte[10], new byte[10], Long.valueOf(10),
- (WSSecurityContext) null, null, null);
+ "username", null, new Date().toString(), new byte[10], new byte[10], 10L,
+ null, null, null);
securityToken.addTokenUsage(SecurityToken.TokenUsage.SupportingTokens);
usernameTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(usernameTokenSecurityEvent);
@@ -325,8 +325,8 @@ public class SupportingTokensTest extend
usernameTokenSecurityEvent.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST);
usernameTokenSecurityEvent.setUsernameTokenProfile(WSSConstants.NS_USERNAMETOKEN_PROFILE11);
securityToken = new UsernameSecurityToken(
- "username", null, new Date().toString(), new byte[10], new byte[10], Long.valueOf(10),
- (WSSecurityContext) null, null, null);
+ "username", null, new Date().toString(), new byte[10], new byte[10], 10L,
+ null, null, null);
securityToken.addTokenUsage(SecurityToken.TokenUsage.SupportingTokens);
usernameTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(usernameTokenSecurityEvent);
@@ -361,8 +361,8 @@ public class SupportingTokensTest extend
usernameTokenSecurityEvent.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE);
usernameTokenSecurityEvent.setUsernameTokenProfile(WSSConstants.NS_USERNAMETOKEN_PROFILE11);
SecurityToken securityToken = new UsernameSecurityToken(
- "username", null, new Date().toString(), new byte[10], new byte[10], Long.valueOf(10),
- (WSSecurityContext) null, null, null);
+ "username", null, new Date().toString(), new byte[10], new byte[10], 10L,
+ null, null, null);
securityToken.addTokenUsage(SecurityToken.TokenUsage.SupportingTokens);
usernameTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(usernameTokenSecurityEvent);
@@ -371,8 +371,8 @@ public class SupportingTokensTest extend
usernameTokenSecurityEvent.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST);
usernameTokenSecurityEvent.setUsernameTokenProfile(WSSConstants.NS_USERNAMETOKEN_PROFILE11);
securityToken = new UsernameSecurityToken(
- "username", "password", new Date().toString(), new byte[10], new byte[10], Long.valueOf(10),
- (WSSecurityContext) null, null, null);
+ "username", "password", new Date().toString(), new byte[10], new byte[10], 10L,
+ null, null, null);
securityToken.addTokenUsage(SecurityToken.TokenUsage.SupportingTokens);
usernameTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(usernameTokenSecurityEvent);
@@ -403,8 +403,8 @@ public class SupportingTokensTest extend
usernameTokenSecurityEvent.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST);
usernameTokenSecurityEvent.setUsernameTokenProfile(WSSConstants.NS_USERNAMETOKEN_PROFILE11);
SecurityToken securityToken = new UsernameSecurityToken(
- "username", "password", new Date().toString(), new byte[10], new byte[10], Long.valueOf(10),
- (WSSecurityContext) null, null, null);
+ "username", "password", new Date().toString(), new byte[10], new byte[10], 10L,
+ null, null, null);
securityToken.addTokenUsage(SecurityToken.TokenUsage.SupportingTokens);
usernameTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(usernameTokenSecurityEvent);
@@ -413,8 +413,8 @@ public class SupportingTokensTest extend
usernameTokenSecurityEvent.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_NONE);
usernameTokenSecurityEvent.setUsernameTokenProfile(WSSConstants.NS_USERNAMETOKEN_PROFILE11);
securityToken = new UsernameSecurityToken(
- "username", null, new Date().toString(), new byte[10], new byte[10], Long.valueOf(10),
- (WSSecurityContext) null, null, null);
+ "username", null, new Date().toString(), new byte[10], new byte[10], 10L,
+ null, null, null);
securityToken.addTokenUsage(SecurityToken.TokenUsage.SupportingTokens);
usernameTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(usernameTokenSecurityEvent);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/TokenProtectionTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/TokenProtectionTest.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/TokenProtectionTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/TokenProtectionTest.java Sat Oct 20 14:16:13 2012
@@ -355,10 +355,6 @@ public class TokenProtectionTest extends
bstPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
bstPath.add(WSSConstants.TAG_wsse_BinarySecurityToken);
- List<QName> sigPath = new ArrayList<QName>();
- sigPath.addAll(WSSConstants.WSSE_SECURITY_HEADER_PATH);
- sigPath.add(WSSConstants.TAG_dsig_Signature);
-
List<SecurityToken> securityTokens = new LinkedList<SecurityToken>();
for (SecurityToken.TokenUsage tokenUsage : EnumSet.allOf(SecurityToken.TokenUsage.class)) {
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/UsernameTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/UsernameTokenTest.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/UsernameTokenTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/UsernameTokenTest.java Sat Oct 20 14:16:13 2012
@@ -84,8 +84,8 @@ public class UsernameTokenTest extends A
initiatorTokenSecurityEvent.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST);
initiatorTokenSecurityEvent.setUsernameTokenProfile(WSSConstants.NS_USERNAMETOKEN_PROFILE11);
SecurityToken securityToken = new UsernameSecurityToken(
- "username", "password", new Date().toString(), new byte[10], new byte[10], Long.valueOf(10),
- (WSSecurityContext) null, null, null);
+ "username", "password", new Date().toString(), new byte[10], new byte[10], 10L,
+ null, null, null);
securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
initiatorTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(initiatorTokenSecurityEvent);
@@ -94,8 +94,8 @@ public class UsernameTokenTest extends A
recipientTokenSecurityEvent.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST);
recipientTokenSecurityEvent.setUsernameTokenProfile(WSSConstants.NS_USERNAMETOKEN_PROFILE11);
securityToken = new UsernameSecurityToken(
- "username", "password", new Date().toString(), new byte[10], new byte[10], Long.valueOf(10),
- (WSSecurityContext) null, null, null);
+ "username", "password", new Date().toString(), new byte[10], new byte[10], 10L,
+ null, null, null);
securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
@@ -158,8 +158,8 @@ public class UsernameTokenTest extends A
usernameTokenSecurityEvent.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT);
usernameTokenSecurityEvent.setUsernameTokenProfile(WSSConstants.NS_USERNAMETOKEN_PROFILE11);
SecurityToken securityToken = new UsernameSecurityToken(
- "username", "password", new Date().toString(), new byte[10], new byte[10], Long.valueOf(10),
- (WSSecurityContext) null, null, null);
+ "username", "password", new Date().toString(), new byte[10], new byte[10], 10L,
+ null, null, null);
securityToken.addTokenUsage(SecurityToken.TokenUsage.MainSignature);
usernameTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(usernameTokenSecurityEvent);
@@ -168,8 +168,8 @@ public class UsernameTokenTest extends A
recipientTokenSecurityEvent.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT);
recipientTokenSecurityEvent.setUsernameTokenProfile(WSSConstants.NS_USERNAMETOKEN_PROFILE11);
securityToken = new UsernameSecurityToken(
- "username", "password", new Date().toString(), new byte[10], new byte[10], Long.valueOf(10),
- (WSSecurityContext) null, null, null);
+ "username", "password", new Date().toString(), new byte[10], new byte[10], 10L,
+ null, null, null);
securityToken.addTokenUsage(SecurityToken.TokenUsage.MainEncryption);
recipientTokenSecurityEvent.setSecurityToken(securityToken);
policyEnforcer.registerSecurityEvent(recipientTokenSecurityEvent);
Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/VulnerabliltyVectorsTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/VulnerabliltyVectorsTest.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/VulnerabliltyVectorsTest.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/VulnerabliltyVectorsTest.java Sat Oct 20 14:16:13 2012
@@ -128,8 +128,6 @@ public class VulnerabliltyVectorsTest ex
inSecurityProperties.setCallbackHandler(new CallbackHandlerImpl());
inSecurityProperties.loadSignatureVerificationKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
inSecurityProperties.loadDecryptionKeystore(this.getClass().getClassLoader().getResource("receiver.jks"), "default".toCharArray());
- //we have to disable the schema validation until WSS4J-DOM is fixed. WSS4J generates an empty PrefixList which is not schema valid!
- inSecurityProperties.setDisableSchemaValidation(true);
PolicyEnforcerFactory policyEnforcerFactory = PolicyEnforcerFactory.newInstance(this.getClass().getClassLoader().getResource("testdata/wsdl/actionSpoofing.wsdl"));
PolicyEnforcer policyEnforcer = policyEnforcerFactory.newPolicyEnforcer("goodPolicy");
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/ext/WSSUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/ext/WSSUtils.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/ext/WSSUtils.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/ext/WSSUtils.java Sat Oct 20 14:16:13 2012
@@ -351,7 +351,7 @@ public class WSSUtils extends XMLSecurit
public static TokenSecurityEvent createTokenSecurityEvent(final SecurityToken securityToken, String correlationID)
throws WSSecurityException {
- WSSConstants.TokenType tokenType = (WSSConstants.TokenType) securityToken.getTokenType();
+ WSSConstants.TokenType tokenType = securityToken.getTokenType();
TokenSecurityEvent tokenSecurityEvent;
if (tokenType == WSSConstants.X509V1Token
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/InboundWSSecurityContextImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/InboundWSSecurityContextImpl.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/InboundWSSecurityContextImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/InboundWSSecurityContextImpl.java Sat Oct 20 14:16:13 2012
@@ -53,6 +53,7 @@ public class InboundWSSecurityContextImp
private List<BSPRule> ignoredBSPRules = Collections.emptyList();
+ @Override
public synchronized void registerSecurityEvent(SecurityEvent securityEvent) throws XMLSecurityException {
if (operationSecurityEventOccured) {
@@ -501,6 +502,7 @@ public class InboundWSSecurityContextImp
return false;
}
+ @Override
public void handleBSPRule(BSPRule bspRule) throws WSSecurityException {
if (!ignoredBSPRules.contains(bspRule)) {
throw new WSSecurityException(
@@ -512,6 +514,7 @@ public class InboundWSSecurityContextImp
}
}
+ @Override
public void ignoredBSPRules(List<BSPRule> bspRules) {
ignoredBSPRules = new ArrayList<BSPRule>(bspRules);
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/WSSecurityContextImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/WSSecurityContextImpl.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/WSSecurityContextImpl.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/WSSecurityContextImpl.java Sat Oct 20 14:16:13 2012
@@ -33,9 +33,11 @@ import java.util.List;
*/
public class WSSecurityContextImpl extends SecurityContextImpl implements WSSecurityContext {
+ @Override
public void handleBSPRule(BSPRule bspRule) throws WSSecurityException {
}
+ @Override
public void ignoredBSPRules(List<BSPRule> bspRules) {
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/BinarySecurityTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/BinarySecurityTokenInputHandler.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/BinarySecurityTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/BinarySecurityTokenInputHandler.java Sat Oct 20 14:16:13 2012
@@ -74,6 +74,8 @@ public class BinarySecurityTokenInputHan
private X509SecurityToken binarySecurityToken = null;
+ @SuppressWarnings("unchecked")
+ @Override
public SecurityToken getSecurityToken() throws XMLSecurityException {
if (this.binarySecurityToken != null) {
return this.binarySecurityToken;
@@ -117,6 +119,7 @@ public class BinarySecurityTokenInputHan
return this.binarySecurityToken;
}
+ @Override
public String getId() {
return binarySecurityTokenType.getId();
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/DecryptInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/DecryptInputProcessor.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/DecryptInputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/DecryptInputProcessor.java Sat Oct 20 14:16:13 2012
@@ -118,6 +118,7 @@ public class DecryptInputProcessor exten
}
}
+ @Override
protected void handleEncryptedContent(
InputProcessorChain inputProcessorChain, XMLSecStartElement parentStartXMLEvent,
SecurityToken securityToken, EncryptedDataType encryptedDataType) throws XMLSecurityException {
@@ -131,14 +132,14 @@ public class DecryptInputProcessor exten
encryptedPartSecurityEvent.setElementPath(elementPath);
encryptedPartSecurityEvent.setXmlSecEvent(parentStartXMLEvent);
encryptedPartSecurityEvent.setCorrelationID(encryptedDataType.getId());
- ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(encryptedPartSecurityEvent);
+ inputProcessorChain.getSecurityContext().registerSecurityEvent(encryptedPartSecurityEvent);
} else {
ContentEncryptedElementSecurityEvent contentEncryptedElementSecurityEvent =
new ContentEncryptedElementSecurityEvent(securityToken, true, documentContext.getProtectionOrder());
contentEncryptedElementSecurityEvent.setElementPath(elementPath);
contentEncryptedElementSecurityEvent.setXmlSecEvent(parentStartXMLEvent);
contentEncryptedElementSecurityEvent.setCorrelationID(encryptedDataType.getId());
- ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(contentEncryptedElementSecurityEvent);
+ inputProcessorChain.getSecurityContext().registerSecurityEvent(contentEncryptedElementSecurityEvent);
}
}
@@ -240,14 +241,14 @@ public class DecryptInputProcessor exten
encryptedPartSecurityEvent.setElementPath(elementPath);
encryptedPartSecurityEvent.setXmlSecEvent(xmlSecStartElement);
encryptedPartSecurityEvent.setCorrelationID(encryptedDataType.getId());
- ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(encryptedPartSecurityEvent);
+ inputProcessorChain.getSecurityContext().registerSecurityEvent(encryptedPartSecurityEvent);
} else {
EncryptedElementSecurityEvent encryptedElementSecurityEvent =
new EncryptedElementSecurityEvent(securityToken, true, documentContext.getProtectionOrder());
encryptedElementSecurityEvent.setElementPath(elementPath);
encryptedElementSecurityEvent.setXmlSecEvent(xmlSecStartElement);
encryptedElementSecurityEvent.setCorrelationID(encryptedDataType.getId());
- ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(encryptedElementSecurityEvent);
+ inputProcessorChain.getSecurityContext().registerSecurityEvent(encryptedElementSecurityEvent);
}
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/DerivedKeyTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/DerivedKeyTokenInputHandler.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/DerivedKeyTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/DerivedKeyTokenInputHandler.java Sat Oct 20 14:16:13 2012
@@ -72,6 +72,7 @@ public class DerivedKeyTokenInputHandler
private AbstractInboundSecurityToken derivedKeySecurityToken = null;
+ @SuppressWarnings("unchecked")
@Override
public SecurityToken getSecurityToken() throws XMLSecurityException {
@@ -178,6 +179,6 @@ public class DerivedKeyTokenInputHandler
DerivedKeyTokenSecurityEvent derivedKeyTokenSecurityEvent = new DerivedKeyTokenSecurityEvent();
derivedKeyTokenSecurityEvent.setSecurityToken((SecurityToken) securityTokenProvider.getSecurityToken());
derivedKeyTokenSecurityEvent.setCorrelationID(derivedKeyTokenType.getId());
- ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(derivedKeyTokenSecurityEvent);
+ inputProcessorChain.getSecurityContext().registerSecurityEvent(derivedKeyTokenSecurityEvent);
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/OperationInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/OperationInputProcessor.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/OperationInputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/OperationInputProcessor.java Sat Oct 20 14:16:13 2012
@@ -20,7 +20,6 @@ package org.apache.ws.security.stax.impl
import org.apache.ws.security.stax.ext.WSSConstants;
import org.apache.ws.security.stax.ext.WSSUtils;
-import org.apache.ws.security.stax.ext.WSSecurityContext;
import org.apache.ws.security.stax.securityEvent.OperationSecurityEvent;
import org.apache.xml.security.exceptions.XMLSecurityException;
import org.apache.xml.security.stax.ext.AbstractInputProcessor;
@@ -66,7 +65,7 @@ public class OperationInputProcessor ext
OperationSecurityEvent operationSecurityEvent = new OperationSecurityEvent();
operationSecurityEvent.setOperation(xmlSecEvent.asStartElement().getName());
operationSecurityEvent.setCorrelationID(IDGenerator.generateID(null));
- ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(operationSecurityEvent);
+ inputProcessorChain.getSecurityContext().registerSecurityEvent(operationSecurityEvent);
inputProcessorChain.removeProcessor(this);
}
}
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SAMLTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SAMLTokenInputHandler.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SAMLTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SAMLTokenInputHandler.java Sat Oct 20 14:16:13 2012
@@ -129,6 +129,7 @@ public class SAMLTokenInputHandler exten
private SAMLSecurityToken securityToken = null;
+ @SuppressWarnings("unchecked")
@Override
public SecurityToken getSecurityToken() throws XMLSecurityException {
if (this.securityToken != null) {
@@ -156,7 +157,7 @@ public class SAMLTokenInputHandler exten
//fire a tokenSecurityEvent
SamlTokenSecurityEvent samlTokenSecurityEvent = new SamlTokenSecurityEvent();
samlTokenSecurityEvent.setSecurityToken((SecurityToken) securityTokenProvider.getSecurityToken());
- ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(samlTokenSecurityEvent);
+ inputProcessorChain.getSecurityContext().registerSecurityEvent(samlTokenSecurityEvent);
}
@SuppressWarnings("unchecked")
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SecurityContextTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SecurityContextTokenInputHandler.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SecurityContextTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SecurityContextTokenInputHandler.java Sat Oct 20 14:16:13 2012
@@ -108,6 +108,7 @@ public class SecurityContextTokenInputHa
SecurityTokenProvider securityTokenProvider = new SecurityTokenProvider() {
+ @SuppressWarnings("unchecked")
@Override
public SecurityToken getSecurityToken() throws XMLSecurityException {
return securityContextToken;
@@ -124,11 +125,12 @@ public class SecurityContextTokenInputHa
SecurityContextTokenSecurityEvent securityContextTokenSecurityEvent = new SecurityContextTokenSecurityEvent();
securityContextTokenSecurityEvent.setSecurityToken((SecurityToken) securityTokenProvider.getSecurityToken());
securityContextTokenSecurityEvent.setCorrelationID(securityContextTokenType.getId());
- ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(securityContextTokenSecurityEvent);
+ inputProcessorChain.getSecurityContext().registerSecurityEvent(securityContextTokenSecurityEvent);
//also register a SecurityProvider with the identifier. @see SecurityContexTest#testSCTKDKTSignAbsolute
SecurityTokenProvider securityTokenProviderDirectReference = new SecurityTokenProvider() {
+ @SuppressWarnings("unchecked")
@Override
public SecurityToken getSecurityToken() throws XMLSecurityException {
return securityContextToken;
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java Sat Oct 20 14:16:13 2012
@@ -131,6 +131,7 @@ public class SecurityTokenReferenceInput
private SecurityToken securityToken = null;
+ @SuppressWarnings("unchecked")
@Override
public SecurityToken getSecurityToken() throws XMLSecurityException {
if (this.securityToken != null) {
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/TimestampInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/TimestampInputHandler.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/TimestampInputHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/TimestampInputHandler.java Sat Oct 20 14:16:13 2012
@@ -129,7 +129,7 @@ public class TimestampInputHandler exten
timestampSecurityEvent.setCreated(crea);
timestampSecurityEvent.setExpires(exp);
timestampSecurityEvent.setCorrelationID(timestampType.getId());
- ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(timestampSecurityEvent);
+ inputProcessorChain.getSecurityContext().registerSecurityEvent(timestampSecurityEvent);
inputProcessorChain.getSecurityContext().put(WSSConstants.PROP_TIMESTAMP_SECURITYEVENT, timestampSecurityEvent);
} catch (IllegalArgumentException e) {
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/UsernameTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/UsernameTokenInputHandler.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/UsernameTokenInputHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/UsernameTokenInputHandler.java Sat Oct 20 14:16:13 2012
@@ -238,6 +238,8 @@ public class UsernameTokenInputHandler e
private UsernameSecurityToken securityToken = null;
+ @SuppressWarnings("unchecked")
+ @Override
public SecurityToken getSecurityToken() throws XMLSecurityException {
if (this.securityToken != null) {
return this.securityToken;
@@ -250,6 +252,7 @@ public class UsernameTokenInputHandler e
return this.securityToken;
}
+ @Override
public String getId() {
return usernameTokenType.getId();
}
@@ -262,7 +265,7 @@ public class UsernameTokenInputHandler e
usernameTokenSecurityEvent.setSecurityToken((SecurityToken) securityTokenProvider.getSecurityToken());
usernameTokenSecurityEvent.setUsernameTokenProfile(WSSConstants.NS_USERNAMETOKEN_PROFILE11);
usernameTokenSecurityEvent.setCorrelationID(usernameTokenType.getId());
- ((WSSecurityContext) inputProcessorChain.getSecurityContext()).registerSecurityEvent(usernameTokenSecurityEvent);
+ inputProcessorChain.getSecurityContext().registerSecurityEvent(usernameTokenSecurityEvent);
}
private void checkBSPCompliance(InputProcessorChain inputProcessorChain, UsernameTokenType usernameTokenType,
Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/WSSSignatureInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/WSSSignatureInputHandler.java?rev=1400458&r1=1400457&r2=1400458&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/WSSSignatureInputHandler.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/WSSSignatureInputHandler.java Sat Oct 20 14:16:13 2012
@@ -169,7 +169,8 @@ public class WSSSignatureInputHandler ex
XMLSecurityProperties securityProperties) throws XMLSecurityException {
super(signatureType, securityContext, securityProperties);
}
-
+
+ @Override
protected SecurityToken retrieveSecurityToken(KeyInfoType keyInfoType,
XMLSecurityProperties securityProperties,
SecurityContext securityContext) throws XMLSecurityException {