camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r790845 - in /camel/trunk: apache-camel/src/main/descriptors/ camel-core/src/test/java/org/apache/camel/component/seda/ camel-core/src/test/java/org/apache/camel/processor/aggregator/ components/camel-bam/src/main/java/org/apache/camel/bam/...
Date Fri, 03 Jul 2009 10:17:52 GMT
Author: davsclaus
Date: Fri Jul  3 10:17:51 2009
New Revision: 790845

URL: http://svn.apache.org/viewvc?rev=790845&view=rev
Log:
CAMEL-1762, CAMEL-1790: Get rid of some jars in lib/optional in dist. Get rid of commons-io
depdendency. Fixed camel-bam. Fixed some examples. Fixed some unit tests reported by TC.

Removed:
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConsumerStartStopTest.java
Modified:
    camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
    camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java
    camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
    camel/trunk/components/camel-cxf/pom.xml
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapBindingTest.java
    camel/trunk/components/camel-http/pom.xml
    camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
    camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
    camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
    camel/trunk/components/camel-jpa/pom.xml
    camel/trunk/components/camel-quartz/pom.xml
    camel/trunk/examples/camel-example-bam/pom.xml
    camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
    camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
    camel/trunk/examples/camel-example-etl/pom.xml
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/pom.xml
    camel/trunk/tests/camel-itest/pom.xml
    camel/trunk/tooling/maven/camel-maven-plugin/pom.xml
    camel/trunk/tooling/maven/guice-maven-plugin/pom.xml

Modified: camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Fri Jul  3 10:17:51 2009
@@ -111,18 +111,12 @@
       <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
-        <include>${pom.groupId}:apache-activemq</include>
-        <include>commons-beanutils:commons-beanutils</include>
-        <include>commons-collections:commons-collections</include>
         <include>commons-httpclient:commons-httpclient</include>
-        <include>commons-dbcp:commons-dbcp</include>
-        <include>commons-pool:commons-pool</include>
         <include>log4j:log4j</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
         <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
-        <include>org.apache.xbean:xbean-spring</include>        
       </includes>
     </dependencySet>
   </dependencySets>

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateTimeoutOnlyTest.java
Fri Jul  3 10:17:51 2009
@@ -32,7 +32,7 @@
         // by default the use latest aggregatation strategy is used so we get message 9
         result.expectedBodiesReceived("Message 9");
         // should take 3 seconds to complete this one
