camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r673336 - in /activemq/camel/trunk: apache-camel/bundle/pom.xml apache-camel/pom.xml examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
Date Wed, 02 Jul 2008 09:59:54 GMT
Author: ningjiang
Date: Wed Jul  2 02:59:53 2008
New Revision: 673336

URL: http://svn.apache.org/viewvc?rev=673336&view=rev
Log:
CAMEL-642 update camel-example-loan-broker code, since we get the bug fixed

Modified:
    activemq/camel/trunk/apache-camel/bundle/pom.xml
    activemq/camel/trunk/apache-camel/pom.xml
    activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java

Modified: activemq/camel/trunk/apache-camel/bundle/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/bundle/pom.xml?rev=673336&r1=673335&r2=673336&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/bundle/pom.xml (original)
+++ activemq/camel/trunk/apache-camel/bundle/pom.xml Wed Jul  2 02:59:53 2008
@@ -232,21 +232,7 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-xstream</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-      <type>test-jar</type>
-      <version>${project.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-spring</artifactId>
-      <type>test-jar</type>
-      <version>${project.version}</version>
-    </dependency>
-
+        
   </dependencies>
 
   <build>
@@ -285,31 +271,17 @@
               <goal>shade</goal>
             </goals>
             <configuration>
+              <artifactSet>
+                <excludes>
+                  <exclude>org.apache.camel:camel-bundle</exclude>
+                  <exclude>org.apache.camel:camel-core:test-jar:tests</exclude>
                 
+                </excludes>
+              </artifactSet> 
               <shadedGroupFilter>org.apache.camel</shadedGroupFilter>
               <shadedArtifactAttached>false</shadedArtifactAttached>
               <createSourcesJar>${createSourcesJar}</createSourcesJar>
               <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
               <createDependencyReducedPom>true</createDependencyReducedPom>
-              <filters>
-                <filter>
-                  <artifact>org.apache.camel:camel-bundle</artifact>
-                  <excludes>
-                    <exclude>org/apache/camel/**</exclude>
-                  </excludes>
-                </filter>
-                <filter>
-                  <artifact>org.apache.camel:camel-core:test</artifact>
-                  <excludes>
-                    <exclude>org/apache/camel/**</exclude>
-                  </excludes>
-                </filter>
-                <filter>
-                  <artifact>org.apache.camel:camel-spring:test</artifact>
-                  <excludes>
-                    <exclude>org/apache/camel/spring/**</exclude>
-                  </excludes>
-                </filter>
-              </filters>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                   <resource>META-INF/spring.handlers</resource>

Modified: activemq/camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/pom.xml?rev=673336&r1=673335&r2=673336&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/pom.xml (original)
+++ activemq/camel/trunk/apache-camel/pom.xml Wed Jul  2 02:59:53 2008
@@ -279,15 +279,7 @@
           <artifactId>camel-manual</artifactId>
         </dependency>
     -->
-
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-core</artifactId>
-      <type>test-jar</type>
-      <version>${project.version}</version>
-      <optional>true</optional>
-    </dependency>
-
+    
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging-api</artifactId>
@@ -300,6 +292,12 @@
     </dependency>
 
     <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <optional>true</optional>      
+    </dependency>
+
+    <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-core</artifactId>
       <optional>true</optional>

Modified: activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java?rev=673336&r1=673335&r2=673336&view=diff
==============================================================================
--- activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
(original)
+++ activemq/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
Wed Jul  2 02:59:53 2008
@@ -85,13 +85,13 @@
         from("test-jms:queue:creditResponseQueue").multicast().to("test-jms:queue:bank1",
"test-jms:queue:bank2", "test-jms:queue:bank3");
 
         // Each bank processor will process the message and put the response message into
the bankReplyQueue
-        from("test-jms:queue:bank1").process(new Bank("bank1")).to("direct:queue:bankReplyQueue");
-        from("test-jms:queue:bank2").process(new Bank("bank2")).to("direct:queue:bankReplyQueue");
-        from("test-jms:queue:bank3").process(new Bank("bank3")).to("direct:queue:bankReplyQueue");
+        from("test-jms:queue:bank1").process(new Bank("bank1")).to("test-jms:queue:bankReplyQueue");
+        from("test-jms:queue:bank2").process(new Bank("bank2")).to("test-jms:queue:bankReplyQueue");
+        from("test-jms:queue:bank3").process(new Bank("bank3")).to("test-jms:queue:bankReplyQueue");
 
         // Now we aggregating the response message by using the Constants.PROPERTY_SSN header
         // The aggregation will completed when all the three bank responses are received
-        from("direct:queue:bankReplyQueue")
+        from("test-jms:queue:bankReplyQueue")
             .aggregator(header(Constants.PROPERTY_SSN), new BankResponseAggregationStrategy())
             .completedPredicate(header("aggregated").isEqualTo(3))
 



Mime
View raw message