activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r746263 - in /activemq/trunk: ./ activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/ activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/ activemq-camel/src/main/java/org/apache/activemq/...
Date Fri, 20 Feb 2009 14:52:37 GMT
Author: jstrachan
Date: Fri Feb 20 14:52:36 2009
New Revision: 746263

URL: http://svn.apache.org/viewvc?rev=746263&view=rev
Log:
Fix for AMQ-2130 to upgrade to Camel 2.0

Modified:
    activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/LoadTest-context.xml
    activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerConsumeTest-context.xml
    activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerLoadTest-context.xml
    activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerParallelProducerLoadTest-context.xml
    activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/CamelMessageProducer.java
    activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/CamelEndpointLoader.java
    activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalComponent.java
    activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalEndpoint.java
    activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelEmbeddedBrokerTestSupport.java
    activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelJmsTest.java
    activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java
    activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/BrowseQueuesInUFace.java
    activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/SetHeaderTest-context.xml
    activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/component/BrowseQueuesInUFace-context.xml
    activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-duplex.xml
    activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-duplex.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/LoadTest-context.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/LoadTest-context.xml?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/LoadTest-context.xml
(original)
+++ activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/LoadTest-context.xml
Fri Feb 20 14:52:36 2009
@@ -20,11 +20,11 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
        http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
     ">
 
-  <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+  <camelContext xmlns="http://camel.apache.org/schema/spring">
 
     <route>
       <!-- sends messages every 10 milliseconds -->

Modified: activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerConsumeTest-context.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerConsumeTest-context.xml?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerConsumeTest-context.xml
(original)
+++ activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerConsumeTest-context.xml
Fri Feb 20 14:52:36 2009
@@ -20,11 +20,11 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
        http://activemq.org/config/1.0 http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd
     ">
 
-  <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+  <camelContext xmlns="http://camel.apache.org/schema/spring">
 
     <route>
       <from uri="activemq:TEST?concurrentConsumers=1"/>

Modified: activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerLoadTest-context.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerLoadTest-context.xml?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerLoadTest-context.xml
(original)
+++ activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerLoadTest-context.xml
Fri Feb 20 14:52:36 2009
@@ -20,11 +20,11 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
        http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
     ">
 
-  <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+  <camelContext xmlns="http://camel.apache.org/schema/spring">
 
     <route>
       <from uri="dataset:myDataSet"/>

Modified: activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerParallelProducerLoadTest-context.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerParallelProducerLoadTest-context.xml?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerParallelProducerLoadTest-context.xml
(original)
+++ activemq/trunk/activemq-camel-loadtest/src/test/resources/org/apache/activemq/soaktest/localBroker/LocalBrokerParallelProducerLoadTest-context.xml
Fri Feb 20 14:52:36 2009
@@ -20,11 +20,11 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
        http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
     ">
 
-  <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+  <camelContext xmlns="http://camel.apache.org/schema/spring">
 
     <route>
       <from uri="dataset:myDataSet?preloadSize=50000"/>

