Author: ruchithf
Date: Tue Nov 29 19:15:00 2011
New Revision: 1208030
URL: http://svn.apache.org/viewvc?rev=1208030&view=rev
Log:
Replacing deprecated DOOMAbstractFactory with OMAbstractFactory
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Token.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenRenewer.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Token.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Token.java?rev=1208030&r1=1208029&r2=1208030&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Token.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Token.java
Tue Nov 29 19:15:00 2011
@@ -16,35 +16,33 @@
package org.apache.rahas;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.util.XmlSchemaDateFormat;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import java.io.ByteArrayInputStream;
import java.io.Externalizable;
import java.io.IOException;
-import java.io.InputStream;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.Reader;
import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
import java.text.DateFormat;
import java.text.ParseException;
import java.util.Date;
import java.util.Properties;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.util.XmlSchemaDateFormat;
+
/**
* This represents a security token which can have either one of 4 states.
<ul> <li>ISSUED</li> <li>EXPIRED</li>
* <li>CACELLED</li> <li>RENEWED</li> </ul> Also this holds the
<code>OMElement</code>s representing the token in its
@@ -144,8 +142,9 @@ public class Token implements Externaliz
public Token(String id, OMElement tokenElem, Date created, Date expires)
throws TrustException {
this.id = id;
- StAXOMBuilder stAXOMBuilder =
- new StAXOMBuilder(DOOMAbstractFactory.getOMFactory(),
tokenElem.getXMLStreamReader());
+ OMMetaFactory metaFactory =
OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM);
+ StAXOMBuilder stAXOMBuilder =
+ new StAXOMBuilder(metaFactory.getOMFactory(),
tokenElem.getXMLStreamReader());
stAXOMBuilder.setNamespaceURIInterning(true);
this.token = stAXOMBuilder.getDocumentElement();
this.created = created;
@@ -155,8 +154,9 @@ public class Token implements Externaliz
public Token(String id, OMElement tokenElem, OMElement lifetimeElem)
throws TrustException {
this.id = id;
+ OMMetaFactory metaFactory =
OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM);
StAXOMBuilder stAXOMBuilder =
- new StAXOMBuilder(DOOMAbstractFactory.getOMFactory(),
tokenElem.getXMLStreamReader());
+ new StAXOMBuilder(metaFactory.getOMFactory(),
tokenElem.getXMLStreamReader());
stAXOMBuilder.setNamespaceURIInterning(true);
this.token = stAXOMBuilder.getDocumentElement();
this.processLifeTime(lifetimeElem);
@@ -258,7 +258,8 @@ public class Token implements Externaliz
* @param presivousToken The presivousToken to set.
*/
public void setPreviousToken(OMElement presivousToken) {
- this.previousToken = new
StAXOMBuilder(DOOMAbstractFactory.getOMFactory(),
presivousToken.getXMLStreamReader())
+ OMMetaFactory metaFactory =
OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM);
+ this.previousToken = new StAXOMBuilder(metaFactory.getOMFactory(),
presivousToken.getXMLStreamReader())
.getDocumentElement();
}
@@ -288,8 +289,9 @@ public class Token implements Externaliz
*/
public void setAttachedReference(OMElement attachedReference) {
if (attachedReference != null) {
+ OMMetaFactory metaFactory =
OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM);
this.attachedReference =
- new StAXOMBuilder(DOOMAbstractFactory.getOMFactory(),
attachedReference.getXMLStreamReader())
+ new StAXOMBuilder(metaFactory.getOMFactory(),
attachedReference.getXMLStreamReader())
.getDocumentElement();
}
}
@@ -306,8 +308,9 @@ public class Token implements Externaliz
*/
public void setUnattachedReference(OMElement unattachedReference) {
if (unattachedReference != null) {
+ OMMetaFactory metaFactory =
OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM);
this.unattachedReference =
- new StAXOMBuilder(DOOMAbstractFactory.getOMFactory(),
unattachedReference.getXMLStreamReader())
+ new StAXOMBuilder(metaFactory.getOMFactory(),
unattachedReference.getXMLStreamReader())
.getDocumentElement();
}
}
@@ -474,7 +477,8 @@ public class Token implements Externaliz
OMElement documentElement = builder.getDocumentElement();
XMLStreamReader llomReader = documentElement.getXMLStreamReader();
- OMFactory doomFactory = DOOMAbstractFactory.getOMFactory();
+ OMMetaFactory metaFactory =
OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM);
+ OMFactory doomFactory = metaFactory.getOMFactory();
StAXOMBuilder doomBuilder = new StAXOMBuilder(doomFactory,
llomReader);
return doomBuilder.getDocumentElement();
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java?rev=1208030&r1=1208029&r2=1208030&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
Tue Nov 29 19:15:00 2011
@@ -16,16 +16,25 @@
package org.apache.rahas;
+import java.security.SecureRandom;
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
+import javax.xml.namespace.QName;
+
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.addressing.AddressingConstants;
-import org.apache.axis2.context.MessageContext;
import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.context.MessageContext;
import org.apache.rahas.impl.AbstractIssuerConfig;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.message.token.Reference;
@@ -38,15 +47,6 @@ import org.opensaml.saml2.core.SubjectCo
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import javax.xml.namespace.QName;
-
-import java.security.SecureRandom;
-import java.text.DateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-import java.util.Iterator;
-
public class TrustUtil {
private static final QName NAME = new QName("name");
@@ -426,11 +426,12 @@ public class TrustUtil {
* @return SOAPEnvelope
*/
public static SOAPEnvelope createSOAPEnvelope(String nsUri) {
+ OMMetaFactory domFac =
OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM);
if (nsUri != null
&& SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI.equals(nsUri)) {
- return DOOMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
+ return domFac.getSOAP11Factory().getDefaultEnvelope();
} else {
- return DOOMAbstractFactory.getSOAP12Factory().getDefaultEnvelope();
+ return domFac.getSOAP12Factory().getDefaultEnvelope();
}
}
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java?rev=1208030&r1=1208029&r2=1208030&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
Tue Nov 29 19:15:00 2011
@@ -16,13 +16,12 @@
package org.apache.rahas.client;
+import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.apache.axiom.om.util.Base64;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.AddressingConstants;
@@ -55,6 +54,7 @@ import org.apache.ws.security.conversati
import org.apache.ws.security.conversation.dkalgo.P_SHA1;
import org.apache.ws.security.message.token.Reference;
import org.apache.ws.security.processor.EncryptedKeyProcessor;
+import org.apache.ws.security.util.UUIDGenerator;
import org.apache.ws.security.util.WSSecurityUtil;
import org.apache.ws.security.util.XmlSchemaDateFormat;
import org.w3c.dom.Element;
@@ -476,8 +476,9 @@ public class STSClient {
} else if (child.getQName().equals(new QName(ns,
WSConstants.ENC_KEY_LN))) {
try {
Element domChild = (Element) new StAXOMBuilder(
- DOOMAbstractFactory.getOMFactory(), child
- .getXMLStreamReader()).getDocumentElement();
+ OMAbstractFactory.getMetaFactory(
+
OMAbstractFactory.FEATURE_DOM).getOMFactory(),
+ child.getXMLStreamReader()).getDocumentElement();
EncryptedKeyProcessor processor = new
EncryptedKeyProcessor();
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java?rev=1208030&r1=1208029&r2=1208030&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
Tue Nov 29 19:15:00 2011
@@ -19,7 +19,6 @@ package org.apache.rahas.impl;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.dom.jaxp.DocumentBuilderFactoryImpl;
-import org.apache.axiom.om.util.UUIDGenerator;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.Parameter;
@@ -36,6 +35,7 @@ import org.apache.ws.security.components
import org.apache.ws.security.message.WSSecEncryptedKey;
import org.apache.ws.security.util.Base64;
import org.apache.ws.security.util.Loader;
+import org.apache.ws.security.util.UUIDGenerator;
import org.apache.ws.security.util.XmlSchemaDateFormat;
import org.apache.xml.security.c14n.Canonicalizer;
import org.apache.xml.security.signature.XMLSignature;
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenRenewer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenRenewer.java?rev=1208030&r1=1208029&r2=1208030&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenRenewer.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenRenewer.java
Tue Nov 29 19:15:00 2011
@@ -1,6 +1,5 @@
package org.apache.rahas.impl;
-import java.security.PublicKey;
import java.security.cert.X509Certificate;
import java.text.DateFormat;
import java.util.Arrays;
