svn commit: r1468312 - in /camel/trunk/tooling/archetypes: camel-archetype-blueprint/src/main/resources/archetype-resources/ camel-archetype-component-scala/src/main/resources/archetype-resources/ cam
Author: davsclaus
Date: Tue Apr 16 06:39:08 2013
New Revision: 1468312
URL: http://svn.apache.org/r1468312
Log:
Polished Camel Maven Archetypes
Modified:
camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt
camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt
camel/trunk/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/ReadMe.txt
camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/ReadMe.txt
camel/trunk/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/ReadMe.txt
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/src/main/java/MyRouteBuilder.java
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/ReadMe.txt
camel/trunk/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/ReadMe.txt
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/ReadMe.txt
Modified:
camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt?rev=1468312r1=1468311r2=1468312view=diff
==
---
camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/ReadMe.txt
Tue Apr 16 06:39:08 2013
@@ -5,14 +5,14 @@ To build this project use
mvn install
-To run the example you can execute the following Maven goal
+To run the project you can execute the following Maven goal
mvn camel:run
-To deploy the example in OSGi. For example using Apache ServiceMix
-or Apache Karaf. You will run the following command from its shell:
+To deploy the project in OSGi. For example using Apache ServiceMix
+or Apache Karaf. You can run the following command from its shell:
-osgi:install -s mvn:${groupId}/${artifactId}
+osgi:install -s mvn:${groupId}/${artifactId}/${version}
For more help see the Apache Camel documentation
Modified:
camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt?rev=1468312r1=1468311r2=1468312view=diff
==
---
camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/ReadMe.txt
Tue Apr 16 06:39:08 2013
@@ -1,6 +1,7 @@
Camel Component Project
-
-This Project is a template of a Camel component using Scala.
+===
+
+This project is a template of a Camel component using Scala.
To build this project use
@@ -10,6 +11,13 @@ For more help see the Apache Camel docum
http://camel.apache.org/writing-components.html
-Scala should only be used for Scala-related components such as Akka or Play
framework.
-See
http://camel.465427.n5.nabble.com/Create-a-new-Camel-component-via-Scala-Component-Archetype-td5708543.html#a5711675
+
+Notice:
+
+We favor writing Camel components in plain Java, which allows all people to
consume and use the components easily.
+Writing components in Scala is intended in situations when being used together
with other Scala libraries such as Akka, Play, etc.
+
+See discussion at:
+
+
http://camel.465427.n5.nabble.com/Create-a-new-Camel-component-via-Scala-Component-Archetype-td5708543.html#a5711675
Modified:
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/ReadMe.txt?rev=1468312r1=1468311r2=1468312view=diff
svn commit: r1468376 - in /camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws: s3/S3Consumer.java sqs/SqsConsumer.java
Author: davsclaus
Date: Tue Apr 16 11:33:34 2013
New Revision: 1468376
URL: http://svn.apache.org/r1468376
Log:
CAMEL-6286: Leverage async routing engine for S3 and SQS consumers. Thanks to
Alex Hutter for the patch.
Modified:
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
Modified:
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java?rev=1468376r1=1468375r2=1468376view=diff
==
---
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
(original)
+++
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Consumer.java
Tue Apr 16 11:33:34 2013
@@ -27,6 +27,7 @@ import com.amazonaws.services.s3.model.O
import com.amazonaws.services.s3.model.S3Object;
import com.amazonaws.services.s3.model.S3ObjectSummary;
+import org.apache.camel.AsyncCallback;
import org.apache.camel.Exchange;
import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.Processor;
@@ -58,7 +59,7 @@ public class S3Consumer extends Schedule
pendingExchanges = 0;
String bucketName = getConfiguration().getBucketName();
-LOG.trace(Quering objects in bucket [{}]..., bucketName);
+LOG.trace(Queueing objects in bucket [{}]..., bucketName);
ListObjectsRequest listObjectsRequest = new ListObjectsRequest();
listObjectsRequest.setBucketName(bucketName);
@@ -66,15 +67,19 @@ public class S3Consumer extends Schedule
listObjectsRequest.setMaxKeys(maxMessagesPerPoll);
ObjectListing listObjects =
getAmazonS3Client().listObjects(listObjectsRequest);
-
-LOG.trace(Found {} objects in bucket [{}]...,
listObjects.getObjectSummaries().size(), bucketName);
+
+if (LOG.isTraceEnabled()) {
+LOG.trace(Found {} objects in bucket [{}]...,
listObjects.getObjectSummaries().size(), bucketName);
+}
QueueExchange exchanges =
createExchanges(listObjects.getObjectSummaries());
return processBatch(CastUtils.cast(exchanges));
}
protected QueueExchange createExchanges(ListS3ObjectSummary
s3ObjectSummaries) {
-LOG.trace(Received {} messages in this poll,
s3ObjectSummaries.size());
+if (LOG.isTraceEnabled()) {
+LOG.trace(Received {} messages in this poll,
s3ObjectSummaries.size());
+}
QueueExchange answer = new LinkedListExchange();
for (S3ObjectSummary s3ObjectSummary : s3ObjectSummaries) {
@@ -91,7 +96,7 @@ public class S3Consumer extends Schedule
for (int index = 0; index total isBatchAllowed(); index++) {
// only loop if we are started (allowed to run)
-Exchange exchange = ObjectHelper.cast(Exchange.class,
exchanges.poll());
+final Exchange exchange = ObjectHelper.cast(Exchange.class,
exchanges.poll());
// add current index and total as properties
exchange.setProperty(Exchange.BATCH_INDEX, index);
exchange.setProperty(Exchange.BATCH_SIZE, total);
@@ -117,8 +122,12 @@ public class S3Consumer extends Schedule
});
LOG.trace(Processing exchange [{}]..., exchange);
-
-getProcessor().process(exchange);
+getAsyncProcessor().process(exchange, new AsyncCallback() {
+@Override
+public void done(boolean doneSync) {
+LOG.trace(Processing exchange [{}] done., exchange);
+}
+});
}
return total;
@@ -138,12 +147,11 @@ public class S3Consumer extends Schedule
LOG.trace(Deleting object from bucket {} with key {}...,
bucketName, key);
getAmazonS3Client().deleteObject(bucketName, key);
-
-LOG.trace(Object deleted);
+
+LOG.trace(Deleted object from bucket {} with key {}...,
bucketName, key);
}
} catch (AmazonClientException e) {
-LOG.warn(Error occurred during deleting object, e);
-exchange.setException(e);
+getExceptionHandler().handleException(Error occurred during
deleting object. This exception is ignored., exchange, e);
}
}
Modified:
camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConsumer.java?rev=1468376r1=1468375r2=1468376view=diff
[CONF] Apache Camel Asynchronous Routing Engine
Asynchronous Routing Engine Page edited by Claus Ibsen Changes (2) ... All the [Enterprise Integration Patterns] is supported as well a selected number of [Components]: - [AHC] *Camel 2.8:* (only producer) - [AWS] *Camel 2.11:* (only consumer) for S3 and SNS. - [Avro|avro] *Camel 2.10:* (only producer) - [CXF] *Camel 2.5:* (both consumer and producer) - [CXFRS] *Camel 2.5:* (only consumer) - [Direct-VM] *Camel 2.10.5/2.11.0:* (both consumer and producer) - [Guava EventBus] *Camel 2.10:* (only consumer) - [JBI] (both consumer and producer) ... Full Content Asynchronous Routing Engine Available as of Camel 2.4 As of Camel 2.4 the asynchronous routing engine is back and kicking. All the Enterprise Integration Patterns is supported as well a selected number of Components: AHC Camel 2.8: (only producer) AWS Camel 2.11: (only consumer) for S3 and SNS. Avro Camel 2.10: (only producer) CXF Camel 2.5: (both consumer and producer) CXFRS Camel 2.5: (only consumer) DirectVM Camel 2.10.5/2.11.0: (both consumer and producer) Guava EventBus Camel 2.10: (only consumer) JBI (both consumer and producer) Jetty (both consumer and producer) JGroups Camel 2.10: (only consumer) JMS Camel 2.5: (only producer for Request Reply messaging over JMS). Camel 2.9: (consumer, if option asyncConsumer=true is used). JMS Camel 2.9: (also consumer) MQTT Camel 2.10.2: (only producer) NMR (both consumer and producer) Netty only producer (Camel 2.10: also consumer) Restlet Camel 2.8: (only producer) SEDA (both consumer and producer) SEDA was mistakenly in this list until November 3rd 2012. As of Camel 2.10.x, it still does not leverage the Async Routing Engine, but support is planned for Camel 3.0. When we say a component is supported, that means, the component is leveraging the asynchronous model. For example Jetty uses continuations and the async http client to be fully asynchronous and non blocked. That means no threads will ever be blocked while waiting for a reply. In the future additional Components will be supported as well where it's applicable. Forcing to use synchronous processing You can configure the endpoints with the option synchronous=true to force using synchronous processing. For example when sending a web service request using CXF, the caller will wait for the reply, if synchronous=true was configured. Currently this option is supported by the all the producers. If you don't want to let the CXF consumer leverage the CXF continuation API to use the asynchronous processing, you can also use this option synchronous=true to disable it. The JBI and NMR component is always asynchronous and doesn't support this option. Background information See Asynchronous Processing for additional information and the concepts behind the asynchronous model. Change Notification Preferences View Online | View Changes | Add Comment
svn commit: r1468408 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/util/MessageHelper.java test/java/org/apache/camel/component/xslt/SAXSourceLogBodyTest.java test/resources/xslt/staff/
Author: davsclaus
Date: Tue Apr 16 13:12:01 2013
New Revision: 1468408
URL: http://svn.apache.org/r1468408
Log:
CAMEL-6133: Avoid touch Source bodies in message helper logger.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/SAXSourceLogBodyTest.java
camel/trunk/camel-core/src/test/resources/xslt/staff/staff.xml
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java?rev=1468408r1=1468407r2=1468408view=diff
==
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
Tue Apr 16 13:12:01 2013
@@ -23,6 +23,7 @@ import java.io.Reader;
import java.io.Writer;
import java.util.Map;
import java.util.TreeMap;
+import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import org.apache.camel.BytesSource;
@@ -185,9 +186,8 @@ public final class MessageHelper {
* @param message the message
* @param prepend a message to prepend
* @param allowStreams whether or not streams is allowed
- * @param allowFiles whether or not files is allowed
- * @param maxChars limit to maximum number of chars. Use 0 or negative
value
- *to not limit at all.
+ * @param allowFiles whether or not files is allowed (currently not in use)
+ * @param maxChars limit to maximum number of chars. Use 0 or negative
value to not limit at all.
* @return the logging message
*/
public static String extractBodyForLogging(Message message, String
prepend, boolean allowStreams, boolean allowFiles, int maxChars) {
@@ -197,12 +197,10 @@ public final class MessageHelper {
}
if (!allowStreams) {
-if (obj instanceof StreamSource !(obj instanceof StringSource
|| obj instanceof BytesSource)) {
-/*
- * Generally do not log StreamSources but as StringSource and
- * ByteSource are memory based they are ok
- */
-return prepend + [Body is instance of
java.xml.transform.StreamSource];
+if (obj instanceof Source !(obj instanceof StringSource || obj
instanceof BytesSource)) {
+// for Source its only StringSource or BytesSource that is
okay as they are memory based
+// all other kinds we should not touch the body
+return prepend + [Body is instance of
java.xml.transform.Source];
} else if (obj instanceof StreamCache) {
return prepend + [Body is instance of
org.apache.camel.StreamCache];
} else if (obj instanceof InputStream) {
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/SAXSourceLogBodyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/SAXSourceLogBodyTest.java?rev=1468408view=auto
==
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/SAXSourceLogBodyTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/SAXSourceLogBodyTest.java
Tue Apr 16 13:12:01 2013
@@ -0,0 +1,70 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.xslt;
+
+import java.io.File;
+import java.io.InputStream;
+import javax.xml.transform.sax.SAXSource;
+
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.LoggingLevel;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class SAXSourceLogBodyTest extends ContextTestSupport {
+
+public void testSAXSource() throws Exception {
+
svn commit: r1468410 - in /camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor: ActivityMonitorEngine.java BamProcessorSupport.java JpaBamProcessorSupport.java
Author: davsclaus
Date: Tue Apr 16 13:40:47 2013
New Revision: 1468410
URL: http://svn.apache.org/r1468410
Log:
Reduce logging noise in camel-bam
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java?rev=1468410r1=1468409r2=1468410view=diff
==
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
Tue Apr 16 13:40:47 2013
@@ -94,11 +94,11 @@ public class ActivityMonitorEngine exten
try {
Thread.sleep(timeToSleep);
} catch (InterruptedException e) {
-LOG.debug(Caught: + e, e);
+// ignore
}
}
} catch (Exception e) {
-LOG.error(Caught: + e, e);
+LOG.warn(Error during running ActivityMonitorEngine. This
exception is ignored., e);
}
}
}
@@ -110,9 +110,9 @@ public class ActivityMonitorEngine exten
public Object doInJpa(EntityManager entityManager) throws
PersistenceException {
// let's try locking the object first
if (isUseLocking()) {
-LOG.info(Attempting to lock: + activityState);
+LOG.debug(Attempting to lock: {}, activityState);
entityManager.lock(activityState, LockModeType.WRITE);
-LOG.info(Grabbed lock: + activityState);
+LOG.debug(Grabbed lock: {}, activityState);
}
try {
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java?rev=1468410r1=1468409r2=1468410view=diff
==
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
Tue Apr 16 13:40:47 2013
@@ -82,7 +82,7 @@ public abstract class BamProcessorSuppor
try {
Thread.sleep(retrySleep);
} catch (InterruptedException e) {
-LOG.debug(Caught: + e, e);
+// ignore
}
}
try {
@@ -104,11 +104,11 @@ public abstract class BamProcessorSuppor
}
});
if (i 1) {
-LOG.info(Attempt {} worked!, i);
+LOG.debug(Attempt {} worked!, i);
}
return;
} catch (Exception e) {
-LOG.warn(Failed to complete transaction: + e, e);
+LOG.warn(Failed to complete transaction. This exception is
ignored., e);
}
}
}
@@ -147,7 +147,7 @@ public abstract class BamProcessorSuppor
protected void onError(TransactionStatus status, Exception e) throws
RuntimeCamelException {
status.setRollbackOnly();
-LOG.error(Caught: + e, e);
+LOG.warn(Caught: + e, e);
throw wrapRuntimeCamelException(e);
}
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java?rev=1468410r1=1468409r2=1468410view=diff
==
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
Tue Apr 16 13:40:47 2013
@@ -115,7 +115,7 @@ public class JpaBamProcessorSupportT e
protected T loadEntity(Exchange exchange, Object key) throws Exception {
LOCK.lock();
try {
-LOG.info( LoadEntity call);
+LOG.trace(LoadEntity call);
T
svn commit: r1468412 - in /camel/trunk/examples/camel-example-bam: README.txt pom.xml src/main/java/org/apache/camel/example/bam/Main.java src/main/resources/META-INF/persistence.xml
Author: davsclaus
Date: Tue Apr 16 13:41:08 2013
New Revision: 1468412
URL: http://svn.apache.org/r1468412
Log:
Polished example
Modified:
camel/trunk/examples/camel-example-bam/README.txt
camel/trunk/examples/camel-example-bam/pom.xml
camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/Main.java
camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/persistence.xml
Modified: camel/trunk/examples/camel-example-bam/README.txt
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/README.txt?rev=1468412r1=1468411r2=1468412view=diff
==
--- camel/trunk/examples/camel-example-bam/README.txt (original)
+++ camel/trunk/examples/camel-example-bam/README.txt Tue Apr 16 13:41:08 2013
@@ -16,11 +16,6 @@ To run the example with Maven, type
You can see the BAM activies defined in
src/main/java/org/apache/camel/example/bam/MyActivites.java
-In the HSQL Database Explorer type
- select * from camel_activitystate
-to see the states of the activities. Notice that one activity never receives
-its expected message and when it's overdue Camel reports this as an error.
-
To stop the example hit ctrl + c
This example is documented at
Modified: camel/trunk/examples/camel-example-bam/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/pom.xml?rev=1468412r1=1468411r2=1468412view=diff
==
--- camel/trunk/examples/camel-example-bam/pom.xml (original)
+++ camel/trunk/examples/camel-example-bam/pom.xml Tue Apr 16 13:41:08 2013
@@ -54,10 +54,6 @@
groupIdorg.apache.camel/groupId
artifactIdcamel-juel/artifactId
/dependency
-dependency
- groupIdorg.springframework/groupId
- artifactIdspring-aop/artifactId
- /dependency
!-- lets use log4j --
dependency
@@ -65,11 +61,6 @@
artifactIdslf4j-log4j12/artifactId
/dependency
-dependency
- groupIdxalan/groupId
- artifactIdxalan/artifactId
-/dependency
-
!-- lets use hibernate by default --
dependency
groupIdorg.hibernate/groupId
@@ -84,8 +75,8 @@
artifactIdgeronimo-jta_1.1_spec/artifactId
/dependency
dependency
- groupIdcommons-dbcp/groupId
- artifactIdcommons-dbcp/artifactId
+ groupIdcommons-dbcp/groupId
+ artifactIdcommons-dbcp/artifactId
/dependency
!-- testing --
Modified:
camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/Main.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/Main.java?rev=1468412r1=1468411r2=1468412view=diff
==
---
camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/Main.java
(original)
+++
camel/trunk/examples/camel-example-bam/src/main/java/org/apache/camel/example/bam/Main.java
Tue Apr 16 13:41:08 2013
@@ -17,12 +17,16 @@
package org.apache.camel.example.bam;
/**
+ * Main class to make it easy to run this example.
+ *
* @version
*/
public final class Main {
+
private Main() {
// do nothing here
}
+
public static void main(String[] args) throws Exception {
org.apache.camel.spring.Main.main(args);
}
Modified:
camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/persistence.xml?rev=1468412r1=1468411r2=1468412view=diff
==
---
camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/persistence.xml
(original)
+++
camel/trunk/examples/camel-example-bam/src/main/resources/META-INF/persistence.xml
Tue Apr 16 13:41:08 2013
@@ -1,18 +1,19 @@
?xml version=1.0 encoding=UTF-8?
!--
- Copyright 2006 The Apache Software Foundation.
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the License); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
- Licensed under the Apache License, Version 2.0 (the License);
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an AS IS BASIS,
-
svn commit: r1468451 - in /camel/trunk/examples: camel-example-bam/src/data/invoices/ camel-example-bam/src/data/purchaseOrders/ camel-example-cdi/src/data/ camel-example-etl/src/data/ camel-example-g
Author: davsclaus Date: Tue Apr 16 15:02:00 2013 New Revision: 1468451 URL: http://svn.apache.org/r1468451 Log: Polished examples. Made the xml sample data smaller files so easier to read/see in logs/console etc. Modified: camel/trunk/examples/camel-example-bam/src/data/invoices/invoiceA.xml camel/trunk/examples/camel-example-bam/src/data/invoices/invoiceC.xml camel/trunk/examples/camel-example-bam/src/data/purchaseOrders/po1.xml camel/trunk/examples/camel-example-bam/src/data/purchaseOrders/po2.xml camel/trunk/examples/camel-example-bam/src/data/purchaseOrders/po3.xml camel/trunk/examples/camel-example-cdi/src/data/message1.xml camel/trunk/examples/camel-example-cdi/src/data/message2.xml camel/trunk/examples/camel-example-etl/src/data/row1.xml camel/trunk/examples/camel-example-etl/src/data/row2.xml camel/trunk/examples/camel-example-guice-jms/src/data/message1.xml camel/trunk/examples/camel-example-guice-jms/src/data/message2.xml camel/trunk/examples/camel-example-management/src/main/data/message.xml camel/trunk/examples/camel-example-osgi-rmi/README.txt camel/trunk/examples/camel-example-osgi/README.txt camel/trunk/examples/camel-example-pojo-messaging/src/data/message1.xml camel/trunk/examples/camel-example-pojo-messaging/src/data/message2.xml camel/trunk/examples/camel-example-pojo-messaging/src/data/message3.xml camel/trunk/examples/camel-example-spring-javaconfig/src/data/message1.xml camel/trunk/examples/camel-example-spring-javaconfig/src/data/message2.xml camel/trunk/examples/camel-example-spring-security/README.txt camel/trunk/examples/camel-example-spring-ws/README.txt camel/trunk/examples/camel-example-spring-xquery/src/data/message1.xml camel/trunk/examples/camel-example-spring/src/data/message1.xml camel/trunk/examples/camel-example-spring/src/data/message2.xml camel/trunk/examples/camel-example-ssh/README.txt camel/trunk/examples/camel-example-tracer/README.txt Modified: camel/trunk/examples/camel-example-bam/src/data/invoices/invoiceA.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/src/data/invoices/invoiceA.xml?rev=1468451r1=1468450r2=1468451view=diff == --- camel/trunk/examples/camel-example-bam/src/data/invoices/invoiceA.xml (original) +++ camel/trunk/examples/camel-example-bam/src/data/invoices/invoiceA.xml Tue Apr 16 15:02:00 2013 @@ -1,20 +1,4 @@ ?xml version=1.0 encoding=UTF-8? -!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the License); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an AS IS BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. --- invoice purchaseOrderId=p1 descriptionThis invoice should tie up with purchase order p1/description /invoice \ No newline at end of file Modified: camel/trunk/examples/camel-example-bam/src/data/invoices/invoiceC.xml URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/src/data/invoices/invoiceC.xml?rev=1468451r1=1468450r2=1468451view=diff == --- camel/trunk/examples/camel-example-bam/src/data/invoices/invoiceC.xml (original) +++ camel/trunk/examples/camel-example-bam/src/data/invoices/invoiceC.xml Tue Apr 16 15:02:00 2013 @@ -1,20 +1,4 @@ ?xml version=1.0 encoding=UTF-8? -!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the License); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an AS IS BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. --- invoice purchaseOrderId=p3 descriptionThis invoice should tie up with purchase order p3/description /invoice \ No newline at end of file Modified:
svn commit: r1468753 - /camel/tags/camel-2.11.0/
Author: cmueller Date: Wed Apr 17 05:51:08 2013 New Revision: 1468753 URL: http://svn.apache.org/r1468753 Log: redo the Camel 2.11.0 release Removed: camel/tags/camel-2.11.0/
