Author: davsclaus
Date: Mon Apr 26 14:01:57 2010
New Revision: 938051
URL: http://svn.apache.org/viewvc?rev=938051&view=rev
Log:
CAMEL-2639: Fixed some examples to run with ANT.
Modified:
camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
camel/trunk/examples/camel-example-bam/build.xml
camel/trunk/examples/camel-example-reportincident/build.xml
camel/trunk/examples/camel-example-tracer/build.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=938051&r1=938050&r2=938051&view=diff
==============================================================================
--- camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Mon Apr 26
14:01:57 2010
@@ -46,8 +46,8 @@
<include>org.apache.camel:camel-csv</include>
<include>org.apache.camel:camel-cxf</include>
<include>org.apache.camel:camel-dozer</include>
- <include>org.apache.camel:camel-exec</include>
- <include>org.apache.camel:camel-flatpack</include>
+ <include>org.apache.camel:camel-exec</include>
+ <include>org.apache.camel:camel-flatpack</include>
<include>org.apache.camel:camel-freemarker</include>
<include>org.apache.camel:camel-ftp</include>
<include>org.apache.camel:camel-gae</include>
@@ -79,8 +79,8 @@
<include>org.apache.camel:camel-msv</include>
<include>org.apache.camel:camel-mvel</include>
<include>org.apache.camel:camel-nagios</include>
- <include>org.apache.camel:camel-netty</include>
- <include>org.apache.camel:camel-ognl</include>
+ <include>org.apache.camel:camel-netty</include>
+ <include>org.apache.camel:camel-ognl</include>
<include>org.apache.camel:camel-printer</include>
<include>org.apache.camel:camel-protobuf</include>
<include>org.apache.camel:camel-quartz</include>
@@ -98,8 +98,8 @@
<include>org.apache.camel:camel-soap</include>
<include>org.apache.camel:camel-spring</include>
<include>org.apache.camel:camel-spring-integration</include>
- <include>org.apache.camel:camel-spring-security</include>
- <include>org.apache.camel:camel-spring-osgi</include>
+ <include>org.apache.camel:camel-spring-security</include>
+ <include>org.apache.camel:camel-spring-osgi</include>
<include>org.apache.camel:camel-sql</include>
<include>org.apache.camel:camel-stream</include>
<include>org.apache.camel:camel-stringtemplate</include>
@@ -122,7 +122,7 @@
<include>org.springframework:spring-context</include>
<include>org.springframework:spring-core</include>
<include>org.springframework:spring-web</include>
- <include>org.springframework:spring-test</include>
+ <include>org.springframework:spring-test</include>
</includes>
</dependencySet>
<dependencySet>
@@ -131,6 +131,11 @@
<scope>runtime</scope>
<includes>
<include>log4j:log4j</include>
+ <!-- commons-XXX is needed when running examples using ANT -->
+ <include>commons-beanutils:commons-beanutils</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-dbcp:commons-dbcp</include>
+ <include>commons-pool:commons-pool</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>
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java?rev=938051&r1=938050&r2=938051&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
Mon Apr 26 14:01:57 2010
@@ -674,6 +674,7 @@ public class AggregateProcessor extends
try {
// set redelivery counter
exchange.getIn().setHeader(Exchange.REDELIVERY_COUNTER, data.redeliveryCounter);
+
exchange.getIn().setHeader(Exchange.REDELIVERY_EXHAUSTED, Boolean.TRUE);
deadLetterProcessor.process(exchange);
} catch (Exception e) {
exchange.setException(e);
Modified: camel/trunk/examples/camel-example-bam/build.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/build.xml?rev=938051&r1=938050&r2=938051&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-bam/build.xml (original)
+++ camel/trunk/examples/camel-example-bam/build.xml Mon Apr 26 14:01:57 2010
@@ -33,6 +33,7 @@
<include name="**/commons-collections-*.jar"/>
<exclude name="**/*-tests.jar"/>
</fileset>
+ <path refid="spring.classpath"/>
<path refid="camel.spring.classpath"/>
<path refid="hibernate.classpath"/>
</path>
Modified: camel/trunk/examples/camel-example-reportincident/build.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-reportincident/build.xml?rev=938051&r1=938050&r2=938051&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-reportincident/build.xml (original)
+++ camel/trunk/examples/camel-example-reportincident/build.xml Mon Apr 26
14:01:57 2010
@@ -59,7 +59,7 @@
<target name="generate.code">
<echo level="info" message="Generating code using
wsdl2java..."/>
- <wsdl2java file="src/main/resources/report_incident.wsdl"/>
+ <wsdl2java file="src/main/resources/etc/report_incident.wsdl"/>
</target>
<target name="run" depends="generate.code,build"
@@ -67,7 +67,7 @@
<camelrun
mainClass="org.apache.camel.example.reportincident.ReportIncidentRoutes" />
</target>
- <available property="wsdl.dir" value="${build.resources.dir}"
file="${build.resources.dir}/report_incident.wsdl" />
+ <available property="wsdl.dir" value="${build.resources.dir}"
file="${build.resources.dir}/etc/report_incident.wsdl" />
<property name="wsdl.dir" location="."/>
<macrodef name="wsdl2java">
Modified: camel/trunk/examples/camel-example-tracer/build.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-tracer/build.xml?rev=938051&r1=938050&r2=938051&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-tracer/build.xml (original)
+++ camel/trunk/examples/camel-example-tracer/build.xml Mon Apr 26 14:01:57 2010
@@ -34,6 +34,7 @@
<include name="**/commons-collections-*.jar"/>
<exclude name="**/*-tests.jar"/>
</fileset>
+ <path refid="spring.classpath"/>
<path refid="camel.spring.classpath"/>
<path refid="hibernate.classpath"/>
</path>
