Author: veithen
Date: Fri Jul 15 21:53:56 2011
New Revision: 1147331
URL: http://svn.apache.org/viewvc?rev=1147331&view=rev
Log:
Eliminated some references to Axiom implementation classes.
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPath.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContextBuilder.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java?rev=1147331&r1=1147330&r2=1147331&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/EntrySerializer.java
Fri Jul 15 21:53:56 2011
@@ -28,7 +28,6 @@ import org.apache.axiom.om.OMElement;
import org.apache.synapse.config.Entry;
import org.apache.synapse.SynapseException;
import org.apache.synapse.SynapseConstants;
-import org.apache.axiom.om.impl.llom.OMTextImpl;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
@@ -81,9 +80,8 @@ public class EntrySerializer {
} else if (type == Entry.INLINE_TEXT) {
Object value = entry.getValue();
if (value != null && value instanceof String) {
- OMTextImpl textData = (OMTextImpl) fac.createOMText(((String)
value).trim());
- textData.setType(XMLStreamConstants.CDATA);
- entryElement.addChild(textData);
+ entryElement.addChild(fac.createOMText(((String) value).trim(),
+ XMLStreamConstants.CDATA));
}
} else if (type == Entry.REMOTE_ENTRY) {
// nothing to serialize
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java?rev=1147331&r1=1147330&r2=1147331&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
Fri Jul 15 21:53:56 2011
@@ -26,7 +26,6 @@ import org.apache.axiom.om.OMOutputForma
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.ds.OMDataSourceExtBase;
import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
-import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.util.blob.OverflowBlob;
@@ -57,7 +56,7 @@ public class TextFileDataSource extends
public static OMSourcedElement createOMSourcedElement(OverflowBlob
overflowBlob, Charset charset) {
OMFactory fac = OMAbstractFactory.getOMFactory();
TextFileDataSource txtFileDS = new TextFileDataSource(overflowBlob,
charset);
- return new OMSourcedElementImpl(BaseConstants.DEFAULT_TEXT_WRAPPER,
fac, txtFileDS);
+ return fac.createOMElement(txtFileDS,
BaseConstants.DEFAULT_TEXT_WRAPPER);
}
@Override
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPath.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPath.java?rev=1147331&r1=1147330&r2=1147331&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPath.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/xpath/SynapseXPath.java
Fri Jul 15 21:53:56 2011
@@ -20,11 +20,10 @@
package org.apache.synapse.util.xpath;
import org.apache.axiom.om.OMAttribute;
+import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.impl.llom.OMDocumentImpl;
-import org.apache.axiom.om.impl.llom.OMElementImpl;
-import org.apache.axiom.om.impl.llom.OMTextImpl;
+import org.apache.axiom.om.OMText;
import org.apache.axiom.om.xpath.AXIOMXPath;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.commons.logging.Log;
@@ -186,21 +185,21 @@ public class SynapseXPath extends AXIOMX
return null;
}
- if (o instanceof OMTextImpl) {
- textValue.append(((OMTextImpl) o).getText());
- } else if (o instanceof OMElementImpl) {
+ if (o instanceof OMText) {
+ textValue.append(((OMText) o).getText());
+ } else if (o instanceof OMElement) {
- String s = ((OMElementImpl) o).getText();
+ String s = ((OMElement) o).getText();
if (s.trim().length() == 0) {
s = o.toString();
}
textValue.append(s);
- } else if (o instanceof OMDocumentImpl) {
+ } else if (o instanceof OMDocument) {
textValue.append(
- ((OMDocumentImpl)
o).getOMDocumentElement().toString());
+ ((OMDocument)
o).getOMDocumentElement().toString());
} else if (o instanceof OMAttribute) {
textValue.append(
((OMAttribute) o).getAttributeValue());
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContextBuilder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContextBuilder.java?rev=1147331&r1=1147330&r2=1147331&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContextBuilder.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/TestMessageContextBuilder.java
Fri Jul 15 21:53:56 2011
@@ -33,11 +33,11 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.synapse.config.Entry;
@@ -139,7 +139,7 @@ public class TestMessageContextBuilder {
SOAPEnvelope envelope;
if (parser != null) {
if (contentIsEnvelope) {
- envelope = new StAXSOAPModelBuilder(parser).getSOAPEnvelope();
+ envelope =
OMXMLBuilderFactory.createStAXSOAPModelBuilder(parser).getSOAPEnvelope();
} else {
envelope =
OMAbstractFactory.getSOAP11Factory().getDefaultEnvelope();
@@ -148,7 +148,7 @@ public class TestMessageContextBuilder {
omDoc.addChild(envelope);
SOAPBody body = envelope.getBody();
- StAXOMBuilder builder = new StAXOMBuilder(parser);
+ OMXMLParserWrapper builder =
OMXMLBuilderFactory.createStAXOMBuilder(parser);
OMElement bodyElement = builder.getDocumentElement();
if (addTextAroundBody) {
OMFactory fac = OMAbstractFactory.getOMFactory();