Modified: activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/CamelMessageProducer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/CamelMessageProducer.java?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/CamelMessageProducer.java
(original)
+++ activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/CamelMessageProducer.java
Fri Feb 20 14:52:36 2009
@@ -80,7 +80,7 @@
 
     public void send(Destination destination, Message message, int deliveryMode, int priority,
long timeToLive) throws JMSException {
         CamelDestination camelDestination = null;
-        if (ObjectHelper.equals(destination, this.destination)) {
+        if (ObjectHelper.equal(destination, this.destination)) {
             camelDestination = this.destination;
         } else {
             // TODO support any CamelDestination?

Modified: activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/CamelEndpointLoader.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/CamelEndpointLoader.java?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/CamelEndpointLoader.java
(original)
+++ activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/CamelEndpointLoader.java
Fri Feb 20 14:52:36 2009
@@ -148,7 +148,7 @@
         String queueUri = getQueueUri(queue);
         ActiveMQComponent jmsComponent = getComponent();
         Endpoint endpoint = new JmsQueueEndpoint(queueUri, jmsComponent, queue.getPhysicalName(),
jmsComponent.getConfiguration());
-        camelContext.addSingletonEndpoint(queueUri, endpoint);
+        camelContext.addEndpoint(queueUri, endpoint);
     }
 
     protected String getQueueUri(ActiveMQQueue queue) {
@@ -157,6 +157,6 @@
 
     protected void removeQueue(ActiveMQQueue queue) throws Exception {
         String queueUri = getQueueUri(queue);
-        camelContext.removeSingletonEndpoint(queueUri);
+        camelContext.removeEndpoints(queueUri);
     }
 }

Modified: activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalComponent.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalComponent.java?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalComponent.java
(original)
+++ activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalComponent.java
Fri Feb 20 14:52:36 2009
@@ -28,10 +28,10 @@
  *
  * @version $Revision$
  */
-public class JournalComponent extends DefaultComponent<Exchange> {
+public class JournalComponent extends DefaultComponent {
 
     @Override
-    protected Endpoint<Exchange> createEndpoint(String uri, String remaining, Map parameters)
throws Exception {        
+    protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws
Exception {        
         JournalEndpoint endpoint = new JournalEndpoint(uri, this, new File(remaining));
         setProperties(endpoint, parameters);
         return endpoint;

Modified: activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalEndpoint.java?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalEndpoint.java
(original)
+++ activemq/trunk/activemq-camel/src/main/java/org/apache/activemq/camel/component/JournalEndpoint.java
Fri Feb 20 14:52:36 2009
@@ -39,12 +39,12 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-public class JournalEndpoint extends DefaultEndpoint<Exchange> {
+public class JournalEndpoint extends DefaultEndpoint {
 
     private static final transient Log LOG = LogFactory.getLog(JournalEndpoint.class);
 
     private final File directory;
-    private final AtomicReference<DefaultConsumer<Exchange>> consumer = new AtomicReference<DefaultConsumer<Exchange>>();
+    private final AtomicReference<DefaultConsumer> consumer = new AtomicReference<DefaultConsumer>();
     private final Object activationMutex = new Object();
     private int referenceCount;
     private AsyncDataManager dataManager;
@@ -72,8 +72,8 @@
         return directory;
     }
 
-    public Consumer<Exchange> createConsumer(Processor processor) throws Exception
{
-        return new DefaultConsumer<Exchange>(this, processor) {
+    public Consumer createConsumer(Processor processor) throws Exception {
+        return new DefaultConsumer(this, processor) {
             @Override
             public void start() throws Exception {
                 super.start();
@@ -115,7 +115,7 @@
         }
     }
 
-    protected void deactivateConsumer(DefaultConsumer<Exchange> consumer) throws IOException
{
+    protected void deactivateConsumer(DefaultConsumer consumer) throws IOException {
         synchronized (activationMutex) {
             if (this.consumer.get() != consumer) {
                 throw new RuntimeCamelException("Consumer was not active.");
@@ -130,7 +130,7 @@
         }
     }
 
-    protected void activateConsumer(DefaultConsumer<Exchange> consumer) throws IOException
{
+    protected void activateConsumer(DefaultConsumer consumer) throws IOException {
         synchronized (activationMutex) {
             if (this.consumer.get() != null) {
                 throw new RuntimeCamelException("Consumer already active: journal endpoints
only support 1 active consumer");
@@ -151,7 +151,7 @@
 
     protected void dispatchToConsumer() {
         try {
-            DefaultConsumer<Exchange> consumer;
+            DefaultConsumer consumer;
             while ((consumer = this.consumer.get()) != null) {
                 // See if there is a new record to process
                 Location location = dataManager.getNextLocation(lastReadLocation);
@@ -184,8 +184,8 @@
         }
     }
 
-    public Producer<Exchange> createProducer() throws Exception {
-        return new DefaultProducer<Exchange>(this) {
+    public Producer createProducer() throws Exception {
+        return new DefaultProducer(this) {
             public void process(Exchange exchange) throws Exception {
                 incrementReference();
                 try {

Modified: activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelEmbeddedBrokerTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelEmbeddedBrokerTestSupport.java?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelEmbeddedBrokerTestSupport.java
(original)
+++ activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelEmbeddedBrokerTestSupport.java
Fri Feb 20 14:52:36 2009
@@ -23,7 +23,7 @@
 
 import org.apache.activemq.EmbeddedBrokerTestSupport;
 import org.apache.camel.CamelContext;
-import org.apache.camel.CamelTemplate;
+import org.apache.camel.ProducerTemplate;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -37,7 +37,7 @@
  */
 public abstract class CamelEmbeddedBrokerTestSupport extends EmbeddedBrokerTestSupport {
     protected CamelContext camelContext;
-    protected CamelTemplate<Exchange> template;
+    protected ProducerTemplate template;
                            
     @Override
     protected void setUp() throws Exception {
@@ -47,7 +47,7 @@
         addCamelRoutes(camelContext);
         assertValidContext(camelContext);
         camelContext.start();
-        template = new CamelTemplate<Exchange>(camelContext);
+        template = camelContext.createProducerTemplate();
         template.start();
     }
 

Modified: activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelJmsTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelJmsTest.java?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelJmsTest.java
(original)
+++ activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/CamelJmsTest.java
Fri Feb 20 14:52:36 2009
@@ -29,7 +29,7 @@
 import junit.framework.Assert;
 
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.CamelTemplate;
+import org.apache.camel.ProducerTemplate;
 import org.apache.camel.impl.DefaultProducerTemplate;
 import org.apache.camel.spring.SpringTestSupport;
 import org.apache.commons.logging.Log;

Modified: activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java
(original)
+++ activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/ActiveMQConfigureTest.java
Fri Feb 20 14:52:36 2009
@@ -37,7 +37,7 @@
         JmsEndpoint endpoint = resolveMandatoryEndpoint("activemq:test.foo");
         JmsProducer producer = endpoint.createProducer();
 
-        JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getTemplate());
+        JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getInOutTemplate());
         assertEquals("pubSubDomain", false, template.isPubSubDomain());
         assertIsInstanceOf(PooledConnectionFactory.class, template.getConnectionFactory());
     }
@@ -46,7 +46,7 @@
         JmsEndpoint endpoint = resolveMandatoryEndpoint("activemq:test.foo?useSingleConnection=true");
         JmsProducer producer = endpoint.createProducer();
 
-        JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getTemplate());
+        JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getInOutTemplate());
         assertEquals("pubSubDomain", false, template.isPubSubDomain());
         SingleConnectionFactory connectionFactory = assertIsInstanceOf(SingleConnectionFactory.class,
template.getConnectionFactory());
         assertIsInstanceOf(ActiveMQConnectionFactory.class, connectionFactory.getTargetConnectionFactory());
@@ -56,7 +56,7 @@
         JmsEndpoint endpoint = resolveMandatoryEndpoint("activemq:test.foo?usePooledConnection=false");
         JmsProducer producer = endpoint.createProducer();
 
-        JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getTemplate());
+        JmsTemplate template = assertIsInstanceOf(JmsTemplate.class, producer.getInOutTemplate());
         assertEquals("pubSubDomain", false, template.isPubSubDomain());
         assertIsInstanceOf(ActiveMQConnectionFactory.class, template.getConnectionFactory());
     }

Modified: activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/BrowseQueuesInUFace.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/BrowseQueuesInUFace.java?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/BrowseQueuesInUFace.java
(original)
+++ activemq/trunk/activemq-camel/src/test/java/org/apache/activemq/camel/component/BrowseQueuesInUFace.java
Fri Feb 20 14:52:36 2009
@@ -20,7 +20,7 @@
 import org.apache.activemq.camel.SetHeaderTest;
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.uface.swing.SwingBrowser;
-import org.apache.camel.CamelTemplate;
+import org.apache.camel.ProducerTemplate;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -37,7 +37,7 @@
     @Autowired
     protected CamelContext camelContext;
     @Autowired
-    protected CamelTemplate template;
+    protected ProducerTemplate template;
     protected String[] queueNames = {"Sample.A", "Sample.B", "Sample.C"};
 
     public void testBrowseQueues() throws Exception {

Modified: activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/SetHeaderTest-context.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/SetHeaderTest-context.xml?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/SetHeaderTest-context.xml
(original)
+++ activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/SetHeaderTest-context.xml
Fri Feb 20 14:52:36 2009
@@ -20,10 +20,10 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-  <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+  <camelContext xmlns="http://camel.apache.org/schema/spring">
     <route>
       <from uri="file://src/test/data?noop=true"/>
       <to uri="activemq:testQ-input"/>

Modified: activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/component/BrowseQueuesInUFace-context.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/component/BrowseQueuesInUFace-context.xml?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/component/BrowseQueuesInUFace-context.xml
(original)
+++ activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/component/BrowseQueuesInUFace-context.xml
Fri Feb 20 14:52:36 2009
@@ -20,10 +20,10 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-  <camelContext xmlns="http://activemq.apache.org/camel/schema/spring">
+  <camelContext xmlns="http://camel.apache.org/schema/spring">
     <template id="camelTemplate"/>
   </camelContext>
 

Modified: activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml
(original)
+++ activemq/trunk/activemq-camel/src/test/resources/org/apache/activemq/camel/spring.xml
Fri Feb 20 14:52:36 2009
@@ -19,11 +19,11 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+       http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
   <!-- START SNIPPET: example -->
-  <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
+  <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
     <beanPostProcessor/>
     
   </camelContext>

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml
(original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/memory/activemq.xml
Fri Feb 20 14:52:36 2009
@@ -21,7 +21,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
-  http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
+  http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   <!-- Allows us to use system properties as variables in this configuration file -->
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-duplex.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-duplex.xml?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-duplex.xml
(original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/receiver-duplex.xml
Fri Feb 20 14:52:36 2009
@@ -20,7 +20,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://activemq.org/config/1.0 http://activemq.apache.org/schema/activemq-core.xsd
-  http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
+  http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   <!-- Allows us to use system properties as variables in this configuration file -->
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

Modified: activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-duplex.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-duplex.xml?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-duplex.xml
(original)
+++ activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/usecases/sender-duplex.xml
Fri Feb 20 14:52:36 2009
@@ -20,7 +20,7 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://activemq.org/config/1.0 http://activemq.apache.org/schema/activemq-core.xsd
-  http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd">
+  http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
   <!-- Allows us to use system properties as variables in this configuration file -->
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=746263&r1=746262&r2=746263&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Feb 20 14:52:36 2009
@@ -42,7 +42,7 @@
     <aopalliance-version>1.0</aopalliance-version>
     <axion-version>1.0-M3-dev</axion-version>
     <axis-version>1.2-RC1</axis-version>
-    <camel-version>1.6.0</camel-version>
+    <camel-version>2.0-SNAPSHOT</camel-version>
     <cglib-version>2.0</cglib-version>
     <commons-beanutils-version>1.6.1</commons-beanutils-version>
     <commons-collections-version>3.1</commons-collections-version>
@@ -395,6 +395,12 @@
         <artifactId>camel-jms</artifactId>
         <version>${camel-version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-web</artifactId>
+        <version>${camel-version}</version>
+        <type>war</type>
+      </dependency>
       
       <dependency>
         <groupId>org.apache.hadoop.zookeeper</groupId>
@@ -407,22 +413,18 @@
       <dependency>
         <groupId>javax.xml.bind</groupId>
         <artifactId>jaxb-api</artifactId>
-        <version>2.0</version>
+        <version>2.1</version>
         <exclusions>
           <exclusion>
             <groupId>javax.xml</groupId>
             <artifactId>jsr173</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
         <groupId>com.sun.xml.bind</groupId>
         <artifactId>jaxb-impl</artifactId>
-        <version>2.0.3</version>
+        <version>2.1.6</version>
         <exclusions>
           <exclusion>
             <groupId>javax.jws</groupId>



Mime
View raw message