camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r917874 - in /camel/trunk/components/camel-cometd: pom.xml src/main/java/org/apache/camel/component/cometd/CometdConsumer.java src/main/java/org/apache/camel/component/cometd/CometdProducer.java
Date Tue, 02 Mar 2010 04:44:46 GMT
Author: ningjiang
Date: Tue Mar  2 04:44:46 2010
New Revision: 917874

URL: http://svn.apache.org/viewvc?rev=917874&view=rev
Log:
CAMEL-2531 Upgraded the jetty cometd version to last Jetty 6.1.x version.

Modified:
    camel/trunk/components/camel-cometd/pom.xml
    camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
    camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java

Modified: camel/trunk/components/camel-cometd/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/pom.xml?rev=917874&r1=917873&r2=917874&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/pom.xml (original)
+++ camel/trunk/components/camel-cometd/pom.xml Tue Mar  2 04:44:46 2010
@@ -46,14 +46,13 @@
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
-            <version>${cometd-bayeux-version}</version>
         </dependency>
         <dependency>
             <groupId>org.mortbay.jetty</groupId>
-            <artifactId>cometd-bayeux</artifactId>
-            <version>${cometd-bayeux-version}</version>
+            <artifactId>cometd-server</artifactId>
+            <version>${jetty-version}</version>
         </dependency>
-
+        
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>

Modified: camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java?rev=917874&r1=917873&r2=917874&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
(original)
+++ camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
Tue Mar  2 04:44:46 2010
@@ -16,13 +16,13 @@
  */
 package org.apache.camel.component.cometd;
 
-import dojox.cometd.Bayeux;
-import dojox.cometd.Client;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.impl.DefaultConsumer;
 import org.apache.camel.impl.DefaultMessage;
+import org.cometd.Bayeux;
+import org.cometd.Client;
 import org.mortbay.cometd.AbstractBayeux;
 import org.mortbay.cometd.BayeuxService;
 

Modified: camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java?rev=917874&r1=917873&r2=917874&view=diff
==============================================================================
--- camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
(original)
+++ camel/trunk/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdProducer.java
Tue Mar  2 04:44:46 2010
@@ -18,12 +18,12 @@
 
 import java.util.Collection;
 
-import dojox.cometd.Client;
 import org.apache.camel.Exchange;
 import org.apache.camel.impl.DefaultProducer;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.cometd.Client;
 import org.mortbay.cometd.AbstractBayeux;
 
 /**



Mime
View raw message