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 [2/2] - in
/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11:
./ builders/
Copied: webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java (from r615774, webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/X509TokenBuilder.java)
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java?p2=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java&p1=webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/X509TokenBuilder.java&r1=615774&r2=615838&rev=615838&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/builders/X509TokenBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.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,26 +27,29 @@
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.X509Token;
public class X509TokenBuilder implements AssertionBuilder {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
- X509Token x509Token = new X509Token();
+ X509Token x509Token = new X509Token(SPConstants.SP_V11);
OMElement policyElement = element.getFirstElement();
//Process token inclusion
- OMAttribute includeAttr = element.getAttribute(Constants.INCLUDE_TOKEN);
+ OMAttribute includeAttr = element.getAttribute(SP11Constants.INCLUDE_TOKEN);
+
if(includeAttr != null) {
- x509Token.setInclusion(includeAttr.getAttributeValue());
+ int inclusion = SP11Constants.getInclusionFromAttributeValue(includeAttr.getAttributeValue());
+ x509Token.setInclusion(inclusion);
}
if (policyElement != null) {
- if (policyElement.getFirstChildWithName(Constants.REQUIRE_DERIVED_KEYS) != null) {
+ if (policyElement.getFirstChildWithName(SP11Constants.REQUIRE_DERIVED_KEYS) != null) {
x509Token.setDerivedKeys(true);
}
@@ -74,50 +77,46 @@
assertion = (Assertion) iterator.next();
name = assertion.getName();
- if (Constants.REQUIRE_KEY_IDENTIFIRE_REFERENCE.equals(name)) {
+ if (SP11Constants.REQUIRE_KEY_IDENTIFIRE_REFERENCE.equals(name)) {
parent.setRequireKeyIdentifierReference(true);
- } else if (Constants.REQUIRE_ISSUER_SERIAL_REFERENCE.equals(name)) {
+ } else if (SP11Constants.REQUIRE_ISSUER_SERIAL_REFERENCE.equals(name)) {
parent.setRequireIssuerSerialReference(true);
- } else if (Constants.REQUIRE_EMBEDDED_TOKEN_REFERENCE.equals(name)) {
+ } else if (SP11Constants.REQUIRE_EMBEDDED_TOKEN_REFERENCE.equals(name)) {
parent.setRequireEmbeddedTokenReference(true);
- } else if (Constants.REQUIRE_THUMBPRINT_REFERENCE.equals(name)) {
+ } else if (SP11Constants.REQUIRE_THUMBPRINT_REFERENCE.equals(name)) {
parent.setRequireThumbprintReference(true);
- } else if (Constants.WSS_X509_V1_TOKEN_10.equals(name)) {
- parent.setTokenVersionAndType(Constants.WSS_X509_V1_TOKEN10);
-
- } else if (Constants.WSS_X509_V1_TOKEN_11.equals(name)) {
- parent.setTokenVersionAndType(Constants.WSS_X509_V1_TOKEN11);
-
- } else if (Constants.WSS_X509_V3_TOKEN_10.equals(name)) {
- parent.setTokenVersionAndType(Constants.WSS_X509_V3_TOKEN10);
+ } else if (SP11Constants.WSS_X509_V1_TOKEN_10.equals(name)) {
+ parent.setTokenVersionAndType(SPConstants.WSS_X509_V1_TOKEN10);
- } else if (Constants.WSS_X509_V3_TOKEN_11.equals(name)) {
- parent.setTokenVersionAndType(Constants.WSS_X509_V3_TOKEN11);
+ } else if (SP11Constants.WSS_X509_V1_TOKEN_11.equals(name)) {
+ parent.setTokenVersionAndType(SPConstants.WSS_X509_V1_TOKEN11);
- } else if (Constants.WSS_X509_PKCS7_TOKEN_10.equals(name)) {
- parent
- .setTokenVersionAndType(Constants.WSS_X509_PKCS7_TOKEN10);
+ } else if (SP11Constants.WSS_X509_V3_TOKEN_10.equals(name)) {
+ parent.setTokenVersionAndType(SPConstants.WSS_X509_V3_TOKEN10);
- } else if (Constants.WSS_X509_PKCS7_TOKEN_11.equals(name)) {
- parent
- .setTokenVersionAndType(Constants.WSS_X509_PKCS7_TOKEN11);
+ } else if (SP11Constants.WSS_X509_V3_TOKEN_11.equals(name)) {
+ parent.setTokenVersionAndType(SPConstants.WSS_X509_V3_TOKEN11);
- } else if (Constants.WSS_X509_PKI_PATH_V1_TOKEN_10.equals(name)) {
- parent
- .setTokenVersionAndType(Constants.WSS_X509_PKI_PATH_V1_TOKEN10);
+ } else if (SP11Constants.WSS_X509_PKCS7_TOKEN_10.equals(name)) {
+ parent.setTokenVersionAndType(SPConstants.WSS_X509_PKCS7_TOKEN10);
+
+ } else if (SP11Constants.WSS_X509_PKCS7_TOKEN_11.equals(name)) {
+ parent.setTokenVersionAndType(SPConstants.WSS_X509_PKCS7_TOKEN11);
- } else if (Constants.WSS_X509_PKI_PATH_V1_TOKEN_11.equals(name)) {
- parent
- .setTokenVersionAndType(Constants.WSS_X509_PKI_PATH_V1_TOKEN11);
+ } else if (SP11Constants.WSS_X509_PKI_PATH_V1_TOKEN_10.equals(name)) {
+ parent.setTokenVersionAndType(SPConstants.WSS_X509_PKI_PATH_V1_TOKEN10);
+
+ } else if (SP11Constants.WSS_X509_PKI_PATH_V1_TOKEN_11.equals(name)) {
+ parent.setTokenVersionAndType(SPConstants.WSS_X509_PKI_PATH_V1_TOKEN11);
}
}
}
public QName[] getKnownElements() {
- return new QName[] {Constants.X509_TOKEN};
+ return new QName[] {SP11Constants.X509_TOKEN};
}
}