You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/09/24 12:52:28 UTC
svn commit: r449391 - in
/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy:
builders/CryptoConfigBuilder.java model/CryptoConfig.java
model/RampartConfig.java
Author: sanka
Date: Sun Sep 24 03:52:27 2006
New Revision: 449391
URL: http://svn.apache.org/viewvc?view=rev&rev=449391
Log:
Completing the serialize(..) method in RampartConfig, CryptoConfig classes
Modified:
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/builders/CryptoConfigBuilder.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/model/CryptoConfig.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/model/RampartConfig.java
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/builders/CryptoConfigBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/builders/CryptoConfigBuilder.java?view=diff&rev=449391&r1=449390&r2=449391
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/builders/CryptoConfigBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/builders/CryptoConfigBuilder.java Sun Sep 24 03:52:27 2006
@@ -32,8 +32,9 @@
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
+
CryptoConfig cryptoCofig = new CryptoConfig();
-
+
OMAttribute attribute = element.getAttribute(new QName(CryptoConfig.PROVIDER_ATTR));
cryptoCofig.setProvider(attribute.getAttributeValue().trim());
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/model/CryptoConfig.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/model/CryptoConfig.java?view=diff&rev=449391&r1=449390&r2=449391
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/model/CryptoConfig.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/model/CryptoConfig.java Sun Sep 24 03:52:27 2006
@@ -24,6 +24,7 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
+import java.util.Iterator;
import java.util.Properties;
/**
@@ -76,8 +77,32 @@
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- // TODO TODO
- throw new UnsupportedOperationException("TODO");
+ String prefix = writer.getPrefix(RampartConfig.NS);
+
+ if (prefix == null) {
+ prefix = RampartConfig.NS;
+ writer.setPrefix(prefix, RampartConfig.NS);
+ }
+
+ writer.writeStartElement(prefix, CRYPTO_LN, RampartConfig.NS);
+
+ if (getProvider() != null) {
+ writer.writeAttribute(PROVIDER_ATTR, getProvider());
+ }
+
+ String key;
+ String value;
+
+ for (Iterator iterator = prop.keySet().iterator(); iterator.hasNext();) {
+ key = (String) iterator.next();
+ value = prop.getProperty(key);
+ writer.writeStartElement(RampartConfig.NS, PROPERTY_LN);
+ writer.writeAttribute("Name", key);
+ writer.writeCharacters(value);
+ writer.writeEndElement();
+ }
+
+ writer.writeEndElement();
}
public boolean equal(PolicyComponent policyComponent) {
@@ -87,4 +112,5 @@
public short getType() {
return Constants.TYPE_ASSERTION;
}
+
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/model/RampartConfig.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/model/RampartConfig.java?view=diff&rev=449391&r1=449390&r2=449391
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/model/RampartConfig.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/policy/model/RampartConfig.java Sun Sep 24 03:52:27 2006
@@ -29,67 +29,78 @@
* Rampart policy model bean to capture Rampart configuration assertion info.
*
* Example:
-<pre>
- <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
- <ramp:user>alice</ramp:user>
- <ramp:encryptionUser>bob</ramp:encryptionUser>
- <ramp:passwordCallbackClass>org.apache.axis2.security.PWCallback</ramp:passwordCallbackClass>
- <ramp:timestampTTL>300</ramp:timestampTTL>
- <ramp:tokenStoreClass>org.apache.rahas.StorageImpl</ramp:tokenStoreClass>
-
- <ramp:signatureCrypto>
- <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
- <ramp:property name="keystoreType">JKS</ramp:property>
- <ramp:property name="keystoreFile">/path/to/file.jks</ramp:property>
- <ramp:property name="keystorePassword">password</ramp:property>
- </ramp:crypto>
- </ramp:signatureCrypto>
-
- <ramp:tokenIssuerPolicy>
- <wsp:Policy>
- ....
- ....
- </wsp:Policy>
- </ramp:tokenIssuerPolicy>
- </ramp:RampartConfig>
-
-</pre>
+ *
+ * <pre>
+ * <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy">
+ * <ramp:user>alice</ramp:user>
+ * <ramp:encryptionUser>bob</ramp:encryptionUser>
+ * <ramp:passwordCallbackClass>org.apache.axis2.security.PWCallback</ramp:passwordCallbackClass>
+ * <ramp:timestampTTL>300</ramp:timestampTTL>
+ * <ramp:tokenStoreClass>org.apache.rahas.StorageImpl</ramp:tokenStoreClass>
+ *
+ * <ramp:signatureCrypto>
+ * <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin">
+ * <ramp:property name="keystoreType">JKS</ramp:property>
+ * <ramp:property name="keystoreFile">/path/to/file.jks</ramp:property>
+ * <ramp:property name="keystorePassword">password</ramp:property>
+ * </ramp:crypto>
+ * </ramp:signatureCrypto>
+ *
+ * <ramp:tokenIssuerPolicy>
+ * <wsp:Policy>
+ * ....
+ * ....
+ * </wsp:Policy>
+ * </ramp:tokenIssuerPolicy>
+ * </ramp:RampartConfig>
+ *
+ * </pre>
*
*/
public class RampartConfig implements Assertion {
public final static String NS = "http://ws.apache.org/rampart/policy";
-
+
+ public final static String PREFIX = "rampart";
+
public final static String RAMPART_CONFIG_LN = "RampartConfig";
-
+
public final static String USER_LN = "user";
-
+
public final static String ENCRYPTION_USER_LN = "encryptionUser";
-
+
public final static String PW_CB_CLASS_LN = "passwordCallbackClass";
-
+
public final static String SIG_CRYPTO_LN = "signatureCrypto";
-
+
public final static String ENCR_CRYPTO_LN = "encryptionCypto";
-
+
public final static String DEC_CRYPTO_LN = "decryptionCrypto";
-
+
public final static String TS_TTL_LN = "timestampTTL";
-
+
public final static String TOKEN_STORE_CLASS_LN = "tokenStoreClass";
-
+
public final static String TOKEN_ISSUER_POLICY_LN = "tokenIssuerPolicy";
-
+
private String user;
+
private String encryptionUser;
+
private String pwCbClass;
+
private CryptoConfig sigCryptoConfig;
+
private CryptoConfig encrCryptoConfig;
+
private CryptoConfig decCryptoConfig;
+
private String timestampTTL;
+
private String tokenStoreClass;
+
private Policy tokenIssuerPolicy;
-
+
/**
* @return Returns the tokenStoreClass.
*/
@@ -98,7 +109,8 @@
}
/**
- * @param tokenStoreClass The tokenStoreClass to set.
+ * @param tokenStoreClass
+ * The tokenStoreClass to set.
*/
public void setTokenStoreClass(String tokenStoreClass) {
this.tokenStoreClass = tokenStoreClass;
@@ -140,8 +152,6 @@
return sigCryptoConfig;
}
-
-
public void setSigCryptoConfig(CryptoConfig sigCryptoConfig) {
this.sigCryptoConfig = sigCryptoConfig;
}
@@ -155,7 +165,7 @@
}
public QName getName() {
- return new QName(NS,RAMPART_CONFIG_LN);
+ return new QName(NS, RAMPART_CONFIG_LN);
}
public boolean isOptional() {
@@ -169,10 +179,54 @@
}
public void serialize(XMLStreamWriter writer) throws XMLStreamException {
- // TODO TODO
- throw new UnsupportedOperationException("TODO");
+ String prefix = writer.getPrefix(NS);
+
+ if (prefix == null) {
+ prefix = PREFIX;
+ writer.setPrefix(PREFIX, NS);
+ }
+
+ writer.writeStartElement(PREFIX, RAMPART_CONFIG_LN, NS);
+ writer.writeNamespace(prefix, NS);
+
+ if (getUser() != null) {
+ writer.writeStartElement(NS, USER_LN);
+ writer.writeCharacters(getUser());
+ writer.writeEndElement();
+ }
+
+ if (getEncryptionUser() != null) {
+ writer.writeStartElement(NS, ENCRYPTION_USER_LN);
+ writer.writeCharacters(getEncryptionUser());
+ writer.writeEndElement();
+ }
+
+ if (getPwCbClass() != null) {
+ writer.writeStartElement(NS, PW_CB_CLASS_LN);
+ writer.writeCharacters(getPwCbClass());
+ writer.writeEndElement();
+ }
+
+ if (getTimestampTTL() != null) {
+ writer.writeStartElement(NS, TS_TTL_LN);
+ writer.writeCharacters(getTimestampTTL());
+ writer.writeEndElement();
+ }
+
+ if (getTokenStoreClass() != null) {
+ writer.writeStartElement(NS, TOKEN_STORE_CLASS_LN);
+ writer.writeCharacters(getTokenStoreClass());
+ writer.writeEndElement();
+ }
+
+ if (sigCryptoConfig != null) {
+ sigCryptoConfig.serialize(writer);
+ }
+
+ writer.writeEndElement();
+
}
-
+
public boolean equal(PolicyComponent policyComponent) {
throw new UnsupportedOperationException("TODO");
}
@@ -189,7 +243,8 @@
}
/**
- * @param timestampTTL The timestampTTL to set.
+ * @param timestampTTL
+ * The timestampTTL to set.
*/
public void setTimestampTTL(String timestampTTL) {
this.timestampTTL = timestampTTL;
@@ -203,11 +258,11 @@
}
/**
- * @param tokenIssuerPolicy The tokenIssuerPolicy to set.
+ * @param tokenIssuerPolicy
+ * The tokenIssuerPolicy to set.
*/
public void setTokenIssuerPolicy(Policy tokenIssuerPolicy) {
this.tokenIssuerPolicy = tokenIssuerPolicy;
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org