Author: veithen
Date: Mon Sep 29 12:04:48 2008
New Revision: 700212
URL: http://svn.apache.org/viewvc?rev=700212&view=rev
Log:
SYNAPSE-417: Enabled the build of the AMQP transport again. This is basically a
revert of revision 682032. Also changed the import statements in the AMQP code
to the new package names of the transport base classes.
Modified:
synapse/trunk/java/modules/transports/pom.xml
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPSender.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPUtils.java
synapse/trunk/java/pom.xml
Modified: synapse/trunk/java/modules/transports/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/pom.xml?rev=700212&r1=700211&r2=700212&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/pom.xml (original)
+++ synapse/trunk/java/modules/transports/pom.xml Mon Sep 29 12:04:48 2008
@@ -39,17 +39,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <excludes>
- <exclude>org/apache/synapse/transport/amqp/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3</version>
<configuration>
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPListener.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPListener.java?rev=700212&r1=700211&r2=700212&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPListener.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPListener.java
Mon Sep 29 12:04:48 2008
@@ -13,15 +13,10 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.ParameterIncludeImpl;
import org.apache.axis2.description.TransportInDescription;
+import org.apache.axis2.transport.base.AbstractTransportListener;
+import org.apache.axis2.transport.base.BaseUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.qpidity.nclient.Client;
-import org.apache.qpidity.nclient.Connection;
-import org.apache.synapse.transport.base.AbstractTransportListener;
-import org.apache.synapse.transport.base.BaseUtils;
-import org.apache.synapse.transport.jms.JMSConnectionFactory;
-import org.apache.synapse.transport.jms.JMSConstants;
-import org.apache.synapse.transport.jms.JMSUtils;
public class AMQPListener extends AbstractTransportListener
{
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPSender.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPSender.java?rev=700212&r1=700211&r2=700212&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPSender.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPSender.java
Mon Sep 29 12:04:48 2008
@@ -15,6 +15,10 @@
import org.apache.axis2.transport.MessageFormatter;
import org.apache.axis2.transport.OutTransportInfo;
import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.transport.base.AbstractTransportSender;
+import org.apache.axis2.transport.base.BaseConstants;
+import org.apache.axis2.transport.base.BaseUtils;
+import org.apache.axis2.transport.jms.JMSUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.qpidity.api.Message;
@@ -26,10 +30,6 @@
import org.apache.qpidity.transport.MessageProperties;
import org.apache.qpidity.transport.Option;
import org.apache.qpidity.transport.ReplyTo;
-import org.apache.synapse.transport.base.AbstractTransportSender;
-import org.apache.synapse.transport.base.BaseConstants;
-import org.apache.synapse.transport.base.BaseUtils;
-import org.apache.synapse.transport.jms.JMSUtils;
public class AMQPSender extends AbstractTransportSender {
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPUtils.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPUtils.java?rev=700212&r1=700211&r2=700212&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPUtils.java
(original)
+++
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/amqp/AMQPUtils.java
Mon Sep 29 12:04:48 2008
@@ -17,12 +17,10 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.ParameterIncludeImpl;
+import org.apache.axis2.transport.base.BaseUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.qpidity.api.Message;
-import org.apache.synapse.transport.base.BaseUtils;
-import org.apache.synapse.transport.jms.JMSConnectionFactory;
-import org.apache.synapse.transport.jms.JMSConstants;
public class AMQPUtils extends BaseUtils
{
Modified: synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=700212&r1=700211&r2=700212&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Mon Sep 29 12:04:48 2008
@@ -1135,18 +1135,6 @@
<updatePolicy>daily</updatePolicy>
</snapshots>
</repository>
- <!-- this is for qpid -->
- <repository>
- <id>apache-incubating</id>
- <name>Apache Maven 2 Incubating Repository</name>
- <url>http://people.apache.org/repo/m2-incubating-repository/</url>
- <releases>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <updatePolicy>interval:60</updatePolicy>
- </snapshots>
- </repository>
</repositories>
<modules>
@@ -1229,7 +1217,7 @@
<bsf.version>3.0-beta2</bsf.version>
<groovy.version>1.0</groovy.version>
<servlet-api.version>2.3</servlet-api.version>
- <qpid.version>1.0-incubating-M2.1</qpid.version>
+ <qpid.version>1.0-incubating-M3-615355</qpid.version>
</properties>
