Author: ruwan Date: Thu Apr 30 23:26:17 2009 New Revision: 34561 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=34561
Log: sync up with the synapse trunk (except for the synapse transports multiple jars) Removed: branches/synapse/1.3-wso2v1/modules/transports/src/main/java/org/apache/synapse/transport/amqp/ Modified: branches/synapse/1.3-wso2v1/modules/core/ (props changed) branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMResultBuilder.java branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMSourceBuilder.java branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilder.java branches/synapse/1.3-wso2v1/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java branches/synapse/1.3-wso2v1/modules/distribution/ (props changed) branches/synapse/1.3-wso2v1/modules/experimental/ (props changed) branches/synapse/1.3-wso2v1/modules/extensions/ (props changed) branches/synapse/1.3-wso2v1/modules/handler/ (props changed) branches/synapse/1.3-wso2v1/modules/packaging/package-archetype/ (props changed) branches/synapse/1.3-wso2v1/modules/packaging/package-skeleton/ (props changed) branches/synapse/1.3-wso2v1/modules/samples/ (props changed) branches/synapse/1.3-wso2v1/modules/tasks/ (props changed) branches/synapse/1.3-wso2v1/modules/transports/ (props changed) branches/synapse/1.3-wso2v1/modules/transports/pom.xml branches/synapse/1.3-wso2v1/modules/utils/ (props changed) branches/synapse/1.3-wso2v1/modules/war/ (props changed) branches/synapse/1.3-wso2v1/modules/xar-maven-plugin/ (props changed) branches/synapse/1.3-wso2v1/pom.xml Modified: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java?rev=34561&r1=34560&r2=34561&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java (original) +++ branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java Thu Apr 30 23:26:17 2009 @@ -27,8 +27,6 @@ import java.net.URLConnection; import java.net.URLStreamHandler; -import org.apache.commons.lang.StringUtils; - public final class ClasspathURLStreamHandler extends URLStreamHandler { public URLConnection openConnection(URL url) { @@ -44,8 +42,8 @@ public void connect() {} public InputStream getInputStream() throws IOException { - if (StringUtils.isNotEmpty(url.getHost())) { - throw new MalformedURLException("No host expected in classpath URLs"); + if (url != null && url.getHost() != null) { + throw new MalformedURLException("No host available in classpath URLs"); } InputStream is = ClasspathURLStreamHandler.class.getClassLoader().getResourceAsStream(url.getFile()); if (is == null) { Modified: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMResultBuilder.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMResultBuilder.java?rev=34561&r1=34560&r2=34561&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMResultBuilder.java (original) +++ branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMResultBuilder.java Thu Apr 30 23:26:17 2009 @@ -21,25 +21,21 @@ import java.nio.charset.Charset; -import javax.xml.transform.Result; -import javax.xml.transform.sax.SAXResult; - import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.builder.SAXOMBuilder; +import org.apache.axiom.om.impl.jaxp.OMResult; /** - * {...@link ResultBuilder} implementation that relies on {...@link SAXResult} and - * {...@link SAXOMBuilder}. + * {...@link ResultBuilder} implementation that relies on {...@link OMResult}. */ public class AXIOMResultBuilder implements ResultBuilder { - private final SAXOMBuilder builder = new SAXOMBuilder(); + private final OMResult result = new OMResult(); - public Result getResult() { - return new SAXResult(builder); + public OMResult getResult() { + return result; } public OMElement getNode(Charset charset) { - return builder.getRootElement(); + return result.getRootElement(); } public void release() { Modified: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMSourceBuilder.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMSourceBuilder.java?rev=34561&r1=34560&r2=34561&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMSourceBuilder.java (original) +++ branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/AXIOMSourceBuilder.java Thu Apr 30 23:26:17 2009 @@ -19,8 +19,6 @@ package org.apache.synapse.util.jaxp; -import javax.xml.transform.Source; - import org.apache.axiom.om.OMElement; import org.apache.axiom.om.impl.jaxp.OMSource; @@ -29,7 +27,7 @@ * using {...@link OMSource}. */ public class AXIOMSourceBuilder implements SourceBuilder { - public Source getSource(OMElement node) { + public OMSource getSource(OMElement node) { return new OMSource(node); } Modified: branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilder.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilder.java?rev=34561&r1=34560&r2=34561&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilder.java (original) +++ branches/synapse/1.3-wso2v1/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilder.java Thu Apr 30 23:26:17 2009 @@ -27,7 +27,7 @@ import org.apache.axiom.om.OMAbstractFactory; import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.dom.jaxp.DocumentBuilderFactoryImpl; +import org.apache.axiom.om.impl.dom.jaxp.DOOMDocumentBuilderFactory; import org.apache.axiom.om.util.ElementHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -45,11 +45,8 @@ private Document document; public Result getResult() { - // TODO: this changes some system properties; see if we can avoid this - // or at least reset the properties afterwards - DocumentBuilderFactoryImpl.setDOOMRequired(true); try { - document = DocumentBuilderFactoryImpl.newInstance().newDocumentBuilder().newDocument(); + document = new DOOMDocumentBuilderFactory().newDocumentBuilder().newDocument(); } catch (ParserConfigurationException e) { handleException("Unable to create empty DOOM document", e); } Modified: branches/synapse/1.3-wso2v1/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java?rev=34561&r1=34560&r2=34561&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java (original) +++ branches/synapse/1.3-wso2v1/modules/core/src/test/java/org/apache/synapse/mediators/transform/XSLTMediatorTest.java Thu Apr 30 23:26:17 2009 @@ -19,10 +19,6 @@ package org.apache.synapse.mediators.transform; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - import javax.xml.namespace.QName; import javax.xml.transform.TransformerFactory; @@ -77,30 +73,24 @@ return suite; } - private static Set<String> testsToExclude = new HashSet<String>( - Arrays.asList("testSaxonDOOMSourceDOOMResult", "testSaxonDOOMSourceStreamResult", - "testSaxonDOOMSourceAXIOMResult")); - private static void addGenericTests(TestSuite suite, final String processorName, final Class<? extends TransformerFactory> transformerFactoryClass) { for (final Class sbf : sourceBuilderFactories) { for (final Class rbf : resultBuilderFactories) { String testName = "test" + processorName + shortName(sbf) + shortName(rbf); - if (!testsToExclude.contains(testName)) { - suite.addTest(new TestCase(testName) { - @Override - public void runTest() throws Throwable { - String oldTransformerFactory = - TransformerFactory.newInstance().getClass().getName(); - System.setProperty(TransformerFactory.class.getName(), - transformerFactoryClass.getName()); - test(sbf, rbf); - System.setProperty(TransformerFactory.class.getName(), - oldTransformerFactory); - } - }); - } + suite.addTest(new TestCase(testName) { + @Override + public void runTest() throws Throwable { + String oldTransformerFactory = + TransformerFactory.newInstance().getClass().getName(); + System.setProperty(TransformerFactory.class.getName(), + transformerFactoryClass.getName()); + test(sbf, rbf); + System.setProperty(TransformerFactory.class.getName(), + oldTransformerFactory); + } + }); } } } Modified: branches/synapse/1.3-wso2v1/modules/transports/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/modules/transports/pom.xml?rev=34561&r1=34560&r2=34561&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/modules/transports/pom.xml (original) +++ branches/synapse/1.3-wso2v1/modules/transports/pom.xml Thu Apr 30 23:26:17 2009 @@ -255,26 +255,6 @@ </dependency> <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-common</artifactId> - <version>${qpid.version}</version> - <exclusions> - <!-- Exclude commons-configuration because the transitive - depedency on DOM4J causes problems. Anyway it is not - really used and has disappeared in recent snapshots. --> - <exclusion> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.qpid</groupId> - <artifactId>qpid-client</artifactId> - <version>${qpid.version}</version> - </dependency> - - <dependency> <groupId>de.schlichtherle.io</groupId> <artifactId>truezip</artifactId> <version>${truezip.version}</version> Modified: branches/synapse/1.3-wso2v1/pom.xml URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.3-wso2v1/pom.xml?rev=34561&r1=34560&r2=34561&view=diff ============================================================================== --- branches/synapse/1.3-wso2v1/pom.xml (original) +++ branches/synapse/1.3-wso2v1/pom.xml Thu Apr 30 23:26:17 2009 @@ -679,12 +679,11 @@ <version>${saxon.version}</version> </dependency> - <!--commons-cli <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> <version>${commons-cli.version}</version> - </dependency--> + </dependency> <!--dependency> <groupId>commons-lang</groupId> @@ -885,7 +884,6 @@ <bsf.version>3.0-beta2</bsf.version> <groovy.version>1.1-rc-1</groovy.version> <servlet-api.version>2.3</servlet-api.version> - <qpid.version>1.0-incubating-M3-615355</qpid.version> <commons-lang.version>2.4</commons-lang.version> </properties> @@ -988,15 +986,15 @@ <developer> <name>Asankha Perera</name> <id>asankha</id> - <email>asankha AT apache.com</email> + <email>asankha AT apache.org</email> <organization>AdroitLogic</organization> <url>http://adroitlogic.org</url> </developer> <developer> <name>Upul Godage</name> <id>upul</id> - <email>upul AT wso2.com</email> - <organization>WSO2</organization> + <email>upul AT apache.org</email> + <organization>Apache</organization> </developer> <developer> <name>Oleg Kalnichevski</name> _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
