Return-Path: Delivered-To: apmail-activemq-camel-commits-archive@locus.apache.org Received: (qmail 92235 invoked from network); 2 Jul 2008 10:00:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Jul 2008 10:00:46 -0000 Received: (qmail 79385 invoked by uid 500); 2 Jul 2008 10:00:47 -0000 Delivered-To: apmail-activemq-camel-commits-archive@activemq.apache.org Received: (qmail 79367 invoked by uid 500); 2 Jul 2008 10:00:47 -0000 Mailing-List: contact camel-commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: camel-dev@activemq.apache.org Delivered-To: mailing list camel-commits@activemq.apache.org Received: (qmail 79357 invoked by uid 99); 2 Jul 2008 10:00:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jul 2008 03:00:47 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jul 2008 10:00:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9946E2388A16; Wed, 2 Jul 2008 02:59:55 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: camel-commits@activemq.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080702095955.9946E2388A16@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ org.apache.camel camel-xstream - - - org.apache.camel - camel-core - test-jar - ${project.version} - - - - org.apache.camel - camel-spring - test-jar - ${project.version} - - + @@ -285,31 +271,17 @@ shade + + + org.apache.camel:camel-bundle + org.apache.camel:camel-core:test-jar:tests + + org.apache.camel false ${createSourcesJar} true true - - - org.apache.camel:camel-bundle - - org/apache/camel/** - - - - org.apache.camel:camel-core:test - - org/apache/camel/** - - - - org.apache.camel:camel-spring:test - - org/apache/camel/spring/** - - - META-INF/spring.handlers 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 @@ camel-manual --> - - - org.apache.camel - camel-core - test-jar - ${project.version} - true - - + commons-logging commons-logging-api @@ -300,6 +292,12 @@ + org.apache.felix + org.osgi.core + true + + + org.apache.activemq activemq-core true 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))