Author: ruchithf
Date: Sun Jul 15 08:54:33 2007
New Revision: 556420
URL: http://svn.apache.org/viewvc?view=rev&rev=556420
Log:
fixed an issue with SAMLTokenIssuerConfig's parameter generation and a few typos
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/IssuedToken.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Token.java
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/AbstractIssuerConfig.java
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SCTIssuerConfig.java
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenIssuerUtil.java
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/IssuedToken.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/IssuedToken.java?view=diff&rev=556420&r1=556419&r2=556420
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/IssuedToken.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/IssuedToken.java
Sun Jul 15 08:54:33 2007
@@ -17,7 +17,6 @@
package org.apache.ws.secpolicy.model;
import org.apache.axiom.om.OMElement;
-import org.apache.neethi.PolicyComponent;
import org.apache.ws.secpolicy.Constants;
import javax.xml.namespace.QName;
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java?view=diff&rev=556420&r1=556419&r2=556420
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java
Sun Jul 15 08:54:33 2007
@@ -18,7 +18,6 @@
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Policy;
-import org.apache.neethi.PolicyComponent;
import org.apache.ws.secpolicy.Constants;
import javax.xml.namespace.QName;
@@ -26,7 +25,7 @@
import javax.xml.stream.XMLStreamWriter;
/**
- * Model class of SecureConversationToken asertion
+ * Model class of SecureConversationToken assertion
*/
public class SecureConversationToken extends SecurityContextToken {
Modified:
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Token.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Token.java?view=diff&rev=556420&r1=556419&r2=556420
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Token.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Token.java
Sun Jul 15 08:54:33 2007
@@ -21,7 +21,7 @@
public abstract class Token extends AbstractSecurityAssertion {
/**
- * Inclusiong property of a TokenAssertion
+ * Inclusion property of a TokenAssertion
*/
private String inclusion = Constants.INCLUDE_ALWAYS;
Modified:
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/AbstractIssuerConfig.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/AbstractIssuerConfig.java?view=diff&rev=556420&r1=556419&r2=556420
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/AbstractIssuerConfig.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/AbstractIssuerConfig.java
Sun Jul 15 08:54:33 2007
@@ -54,6 +54,7 @@
protected long ttl = 300000;
protected String cryptoPropertiesFile;
protected OMElement cryptoPropertiesElement;
+ protected OMElement cryptoElement;
protected int keySize = 256;
public void setAddRequestedAttachedRef(boolean addRequestedAttachedRef) {
Modified:
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java?view=diff&rev=556420&r1=556419&r2=556420
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
Sun Jul 15 08:54:33 2007
@@ -109,11 +109,11 @@
.getEnvelope().getNamespace().getNamespaceURI());
Crypto crypto;
- if (config.cryptoPropertiesElement != null) { // crypto props
+ if (config.cryptoElement != null) { // crypto props
// defined as
// elements
crypto = CryptoFactory.getInstance(TrustUtil
- .toProperties(config.cryptoPropertiesElement), inMsgCtx
+ .toProperties(config.cryptoElement), inMsgCtx
.getAxisService().getClassLoader());
} else { // crypto props defined in a properties file
crypto = CryptoFactory.getInstance(config.cryptoPropertiesFile,
Modified:
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java?view=diff&rev=556420&r1=556419&r2=556420
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
Sun Jul 15 08:54:33 2007
@@ -156,12 +156,12 @@
throw new TrustException("samlIssuerNameMissing");
}
- OMElement cryptoPropElem =
elem.getFirstChildWithName(CRYPTO_PROPERTIES);
- if (cryptoPropElem != null) {
- if ((cryptoPropertiesElement =
- cryptoPropElem.getFirstChildWithName(CRYPTO)) == null){
+ this.cryptoPropertiesElement =
elem.getFirstChildWithName(CRYPTO_PROPERTIES);
+ if (this.cryptoPropertiesElement != null) {
+ if ((this.cryptoElement =
+ this.cryptoPropertiesElement .getFirstChildWithName(CRYPTO))
== null){
// no children. Hence, prop file should have been defined
- this.cryptoPropertiesFile = cryptoPropElem.getText().trim();
+ this.cryptoPropertiesFile = this.cryptoPropertiesElement
.getText().trim();
}
// else Props should be defined as children of a crypto element
}
@@ -253,7 +253,8 @@
OMElement issuerKeyPasswd = fac.createOMElement(ISSUER_KEY_PASSWD,
configElem);
issuerKeyPasswd.setText(this.issuerKeyPassword);
- configElem.addChild(this.cryptoPropertiesElement);
+ OMElement cryptProp = fac.createOMElement(CRYPTO_PROPERTIES,
configElem);
+ cryptProp.addChild(this.cryptoPropertiesElement);
OMElement keySizeElem = fac.createOMElement(KEY_SIZE, configElem);
keySizeElem.setText(Integer.toString(this.keySize));
Modified:
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SCTIssuerConfig.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SCTIssuerConfig.java?view=diff&rev=556420&r1=556419&r2=556420
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SCTIssuerConfig.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SCTIssuerConfig.java
Sun Jul 15 08:54:33 2007
@@ -49,8 +49,8 @@
elem.getFirstChildWithName(ADD_REQUESTED_ATTACHED_REF) != null;
this.addRequestedUnattachedRef =
elem.getFirstChildWithName(ADD_REQUESTED_UNATTACHED_REF) !=
null;
- if ((cryptoPropertiesElement =
- cryptoPropertiesElem.getFirstChildWithName(CRYPTO)) == null) {
// no children. Hence, prop file shud have been defined
+ if ((cryptoElement =
+ cryptoPropertiesElem.getFirstChildWithName(CRYPTO)) == null) {
// no children. Hence, prop file should have been defined
this.cryptoPropertiesFile = cryptoPropertiesElem.getText().trim();
}
// else Props should be defined as children of a crypto element
Modified:
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenIssuerUtil.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenIssuerUtil.java?view=diff&rev=556420&r1=556419&r2=556420
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenIssuerUtil.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenIssuerUtil.java
Sun Jul 15 08:54:33 2007
@@ -107,8 +107,8 @@
if (TokenIssuerUtil.ENCRYPTED_KEY.equals(config.proofKeyType)) {
WSSecEncryptedKey encrKeyBuilder = new WSSecEncryptedKey();
Crypto crypto;
- if (config.cryptoPropertiesElement != null) { // crypto props
defined as elements
- crypto =
CryptoFactory.getInstance(TrustUtil.toProperties(config.cryptoPropertiesElement),
+ if (config.cryptoElement != null) { // crypto props defined as
elements
+ crypto =
CryptoFactory.getInstance(TrustUtil.toProperties(config.cryptoElement),
data.getInMessageContext().
getAxisService().getClassLoader());
} else { // crypto props defined in a properties file