-        result.setMinimumResultWaitTime(2900);
+        result.setMinimumResultWaitTime(2500);
 
         for (int i = 0; i < 10; i++) {
             template.sendBodyAndHeader("direct:start", "Message " + i, "id", "1");

Modified: camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
(original)
+++ camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
Fri Jul  3 10:17:51 2009
@@ -30,6 +30,7 @@
 import org.apache.camel.bam.rules.ProcessRules;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.util.ObjectHelper;
 import org.springframework.orm.jpa.JpaTemplate;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
@@ -45,14 +46,17 @@
 public abstract class ProcessBuilder extends RouteBuilder {
     private static int processCounter;
     private JpaTemplate jpaTemplate;
-    private final TransactionTemplate transactionTemplate;
-    private final String processName;
+    private TransactionTemplate transactionTemplate;
+    private String processName;
     private List<ActivityBuilder> activityBuilders = new ArrayList<ActivityBuilder>();
     private Class entityType = ProcessInstance.class;
     private ProcessRules processRules = new ProcessRules();
     private ProcessDefinition processDefinition;
     private ActivityMonitorEngine engine;
 
+    protected ProcessBuilder() {
+    }
+
     protected ProcessBuilder(JpaTemplate jpaTemplate, TransactionTemplate transactionTemplate)
{
         this(jpaTemplate, transactionTemplate, createProcessName());
     }
@@ -117,6 +121,10 @@
         return transactionTemplate;
     }
 
+    public void setTransactionTemplate(TransactionTemplate transactionTemplate) {
+        this.transactionTemplate = transactionTemplate;
+    }
+
     public ProcessRules getProcessRules() {
         return processRules;
     }
@@ -139,6 +147,8 @@
     // Implementation methods
     // -------------------------------------------------------------------------
     protected void populateRoutes() throws Exception {
+        ObjectHelper.notNull(getJpaTemplate(), "jpaTemplate", this);
+        ObjectHelper.notNull(getTransactionTemplate(), "transactionTemplate", this);
 
         // lets add the monitoring service - should there be an easier way??
         if (engine == null) {

Modified: camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Fri Jul  3 10:17:51 2009
@@ -82,12 +82,7 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-spring</artifactId>
     </dependency>
-    
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    
+       
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging-api</artifactId>

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
(original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/interceptors/RawMessageContentRedirectInterceptor.java
Fri Jul  3 10:17:51 2009
@@ -20,13 +20,15 @@
 import java.io.OutputStream;
 import java.util.List;
 
-import org.apache.commons.io.IOUtils;
+import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ObjectHelper;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 
 public class RawMessageContentRedirectInterceptor extends AbstractPhaseInterceptor<Message>
{
+
     public RawMessageContentRedirectInterceptor() {
         super(Phase.WRITE);
     }
@@ -47,11 +49,12 @@
         OutputStream os = message.getContent(OutputStream.class);
 
         try {
-            IOUtils.copy(is, os);
-            is.close();
-            os.flush();
+            IOHelper.copy(is, os);
         } catch (Exception e) {
             throw new Fault(e);
+        } finally {
+            ObjectHelper.close(is, "input stream", null);
+            ObjectHelper.close(os, "output stream", null);
         }
     }
 }

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
(original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
Fri Jul  3 10:17:51 2009
@@ -30,7 +30,7 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.io.IOUtils;
+import org.apache.camel.util.IOHelper;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.binding.soap.SoapFault;
@@ -127,7 +127,7 @@
         OutputStream out = urlConnection.getOutputStream();
         // copy the message out
         InputStream is = this.getClass().getResourceAsStream("SimpleSoapRequest.xml");
-        IOUtils.copy(is, out);
+        IOHelper.copy(is, out);
         out.flush();
         is.close();
         // check the response code        

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapBindingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapBindingTest.java?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapBindingTest.java
(original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapBindingTest.java
Fri Jul  3 10:17:51 2009
@@ -28,7 +28,7 @@
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.spi.HeaderFilterStrategy;
-import org.apache.commons.io.IOUtils;
+import org.apache.camel.util.IOHelper;
 import org.apache.cxf.io.CachedOutputStream;
 import org.apache.cxf.staxutils.StaxUtils;
 import org.junit.Assert;
@@ -78,7 +78,7 @@
     private String toString(InputStream is) throws IOException {
         StringBuilder out = new StringBuilder();
         CachedOutputStream os = new CachedOutputStream();
-        IOUtils.copy(is, os);
+        IOHelper.copy(is, os);
         is.close();
         os.writeCacheTo(out);
         return out.toString();

Modified: camel/trunk/components/camel-http/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/pom.xml?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/components/camel-http/pom.xml (original)
+++ camel/trunk/components/camel-http/pom.xml Fri Jul  3 10:17:51 2009
@@ -50,13 +50,6 @@
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
       <version>${httpclient-version}</version>
-      <optional>false</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <optional>false</optional>
     </dependency>
 
     <!-- testing -->

Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
(original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpPollingConsumer.java
Fri Jul  3 10:17:51 2009
@@ -22,6 +22,8 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.util.IOHelper;
+import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.component.http.helper.LoadingByteArrayOutputStream;
 import org.apache.camel.impl.PollingConsumerSupport;
 import org.apache.camel.spi.HeaderFilterStrategy;
@@ -29,7 +31,6 @@
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.io.IOUtils;
 
 /**
  * A polling HTTP consumer which by default performs a GET
@@ -64,10 +65,10 @@
             LoadingByteArrayOutputStream bos = new LoadingByteArrayOutputStream();
             InputStream is = method.getResponseBodyAsStream();
             try {
-                IOUtils.copy(is, bos);
+                IOHelper.copy(is, bos);
                 bos.flush();
             } finally {
-                is.close();
+                ObjectHelper.close(is, "input stream", null);
             }
             Message message = exchange.getIn();
             message.setBody(bos.createInputStream());

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
(original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
Fri Jul  3 10:17:51 2009
@@ -25,7 +25,6 @@
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 
 public class InterfacesTest extends CamelTestSupport {
@@ -60,17 +59,17 @@
         getMockEndpoint("mock:endpoint").expectedMessageCount(expectedMessages);
         
         URL localUrl = new URL("http://localhost:4567/testRoute");
-        String localResponse = IOUtils.toString(localUrl.openStream());
+        String localResponse = context.getTypeConverter().convertTo(String.class, localUrl.openStream());
         assertEquals("local", localResponse);
 
         // 127.0.0.1 is an alias of localhost so should work
         localUrl = new URL("http://127.0.0.1:4568/testRoute");
-        localResponse = IOUtils.toString(localUrl.openStream());
+        localResponse = context.getTypeConverter().convertTo(String.class, localUrl.openStream());
         assertEquals("local-differentPort", localResponse);
         
         if (remoteInterfaceAddress != null) {
             URL url = new URL("http://" + remoteInterfaceAddress + ":4567/testRoute");
-            String remoteResponse = IOUtils.toString(url.openStream());
+            String remoteResponse = context.getTypeConverter().convertTo(String.class, url.openStream());
             assertEquals("remote", remoteResponse);
         }
         
@@ -83,12 +82,12 @@
         getMockEndpoint("mock:endpoint").expectedMessageCount(expectedMessages);
         
         URL localUrl = new URL("http://localhost:4569/allInterfaces");
-        String localResponse = IOUtils.toString(localUrl.openStream());
+        String localResponse = context.getTypeConverter().convertTo(String.class, localUrl.openStream());
         assertEquals("allInterfaces", localResponse);
         
         if (remoteInterfaceAddress != null) {
             URL url = new URL("http://" + remoteInterfaceAddress + ":4569/allInterfaces");
-            String remoteResponse = IOUtils.toString(url.openStream());
+            String remoteResponse = context.getTypeConverter().convertTo(String.class, url.openStream());
             assertEquals("allInterfaces", remoteResponse);
         }
         

Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
(original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProducerWithJMSHeaderTest.java
Fri Jul  3 10:17:51 2009
@@ -95,7 +95,8 @@
         // sleep just a little
         Thread.sleep(2000);
 
-        Exchange bar = consumer.receiveNoWait("activemq:queue:bar");
+        // use timeout in case running on slow box
+        Exchange bar = consumer.receive("activemq:queue:bar", 10000);
         assertNotNull("Should be a message on queue", bar);
 
         template.send("activemq:queue:foo", bar);
@@ -112,7 +113,7 @@
         template.sendBodyAndHeader("activemq:queue:bar?preserveMessageQos=true", "Hello World",
"JMSExpiration", ttl);
 
         // sleep more so the message is expired
-        Thread.sleep(3000);
+        Thread.sleep(5000);
 
         Exchange bar = consumer.receiveNoWait("activemq:queue:bar");
         assertNull("Should NOT be a message on queue", bar);
@@ -175,7 +176,7 @@
         template.sendBodyAndHeaders("activemq:queue:bar?preserveMessageQos=true", "Hello
World", headers);
 
         // sleep more so the message is expired
-        Thread.sleep(3000);
+        Thread.sleep(5000);
 
         Exchange bar = consumer.receiveNoWait("activemq:queue:bar");
         assertNull("Should NOT be a message on queue", bar);

Modified: camel/trunk/components/camel-jpa/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/pom.xml?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/pom.xml (original)
+++ camel/trunk/components/camel-jpa/pom.xml Fri Jul  3 10:17:51 2009
@@ -83,11 +83,13 @@
     <dependency>
       <groupId>commons-dbcp</groupId>
       <artifactId>commons-dbcp</artifactId>
+      <version>1.2.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
+      <version>3.2.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: camel/trunk/components/camel-quartz/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/pom.xml?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/pom.xml (original)
+++ camel/trunk/components/camel-quartz/pom.xml Fri Jul  3 10:17:51 2009
@@ -57,6 +57,7 @@
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
         </dependency>
 
         <!-- testing -->

Modified: camel/trunk/examples/camel-example-bam/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/pom.xml?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-bam/pom.xml (original)
+++ camel/trunk/examples/camel-example-bam/pom.xml Fri Jul  3 10:17:51 2009
@@ -72,14 +72,6 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jta_1.1_spec</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
 
     <!-- testing -->
     <dependency>

Modified: camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
(original)
+++ camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/MyActivities.java
Fri Jul  3 10:17:51 2009
@@ -32,6 +32,9 @@
 // START SNIPPET: demo
 public class MyActivities extends ProcessBuilder {
 
+    public MyActivities() {
+    }
+
     public MyActivities(JpaTemplate jpaTemplate, TransactionTemplate transactionTemplate)
{
         super(jpaTemplate, transactionTemplate);
     }

Modified: camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
(original)
+++ camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/spring/camel-context.xml
Fri Jul  3 10:17:51 2009
@@ -24,36 +24,41 @@
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
-  <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-    <package>org.apache.camel.example.bam</package>
-  </camelContext>
+    <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+        <routeBuilder ref="activities"/>
+    </camelContext>
+
+    <!-- the builder with our activities -->
+    <bean id="activities" class="org.apache.camel.example.bam.MyActivities">
+        <property name="jpaTemplate" ref="jpaTemplate"/>
+        <property name="transactionTemplate" ref="transactionTemplate"/>
+    </bean>
+
+    <bean id="transactionTemplate" class="org.springframework.transaction.support.TransactionTemplate">
+        <property name="transactionManager">
+            <bean class="org.springframework.orm.jpa.JpaTransactionManager">
+                <property name="entityManagerFactory" ref="entityManagerFactory"/>
+            </bean>
+        </property>
+    </bean>
 
-
-  <bean id="transactionTemplate" class="org.springframework.transaction.support.TransactionTemplate">
-    <property name="transactionManager">
-      <bean class="org.springframework.orm.jpa.JpaTransactionManager">
+    <bean id="jpaTemplate" class="org.springframework.orm.jpa.JpaTemplate">
         <property name="entityManagerFactory" ref="entityManagerFactory"/>
-      </bean>
-    </property>
-  </bean>
-
-  <bean id="jpaTemplate" class="org.springframework.orm.jpa.JpaTemplate">
-    <property name="entityManagerFactory" ref="entityManagerFactory"/>
-  </bean>
-
-  <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
-    <property name="persistenceUnitName" value="bam"/>
-  </bean>
-
-  <!-- let's show a simple UI to browse the database -->
-  <bean id="databaseExplorer" class="org.apache.camel.spring.util.MainRunner" lazy-init="false">
-    <property name="main" value="org.hsqldb.util.DatabaseManagerSwing"/>
-    <property name="args">
-      <list>
-        <value>--url</value>
-        <value>jdbc:hsqldb:mem:camel_bam</value>
-      </list>
-    </property>
-    <property name="delay" value="1000"/>
-  </bean>
+    </bean>
+
+    <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
+        <property name="persistenceUnitName" value="bam"/>
+    </bean>
+
+    <!-- let's show a simple UI to browse the database -->
+    <bean id="databaseExplorer" class="org.apache.camel.spring.util.MainRunner" lazy-init="false">
+        <property name="main" value="org.hsqldb.util.DatabaseManagerSwing"/>
+        <property name="args">
+            <list>
+                <value>--url</value>
+                <value>jdbc:hsqldb:mem:camel_bam</value>
+            </list>
+        </property>
+        <property name="delay" value="1000"/>
+    </bean>
 </beans>

Modified: camel/trunk/examples/camel-example-etl/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/pom.xml?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-etl/pom.xml (original)
+++ camel/trunk/examples/camel-example-etl/pom.xml Fri Jul  3 10:17:51 2009
@@ -76,14 +76,6 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jta_1.1_spec</artifactId>
     </dependency>
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
 
     <!-- testing -->
     <dependency>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Jul  3 10:17:51 2009
@@ -500,6 +500,9 @@
         <artifactId>commons-logging</artifactId>
         <version>${commons-logging-version}</version>
       </dependency>
+
+      <!-- TODO not needed as parent dependency -->
+<!--
       <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
@@ -520,6 +523,7 @@
         <artifactId>commons-io</artifactId>
         <version>${commons-io-version}</version>
       </dependency>
+-->
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Fri Jul  3 10:17:51 2009
@@ -44,7 +44,6 @@
       <commons-dbcp-bundle-version>1.2.2_3</commons-dbcp-bundle-version>
       <commons-csv-version>1.0-r706899_1</commons-csv-version>
       <commons-httpclient-bundle-version>3.1_1</commons-httpclient-bundle-version>
-      <commons-io-bundle-version>1.3.2_1</commons-io-bundle-version>
       <commons-jxpath-version>1.3</commons-jxpath-version>
       <commons-lang-version>2.4</commons-lang-version>
       <commons-net-version>2.0</commons-net-version>

Modified: camel/trunk/tests/camel-itest/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/pom.xml (original)
+++ camel/trunk/tests/camel-itest/pom.xml Fri Jul  3 10:17:51 2009
@@ -154,11 +154,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <scope>test</scope>

Modified: camel/trunk/tooling/maven/camel-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/camel-maven-plugin/pom.xml?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/tooling/maven/camel-maven-plugin/pom.xml (original)
+++ camel/trunk/tooling/maven/camel-maven-plugin/pom.xml Fri Jul  3 10:17:51 2009
@@ -90,11 +90,5 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
 
-    <!-- TODO: do we need all these? -->
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-	
   </dependencies>
 </project>

Modified: camel/trunk/tooling/maven/guice-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/maven/guice-maven-plugin/pom.xml?rev=790845&r1=790844&r2=790845&view=diff
==============================================================================
--- camel/trunk/tooling/maven/guice-maven-plugin/pom.xml (original)
+++ camel/trunk/tooling/maven/guice-maven-plugin/pom.xml Fri Jul  3 10:17:51 2009
@@ -87,11 +87,5 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
 
-    <!-- TODO: do we need all these? -->
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-	
   </dependencies>
 </project>



Mime
View raw message