You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/12/04 12:37:28 UTC
svn commit: r482144 - in
/webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy:
builders/SymmetricBindingBuilder.java model/ProtectionToken.java
model/SymmetricBinding.java
Author: sanka
Date: Mon Dec 4 03:37:26 2006
New Revision: 482144
URL: http://svn.apache.org/viewvc?view=rev&rev=482144
Log:
Applied the patch.
See: https://issues.apache.org/jira/browse/AXIS2-1818
Modified:
webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/builders/SymmetricBindingBuilder.java
webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/model/ProtectionToken.java
webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/model/SymmetricBinding.java
Modified: webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/builders/SymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/builders/SymmetricBindingBuilder.java?view=diff&rev=482144&r1=482143&r2=482144
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/builders/SymmetricBindingBuilder.java (original)
+++ webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/builders/SymmetricBindingBuilder.java Mon Dec 4 03:37:26 2006
@@ -83,6 +83,7 @@
} else if (Constants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY.equals(name.getLocalPart())) {
symmetricBinding.setEntireHeadersAndBodySignatures(true);
+
} else if (Constants.ENCRYPT_SIGNATURE.equals(name)) {
symmetricBinding.setSignatureProtection(true);
}
Modified: webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/model/ProtectionToken.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/model/ProtectionToken.java?view=diff&rev=482144&r1=482143&r2=482144
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/model/ProtectionToken.java (original)
+++ webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/model/ProtectionToken.java Mon Dec 4 03:37:26 2006
@@ -80,8 +80,8 @@
writer.writeNamespace(prefix, namespaceURI);
}
- String policyLocalName = Constants.PROTECTION_TOKEN.getLocalPart();
- String policyNamespaceURI = Constants.PROTECTION_TOKEN.getNamespaceURI();
+ String policyLocalName = Constants.POLICY.getLocalPart();
+ String policyNamespaceURI = Constants.POLICY.getNamespaceURI();
String wspPrefix;
Modified: webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/model/SymmetricBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/model/SymmetricBinding.java?view=diff&rev=482144&r1=482143&r2=482144
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/model/SymmetricBinding.java (original)
+++ webservices/axis2/branches/java/1_1/modules/secpolicy/src/org/apache/ws/secpolicy/model/SymmetricBinding.java Mon Dec 4 03:37:26 2006
@@ -183,14 +183,15 @@
// <wsp:Policy>
writer.writeStartElement(wspPrefix, policyLocalName, policyNamespaceURI);
- if (encryptionToken != null) {
- encryptionToken.serialize(writer);
-
- } else if ( protectionToken != null) {
+ if ( protectionToken != null) {
protectionToken.serialize(writer);
+ } else if (encryptionToken != null && signatureToken != null) {
+ encryptionToken.serialize(writer);
+ signatureToken.serialize(writer);
+
} else {
- throw new RuntimeException("Either EncryptionToken or ProtectionToken must be set");
+ throw new RuntimeException("Either (EncryptionToken and SignatureToken) or ProtectionToken must be set");
}
AlgorithmSuite algorithmSuite = getAlgorithmSuite();
@@ -213,10 +214,15 @@
writer.writeEndElement();
}
- if (Constants.ENCRYPT_BEFORE_SIGNING.equals(protectionToken)) {
+ if (Constants.ENCRYPT_BEFORE_SIGNING.equals(getProtectionOrder())) {
// <sp:EncryptBeforeSigning />
writer.writeStartElement(prefix, Constants.ENCRYPT_BEFORE_SIGNING, namespaceURI);
writer.writeEndElement();
+
+ } else if (Constants.SIGN_BEFORE_ENCRYPTING.equals(getProtectionOrder())) {
+ // <sp:SignBeforeEncrypt />
+ writer.writeStartElement(prefix, Constants.SIGN_BEFORE_ENCRYPTING, namespaceURI);
+ writer.writeEndElement();
}
if (isSignatureProtection()) {
@@ -225,8 +231,10 @@
writer.writeEndElement();
}
- if (protectionToken != null) {
- protectionToken.serialize(writer);
+ if (isEntireHeadersAndBodySignatures()) {
+ // <sp:OnlySignEntireHeadersAndBody />
+ writer.writeStartElement(prefix, Constants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY, namespaceURI);
+ writer.writeEndElement();
}
// </wsp:Policy>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org