You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by as...@apache.org on 2009/04/30 08:05:43 UTC

svn commit: r770080 - in /synapse/trunk/java: modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java modules/transports/pom.xml modules/transports/src/main/java/org/apache/synapse/transport/amqp/ pom.xml

Author: asankha
Date: Thu Apr 30 06:05:41 2009
New Revision: 770080

URL: http://svn.apache.org/viewvc?rev=770080&view=rev
Log:
remove AMQP transport and dependencies on QPID as per discussion on the dev list

Removed:
    synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/
Modified:
    synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java
    synapse/trunk/java/modules/transports/pom.xml
    synapse/trunk/java/pom.xml

Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java?rev=770080&r1=770079&r2=770080&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/ClasspathURLStreamHandler.java Thu Apr 30 06:05:41 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: synapse/trunk/java/modules/transports/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/pom.xml?rev=770080&r1=770079&r2=770080&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/pom.xml (original)
+++ synapse/trunk/java/modules/transports/pom.xml Thu Apr 30 06:05:41 2009
@@ -249,26 +249,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: synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=770080&r1=770079&r2=770080&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Thu Apr 30 06:05:41 2009
@@ -653,12 +653,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>
@@ -861,7 +860,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>