You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2006/08/06 08:16:30 UTC
svn commit: r429112 -
/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/
Author: ruchithf
Date: Sat Aug 5 23:16:29 2006
New Revision: 429112
URL: http://svn.apache.org/viewvc?rev=429112&view=rev
Log:
Fixed the build break - reverted changes from commit : 428983
Added:
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/PolicyEngineData.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/RootPolicyEngineData.java
Modified:
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AlgorithmSuite.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AlgorithmWrapper.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AsymmetricBinding.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Binding.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/EncryptionToken.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Header.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/HttpsToken.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/InitiatorToken.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Layout.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/ProtectionToken.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/RecipientToken.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignatureToken.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignedEncryptedElements.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignedEncryptedParts.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SupportingToken.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SymmetricAsymmetricBindingBase.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SymmetricBinding.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Token.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TokenWrapper.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TransportBinding.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TransportToken.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/UsernameToken.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Wss10.java
webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/X509Token.java
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AlgorithmSuite.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AlgorithmSuite.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AlgorithmSuite.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AlgorithmSuite.java Sat Aug 5 23:16:29 2006
@@ -15,17 +15,10 @@
*/
package org.apache.ws.security.policy.model;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.neethi.PolicyComponent;
import org.apache.ws.security.policy.Constants;
+import org.apache.ws.security.policy.WSSPolicyException;
-public class AlgorithmSuite extends AbstractSecurityAssertion {
+public class AlgorithmSuite extends PolicyEngineData {
private String symmetricSignature = Constants.HMAC_SHA1;
@@ -61,8 +54,6 @@
private String xPath;
- private List algorithmSuites;
-
// public AlgorithmSuite (String algoSuite) throws WSSPolicyException {
// this.setAlgorithmSuite(algoSuite);
// }
@@ -88,7 +79,7 @@
* @see Constants#ALGO_SUITE_TRIPLE_DES_SHA256
* @see Constants#ALGO_SUITE_TRIPLE_DES_SHA256_RSA15
*/
- public void setAlgorithmSuite(String algoSuite) {
+ public void setAlgorithmSuite(String algoSuite) throws WSSPolicyException {
//TODO: Optimize this :-)
if(Constants.ALGO_SUITE_BASIC256.equals(algoSuite)) {
this.digest = Constants.SHA1;
@@ -219,7 +210,7 @@
this.signatureKeyDerivation = Constants.P_SHA1_L192;
this.minimumSymmetricKeyLength = 192;
} else {
-// throw new WSSPolicyException("Invalid algorithm suite : " + algoSuite);
+ throw new WSSPolicyException("Invalid algorithm suite : " + algoSuite);
}
}
@@ -324,7 +315,7 @@
/**
* @param c14n The c14n to set.
*/
- public void setC14n(String c14n) {
+ public void setC14n(String c14n) throws WSSPolicyException {
this.c14n = c14n;
}
@@ -338,7 +329,7 @@
/**
* @param soapNormalization The soapNormalization to set.
*/
- public void setSoapNormalization(String soapNormalization) {
+ public void setSoapNormalization(String soapNormalization) throws WSSPolicyException {
this.soapNormalization = soapNormalization;
}
@@ -352,7 +343,7 @@
/**
* @param strTransform The strTransform to set.
*/
- public void setStrTransform(String strTransform) {
+ public void setStrTransform(String strTransform) throws WSSPolicyException {
this.strTransform = strTransform;
}
@@ -366,30 +357,8 @@
/**
* @param path The xPath to set.
*/
- public void setXPath(String path) {
+ public void setXPath(String path) throws WSSPolicyException{
xPath = path;
}
- public List getOptions() {
- return algorithmSuites;
- }
-
- public void addOption(AlgorithmSuite algorithmSuite) {
- if (algorithmSuites == null) {
- algorithmSuites = new ArrayList();
- }
- algorithmSuites.add(algorithmSuite);
- }
-
- public QName getName() {
- return Constants.ALGORITHM_SUITE;
- }
-
- public PolicyComponent normalize() {
- throw new UnsupportedOperationException();
- }
-
- public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- throw new UnsupportedOperationException();
- }
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AlgorithmWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AlgorithmWrapper.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AlgorithmWrapper.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AlgorithmWrapper.java Sat Aug 5 23:16:29 2006
@@ -16,8 +16,10 @@
package org.apache.ws.security.policy.model;
+import org.apache.ws.security.policy.WSSPolicyException;
+
public interface AlgorithmWrapper {
- public void setAlgorithmSuite(AlgorithmSuite algorithmSuite);
+ public void setAlgorithmSuite(AlgorithmSuite algorithmSuite) throws WSSPolicyException;
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AsymmetricBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AsymmetricBinding.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AsymmetricBinding.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/AsymmetricBinding.java Sat Aug 5 23:16:29 2006
@@ -16,25 +16,12 @@
package org.apache.ws.security.policy.model;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.neethi.PolicyComponent;
-import org.apache.ws.security.policy.Constants;
-
public class AsymmetricBinding extends SymmetricAsymmetricBindingBase {
private InitiatorToken initiatorToken;
private RecipientToken recipientToken;
- private List asymmetricBindings = new ArrayList();
-
/**
* @return Returns the initiatorToken.
*/
@@ -59,24 +46,6 @@
public void setRecipientToken(RecipientToken recipientToken) {
this.recipientToken = recipientToken;
}
-
- public Iterator getOptions() {
- return asymmetricBindings.iterator();
- }
-
- public void addOption(AsymmetricBinding asymmetricBinding) {
- asymmetricBindings.add(asymmetricBinding);
- }
- public QName getName() {
- return Constants.ASYMMETRIC_BINDING;
- }
- public PolicyComponent normalize() {
- throw new UnsupportedOperationException();
- }
- public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- throw new UnsupportedOperationException();
- }
-
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Binding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Binding.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Binding.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Binding.java Sat Aug 5 23:16:29 2006
@@ -16,14 +16,14 @@
package org.apache.ws.security.policy.model;
-public abstract class Binding extends AbstractSecurityAssertion implements AlgorithmWrapper {
+import org.apache.ws.security.policy.WSSPolicyException;
+
+public class Binding extends PolicyEngineData implements AlgorithmWrapper {
private AlgorithmSuite algorithmSuite;
private boolean includeTimestamp;
private Layout layout = new Layout();
- private SupportingToken signedSupportingToken;
- private SupportingToken signedEndorsingSupportingTokens;
-
+
/**
* @return Returns the algorithmSuite.
*/
@@ -62,28 +62,7 @@
/**
* @param layout The layout to set.
*/
- public void setLayout(Layout layout) {
+ public void setLayout(Layout layout) throws WSSPolicyException {
this.layout = layout;
}
-
- public SupportingToken getSignedEndorsingSupportingTokens() {
- return signedEndorsingSupportingTokens;
- }
-
- public void setSignedEndorsingSupportingTokens(
- SupportingToken signedEndorsingSupportingTokens) {
- this.signedEndorsingSupportingTokens = signedEndorsingSupportingTokens;
- }
-
- public SupportingToken getSignedSupportingToken() {
- return signedSupportingToken;
- }
-
- public void setSignedSupportingToken(SupportingToken signedSupportingToken) {
- this.signedSupportingToken = signedSupportingToken;
- }
-
-
-
-
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/EncryptionToken.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/EncryptionToken.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/EncryptionToken.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/EncryptionToken.java Sat Aug 5 23:16:29 2006
@@ -16,7 +16,9 @@
package org.apache.ws.security.policy.model;
-public class EncryptionToken implements TokenWrapper {
+import org.apache.ws.security.policy.WSSPolicyException;
+
+public class EncryptionToken extends PolicyEngineData implements TokenWrapper {
private Token encryptionToken;
@@ -37,7 +39,7 @@
/* (non-Javadoc)
* @see org.apache.ws.security.policy.TokenWrapper#setToken(org.apache.ws.security.policy.Token)
*/
- public void setToken(Token tok) {
+ public void setToken(Token tok) throws WSSPolicyException {
this.setEncryptionToken(tok);
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Header.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Header.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Header.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Header.java Sat Aug 5 23:16:29 2006
@@ -16,7 +16,7 @@
package org.apache.ws.security.policy.model;
-public class Header {
+public class Header extends PolicyEngineData {
private String name;
private String namespace;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/HttpsToken.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/HttpsToken.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/HttpsToken.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/HttpsToken.java Sat Aug 5 23:16:29 2006
@@ -16,26 +16,13 @@
package org.apache.ws.security.policy.model;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.neethi.PolicyComponent;
-import org.apache.ws.security.policy.Constants;
-
/**
*
* @author Ruchith Fernando (ruchith.fernando@gmail.com)
*/
-public class HttpsToken extends Token {
+public class HttpsToken extends PolicyEngineData {
private Token httpsToken;
-
- private List httpsTokens = new ArrayList();
/**
* @return Returns the httpsToken.
@@ -50,27 +37,6 @@
public void setHttpsToken(Token httpsToken) {
this.httpsToken = httpsToken;
}
-
- public Iterator getOptions() {
- return httpsTokens.iterator();
- }
-
- public void addOption(HttpsToken httpsToken) {
- httpsTokens.add(httpsToken);
- }
-
- public QName getName() {
- return Constants.HTTPS_TOKEN;
- }
-
- public PolicyComponent normalize() {
- throw new UnsupportedOperationException();
- }
-
- public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- throw new UnsupportedOperationException();
- }
-
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/InitiatorToken.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/InitiatorToken.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/InitiatorToken.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/InitiatorToken.java Sat Aug 5 23:16:29 2006
@@ -16,7 +16,9 @@
package org.apache.ws.security.policy.model;
-public class InitiatorToken implements TokenWrapper {
+import org.apache.ws.security.policy.WSSPolicyException;
+
+public class InitiatorToken extends PolicyEngineData implements TokenWrapper {
private Token initiatorToken;
@@ -37,7 +39,7 @@
/* (non-Javadoc)
* @see org.apache.ws.security.policy.TokenWrapper#setToken(org.apache.ws.security.policy.Token)
*/
- public void setToken(Token tok) {
+ public void setToken(Token tok) throws WSSPolicyException {
this.setInitiatorToken(tok);
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Layout.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Layout.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Layout.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Layout.java Sat Aug 5 23:16:29 2006
@@ -16,21 +16,12 @@
package org.apache.ws.security.policy.model;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.neethi.PolicyComponent;
import org.apache.ws.security.policy.Constants;
+import org.apache.ws.security.policy.WSSPolicyException;
-public class Layout extends AbstractSecurityAssertion {
+public class Layout extends PolicyEngineData {
private String value = Constants.LAYOUT_LAX;
-
- private List layouts;
/**
* @return Returns the value.
@@ -42,37 +33,16 @@
/**
* @param value The value to set.
*/
- public void setValue(String value) {
+ public void setValue(String value) throws WSSPolicyException{
if(Constants.LAYOUT_LAX.equals(value) ||
Constants.LAYOUT_STRICT.equals(value) ||
Constants.LAYOUT_LAX_TIMESTAMP_FIRST.equals(value) ||
Constants.LAYOUT_LAX_TIMESTAMP_LAST.equals(value)) {
this.value = value;
} else {
-// throw new WSSPolicyException("Incorrect layout value : " + value);
+ throw new WSSPolicyException("Incorrect layout value : " + value);
}
}
- public List getOptions() {
- return layouts;
- }
- public void addOption(Layout layout) {
- if (layouts == null) {
- layouts = new ArrayList();
- }
- layouts.add(layout);
- }
-
- public QName getName() {
- return Constants.LAYOUT;
- }
-
- public PolicyComponent normalize() {
- throw new UnsupportedOperationException();
- }
-
- public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- throw new UnsupportedOperationException();
- }
}
Added: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/PolicyEngineData.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/PolicyEngineData.java?rev=429112&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/PolicyEngineData.java (added)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/PolicyEngineData.java Sat Aug 5 23:16:29 2006
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ws.security.policy.model;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.security.policy.Constants;
+import org.apache.ws.security.policy.WSSPolicyException;
+import org.apache.ws.security.policy.parser.SecurityPolicy;
+
+import javax.xml.namespace.QName;
+
+public class PolicyEngineData {
+
+ private static final Log log = LogFactory.getLog(PolicyEngineData.class);
+
+ public void initializeWithDefaults() {
+
+ }
+
+ public static PolicyEngineData copy(QName name) throws WSSPolicyException {
+ String localPart = name.getLocalPart();
+ if(localPart.equals(SecurityPolicy.symmetricBinding.getTokenName())) {
+ return new SymmetricBinding();
+ } else if (localPart.equals(SecurityPolicy.asymmetricBinding.getTokenName())) {
+ return new AsymmetricBinding();
+ } else if (localPart.equals(SecurityPolicy.transportBinding.getTokenName())) {
+ return new TransportBinding();
+ } else if (localPart.equals(SecurityPolicy.algorithmSuite.getTokenName())) {
+ return new AlgorithmSuite();
+ } else if (localPart.equals(SecurityPolicy.signedElements.getTokenName())) {
+ return new SignedEncryptedElements(true);
+ } else if (localPart.equals(SecurityPolicy.encryptedElements.getTokenName())) {
+ return new SignedEncryptedElements(false);
+ } else if (localPart.equals(SecurityPolicy.signedParts.getTokenName())) {
+ return new SignedEncryptedParts(true);
+ } else if (localPart.equals(SecurityPolicy.encryptedParts.getTokenName())) {
+ return new SignedEncryptedParts(false);
+ } else if (localPart.equals(SecurityPolicy.header.getTokenName())) {
+ return new Header();
+ } else if (localPart.equals(SecurityPolicy.protectionToken.getTokenName())) {
+ return new ProtectionToken();
+ } else if (localPart.equals(SecurityPolicy.signatureToken.getTokenName())) {
+ return new SignatureToken();
+ } else if (localPart.equals(SecurityPolicy.encryptionToken.getTokenName())) {
+ return new EncryptionToken();
+ } else if (localPart.equals(SecurityPolicy.x509Token.getTokenName())) {
+ return new X509Token();
+ } else if (localPart.equals(SecurityPolicy.layout.getTokenName())) {
+ return new Layout();
+ } else if (localPart.equals(SecurityPolicy.signedSupportingTokens.getTokenName())) {
+ return new SupportingToken(Constants.SUPPORTING_TOKEN_SIGNED);
+ } else if (localPart.equals(SecurityPolicy.signedEndorsingSupportingTokens.getTokenName())) {
+ return new SupportingToken(Constants.SUPPORTING_TOKEN_SIGNED_ENDORSING);
+ } else if (localPart.equals(SecurityPolicy.supportingTokens.getTokenName())) {
+ return new SupportingToken(Constants.SUPPORTING_TOKEN_SUPPORTING);
+ } else if (localPart.equals(SecurityPolicy.endorsingSupportingTokens.getTokenName())) {
+ return new SupportingToken(Constants.SUPPORTING_TOKEN_ENDORSING);
+ } else if (localPart.equals(SecurityPolicy.usernameToken.getTokenName())) {
+ return new UsernameToken();
+ } else if (localPart.equals(SecurityPolicy.wss10.getTokenName())) {
+ return new Wss10();
+ } else if (localPart.equals(SecurityPolicy.wss11.getTokenName())) {
+ return new Wss11();
+ } else if (localPart.equals(SecurityPolicy.initiatorToken.getTokenName())) {
+ return new InitiatorToken();
+ } else if (localPart.equals(SecurityPolicy.recipientToken.getTokenName())) {
+ return new RecipientToken();
+ } else if (localPart.equals(SecurityPolicy.transportToken.getTokenName())) {
+ return new TransportToken();
+ } else if (localPart.equals(SecurityPolicy.httpsToken.getTokenName())) {
+ return new HttpsToken();
+ } else {
+ log.error("Unsuppotred: " + localPart);
+ throw new WSSPolicyException("Unsuppotred complex assertion :" + localPart);
+ }
+ }
+}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/ProtectionToken.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/ProtectionToken.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/ProtectionToken.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/ProtectionToken.java Sat Aug 5 23:16:29 2006
@@ -16,22 +16,11 @@
package org.apache.ws.security.policy.model;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import org.apache.ws.security.policy.WSSPolicyException;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.neethi.PolicyComponent;
-import org.apache.ws.security.policy.Constants;
-
-public class ProtectionToken extends AbstractSecurityAssertion implements TokenWrapper {
+public class ProtectionToken extends PolicyEngineData implements TokenWrapper {
private Token protectionToken;
-
- private List protectionTokens = new ArrayList();
/**
* @return Returns the protectionToken.
@@ -47,30 +36,8 @@
this.protectionToken = protectionToken;
}
- public void setToken(Token tok) {
+ public void setToken(Token tok) throws WSSPolicyException {
this.setProtectionToken(tok);
- }
-
- public Iterator getOptions() {
- return protectionTokens.iterator();
- }
-
- public void addOption(ProtectionToken protectionToken) {
- protectionTokens.add(protectionToken);
- }
-
- public QName getName() {
- return Constants.PROTECTION_TOKEN;
- }
-
- public PolicyComponent normalize() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- // TODO Auto-generated method stub
-
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/RecipientToken.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/RecipientToken.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/RecipientToken.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/RecipientToken.java Sat Aug 5 23:16:29 2006
@@ -16,7 +16,9 @@
package org.apache.ws.security.policy.model;
-public class RecipientToken implements TokenWrapper {
+import org.apache.ws.security.policy.WSSPolicyException;
+
+public class RecipientToken extends PolicyEngineData implements TokenWrapper {
private Token receipientToken;
@@ -37,7 +39,7 @@
/* (non-Javadoc)
* @see org.apache.ws.security.policy.TokenWrapper#setToken(org.apache.ws.security.policy.Token)
*/
- public void setToken(Token tok) {
+ public void setToken(Token tok) throws WSSPolicyException {
this.setReceipientToken(tok);
}
Added: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/RootPolicyEngineData.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/RootPolicyEngineData.java?rev=429112&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/RootPolicyEngineData.java (added)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/RootPolicyEngineData.java Sat Aug 5 23:16:29 2006
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ws.security.policy.model;
+
+import java.util.ArrayList;
+
+public class RootPolicyEngineData extends PolicyEngineData {
+
+ private ArrayList topLevelPEDs = new ArrayList();
+
+ public void addTopLevelPED(PolicyEngineData ped) {
+ if(!topLevelPEDs.contains(ped)) {
+ this.topLevelPEDs.add(ped);
+ }
+ }
+
+ public ArrayList getTopLevelPEDs() {
+ return this.topLevelPEDs;
+ }
+}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignatureToken.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignatureToken.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignatureToken.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignatureToken.java Sat Aug 5 23:16:29 2006
@@ -16,7 +16,9 @@
package org.apache.ws.security.policy.model;
-public class SignatureToken implements TokenWrapper {
+import org.apache.ws.security.policy.WSSPolicyException;
+
+public class SignatureToken extends PolicyEngineData implements TokenWrapper {
private Token signatureToken;
@@ -37,7 +39,7 @@
/* (non-Javadoc)
* @see org.apache.ws.security.policy.TokenWrapper#setToken(org.apache.ws.security.policy.Token)
*/
- public void setToken(Token tok) {
+ public void setToken(Token tok) throws WSSPolicyException {
this.setSignatureToken(tok);
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignedEncryptedElements.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignedEncryptedElements.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignedEncryptedElements.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignedEncryptedElements.java Sat Aug 5 23:16:29 2006
@@ -18,14 +18,7 @@
import java.util.ArrayList;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.neethi.PolicyComponent;
-import org.apache.ws.security.policy.Constants;
-
-public class SignedEncryptedElements extends AbstractSecurityAssertion {
+public class SignedEncryptedElements extends PolicyEngineData {
private ArrayList xPathExpressions = new ArrayList();
private String xPathVersion;
@@ -70,22 +63,6 @@
*/
public boolean isSignedElemets() {
return signedElemets;
- }
-
- public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- throw new UnsupportedOperationException();
-
- }
-
- public QName getName() {
- if (signedElemets) {
- return Constants.SIGNED_ELEMENTS;
- }
- return Constants.ENCRYPTED_ELEMENTS;
- }
-
- public PolicyComponent normalize() {
- throw new UnsupportedOperationException();
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignedEncryptedParts.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignedEncryptedParts.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignedEncryptedParts.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SignedEncryptedParts.java Sat Aug 5 23:16:29 2006
@@ -18,14 +18,7 @@
import java.util.ArrayList;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.neethi.PolicyComponent;
-import org.apache.ws.security.policy.Constants;
-
-public class SignedEncryptedParts extends AbstractSecurityAssertion {
+public class SignedEncryptedParts extends PolicyEngineData {
private boolean body;
@@ -71,19 +64,7 @@
public boolean isSignedParts() {
return signedParts;
}
-
- public QName getName() {
- if (signedParts) {
- return Constants.SIGNED_PARTS;
- }
- return Constants.ENCRYPTED_PARTS;
- }
-
- public PolicyComponent normalize() {
- throw new UnsupportedOperationException();
- }
-
- public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- throw new UnsupportedOperationException();
- }
+
+
+
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SupportingToken.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SupportingToken.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SupportingToken.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SupportingToken.java Sat Aug 5 23:16:29 2006
@@ -16,44 +16,33 @@
package org.apache.ws.security.policy.model;
-import java.util.ArrayList;
-import java.util.Iterator;
+import org.apache.ws.security.policy.WSSPolicyException;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.neethi.Assertion;
-import org.apache.neethi.PolicyComponent;
-import org.apache.ws.security.policy.Constants;
+import java.util.ArrayList;
-public class SupportingToken implements AlgorithmWrapper, TokenWrapper,
- Assertion {
+public class SupportingToken extends PolicyEngineData implements AlgorithmWrapper, TokenWrapper {
/**
* Type of SupportingToken
- *
* @see SupportingToken#SUPPORTING
* @see SupportingToken#ENDORSING
* @see SupportingToken#SIGNED
* @see SupportingToken#SIGNED_ENDORSING
*/
private int type;
-
+
private AlgorithmSuite algorithmSuite;
-
+
private ArrayList tokens = new ArrayList();
-
+
private SignedEncryptedElements signedElements;
-
+
private SignedEncryptedElements encryptedElements;
-
+
private SignedEncryptedParts signedParts;
-
+
private SignedEncryptedParts encryptedParts;
-
- private ArrayList SupportingTokens = new ArrayList();
-
+
public SupportingToken(int type) {
this.type = type;
}
@@ -66,8 +55,7 @@
}
/**
- * @param algorithmSuite
- * The algorithmSuite to set.
+ * @param algorithmSuite The algorithmSuite to set.
*/
public void setAlgorithmSuite(AlgorithmSuite algorithmSuite) {
this.algorithmSuite = algorithmSuite;
@@ -81,8 +69,7 @@
}
/**
- * @param token
- * The token to set.
+ * @param token The token to set.
*/
public void addToken(Token token) {
this.tokens.add(token);
@@ -91,15 +78,14 @@
/**
* @return Returns the type.
*/
- public int getTokenType() {
+ public int getType() {
return type;
}
/**
- * @param type
- * The type to set.
+ * @param type The type to set.
*/
- public void setTokenType(int type) {
+ public void setType(int type) {
this.type = type;
}
@@ -111,8 +97,7 @@
}
/**
- * @param encryptedElements
- * The encryptedElements to set.
+ * @param encryptedElements The encryptedElements to set.
*/
public void setEncryptedElements(SignedEncryptedElements encryptedElements) {
this.encryptedElements = encryptedElements;
@@ -126,8 +111,7 @@
}
/**
- * @param encryptedParts
- * The encryptedParts to set.
+ * @param encryptedParts The encryptedParts to set.
*/
public void setEncryptedParts(SignedEncryptedParts encryptedParts) {
this.encryptedParts = encryptedParts;
@@ -141,8 +125,7 @@
}
/**
- * @param signedElements
- * The signedElements to set.
+ * @param signedElements The signedElements to set.
*/
public void setSignedElements(SignedEncryptedElements signedElements) {
this.signedElements = signedElements;
@@ -156,60 +139,19 @@
}
/**
- * @param signedParts
- * The signedParts to set.
+ * @param signedParts The signedParts to set.
*/
public void setSignedParts(SignedEncryptedParts signedParts) {
this.signedParts = signedParts;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.apache.ws.security.policy.TokenWrapper#setToken(org.apache.ws.security.policy.Token)
*/
- public void setToken(Token tok) {
+ public void setToken(Token tok) throws WSSPolicyException {
this.addToken(tok);
}
-
- public QName getName() {
- switch (type) {
- case Constants.SUPPORTING_TOKEN_SIGNED:
- return Constants.SIGNED_SUPPORTING_TOKENS;
- case Constants.SUPPORTING_TOKEN_ENDORSING:
- return Constants.ENDORSING_SUPPORTING_TOKENS;
- case Constants.SUPPORTING_TOKEN_SIGNED_ENDORSING:
- return Constants.SIGNED_ENDORSING_SUPPORTING_TOKENS;
- default:
- return null;
- }
- }
-
- public boolean isOptional() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public PolicyComponent normalize() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public short getType() {
- return Assertion.ASSERTION;
- }
-
- public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- // TODO Auto-generated method stub
-
- }
-
- public void addOption(SupportingToken supportingToken) {
- this.SupportingTokens.add(supportingToken);
- }
-
- public Iterator getOptions() {
- return this.SupportingTokens.iterator();
- }
-
+
+
+
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SymmetricAsymmetricBindingBase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SymmetricAsymmetricBindingBase.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SymmetricAsymmetricBindingBase.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SymmetricAsymmetricBindingBase.java Sat Aug 5 23:16:29 2006
@@ -17,8 +17,9 @@
package org.apache.ws.security.policy.model;
import org.apache.ws.security.policy.Constants;
+import org.apache.ws.security.policy.WSSPolicyException;
-public abstract class SymmetricAsymmetricBindingBase extends Binding {
+public class SymmetricAsymmetricBindingBase extends Binding {
private String protectionOrder = Constants.SIGN_BEFORE_ENCRYPTING;
@@ -53,13 +54,14 @@
/**
* @param protectionOrder The protectionOrder to set.
*/
- public void setProtectionOrder(String protectionOrder) {
+ public void setProtectionOrder(String protectionOrder)
+ throws WSSPolicyException {
if(Constants.ENCRYPT_BEFORE_SIGNING.equals(protectionOrder) ||
Constants.SIGN_BEFORE_ENCRYPTING.equals(protectionOrder)) {
this.protectionOrder = protectionOrder;
} else {
-// throw new WSSPolicyException("Incorrect protection order value : "
-// + protectionOrder);
+ throw new WSSPolicyException("Incorrect protection order value : "
+ + protectionOrder);
}
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SymmetricBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SymmetricBinding.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SymmetricBinding.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/SymmetricBinding.java Sat Aug 5 23:16:29 2006
@@ -16,15 +16,7 @@
package org.apache.ws.security.policy.model;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.neethi.PolicyComponent;
+import org.apache.ws.security.policy.WSSPolicyException;
public class SymmetricBinding extends SymmetricAsymmetricBindingBase {
@@ -33,9 +25,7 @@
private SignatureToken signatureToken;
private ProtectionToken protectionToken;
-
- private List symmetricBindings = new ArrayList();
-
+
/**
* @return Returns the encryptionToken.
*/
@@ -46,10 +36,10 @@
/**
* @param encryptionToken The encryptionToken to set.
*/
- public void setEncryptionToken(EncryptionToken encryptionToken) {
+ public void setEncryptionToken(EncryptionToken encryptionToken) throws WSSPolicyException {
if(this.protectionToken != null) {
-// throw new WSSPolicyException("Cannot use an EncryptionToken in a " +
-// "SymmetricBinding when there is a ProtectionToken");
+ throw new WSSPolicyException("Cannot use an EncryptionToken in a " +
+ "SymmetricBinding when there is a ProtectionToken");
}
this.encryptionToken = encryptionToken;
}
@@ -64,11 +54,11 @@
/**
* @param protectionToken The protectionToken to set.
*/
- public void setProtectionToken(ProtectionToken protectionToken) {
+ public void setProtectionToken(ProtectionToken protectionToken) throws WSSPolicyException {
if(this.encryptionToken != null || this.signatureToken != null) {
-// throw new WSSPolicyException("Cannot use a ProtectionToken in a " +
-// "SymmetricBinding when there is a SignatureToken or an" +
-// "EncryptionToken");
+ throw new WSSPolicyException("Cannot use a ProtectionToken in a " +
+ "SymmetricBinding when there is a SignatureToken or an" +
+ "EncryptionToken");
}
this.protectionToken = protectionToken;
}
@@ -83,35 +73,12 @@
/**
* @param signatureToken The signatureToken to set.
*/
- public void setSignatureToken(SignatureToken signatureToken) {
+ public void setSignatureToken(SignatureToken signatureToken) throws WSSPolicyException {
if(this.protectionToken != null) {
-// throw new WSSPolicyException("Cannot use a SignatureToken in a " +
-// "SymmetricBinding when there is a ProtectionToken");
+ throw new WSSPolicyException("Cannot use a SignatureToken in a " +
+ "SymmetricBinding when there is a ProtectionToken");
}
this.signatureToken = signatureToken;
- }
-
- public Iterator getOptions() {
- return symmetricBindings.iterator();
- }
-
- public void addOption(SymmetricBinding symmetricBinding) {
- symmetricBindings.add(symmetricBinding);
- }
-
- public QName getName() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public PolicyComponent normalize() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- // TODO Auto-generated method stub
-
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Token.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Token.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Token.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Token.java Sat Aug 5 23:16:29 2006
@@ -17,8 +17,9 @@
package org.apache.ws.security.policy.model;
import org.apache.ws.security.policy.Constants;
+import org.apache.ws.security.policy.WSSPolicyException;
-public abstract class Token extends AbstractSecurityAssertion {
+public class Token extends PolicyEngineData {
/**
* Inclusiong property of a TokenAssertion
@@ -40,14 +41,14 @@
/**
* @param inclusion The inclusion to set.
*/
- public void setInclusion(String inclusion) {
+ public void setInclusion(String inclusion) throws WSSPolicyException {
if(Constants.INCLUDE_ALWAYS.equals(inclusion) ||
Constants.INCLUDE_ALWAYS_TO_RECIPIENT.equals(inclusion) ||
Constants.INCLUDE_NEVER.equals(inclusion) ||
Constants.INCLUDE_ONCE.equals(inclusion)) {
this.inclusion = inclusion;
} else {
-// throw new WSSPolicyException("Incorrect inclusion value: " + inclusion);
+ throw new WSSPolicyException("Incorrect inclusion value: " + inclusion);
}
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TokenWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TokenWrapper.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TokenWrapper.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TokenWrapper.java Sat Aug 5 23:16:29 2006
@@ -16,7 +16,9 @@
package org.apache.ws.security.policy.model;
+import org.apache.ws.security.policy.WSSPolicyException;
+
public interface TokenWrapper {
- public void setToken(Token tok);
+ public void setToken(Token tok) throws WSSPolicyException;
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TransportBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TransportBinding.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TransportBinding.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TransportBinding.java Sat Aug 5 23:16:29 2006
@@ -16,57 +16,22 @@
package org.apache.ws.security.policy.model;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.neethi.PolicyComponent;
-import org.apache.ws.security.policy.Constants;
-
public class TransportBinding extends Binding {
- private TransportToken transportToken;
-
- private List transportBindings;
-
+ private Token transportToken;
+
/**
* @return Returns the transportToken.
*/
- public TransportToken getTransportToken() {
+ public Token getTransportToken() {
return transportToken;
}
/**
* @param transportToken The transportToken to set.
*/
- public void setTransportToken(TransportToken transportToken) {
+ public void setTransportToken(Token transportToken) {
this.transportToken = transportToken;
- }
-
- public List getOptions() {
- return transportBindings;
- }
-
- public void addOption(TransportBinding transportBinding) {
- if (transportBindings == null) {
- transportBindings = new ArrayList();
- }
- transportBindings.add(transportBinding);
- }
-
- public QName getName() {
- return Constants.TRANSPORT_BINDING;
- }
-
- public PolicyComponent normalize() {
- throw new UnsupportedOperationException();
- }
-
- public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- throw new UnsupportedOperationException();
}
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TransportToken.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TransportToken.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TransportToken.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/TransportToken.java Sat Aug 5 23:16:29 2006
@@ -16,23 +16,11 @@
package org.apache.ws.security.policy.model;
-import java.util.ArrayList;
-import java.util.Iterator;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.neethi.Assertion;
-import org.apache.neethi.PolicyComponent;
-import org.apache.ws.security.policy.Constants;
-
-
-public class TransportToken implements Assertion {
+public class TransportToken extends PolicyEngineData {
private Token transportToken;
-
- private ArrayList transportTokens = new ArrayList();
+
/**
* @return Returns the transportToken.
@@ -47,37 +35,4 @@
public void setTransportToken(Token transportToken) {
this.transportToken = transportToken;
}
-
- public Iterator getOptions() {
- return transportTokens.iterator();
- }
-
- public void addOption(TransportToken transportToken) {
- transportTokens.add(transportToken);
- }
-
- public QName getName() {
- return new QName(Constants.SP_NS, "TransportToken");
- }
-
- public boolean isOptional() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public PolicyComponent normalize() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public short getType() {
- return Assertion.ASSERTION;
- }
-
- public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- // TODO Auto-generated method stub
-
- }
-
-
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/UsernameToken.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/UsernameToken.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/UsernameToken.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/UsernameToken.java Sat Aug 5 23:16:29 2006
@@ -16,20 +16,8 @@
package org.apache.ws.security.policy.model;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.neethi.PolicyComponent;
-import org.apache.ws.security.policy.Constants;
-
public class UsernameToken extends Token {
- private List usernameTokens;
-
private boolean useUTProfile11;
/**
@@ -46,26 +34,5 @@
this.useUTProfile11 = useUTProfile11;
}
- public List getOptions() {
- return usernameTokens;
- }
- public void addOption(UsernameToken usernameToken) {
- if (usernameTokens == null) {
- usernameTokens= new ArrayList();
- }
- usernameTokens.add(usernameToken);
- }
-
- public QName getName() {
- return Constants.USERNAME_TOKEN;
- }
-
- public PolicyComponent normalize() {
- throw new UnsupportedOperationException();
- }
-
- public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- throw new UnsupportedOperationException();
- }
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Wss10.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Wss10.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Wss10.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/Wss10.java Sat Aug 5 23:16:29 2006
@@ -16,7 +16,7 @@
package org.apache.ws.security.policy.model;
-public class Wss10 {
+public class Wss10 extends PolicyEngineData {
private boolean mustSupportRefKeyIdentifier;
private boolean MustSupportRefIssuerSerial;
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/X509Token.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/X509Token.java?rev=429112&r1=429111&r2=429112&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/X509Token.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/model/X509Token.java Sat Aug 5 23:16:29 2006
@@ -16,17 +16,6 @@
package org.apache.ws.security.policy.model;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.neethi.PolicyComponent;
-import org.apache.ws.security.policy.Constants;
-
public class X509Token extends Token {
private boolean requireKeyIdentifierReference;
@@ -38,9 +27,7 @@
private boolean requireThumbprintReference;
private String tokenVersionAndType;
-
- private List x509Tokens = new ArrayList();
-
+
/**
* @return Returns the requireEmbeddedTokenReference.
*/
@@ -112,27 +99,6 @@
public void setTokenVersionAndType(String tokenVersionAndType) {
this.tokenVersionAndType = tokenVersionAndType;
}
-
- public Iterator getOptions() {
- return x509Tokens.iterator();
- }
-
- public void addOption(X509Token token) {
- x509Tokens.add(token);
- }
-
- public QName getName() {
- return Constants.X509_TOKEN;
- }
-
- public PolicyComponent normalize() {
- throw new UnsupportedOperationException();
- }
-
- public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- throw new UnsupportedOperationException();
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org