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:52:29 UTC
svn commit: r615838 [1/2] - in
/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11:
./ builders/
Author: nandana
Date: Mon Jan 28 01:52:18 2008
New Revision: 615838
URL: http://svn.apache.org/viewvc?rev=615838&view=rev
Log:
rampart-policy related changes to support WS Security Policy 1.2
Added:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/
- copied from r614415, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/AlgorithmSuiteBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/AsymmetricBindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/EncryptedElementsBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/EncryptedPartsBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/InitiatorTokenBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/LayoutBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/ProtectionTokenBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/RecipientTokenBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecureConversationTokenBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SecureConversationTokenBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SecurityContextTokenBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SignedElementsBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SignedPartsBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SupportingTokensBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SymmetricBindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/TransportBindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/TransportTokenBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/Trust10Builder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/Trust10Builder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/UsernameTokenBuilder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/WSS10Builder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/WSS11Builder.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
- copied, changed from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/X509TokenBuilder.java
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/AlgorithmSuiteBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/AlgorithmSuiteBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/AlgorithmSuiteBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,28 +13,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.AlgorithmSuite;
import javax.xml.namespace.QName;
public class AlgorithmSuiteBuilder implements AssertionBuilder {
-
- public static final String INCLUSIVE_C14N = "InclusiveC14N";
- public static final String SOAP_NORMALIZATION_10 = "SoapNormalization10";
- public static final String STR_TRANSFORM_10 = "STRTransform10";
- public static final String XPATH10 = "XPath10";
- public static final String XPATH_FILTER20 = "XPathFilter20";
-
-
+
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
- AlgorithmSuite algorithmSuite = new AlgorithmSuite();
+ AlgorithmSuite algorithmSuite = new AlgorithmSuite(SPConstants.SP_V11);
OMElement policyElem = element.getFirstElement();
algorithmSuite.setAlgorithmSuite(policyElem.getFirstElement().getLocalName());
@@ -43,6 +37,6 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.ALGORITHM_SUITE};
+ return new QName[] {SP11Constants.ALGORITHM_SUITE};
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/AsymmetricBindingBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/AsymmetricBindingBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/AsymmetricBindingBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
import java.util.List;
@@ -26,7 +26,8 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.AlgorithmSuite;
import org.apache.ws.secpolicy.model.AsymmetricBinding;
import org.apache.ws.secpolicy.model.InitiatorToken;
@@ -37,7 +38,7 @@
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
- AsymmetricBinding asymmetricBinding = new AsymmetricBinding();
+ AsymmetricBinding asymmetricBinding = new AsymmetricBinding(SPConstants.SP_V11);
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
@@ -63,41 +64,41 @@
assertion = (Assertion) iterator.next();
name = assertion.getName();
- if (Constants.INITIATOR_TOKEN.equals(name)) {
+ if (SP11Constants.INITIATOR_TOKEN.equals(name)) {
asymmetricBinding.setInitiatorToken((InitiatorToken) assertion);
- } else if (Constants.RECIPIENT_TOKEN.equals(name)){
+ } else if (SP11Constants.RECIPIENT_TOKEN.equals(name)){
asymmetricBinding.setRecipientToken((RecipientToken) assertion);
- } else if (Constants.ALGORITHM_SUITE.equals(name)) {
+ } else if (SP11Constants.ALGORITHM_SUITE.equals(name)) {
asymmetricBinding.setAlgorithmSuite((AlgorithmSuite) assertion);
- } else if (Constants.LAYOUT.equals(name)) {
+ } else if (SP11Constants.LAYOUT.equals(name)) {
asymmetricBinding.setLayout((Layout) assertion);
- } else if (Constants.INCLUDE_TIMESTAMP.equals(name)) {
+ } else if (SP11Constants.INCLUDE_TIMESTAMP.equals(name)) {
asymmetricBinding.setIncludeTimestamp(true);
- } else if (Constants.ENCRYPT_BEFORE_SIGNING.equals(name.getLocalPart())) {
- asymmetricBinding.setProtectionOrder(Constants.ENCRYPT_BEFORE_SIGNING);
+ } else if (SPConstants.ENCRYPT_BEFORE_SIGNING.equals(name.getLocalPart())) {
+ asymmetricBinding.setProtectionOrder(SPConstants.ENCRYPT_BEFORE_SIGNING);
- } else if (Constants.SIGN_BEFORE_ENCRYPTING.equals(name.getLocalPart())) {
- asymmetricBinding.setProtectionOrder(Constants.SIGN_BEFORE_ENCRYPTING);
+ } else if (SPConstants.SIGN_BEFORE_ENCRYPTING.equals(name.getLocalPart())) {
+ asymmetricBinding.setProtectionOrder(SPConstants.SIGN_BEFORE_ENCRYPTING);
- } else if (Constants.ENCRYPT_SIGNATURE.equals(name)) {
+ } else if (SPConstants.ENCRYPT_SIGNATURE.equals(name)) {
asymmetricBinding.setSignatureProtection(true);
- } else if (Constants.PROTECT_TOKENS.equals(name)) {
+ } else if (SPConstants.PROTECT_TOKENS.equals(name)) {
asymmetricBinding.setTokenProtection(true);
- } else if (Constants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY.equals(name.getLocalPart())) {
+ } else if (SPConstants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY.equals(name.getLocalPart())) {
asymmetricBinding.setEntireHeadersAndBodySignatures(true);
}
}
}
public QName[] getKnownElements() {
- return new QName[]{Constants.ASYMMETRIC_BINDING};
+ return new QName[]{SP11Constants.ASYMMETRIC_BINDING};
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/EncryptedElementsBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/EncryptedElementsBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/EncryptedElementsBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
@@ -25,18 +25,16 @@
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.SignedEncryptedElements;
public class EncryptedElementsBuilder implements AssertionBuilder {
-
- public static final QName ATTR_XPATH_VERSION = new QName(Constants.SP_NS, "XPathVersion");
- public static final QName XPATH = new QName(Constants.SP_NS, "XPath");
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
- SignedEncryptedElements signedEncryptedElements = new SignedEncryptedElements(false);
+ SignedEncryptedElements signedEncryptedElements = new SignedEncryptedElements(false, SPConstants.SP_V11);
- OMAttribute attribute = element.getAttribute(ATTR_XPATH_VERSION);
+ OMAttribute attribute = element.getAttribute(SP11Constants.ATTR_XPATH_VERSION);
if (attribute != null) {
signedEncryptedElements.setXPathVersion(attribute.getAttributeValue());
}
@@ -51,13 +49,13 @@
public QName[] getKnownElements() {
- return new QName[] {Constants.ENCRYPTED_ELEMENTS};
+ return new QName[] {SP11Constants.ENCRYPTED_ELEMENTS};
}
private void processElement(OMElement element, SignedEncryptedElements parent) {
- if (XPATH.equals(element.getQName())) {
+ if (SP11Constants.XPATH.equals(element.getQName())) {
parent.addXPathExpression(element.getText());
Iterator namespaces = element.getAllDeclaredNamespaces();
while (namespaces.hasNext()) {
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/EncryptedPartsBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/EncryptedPartsBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/EncryptedPartsBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java Mon Jan 28 01:52:18 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
@@ -25,20 +25,16 @@
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.Header;
import org.apache.ws.secpolicy.model.SignedEncryptedParts;
public class EncryptedPartsBuilder implements AssertionBuilder {
-
- public static final QName HEADER = new QName(Constants.SP_NS, "Header");
- public static final QName NAME = new QName("Name");
- public static final QName NAMESPACE = new QName("Namespace");
- public static final QName BODY = new QName(Constants.SP_NS, "Body");
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
- SignedEncryptedParts signedEncryptedParts = new SignedEncryptedParts(false);
+ SignedEncryptedParts signedEncryptedParts = new SignedEncryptedParts(false, SPConstants.SP_V11);
for (Iterator iterator = element.getChildElements(); iterator.hasNext();) {
processElement((OMElement) iterator.next(), signedEncryptedParts);
@@ -48,27 +44,27 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.ENCRYPTED_PARTS};
+ return new QName[] {SP11Constants.ENCRYPTED_PARTS};
}
private void processElement(OMElement element, SignedEncryptedParts parent) {
QName name = element.getQName();
- if (HEADER.equals(name)) {
+ if (SP11Constants.HEADER.equals(name)) {
Header header = new Header();
- OMAttribute nameAttribute = element.getAttribute(NAME);
+ OMAttribute nameAttribute = element.getAttribute(SPConstants.NAME);
if( nameAttribute != null ) {
header.setName(nameAttribute.getAttributeValue());
}
- OMAttribute namespaceAttribute = element.getAttribute(NAMESPACE);
+ OMAttribute namespaceAttribute = element.getAttribute(SPConstants.NAMESPACE);
header.setNamespace(namespaceAttribute.getAttributeValue());
parent.addHeader(header);
- } else if (BODY.equals(name)) {
+ } else if (SP11Constants.BODY.equals(name)) {
parent.setBody(true);
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/InitiatorTokenBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/InitiatorTokenBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/InitiatorTokenBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
import java.util.List;
@@ -26,7 +26,8 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.InitiatorToken;
import org.apache.ws.secpolicy.model.Token;
@@ -34,7 +35,7 @@
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
- InitiatorToken initiatorToken = new InitiatorToken();
+ InitiatorToken initiatorToken = new InitiatorToken(SPConstants.SP_V11);
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
@@ -61,7 +62,7 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.INITIATOR_TOKEN};
+ return new QName[] {SP11Constants.INITIATOR_TOKEN};
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/IssuedTokenBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
@@ -22,7 +22,8 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.IssuedToken;
import javax.xml.namespace.QName;
@@ -34,20 +35,20 @@
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
- IssuedToken issuedToken = new IssuedToken();
+ IssuedToken issuedToken = new IssuedToken(SPConstants.SP_V11);
- OMAttribute includeAttr = element.getAttribute(Constants.INCLUDE_TOKEN);
+ OMAttribute includeAttr = element.getAttribute(SP11Constants.INCLUDE_TOKEN);
if(includeAttr != null) {
- issuedToken.setInclusion(includeAttr.getAttributeValue());
+ issuedToken.setInclusion(SP11Constants.getInclusionFromAttributeValue(includeAttr.getAttributeValue()));
}
// Extract Issuer
- OMElement issuerElem = element.getFirstChildWithName(Constants.ISSUER);
+ OMElement issuerElem = element.getFirstChildWithName(SP11Constants.ISSUER);
if (issuerElem != null && issuerElem.getFirstElement() != null) {
issuedToken.setIssuerEpr(issuerElem.getFirstElement());
}
// Extract RSTTemplate
- OMElement rstTmplElem = element.getFirstChildWithName(Constants.RST_TEMPLATE);
+ OMElement rstTmplElem = element.getFirstChildWithName(SP11Constants.REQUEST_SECURITY_TOKEN_TEMPLATE);
if (rstTmplElem != null) {
issuedToken.setRstTemplate(rstTmplElem);
}
@@ -70,7 +71,7 @@
}
public QName[] getKnownElements() {
- return new QName[] { Constants.ISSUED_TOKEN };
+ return new QName[] { SP11Constants.ISSUED_TOKEN };
}
private void processAlternative(List assertions, IssuedToken parent) {
@@ -81,11 +82,11 @@
assertion = (Assertion) iterator.next();
name = assertion.getName();
- if (Constants.REQUIRE_DERIVED_KEYS.equals(name)) {
+ if (SP11Constants.REQUIRE_DERIVED_KEYS.equals(name)) {
parent.setDerivedKeys(true);
- } else if (Constants.REQUIRE_EXTERNAL_REFERNCE.equals(name)) {
+ } else if (SP11Constants.REQUIRE_EXTERNAL_REFERNCE.equals(name)) {
parent.setRequireExternalReference(true);
- } else if (Constants.REQUIRE_INTERNAL_REFERNCE.equals(name)) {
+ } else if (SP11Constants.REQUIRE_INTERNAL_REFERNCE.equals(name)) {
parent.setRequireInternalReference(true);
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/LayoutBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/LayoutBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/LayoutBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
import java.util.List;
@@ -26,7 +26,8 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.Layout;
public class LayoutBuilder implements AssertionBuilder {
@@ -34,7 +35,7 @@
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
- Layout layout = new Layout();
+ Layout layout = new Layout(SPConstants.SP_V11);
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
@@ -48,7 +49,7 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.LAYOUT};
+ return new QName[] {SP11Constants.LAYOUT};
}
public void processAlternative(List assertions, Layout parent) {
@@ -57,14 +58,14 @@
Assertion assertion = (Assertion) iterator.next();
QName qname = assertion.getName();
- if (Constants.STRICT.equals(qname)) {
- parent.setValue(Constants.LAYOUT_STRICT);
- } else if (Constants.LAX.equals(qname)) {
- parent.setValue(Constants.LAYOUT_LAX);
- } else if (Constants.LAXTSFIRST.equals(qname)) {
- parent.setValue(Constants.LAYOUT_LAX_TIMESTAMP_FIRST);
- } else if (Constants.LAXTSLAST.equals(qname)) {
- parent.setValue(Constants.LAYOUT_LAX_TIMESTAMP_LAST);
+ if (SP11Constants.STRICT.equals(qname)) {
+ parent.setValue(SPConstants.LAYOUT_STRICT);
+ } else if (SP11Constants.LAX.equals(qname)) {
+ parent.setValue(SPConstants.LAYOUT_LAX);
+ } else if (SP11Constants.LAXTSFIRST.equals(qname)) {
+ parent.setValue(SPConstants.LAYOUT_LAX_TIMESTAMP_FIRST);
+ } else if (SP11Constants.LAXTSLAST.equals(qname)) {
+ parent.setValue(SPConstants.LAYOUT_LAX_TIMESTAMP_LAST);
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/ProtectionTokenBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/ProtectionTokenBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/ProtectionTokenBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
import java.util.List;
@@ -26,14 +26,15 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.ProtectionToken;
import org.apache.ws.secpolicy.model.Token;
public class ProtectionTokenBuilder implements AssertionBuilder {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
- ProtectionToken protectionToken = new ProtectionToken();
+ ProtectionToken protectionToken = new ProtectionToken(SPConstants.SP_V11);
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
@@ -47,7 +48,7 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.PROTECTION_TOKEN};
+ return new QName[] {SP11Constants.PROTECTION_TOKEN};
}
private void processAlternative(List assertions, ProtectionToken parent) {
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/RecipientTokenBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/RecipientTokenBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/RecipientTokenBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
import java.util.List;
@@ -26,7 +26,8 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.RecipientToken;
import org.apache.ws.secpolicy.model.Token;
@@ -34,7 +35,7 @@
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
- RecipientToken recipientToken = new RecipientToken();
+ RecipientToken recipientToken = new RecipientToken(SPConstants.SP_V11);
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
@@ -65,7 +66,7 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.RECIPIENT_TOKEN};
+ return new QName[] {SP11Constants.RECIPIENT_TOKEN};
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecureConversationTokenBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SecureConversationTokenBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecureConversationTokenBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecureConversationTokenBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SecureConversationTokenBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SecureConversationTokenBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecureConversationTokenBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import javax.xml.namespace.QName;
@@ -24,16 +24,17 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.SecureConversationToken;
public class SecureConversationTokenBuilder implements AssertionBuilder {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
- SecureConversationToken conversationToken = new SecureConversationToken();
+ SecureConversationToken conversationToken = new SecureConversationToken(SPConstants.SP_V11);
- OMAttribute attribute = element.getAttribute(Constants.INCLUDE_TOKEN);
+ OMAttribute attribute = element.getAttribute(SP11Constants.INCLUDE_TOKEN);
if (attribute == null) {
throw new IllegalArgumentException(
"SecurityContextToken doesn't contain any sp:IncludeToken attribute");
@@ -41,42 +42,30 @@
String inclusionValue = attribute.getAttributeValue().trim();
- if (inclusionValue.endsWith(Constants.INCLUDE_NEVER)) {
- conversationToken.setInclusion(Constants.INCLUDE_NEVER);
-
- } else if (inclusionValue.endsWith(Constants.INCLUDE_ONCE)) {
- conversationToken.setInclusion(Constants.INCLUDE_ONCE);
-
- } else if (inclusionValue
- .endsWith(Constants.INCLUDE_ALWAYS_TO_RECIPIENT)) {
- conversationToken.setInclusion(Constants.INCLUDE_ALWAYS_TO_RECIPIENT);
-
- } else if (inclusionValue.endsWith(Constants.INCLUDE_ALWAYS)) {
- conversationToken.setInclusion(Constants.INCLUDE_ALWAYS);
- }
+ conversationToken.setInclusion(SP11Constants.getInclusionFromAttributeValue(inclusionValue));
- OMElement issuer = element.getFirstChildWithName(Constants.ISSUER);
+ OMElement issuer = element.getFirstChildWithName(SP11Constants.ISSUER);
if ( issuer != null) {
conversationToken.setIssuerEpr(issuer.getFirstElement());
}
- element = element.getFirstChildWithName(Constants.POLICY);
+ element = element.getFirstChildWithName(SPConstants.POLICY);
if (element != null) {
- if (element.getFirstChildWithName(Constants.REQUIRE_DERIVED_KEYS) != null) {
+ if (element.getFirstChildWithName(SP11Constants.REQUIRE_DERIVED_KEYS) != null) {
conversationToken.setDerivedKeys(true);
}
if (element
- .getFirstChildWithName(Constants.REQUIRE_EXTERNAL_URI_REFERNCE) != null) {
+ .getFirstChildWithName(SP11Constants.REQUIRE_EXTERNAL_URI_REFERNCE) != null) {
conversationToken.setRequireExternalUriRef(true);
}
if (element
- .getFirstChildWithName(Constants.SC10_SECURITY_CONTEXT_TOKEN) != null) {
+ .getFirstChildWithName(SP11Constants.SC10_SECURITY_CONTEXT_TOKEN) != null) {
conversationToken.setSc10SecurityContextToken(true);
}
- OMElement bootstrapPolicyElement = element.getFirstChildWithName(Constants.BOOTSTRAP_POLICY);
+ OMElement bootstrapPolicyElement = element.getFirstChildWithName(SP11Constants.BOOTSTRAP_POLICY);
if (bootstrapPolicyElement != null) {
Policy policy = PolicyEngine.getPolicy(bootstrapPolicyElement.getFirstElement());
conversationToken.setBootstrapPolicy(policy);
@@ -87,7 +76,7 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.SECURE_CONVERSATION_TOKEN};
+ return new QName[] {SP11Constants.SECURE_CONVERSATION_TOKEN};
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SecurityContextTokenBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SecurityContextTokenBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SecurityContextTokenBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,14 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.SecurityContextToken;
import javax.xml.namespace.QName;
@@ -30,30 +31,31 @@
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
- SecurityContextToken contextToken = new SecurityContextToken();
+ SecurityContextToken contextToken = new SecurityContextToken(SPConstants.SP_V11);
- OMAttribute attribute = element.getAttribute(Constants.INCLUDE_TOKEN);
-
- OMAttribute includeAttr = element.getAttribute(Constants.INCLUDE_TOKEN);
+ OMAttribute includeAttr = element.getAttribute(SP11Constants.INCLUDE_TOKEN);
+
+ int inclusion = SP11Constants.getInclusionFromAttributeValue(includeAttr.getAttributeValue());
+
if(includeAttr != null) {
- contextToken.setInclusion(includeAttr.getAttributeValue());
+ contextToken.setInclusion(inclusion);
}
- element = element.getFirstChildWithName(Constants.POLICY);
+ element = element.getFirstChildWithName(SPConstants.POLICY);
if (element != null) {
- if (element.getFirstChildWithName(Constants.REQUIRE_DERIVED_KEYS) != null) {
+ if (element.getFirstChildWithName(SP11Constants.REQUIRE_DERIVED_KEYS) != null) {
contextToken.setDerivedKeys(true);
}
if (element
- .getFirstChildWithName(Constants.REQUIRE_EXTERNAL_URI_REFERNCE) != null) {
+ .getFirstChildWithName(SP11Constants.REQUIRE_EXTERNAL_URI_REFERNCE) != null) {
contextToken.setRequireExternalUriRef(true);
}
if (element
- .getFirstChildWithName(Constants.SC10_SECURITY_CONTEXT_TOKEN) != null) {
+ .getFirstChildWithName(SP11Constants.SC10_SECURITY_CONTEXT_TOKEN) != null) {
contextToken.setSc10SecurityContextToken(true);
}
}
@@ -62,7 +64,7 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.SECURITY_CONTEXT_TOKEN};
+ return new QName[] {SP11Constants.SECURITY_CONTEXT_TOKEN};
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SignedElementsBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SignedElementsBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SignedElementsBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
@@ -25,18 +25,16 @@
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.SignedEncryptedElements;
public class SignedElementsBuilder implements AssertionBuilder {
-
- public static final QName ATTR_XPATH_VERSION = new QName(Constants.SP_NS, "XPathVersion");
- public static final QName XPATH = new QName(Constants.SP_NS, "XPath");
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
- SignedEncryptedElements signedEncryptedElements = new SignedEncryptedElements(true);
- OMAttribute attrXPathVersion = element.getAttribute(ATTR_XPATH_VERSION);
+ SignedEncryptedElements signedEncryptedElements = new SignedEncryptedElements(true, SPConstants.SP_V11);
+ OMAttribute attrXPathVersion = element.getAttribute(SP11Constants.ATTR_XPATH_VERSION);
if (attrXPathVersion != null) {
signedEncryptedElements.setXPathVersion(attrXPathVersion.getAttributeValue());
@@ -50,12 +48,12 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.SIGNED_ELEMENTS};
+ return new QName[] {SP11Constants.SIGNED_ELEMENTS};
}
private void processElement(OMElement element, SignedEncryptedElements parent) {
QName name = element.getQName();
- if (XPATH.equals(name)) {
+ if (SP11Constants.XPATH.equals(name)) {
parent.addXPathExpression(element.getText());
Iterator namespaces = element.getAllDeclaredNamespaces();
while (namespaces.hasNext()) {
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SignedPartsBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SignedPartsBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SignedPartsBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
@@ -24,18 +24,15 @@
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.Header;
import org.apache.ws.secpolicy.model.SignedEncryptedParts;
public class SignedPartsBuilder implements AssertionBuilder {
- public static final QName HEADER = new QName(Constants.SP_NS, "Header");
- public static final QName NAME = new QName("Name");
- public static final QName NAMESPACE = new QName("Namespace");
- public static final QName BODY = new QName(Constants.SP_NS, "Body");
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
- SignedEncryptedParts signedEncryptedParts = new SignedEncryptedParts(true);
+ SignedEncryptedParts signedEncryptedParts = new SignedEncryptedParts(true, SPConstants.SP_V11);
for (Iterator iterator = element.getChildElements(); iterator.hasNext();) {
processElement((OMElement) iterator.next(), signedEncryptedParts);
@@ -45,27 +42,27 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.SIGNED_PARTS};
+ return new QName[] {SP11Constants.SIGNED_PARTS};
}
private void processElement(OMElement element, SignedEncryptedParts parent) {
QName name = element.getQName();
- if (HEADER.equals(name)) {
+ if (SP11Constants.HEADER.equals(name)) {
Header header = new Header();
- OMAttribute nameAttribute = element.getAttribute(NAME);
+ OMAttribute nameAttribute = element.getAttribute(SPConstants.NAME);
if( nameAttribute != null ) {
header.setName(nameAttribute.getAttributeValue());
}
- OMAttribute namespaceAttribute = element.getAttribute(NAMESPACE);
+ OMAttribute namespaceAttribute = element.getAttribute(SPConstants.NAMESPACE);
header.setNamespace(namespaceAttribute.getAttributeValue());
parent.addHeader(header);
- } else if (BODY.equals(name)) {
+ } else if (SP11Constants.BODY.equals(name)) {
parent.setBody(true);
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SupportingTokensBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SupportingTokensBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SupportingTokensBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
import java.util.List;
@@ -26,7 +26,8 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.AlgorithmSuite;
import org.apache.ws.secpolicy.model.SignedEncryptedElements;
import org.apache.ws.secpolicy.model.SignedEncryptedParts;
@@ -40,18 +41,14 @@
QName name = element.getQName();
SupportingToken supportingToken = null;
- if (Constants.SUPPORIING_TOKENS.equals(name)) {
- supportingToken = new SupportingToken(
- Constants.SUPPORTING_TOKEN_SUPPORTING);
- } else if (Constants.SIGNED_SUPPORTING_TOKENS.equals(name)) {
- supportingToken = new SupportingToken(
- Constants.SUPPORTING_TOKEN_SIGNED);
- } else if (Constants.ENDORSING_SUPPORTING_TOKENS.equals(name)) {
- supportingToken = new SupportingToken(
- Constants.SUPPORTING_TOKEN_ENDORSING);
- } else if (Constants.SIGNED_ENDORSING_SUPPORTING_TOKENS.equals(name)) {
- supportingToken = new SupportingToken(
- Constants.SUPPORTING_TOKEN_SIGNED_ENDORSING);
+ if (SP11Constants.SUPPORTING_TOKENS.equals(name)) {
+ supportingToken = new SupportingToken(SPConstants.SUPPORTING_TOKEN_SUPPORTING, SPConstants.SP_V11);
+ } else if (SP11Constants.SIGNED_SUPPORTING_TOKENS.equals(name)) {
+ supportingToken = new SupportingToken(SPConstants.SUPPORTING_TOKEN_SIGNED, SPConstants.SP_V11);
+ } else if (SP11Constants.ENDORSING_SUPPORTING_TOKENS.equals(name)) {
+ supportingToken = new SupportingToken(SPConstants.SUPPORTING_TOKEN_ENDORSING, SPConstants.SP_V11);
+ } else if (SP11Constants.SIGNED_ENDORSING_SUPPORTING_TOKENS.equals(name)) {
+ supportingToken = new SupportingToken(SPConstants.SUPPORTING_TOKEN_SIGNED_ENDORSING, SPConstants.SP_V11);
}
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
@@ -69,10 +66,10 @@
}
public QName[] getKnownElements() {
- return new QName[] { Constants.SUPPORIING_TOKENS,
- Constants.SIGNED_SUPPORTING_TOKENS,
- Constants.ENDORSING_SUPPORTING_TOKENS,
- Constants.SIGNED_ENDORSING_SUPPORTING_TOKENS};
+ return new QName[] { SP11Constants.SUPPORTING_TOKENS,
+ SP11Constants.SIGNED_SUPPORTING_TOKENS,
+ SP11Constants.ENDORSING_SUPPORTING_TOKENS,
+ SP11Constants.SIGNED_ENDORSING_SUPPORTING_TOKENS};
}
private void processAlternative(List assertions, SupportingToken supportingToken) {
@@ -82,22 +79,22 @@
Assertion primitive = (Assertion) iterator.next();
QName qname = primitive.getName();
- if (Constants.ALGORITHM_SUITE.equals(qname)) {
+ if (SP11Constants.ALGORITHM_SUITE.equals(qname)) {
supportingToken.setAlgorithmSuite((AlgorithmSuite) primitive);
- } else if (Constants.SIGNED_PARTS.equals(qname)) {
+ } else if (SP11Constants.SIGNED_PARTS.equals(qname)) {
supportingToken
.setSignedParts((SignedEncryptedParts) primitive);
- } else if (Constants.SIGNED_ELEMENTS.equals(qname)) {
+ } else if (SP11Constants.SIGNED_ELEMENTS.equals(qname)) {
supportingToken
.setSignedElements((SignedEncryptedElements) primitive);
- } else if (Constants.ENCRYPTED_PARTS.equals(qname)) {
+ } else if (SP11Constants.ENCRYPTED_PARTS.equals(qname)) {
supportingToken
.setEncryptedParts((SignedEncryptedParts) primitive);
- } else if (Constants.ENCRYPTED_ELEMENTS.equals(qname)) {
+ } else if (SP11Constants.ENCRYPTED_ELEMENTS.equals(qname)) {
supportingToken
.setEncryptedElements((SignedEncryptedElements) primitive);
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SymmetricBindingBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SymmetricBindingBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/SymmetricBindingBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
import java.util.List;
@@ -26,7 +26,8 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.AlgorithmSuite;
import org.apache.ws.secpolicy.model.Layout;
import org.apache.ws.secpolicy.model.ProtectionToken;
@@ -35,7 +36,7 @@
public class SymmetricBindingBuilder implements AssertionBuilder {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
- SymmetricBinding symmetricBinding = new SymmetricBinding();
+ SymmetricBinding symmetricBinding = new SymmetricBinding(SPConstants.SP_V11);
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
@@ -52,7 +53,7 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.SYMMETRIC_BINDING};
+ return new QName[] {SP11Constants.SYMMETRIC_BINDING};
}
private void processAlternatives(List assertions, SymmetricBinding symmetricBinding) {
@@ -63,27 +64,27 @@
assertion = (Assertion) iterator.next();
name = assertion.getName();
- if (Constants.ALGORITHM_SUITE.equals(name)) {
+ if (SP11Constants.ALGORITHM_SUITE.equals(name)) {
symmetricBinding.setAlgorithmSuite((AlgorithmSuite) assertion);
- } else if (Constants.LAYOUT.equals(name)) {
+ } else if (SP11Constants.LAYOUT.equals(name)) {
symmetricBinding.setLayout((Layout) assertion);
- } else if (Constants.INCLUDE_TIMESTAMP.equals(name)) {
+ } else if (SP11Constants.INCLUDE_TIMESTAMP.equals(name)) {
symmetricBinding.setIncludeTimestamp(true);
- } else if (Constants.PROTECTION_TOKEN.equals(name)) {
+ } else if (SP11Constants.PROTECTION_TOKEN.equals(name)) {
symmetricBinding.setProtectionToken((ProtectionToken) assertion);
- } else if (Constants.ENCRYPT_BEFORE_SIGNING.equals(name.getLocalPart())) {
- symmetricBinding.setProtectionOrder(Constants.ENCRYPT_BEFORE_SIGNING);
+ } else if (SPConstants.ENCRYPT_BEFORE_SIGNING.equals(name.getLocalPart())) {
+ symmetricBinding.setProtectionOrder(SPConstants.ENCRYPT_BEFORE_SIGNING);
- } else if (Constants.SIGN_BEFORE_ENCRYPTING.equals(name.getLocalPart())) {
- symmetricBinding.setProtectionOrder(Constants.SIGN_BEFORE_ENCRYPTING);
+ } else if (SPConstants.SIGN_BEFORE_ENCRYPTING.equals(name.getLocalPart())) {
+ symmetricBinding.setProtectionOrder(SPConstants.SIGN_BEFORE_ENCRYPTING);
- } else if (Constants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY.equals(name.getLocalPart())) {
+ } else if (SPConstants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY.equals(name.getLocalPart())) {
symmetricBinding.setEntireHeadersAndBodySignatures(true);
- } else if (Constants.ENCRYPT_SIGNATURE.equals(name)) {
+ } else if (SP11Constants.ENCRYPT_SIGNATURE.equals(name)) {
symmetricBinding.setSignatureProtection(true);
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/TransportBindingBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/TransportBindingBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/TransportBindingBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
import java.util.List;
@@ -26,7 +26,8 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.AlgorithmSuite;
import org.apache.ws.secpolicy.model.Layout;
import org.apache.ws.secpolicy.model.SupportingToken;
@@ -36,7 +37,7 @@
public class TransportBindingBuilder implements AssertionBuilder {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
- TransportBinding transportBinding = new TransportBinding();
+ TransportBinding transportBinding = new TransportBinding(SPConstants.SP_V11);
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
@@ -54,7 +55,7 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.TRANSPORT_BINDING};
+ return new QName[] {SP11Constants.TRANSPORT_BINDING};
}
private void processAlternative(List assertionList, TransportBinding parent, AssertionBuilderFactory factory) {
@@ -64,22 +65,22 @@
Assertion primitive = (Assertion) iterator.next();
QName name = primitive.getName();
- if (name.equals(Constants.ALGORITHM_SUITE)) {
+ if (name.equals(SP11Constants.ALGORITHM_SUITE)) {
parent.setAlgorithmSuite((AlgorithmSuite) primitive);
- } else if (name.equals(Constants.TRANSPORT_TOKEN)) {
+ } else if (name.equals(SP11Constants.TRANSPORT_TOKEN)) {
parent.setTransportToken(((TransportToken) primitive));
- } else if (name.equals(Constants.INCLUDE_TIMESTAMP)) {
+ } else if (name.equals(SP11Constants.INCLUDE_TIMESTAMP)) {
parent.setIncludeTimestamp(true);
- } else if (name.equals(Constants.LAYOUT)) {
+ } else if (name.equals(SP11Constants.LAYOUT)) {
parent.setLayout((Layout) primitive);
- } else if (name.equals(Constants.SIGNED_SUPPORTING_TOKENS)) {
+ } else if (name.equals(SP11Constants.SIGNED_SUPPORTING_TOKENS)) {
parent.setSignedSupportingToken((SupportingToken) primitive);
- } else if (name.equals(Constants.SIGNED_ENDORSING_SUPPORTING_TOKENS)) {
+ } else if (name.equals(SP11Constants.SIGNED_ENDORSING_SUPPORTING_TOKENS)) {
parent.setSignedEndorsingSupportingTokens((SupportingToken) primitive);
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/TransportTokenBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/TransportTokenBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/TransportTokenBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
import java.util.List;
@@ -28,7 +28,8 @@
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.neethi.builders.xml.XmlPrimtiveAssertion;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.HttpsToken;
import org.apache.ws.secpolicy.model.TransportToken;
@@ -37,7 +38,7 @@
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
- TransportToken transportToken = new TransportToken();
+ TransportToken transportToken = new TransportToken(SPConstants.SP_V11);
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
@@ -51,7 +52,7 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.TRANSPORT_TOKEN};
+ return new QName[] {SP11Constants.TRANSPORT_TOKEN};
}
private void processAlternative(List assertions, TransportToken parent) {
@@ -60,9 +61,9 @@
XmlPrimtiveAssertion primtive = (XmlPrimtiveAssertion) iterator.next();
QName qname = primtive.getName();
- if (Constants.HTTPS_TOKEN.equals(qname)) {
- HttpsToken httpsToken = new HttpsToken();
- OMAttribute attr = primtive.getValue().getAttribute(Constants.REQUIRE_CLIENT_CERTIFICATE);
+ if (SP11Constants.HTTPS_TOKEN.equals(qname)) {
+ HttpsToken httpsToken = new HttpsToken(SPConstants.SP_V11);
+ OMAttribute attr = primtive.getValue().getAttribute(SPConstants.REQUIRE_CLIENT_CERTIFICATE);
if(attr != null) {
httpsToken.setRequireClientCertificate("true".equals(attr.getAttributeValue()));
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/Trust10Builder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/Trust10Builder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/Trust10Builder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/Trust10Builder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/Trust10Builder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/Trust10Builder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/Trust10Builder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import javax.xml.namespace.QName;
@@ -21,7 +21,8 @@
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.Trust10;
public class Trust10Builder implements AssertionBuilder {
@@ -29,34 +30,34 @@
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
- element = element.getFirstChildWithName(Constants.POLICY);
+ element = element.getFirstChildWithName(SPConstants.POLICY);
if (element == null) {
throw new IllegalArgumentException(
"Trust10 assertion doesn't contain any Policy");
}
- Trust10 trust10 = new Trust10();
+ Trust10 trust10 = new Trust10(SPConstants.SP_V11);
if (element
- .getFirstChildWithName(Constants.MUST_SUPPORT_CLIENT_CHALLENGE) != null) {
+ .getFirstChildWithName(SP11Constants.MUST_SUPPORT_CLIENT_CHALLENGE) != null) {
trust10.setMustSupportClientChallenge(true);
}
if (element
- .getFirstChildWithName(Constants.MUST_SUPPORT_SERVER_CHALLENGE) != null) {
+ .getFirstChildWithName(SP11Constants.MUST_SUPPORT_SERVER_CHALLENGE) != null) {
trust10.setMustSupportServerChallenge(true);
}
- if (element.getFirstChildWithName(Constants.REQUIRE_CLIENT_ENTROPY) != null) {
+ if (element.getFirstChildWithName(SP11Constants.REQUIRE_CLIENT_ENTROPY) != null) {
trust10.setRequireClientEntropy(true);
}
- if (element.getFirstChildWithName(Constants.REQUIRE_SERVER_ENTROPY) != null) {
+ if (element.getFirstChildWithName(SP11Constants.REQUIRE_SERVER_ENTROPY) != null) {
trust10.setRequireServerEntropy(true);
}
- if (element.getFirstChildWithName(Constants.MUST_SUPPORT_ISSUED_TOKENS) != null) {
+ if (element.getFirstChildWithName(SP11Constants.MUST_SUPPORT_ISSUED_TOKENS) != null) {
trust10.setMustSupportIssuedTokens(true);
}
@@ -64,7 +65,7 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.TRUST_10};
+ return new QName[] {SP11Constants.TRUST_10};
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/UsernameTokenBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/UsernameTokenBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/UsernameTokenBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
import java.util.List;
@@ -27,18 +27,21 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.UsernameToken;
public class UsernameTokenBuilder implements AssertionBuilder {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
- UsernameToken usernameToken = new UsernameToken();
+ UsernameToken usernameToken = new UsernameToken(SPConstants.SP_V11);
+
+ OMAttribute attribute = element.getAttribute(SP11Constants.INCLUDE_TOKEN);
- OMAttribute attribute = element.getAttribute(Constants.INCLUDE_TOKEN);
if(attribute != null) {
- usernameToken.setInclusion(attribute.getAttributeValue());
+ int inclusion = SP11Constants.getInclusionFromAttributeValue(attribute.getAttributeValue());
+ usernameToken.setInclusion(inclusion);
}
OMElement policyElement = element.getFirstElement();
@@ -62,7 +65,7 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.USERNAME_TOKEN};
+ return new QName[] {SP11Constants.USERNAME_TOKEN};
}
private void processAlternative(List assertions, UsernameToken parent) {
@@ -71,10 +74,10 @@
Assertion assertion = (Assertion) iterator.next();
QName qname = assertion.getName();
- if (Constants.WSS_USERNAME_TOKEN10.equals(qname)) {
+ if (SP11Constants.WSS_USERNAME_TOKEN10.equals(qname)) {
parent.setUseUTProfile10(true);
- } else if (Constants.WSS_USERNAME_TOKEN11.equals(qname)) {
+ } else if (SP11Constants.WSS_USERNAME_TOKEN11.equals(qname)) {
parent.setUseUTProfile11(true);
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/WSS10Builder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/WSS10Builder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/WSS10Builder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
import java.util.List;
@@ -26,7 +26,8 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.Wss10;
public class WSS10Builder implements AssertionBuilder {
@@ -34,7 +35,7 @@
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
- Wss10 wss10 = new Wss10();
+ Wss10 wss10 = new Wss10(SPConstants.SP_V11);
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
@@ -51,7 +52,7 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.WSS10};
+ return new QName[] {SP11Constants.WSS10};
}
private void processAlternative(List assertions, Wss10 parent) {
@@ -63,16 +64,16 @@
assertion = (Assertion) iterator.next();
name = assertion.getName();
- if (Constants.MUST_SUPPORT_REF_KEY_IDENTIFIER.equals(name)) {
+ if (SP11Constants.MUST_SUPPORT_REF_KEY_IDENTIFIER.equals(name)) {
parent.setMustSupportRefKeyIdentifier(true);
- } else if (Constants.MUST_SUPPORT_REF_ISSUER_SERIAL.equals(name)) {
+ } else if (SP11Constants.MUST_SUPPORT_REF_ISSUER_SERIAL.equals(name)) {
parent.setMustSupportRefIssuerSerial(true);
- } else if (Constants.MUST_SUPPORT_REF_EXTERNAL_URI.equals(name)) {
+ } else if (SP11Constants.MUST_SUPPORT_REF_EXTERNAL_URI.equals(name)) {
parent.setMustSupportRefExternalURI(true);
- } else if (Constants.MUST_SUPPORT_REF_EMBEDDED_TOKEN.equals(name)) {
+ } else if (SP11Constants.MUST_SUPPORT_REF_EMBEDDED_TOKEN.equals(name)) {
parent.setMustSupportRefEmbeddedToken(true);
}
}
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/WSS11Builder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/WSS11Builder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/WSS11Builder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java Mon Jan 28 01:52:18 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.ws.secpolicy.builders;
+package org.apache.ws.secpolicy11.builders;
import java.util.Iterator;
import java.util.List;
@@ -26,14 +26,15 @@
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.Wss11;
public class WSS11Builder implements AssertionBuilder {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
- Wss11 wss11 = new Wss11();
+ Wss11 wss11 = new Wss11(SPConstants.SP_V11);
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
@@ -50,7 +51,7 @@
}
public QName[] getKnownElements() {
- return new QName[] {Constants.WSS11};
+ return new QName[] {SP11Constants.WSS11};
}
private void processAlternative(List assertions, Wss11 parent) {
@@ -62,25 +63,25 @@
assertion = (Assertion) iterator.next();
name = assertion.getName();
- if (Constants.MUST_SUPPORT_REF_KEY_IDENTIFIER.equals(name)) {
+ if (SP11Constants.MUST_SUPPORT_REF_KEY_IDENTIFIER.equals(name)) {
parent.setMustSupportRefKeyIdentifier(true);
- } else if (Constants.MUST_SUPPORT_REF_ISSUER_SERIAL.equals(name)) {
+ } else if (SP11Constants.MUST_SUPPORT_REF_ISSUER_SERIAL.equals(name)) {
parent.setMustSupportRefIssuerSerial(true);
- } else if (Constants.MUST_SUPPORT_REF_EXTERNAL_URI.equals(name)) {
+ } else if (SP11Constants.MUST_SUPPORT_REF_EXTERNAL_URI.equals(name)) {
parent.setMustSupportRefExternalURI(true);
- } else if (Constants.MUST_SUPPORT_REF_EMBEDDED_TOKEN.equals(name)) {
+ } else if (SP11Constants.MUST_SUPPORT_REF_EMBEDDED_TOKEN.equals(name)) {
parent.setMustSupportRefEmbeddedToken(true);
- } else if (Constants.MUST_SUPPORT_REF_THUMBPRINT.equals(name)) {
+ } else if (SP11Constants.MUST_SUPPORT_REF_THUMBPRINT.equals(name)) {
parent.setMustSupportRefThumbprint(true);
- } else if (Constants.MUST_SUPPORT_REF_ENCRYPTED_KEY.equals(name)) {
+ } else if (SP11Constants.MUST_SUPPORT_REF_ENCRYPTED_KEY.equals(name)) {
parent.setMustSupportRefEncryptedKey(true);
- } else if (Constants.REQUIRE_SIGNATURE_CONFIRMATION.equals(name)) {
+ } else if (SP11Constants.REQUIRE_SIGNATURE_CONFIRMATION.equals(name)) {
parent.setRequireSignatureConfirmation(true);
}
}