You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by na...@apache.org on 2008/01/28 10:46:17 UTC
svn commit: r615826 -
/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java
Author: nandana
Date: Mon Jan 28 01:46:10 2008
New Revision: 615826
URL: http://svn.apache.org/viewvc?rev=615826&view=rev
Log:
rampart-policy related changes to support WS Security Policy 1.2
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java
Modified: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java?rev=615826&r1=615825&r2=615826&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java Mon Jan 28 01:46:10 2008
@@ -24,7 +24,9 @@
import javax.xml.stream.XMLStreamWriter;
import org.apache.neethi.PolicyComponent;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SP12Constants;
+import org.apache.ws.secpolicy.SPConstants;
public class SignedEncryptedParts extends AbstractSecurityAssertion {
@@ -34,8 +36,9 @@
private boolean signedParts;
- public SignedEncryptedParts(boolean signedParts) {
+ public SignedEncryptedParts(boolean signedParts, int version) {
this.signedParts = signedParts;
+ setVersion(version);
}
/**
@@ -75,9 +78,19 @@
public QName getName() {
if (signedParts) {
- return Constants.SIGNED_PARTS;
+ if ( version == SPConstants.SP_V12) {
+ return SP12Constants.SIGNED_PARTS;
+ } else {
+ return SP11Constants.SIGNED_PARTS;
+ }
}
- return Constants.ENCRYPTED_PARTS;
+
+ if ( version == SPConstants.SP_V12) {
+ return SP12Constants.ENCRYPTED_PARTS;
+ } else {
+ return SP11Constants.ENCRYPTED_PARTS;
+ }
+
}
public PolicyComponent normalize() {
@@ -103,8 +116,7 @@
if (isBody()) {
// <sp:Body />
- // FIXME : move 'Body' to Constants
- writer.writeStartElement(prefix, "Body", namespaceURI);
+ writer.writeStartElement(prefix, SPConstants.BODY, namespaceURI);
writer.writeEndElement();
}
@@ -112,8 +124,7 @@
for (Iterator iterator = headers.iterator(); iterator.hasNext();) {
header = (Header) iterator.next();
// <sp:Header Name=".." Namespace=".." />
- // FIXME move 'Header' to Constants
- writer.writeStartElement(prefix, "Header", namespaceURI);
+ writer.writeStartElement(prefix, SPConstants.HEADER, namespaceURI);
// Name attribute is optional
if (header.getName() != null) {
writer.writeAttribute("Name", header.getName());