You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2008/12/27 18:03:27 UTC
svn commit: r729642 - in /synapse/trunk/java: ./
modules/core/src/main/java/org/apache/synapse/util/
modules/core/src/main/java/org/apache/synapse/util/jaxp/
modules/core/src/test/java/org/apache/synapse/mediators/transform/
modules/extensions/ modules...
Author: veithen
Date: Sat Dec 27 09:03:26 2008
New Revision: 729642
URL: http://svn.apache.org/viewvc?rev=729642&view=rev
Log:
Eliminated usage of Spring-WS's StaxSource. Rationale: StaxSource is implemented on top of SAXSource and transforms a sequence of StAX events into SAX events. Axiom now has an OMSource that directly produces SAX events from an Axiom tree and this can be used instead of StaxSource.
Removed:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/SpringStaxSourceBuilder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/SpringStaxSourceBuilderFactory.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/AXIOMUtils.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
synapse/trunk/java/modules/extensions/pom.xml
synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/format/syslog/SyslogMessageBuilderTest.java
synapse/trunk/java/pom.xml
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/AXIOMUtils.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/AXIOMUtils.java?rev=729642&r1=729641&r2=729642&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/AXIOMUtils.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/AXIOMUtils.java Sat Dec 27 09:03:26 2008
@@ -25,7 +25,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.dom.NodeImpl;
-import org.springframework.xml.transform.StaxSource;
+import org.apache.axiom.om.impl.jaxp.OMSource;
/**
* Utility class with AXIOM helper methods.
@@ -41,12 +41,11 @@
* schema validators, etc.
*/
public static Source asSource(OMNode node) {
+ // Note: Once we depend on JDK 1.6, we could also use StAXSource from JAXP 1.4.
if (node instanceof NodeImpl) {
return new DOMSource((NodeImpl)node);
} else {
- // We use Spring's StaxSource for the transformation source. Once we depend
- // on JDK 1.6, we can replace this by StAXSource from JAXP 1.4.
- return new StaxSource(((OMElement)node).getXMLStreamReader());
+ return new OMSource((OMElement)node);
}
}
}
Modified: synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java?rev=729642&r1=729641&r2=729642&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java (original)
+++ synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java Sat Dec 27 09:03:26 2008
@@ -42,7 +42,6 @@
import org.apache.synapse.util.jaxp.AXIOMSourceBuilderFactory;
import org.apache.synapse.util.jaxp.DOOMResultBuilderFactory;
import org.apache.synapse.util.jaxp.DOOMSourceBuilderFactory;
-import org.apache.synapse.util.jaxp.SpringStaxSourceBuilderFactory;
import org.apache.synapse.util.jaxp.StreamResultBuilderFactory;
import org.apache.synapse.util.jaxp.StreamSourceBuilderFactory;
import org.apache.synapse.util.xpath.SynapseXPath;
@@ -51,7 +50,6 @@
public class XSLTMediatorTest extends TestCase {
private static final Class[] sourceBuilderFactories = {
DOOMSourceBuilderFactory.class,
- SpringStaxSourceBuilderFactory.class,
StreamSourceBuilderFactory.class,
AXIOMSourceBuilderFactory.class };
Modified: synapse/trunk/java/modules/extensions/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/pom.xml?rev=729642&r1=729641&r2=729642&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/pom.xml (original)
+++ synapse/trunk/java/modules/extensions/pom.xml Sat Dec 27 09:03:26 2008
@@ -113,6 +113,21 @@
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
<version>${xbean.version}</version>
@@ -295,4 +310,8 @@
<version>SNAPSHOT</version>
</dependency>-->
</dependencies>
+
+ <properties>
+ <spring.version>1.2.8</spring.version>
+ </properties>
</project>
Modified: synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/format/syslog/SyslogMessageBuilderTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/format/syslog/SyslogMessageBuilderTest.java?rev=729642&r1=729641&r2=729642&view=diff
==============================================================================
--- synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/format/syslog/SyslogMessageBuilderTest.java (original)
+++ synapse/trunk/java/modules/extensions/src/test/java/org/apache/synapse/format/syslog/SyslogMessageBuilderTest.java Sat Dec 27 09:03:26 2008
@@ -30,9 +30,9 @@
import junit.framework.TestCase;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.impl.jaxp.OMSource;
import org.apache.axis2.context.MessageContext;
import org.apache.commons.lang.ObjectUtils;
-import org.springframework.xml.transform.StaxSource;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -94,7 +94,7 @@
throw exception;
}
});
- validator.validate(new StaxSource(element.getXMLStreamReader()));
+ validator.validate(new OMSource(element));
String pidString = element.getAttributeValue(new QName(SyslogConstants.PID));
return new SyslogMessage(element.getAttributeValue(new QName(SyslogConstants.FACILITY)),
element.getAttributeValue(new QName(SyslogConstants.SEVERITY)),
Modified: synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=729642&r1=729641&r2=729642&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Sat Dec 27 09:03:26 2008
@@ -845,26 +845,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-xml</artifactId>
- <version>${springws.version}</version>
- </dependency>
</dependencies>
@@ -1010,8 +990,6 @@
<wso2commons.version>1.2</wso2commons.version>
<wso2caching.version>1.6.1</wso2caching.version>
<wso2throttle.version>1.6</wso2throttle.version>
- <spring.version>1.2.8</spring.version>
- <springws.version>1.5.2</springws.version>
<xbean.version>2.2.0</xbean.version>
<bsf.version>3.0-beta2</bsf.version>
<groovy.version>1.0</groovy.version>