Author: veithen
Date: Sat Jul 16 07:58:43 2011
New Revision: 1147375
URL: http://svn.apache.org/viewvc?rev=1147375&view=rev
Log:
Consistently use the API defined by AXIOM-353 so that one can use non standard
Axiom implementations with Synapse.
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilder.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LocalEntryConfigurationTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java?rev=1147375&r1=1147374&r2=1147375&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
Sat Jul 16 07:58:43 2011
@@ -21,7 +21,6 @@ package org.apache.synapse.config;
import org.apache.axiom.om.*;
import org.apache.axiom.om.util.AXIOMUtil;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.logging.Log;
@@ -198,7 +197,7 @@ public class SynapseConfigUtils {
try {
XMLStreamReader parser = XMLInputFactory.newInstance().
createXMLStreamReader(inputStream);
- StAXOMBuilder builder = new StAXOMBuilder(parser);
+ OMXMLParserWrapper builder =
OMXMLBuilderFactory.createStAXOMBuilder(parser);
OMElement omElem = builder.getDocumentElement();
// detach from URL connection and keep in memory
@@ -286,7 +285,7 @@ public class SynapseConfigUtils {
}
InputStream inStream = connection.getInputStream();
try {
- StAXOMBuilder builder = new StAXOMBuilder(inStream);
+ OMXMLParserWrapper builder =
OMXMLBuilderFactory.createOMBuilder(inStream);
OMElement doc = builder.getDocumentElement();
doc.build();
return doc;
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java?rev=1147375&r1=1147374&r2=1147375&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
Sat Jul 16 07:58:43 2011
@@ -20,7 +20,8 @@
package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -452,10 +453,10 @@ public class MultiXMLConfigurationBuilde
}
try {
- document = new StAXOMBuilder(is).getDocumentElement();
+ document =
OMXMLBuilderFactory.createOMBuilder(is).getDocumentElement();
document.build();
is.close();
- } catch (XMLStreamException e) {
+ } catch (OMException e) {
handleException("Error while parsing the content of the file: " +
file.getName(), e);
} catch (IOException e) {
log.warn("Error while closing the input stream from the file: " +
file.getName(), e);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java?rev=1147375&r1=1147374&r2=1147375&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigurationBuilder.java
Sat Jul 16 07:58:43 2011
@@ -23,7 +23,6 @@ import java.io.InputStream;
import java.util.Properties;
import org.apache.axiom.om.*;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.config.SynapseConfiguration;
@@ -42,7 +41,7 @@ public class XMLConfigurationBuilder {
log.info("Generating the Synapse configuration model by parsing the
XML configuration");
- OMElement definitions = new StAXOMBuilder(is).getDocumentElement();
+ OMElement definitions =
OMXMLBuilderFactory.createOMBuilder(is).getDocumentElement();
definitions.build();
return ConfigurationFactoryAndSerializerFinder.getInstance()
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java?rev=1147375&r1=1147374&r2=1147375&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/AbstractSynapseArtifactDeployer.java
Sat Jul 16 07:58:43 2011
@@ -21,8 +21,7 @@ package org.apache.synapse.deployers;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.deployment.AbstractDeployer;
import org.apache.axis2.deployment.DeploymentException;
@@ -40,7 +39,6 @@ import org.apache.synapse.SynapseConstan
import org.apache.synapse.config.SynapseConfiguration;
import org.apache.synapse.core.SynapseEnvironment;
-import javax.xml.stream.XMLStreamException;
import java.io.*;
import java.util.Properties;
@@ -122,8 +120,7 @@ public abstract class AbstractSynapseArt
try {
// construct the xml element from the file, it has to be XML,
// since all synapse artifacts are XML based
- OMElement element = new StAXOMBuilder(
-
StAXUtils.createXMLStreamReader(in)).getDocumentElement();
+ OMElement element =
OMXMLBuilderFactory.createOMBuilder(in).getDocumentElement();
Properties properties = new Properties();
properties.put(SynapseConstants.RESOLVE_ROOT,
getSynapseEnvironment()
.getServerContextInformation()
@@ -170,9 +167,6 @@ public abstract class AbstractSynapseArt
} catch (IOException ex) {
handleDeploymentError("Deployment of synapse artifact failed.
Error reading "
+ filename + " : " + ex.getMessage(), ex, filename);
- } catch (XMLStreamException ex) {
- handleDeploymentError("Deployment of synapse artifact failed.
Error parsing "
- + filename + " : " + ex.getMessage(), ex, filename);
} catch (OMException ex) {
handleDeploymentError("Deployment of synapse artifact failed.
Error parsing "
+ filename + " : " + ex.getMessage(), ex, filename);
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java?rev=1147375&r1=1147374&r2=1147375&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/registry/url/SimpleURLRegistry.java
Sat Jul 16 07:58:43 2011
@@ -20,7 +20,6 @@
package org.apache.synapse.registry.url;
import org.apache.axiom.om.*;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseConstants;
@@ -91,7 +90,7 @@ public class SimpleURLRegistry extends A
XMLStreamReader parser = XMLInputFactory.newInstance().
createXMLStreamReader(inputStream);
- StAXOMBuilder builder = new StAXOMBuilder(parser);
+ OMXMLParserWrapper builder =
OMXMLBuilderFactory.createStAXOMBuilder(parser);
result = builder.getDocumentElement();
} catch (OMException ignored) {
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java?rev=1147375&r1=1147374&r2=1147375&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/PayloadHelper.java
Sat Jul 16 07:58:43 2011
@@ -31,7 +31,8 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
-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.SOAP11Version;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -298,7 +299,7 @@ public class PayloadHelper {
}
public static void setStAXPayload(SOAPEnvelope envelope,
XMLStreamReader streamReader) {
- StAXOMBuilder builder = new
StAXOMBuilder(envelope.getOMFactory(), streamReader);
+ OMXMLParserWrapper builder =
OMXMLBuilderFactory.createStAXOMBuilder(envelope.getOMFactory(), streamReader);
OMElement el = builder.getDocumentElement();
setXMLPayload(envelope, el);
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilder.java?rev=1147375&r1=1147374&r2=1147375&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilder.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/StreamResultBuilder.java
Sat Jul 16 07:58:43 2011
@@ -20,9 +20,8 @@
package org.apache.synapse.util.jaxp;
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.util.StAXUtils;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axiom.util.blob.OverflowBlob;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -82,9 +81,9 @@ public class StreamResultBuilder impleme
return null;
}
if (expectedOutput == ResultBuilderFactory.Output.SOAP_ENVELOPE) {
- return new StAXSOAPModelBuilder(reader).getSOAPEnvelope();
+ return
OMXMLBuilderFactory.createStAXSOAPModelBuilder(reader).getSOAPEnvelope();
} else {
- return new StAXOMBuilder(reader).getDocumentElement();
+ return
OMXMLBuilderFactory.createStAXOMBuilder(reader).getDocumentElement();
}
}
}
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LocalEntryConfigurationTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LocalEntryConfigurationTest.java?rev=1147375&r1=1147374&r2=1147375&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LocalEntryConfigurationTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LocalEntryConfigurationTest.java
Sat Jul 16 07:58:43 2011
@@ -20,8 +20,9 @@
package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.util.AXIOMUtil;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.synapse.config.Entry;
import javax.xml.stream.XMLStreamException;
@@ -353,7 +354,7 @@ public class LocalEntryConfigurationTest
xmlInFac.setProperty("javax.xml.stream.isCoalescing", false);
XMLStreamReader parser = xmlInFac.createXMLStreamReader(strReader);
- StAXOMBuilder builder = new StAXOMBuilder(parser);
+ OMXMLParserWrapper builder =
OMXMLBuilderFactory.createStAXOMBuilder(parser);
return builder.getDocumentElement();
}
}
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java?rev=1147375&r1=1147374&r2=1147375&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/SendMediatorSerializationTest.java
Sat Jul 16 07:58:43 2011
@@ -19,8 +19,9 @@
package org.apache.synapse.config.xml;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.synapse.mediators.builtin.SendMediator;
import org.apache.synapse.endpoints.LoadbalanceEndpoint;
import org.apache.synapse.endpoints.AddressEndpoint;
@@ -278,7 +279,7 @@ public class SendMediatorSerializationTe
try {
XMLStreamReader reader =
XMLInputFactory.newInstance().createXMLStreamReader(new StringReader(xml));
- StAXOMBuilder builder = new StAXOMBuilder(reader);
+ OMXMLParserWrapper builder =
OMXMLBuilderFactory.createStAXOMBuilder(reader);
OMElement omElement = builder.getDocumentElement();
return omElement;
