Author: veithen
Date: Sun Jul 10 21:23:24 2011
New Revision: 1144963
URL: http://svn.apache.org/viewvc?rev=1144963&view=rev
Log:
Merged a couple of changes to the 1.6 branch to take advantage of the API
introduced by AXIOM-353: r1088013, r1088558 and r1088571.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy/model/SecpolicyModelTest.java
Propchange: axis/axis2/java/rampart/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 10 21:23:24 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1087998,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075684,1083686,1087998,1088013,1088558,1088571,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java?rev=1144963&r1=1144962&r2=1144963&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
Sun Jul 10 21:23:24 2011
@@ -21,6 +21,7 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.apache.axiom.soap.SOAP11Constants;
@@ -29,6 +30,7 @@ import org.apache.axiom.soap.SOAPEnvelop
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
+import org.apache.axiom.soap.SOAPModelBuilder;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axiom.soap.impl.dom.SOAPHeaderBlockImpl;
import org.apache.axiom.soap.impl.dom.factory.DOMSOAPFactory;
@@ -41,7 +43,6 @@ import org.w3c.dom.Element;
import javax.xml.namespace.QName;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import java.io.ByteArrayInputStream;
@@ -230,8 +231,8 @@ public class Axis2Util {
}
XMLStreamReader reader = ((OMElement) doc.getDocumentElement())
.getXMLStreamReader();
- StAXSOAPModelBuilder stAXSOAPModelBuilder = new
StAXSOAPModelBuilder(
- reader, null);
+ SOAPModelBuilder stAXSOAPModelBuilder =
OMXMLBuilderFactory.createStAXSOAPModelBuilder(
+ reader);
SOAPEnvelope envelope = stAXSOAPModelBuilder.getSOAPEnvelope();
//Set the processed flag of the processed headers
@@ -258,7 +259,7 @@ public class Axis2Util {
XMLUtils.outputDOM(doc.getDocumentElement(), os, true);
ByteArrayInputStream bais = new
ByteArrayInputStream(os.toByteArray());
- StAXSOAPModelBuilder stAXSOAPModelBuilder = new
StAXSOAPModelBuilder(XMLInputFactory.newInstance().createXMLStreamReader(bais),
null);
+ SOAPModelBuilder stAXSOAPModelBuilder =
OMXMLBuilderFactory.createSOAPModelBuilder(bais, null);
return stAXSOAPModelBuilder.getSOAPEnvelope();
} catch (Exception e) {
throw new WSSecurityException(e.getMessage());
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java?rev=1144963&r1=1144962&r2=1144963&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java
Sun Jul 10 21:23:24 2011
@@ -17,11 +17,11 @@
package org.apache.rampart;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.Options;
import org.apache.axis2.context.ConfigurationContext;
@@ -40,9 +40,7 @@ import org.apache.ws.security.WSConstant
import javax.xml.namespace.QName;
import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
import java.io.FileInputStream;
import java.util.Iterator;
@@ -108,15 +106,13 @@ public class MessageBuilderTestBase exte
options.setAction("urn:testOperation");
ctx.setOptions(options);
- XMLStreamReader reader =
- XMLInputFactory.newInstance().
- createXMLStreamReader(new
FileInputStream(messageResource));
- ctx.setEnvelope(new StAXSOAPModelBuilder(reader,
null).getSOAPEnvelope());
+ ctx.setEnvelope(OMXMLBuilderFactory.createSOAPModelBuilder(
+ new FileInputStream(messageResource), null).getSOAPEnvelope());
return ctx;
}
protected Policy loadPolicy(String xmlPath) throws Exception {
- StAXOMBuilder builder = new StAXOMBuilder(xmlPath);
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(new
FileInputStream(xmlPath));
return PolicyEngine.getPolicy(builder.getDocumentElement());
}
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java?rev=1144963&r1=1144962&r2=1144963&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
Sun Jul 10 21:23:24 2011
@@ -17,13 +17,15 @@
package org.apache.rampart.policy.model;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import javax.xml.namespace.QName;
+import java.io.FileInputStream;
import java.util.Properties;
import junit.framework.TestCase;
@@ -35,7 +37,7 @@ public class RampartPolicyTest extends T
public void testLoadPolicy() throws Exception {
String xmlPath = "test-resources/policy/rampart-policy-1.xml";
- StAXOMBuilder builder = new StAXOMBuilder(xmlPath);
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(new
FileInputStream(xmlPath));
OMElement elem = builder.getDocumentElement();
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy/model/SecpolicyModelTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy/model/SecpolicyModelTest.java?rev=1144963&r1=1144962&r2=1144963&view=diff
==============================================================================
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy/model/SecpolicyModelTest.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy/model/SecpolicyModelTest.java
Sun Jul 10 21:23:24 2011
@@ -17,12 +17,14 @@
package org.apache.ws.secpolicy.model;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.ws.secpolicy.SPConstants;
+import java.io.FileInputStream;
import java.util.Iterator;
import java.util.List;
@@ -71,7 +73,7 @@ public class SecpolicyModelTest extends
}
private Policy getPolicy(String filePath) throws Exception {
- StAXOMBuilder builder = new StAXOMBuilder(filePath);
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(new
FileInputStream(filePath));
OMElement elem = builder.getDocumentElement();
return PolicyEngine.getPolicy(elem);
}
