[2/2] camel git commit: CAMEL-9668 - Add lzf to DataFormatsDefinition

[davsclaus]

CAMEL-9668 - Add lzf to DataFormatsDefinition


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4a3c464c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a3c464c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a3c464c

Branch: refs/heads/master
Commit: 4a3c464c97c053a776484926700a961b0a3a2967
Parents: 4e5599c
Author: lburgazzoli 
Authored: Thu Mar 3 17:39:45 2016 +0100
Committer: Claus Ibsen 
Committed: Fri Mar 4 08:53:04 2016 +0100

--
 .../org/apache/camel/model/dataformat/DataFormatsDefinition.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4a3c464c/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
index bdb8caf..a887c04 100644
--- 
a/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
+++ 
b/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
@@ -57,6 +57,7 @@ public class DataFormatsDefinition {
 @XmlElement(required = false, name = "jaxb", type = 
JaxbDataFormat.class),
 @XmlElement(required = false, name = "jibx", type = 
JibxDataFormat.class),
 @XmlElement(required = false, name = "json", type = 
JsonDataFormat.class),
+@XmlElement(required = false, name = "lzf", type = 
LZFDataFormat.class),
 @XmlElement(required = false, name = "mimeMultipart", type = 
MimeMultipartDataFormat.class),
 @XmlElement(required = false, name = "protobuf", type = 
ProtobufDataFormat.class),
 @XmlElement(required = false, name = "rss", type = 
RssDataFormat.class),

camel git commit: Upgrade Amqp Rabbitmq client to version 3.6.1

[acosentino]

Repository: camel
Updated Branches:
  refs/heads/master 3e1178afa -> 4e5599c6c


Upgrade Amqp Rabbitmq client to version 3.6.1


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4e5599c6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4e5599c6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4e5599c6

Branch: refs/heads/master
Commit: 4e5599c6c0ef759c4b40cd5ce3367a49e677aa4b
Parents: 3e1178a
Author: Andrea Cosentino 
Authored: Fri Mar 4 08:31:14 2016 +0100
Committer: Andrea Cosentino 
Committed: Fri Mar 4 08:31:14 2016 +0100

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4e5599c6/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 59bd416..330f0b2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -450,7 +450,7 @@
 [1.8,2)
 2.2.2
 1.6.1_1
-3.6.0
+3.6.1
 0.9.10_3
 1.4_1
 2.7.0

svn commit: r981747 - in /websites/production/camel/content: cache/main.pageCache gridfs.html

[buildbot]

Author: buildbot
Date: Thu Mar  3 19:19:00 2016
New Revision: 981747

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/gridfs.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/gridfs.html
==
--- websites/production/camel/content/gridfs.html (original)
+++ websites/production/camel/content/gridfs.html Thu Mar  3 19:19:00 2016
@@ -96,7 +96,7 @@
 URI format
 
-Endpoint optionsGridFS 
endpoints support the following options, depending on whether they are acting 
like a Producer or as a Consumer (options vary based on the consumer type 
too).NameDefault ValueDescriptionProducerConsumerdatabasenoneRequired. The name of the database to 
which this endpoint will be bound. All operations will be executed aga
 inst this database.https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">bucketfsThe name of the GridFS bucket within the Database. The 
default is the GridFS.DEFAULT_BUCKET value ("fs").https://cwiki.apache
 
.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png"
 data-emoticon-name="tick" alt="(tick)">https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">operationcreateThe id of the operation this endpoint will 
execute. Pick from the following:Query operations: 
findOne, listAll, countWrite 
operations: createDelete operations: 
removehttps://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">Configuration of database in 
Spring XMLThe following Spring XML creates a bean defining the 
connection to a MongoDB instance.
+Endpoint optionsGridFS 
endpoints support the following options, depending on whether they are acting 
like a Producer or as a Consumer (options vary based on the consumer type 
too).NameDefault ValueDescriptionProducerConsumerdatabasenoneRequired. The name of the database to 
which this endpoint will be bound. All operations will be executed aga
 inst this database.https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">bucketfsThe name of the GridFS bucket within the Database. The 
default is the GridFS.DEFAULT_BUCKET value ("fs").https://cwiki.apache
 
.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png"
 data-emoticon-name="tick" alt="(tick)">https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">operationcreateThe id of the operation this endpoint will 
execute. Pick from the following:Query operations: 
findOne, listAll, countWrite 
operations: createDelete operations: 
removehttps://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">querynoneCombined with the query strategy parameters to create the 
query used to search for new files.https://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" alt="(tick)">queryStrategyTimeStampThe strategy that is used to find new 
files. Can be one of:TimeStamp - files that are uploaded after the 
Consumer starts are processedPersistentTimestamp - Like TimeStamp, but 
the last timestamp used is persisted to a collection so when the Consumer 
restarts, it can resume where it left offFileAttribute - finds files 
that do NOT have the give attribute. After processing, it adds the 
attribute.TimestampAndFileAttribute - finds files that are newer than 
the TimeStamp and are missing the 
attributePersistentTimestampAndFileAttributehttps://cwiki.apache.org/confluence/s/en_GB/5982/f2b47fb3d636c8bc9fd0b11c0ec6d0ae18646be7.1/_/images/icons/emoticons/check.png;
 data-emoticon-name="tick" 

camel git commit: Add the oid to the output so if there are multiple files with the same name, they can be distinguished

[dkulp]

Repository: camel
Updated Branches:
  refs/heads/master 2f80b8e31 -> 3e1178afa


Add the oid to the output so if there are multiple files with the same name, 
they can be distinguished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e1178af
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e1178af
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e1178af

Branch: refs/heads/master
Commit: 3e1178afa05f91ac897db51ea56e83d204d98989
Parents: 2f80b8e
Author: Daniel Kulp 
Authored: Thu Mar 3 13:37:03 2016 -0500
Committer: Daniel Kulp 
Committed: Thu Mar 3 13:37:03 2016 -0500

--
 .../java/org/apache/camel/component/gridfs/GridFsProducer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3e1178af/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java
--
diff --git 
a/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java
 
b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java
index 58416b1..dccb499 100644
--- 
a/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java
+++ 
b/components/camel-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsProducer.java
@@ -118,7 +118,7 @@ public class GridFsProducer extends DefaultProducer {
 }
 while (cursor.hasNext() && current.length() < 4000) {
 DBObject o = cursor.next();
-current.append(o.get("filename")).append("\n");
+
current.append(o.get("filename")).append("\t").append(o.get("_id")).append("\n");
 }
 }
 @Override

svn commit: r981742 - in /websites/production/camel/content: cache/main.pageCache gridfs.html

[buildbot]

Author: buildbot
Date: Thu Mar  3 18:18:34 2016
New Revision: 981742

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/gridfs.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/gridfs.html
==
--- websites/production/camel/content/gridfs.html (original)
+++ websites/production/camel/content/gridfs.html Thu Mar  3 18:18:34 2016
@@ -112,16 +112,40 @@
   to 
uri=gridfs:mongoBean?database=${mongodb.database}amp;operation=findOne
 /
   to uri=direct:result /
 /route]]>
-GridFS operations - producer 
endpointsQuery operationscountReturns the total number of file in the 
collection, returning a Long as the OUT message body.
+GridFS operations - producer 
endpointcountReturns the total number of 
file in the collection, returning an Integer as the OUT message body.
 
 You can provide a filename header to provide a count of files 
matching that filename.
 
+listAllReturns an Reader that 
lists all the filenames and their IDs in a tab separated stream.
+
+findOneFinds a file in the GridFS 
system and sets the body to an InputStream of the content.  Also provides 
the metadata has headers. It uses Exchange.FILE_NAME from the incoming 
headers to determine the file to find.
+
+createCreates a new 
file in the GridFs database. It uses the Exchange.FILE_NAME from the incoming 
headers for the name and the body contents (as an InputStream) as the 
content.
+
+removeRemoves a file from the 
GridFS database.
+
 GridFS 
ConsumerSee 
alsohttp://www.mongodb.org/; rel="nofollow">MongoDB websitehttp://en.wikipedia.org/wiki/NoSQL; 
rel="nofollow">NoSQL Wikipedia articlehttp://api.mongodb.org/java/current/; 
rel="nofollow">MongoDB Java driver API docs - current versionhttp://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/;>Unit
 tests for more examples of usage
 
 

[2/3] camel git commit: Add missing non-bean classes vetoing

[astefanutti]

Add missing non-bean classes vetoing


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4665a605
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4665a605
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4665a605

Branch: refs/heads/master
Commit: 4665a60577c6f72caca67be84a83111bf6b21fe5
Parents: adc493e
Author: Antonin Stefanutti 
Authored: Thu Mar 3 15:50:06 2016 +0100
Committer: Antonin Stefanutti 
Committed: Thu Mar 3 15:50:06 2016 +0100

--
 .../camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java| 3 ++-
 .../camel-cdi/src/main/java/org/apache/camel/cdi/RoutesXml.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4665a605/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
--
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
index eccf446..0956c95 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/Excluded.java
@@ -35,6 +35,7 @@ import javax.inject.Qualifier;
 
 Excluded INSTANCE = new ExcludedLiteral();
 
-final class ExcludedLiteral extends AnnotationLiteralimplements 
Excluded {
+@Vetoed
+final class ExcludedLiteral extends AnnotationLiteral implements 
Excluded {
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/4665a605/components/camel-cdi/src/main/java/org/apache/camel/cdi/RoutesXml.java
--
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/RoutesXml.java 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/RoutesXml.java
index aa83263..76a76e2 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/RoutesXml.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/RoutesXml.java
@@ -32,8 +32,9 @@ import org.apache.camel.util.ObjectHelper;
 /**
  * A helper class for loading route definitions from a file, URL or the 
classpath
  */
+@Vetoed
 public final class RoutesXml {
-
+
 private RoutesXml() {
 //The helper class
 }

[3/3] camel git commit: Remove unused import

[astefanutti]

Remove unused import


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2f80b8e3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2f80b8e3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2f80b8e3

Branch: refs/heads/master
Commit: 2f80b8e31b7cb9f47a2bfa64ba18a60d67fb5669
Parents: 4665a60
Author: Antonin Stefanutti 
Authored: Thu Mar 3 15:50:28 2016 +0100
Committer: Antonin Stefanutti 
Committed: Thu Mar 3 15:50:28 2016 +0100

--
 .../src/main/java/org/apache/camel/cdi/CdiCamelExtension.java   | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2f80b8e3/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
--
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
index 4cacd4a..5d79f46 100755
--- 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
+++ 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelExtension.java
@@ -30,7 +30,6 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import static java.util.Collections.newSetFromMap;
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Default;
 import javax.enterprise.inject.InjectionException;
 import javax.enterprise.inject.Produces;

[1/3] camel git commit: Add missing toString delegation

[astefanutti]

Repository: camel
Updated Branches:
  refs/heads/master beb08eed5 -> 2f80b8e31


Add missing toString delegation


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/adc493ec
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/adc493ec
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/adc493ec

Branch: refs/heads/master
Commit: adc493ece7aeac214bf4473d3667210461759d5e
Parents: beb08ee
Author: Antonin Stefanutti 
Authored: Thu Mar 3 15:48:35 2016 +0100
Committer: Antonin Stefanutti 
Committed: Thu Mar 3 15:48:35 2016 +0100

--
 .../src/main/java/org/apache/camel/cdi/BeanDelegate.java| 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/adc493ec/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
--
diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
index c1592cd..9b5fab1 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java
@@ -89,4 +89,9 @@ final class BeanDelegate implements Bean {
 public void destroy(T instance, CreationalContext creationalContext) {
 delegate.destroy(instance, creationalContext);
 }
+
+@Override
+public String toString() {
+return delegate.toString();
+}
 }

camel git commit: Declare DeltaSpike and Weld as Camel Maven plugin dependencies

[astefanutti]

Repository: camel
Updated Branches:
  refs/heads/master 664562d3c -> beb08eed5


Declare DeltaSpike and Weld as Camel Maven plugin dependencies


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/beb08eed
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/beb08eed
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/beb08eed

Branch: refs/heads/master
Commit: beb08eed5d6bf1c61fb7a2a17ae02b2e5952295d
Parents: 664562d
Author: Antonin Stefanutti 
Authored: Thu Mar 3 15:42:00 2016 +0100
Committer: Antonin Stefanutti 
Committed: Thu Mar 3 15:42:00 2016 +0100

--
 .../main/resources/archetype-resources/pom.xml  | 44 +++-
 1 file changed, 16 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/beb08eed/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
--
diff --git 
a/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
 
b/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
index e08fb5f..9980f61 100644
--- 
a/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
+++ 
b/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
@@ -35,12 +35,6 @@
 
   
 
-
-  org.apache.camel
-  camel-cdi
-  ${camel-version}
-
-
 
 
   javax.enterprise
@@ -49,29 +43,11 @@
   provided
 
 
-
-
-
-  org.jboss.weld.se
-  weld-se
-  ${weld2-version}
-
+
 
-  org.jboss.weld
-  weld-core
-  ${weld2-version}
-
-
-  org.apache.deltaspike.core
-  deltaspike-core-api
-  ${deltaspike-version}
-  runtime
-
-
-  org.apache.deltaspike.cdictrl
-  deltaspike-cdictrl-weld
-  ${deltaspike-version}
-  runtime
+  org.apache.camel
+  camel-cdi
+  ${camel-version}
 
 
 
@@ -125,6 +101,18 @@
 org.apache.camel
 camel-maven-plugin
 ${camel-version}
+
+  
+org.apache.deltaspike.cdictrl
+deltaspike-cdictrl-weld
+${deltaspike-version}
+  
+  
+org.jboss.weld.se
+weld-se
+${weld2-version}
+  
+
   
 
 

[3/3] camel git commit: Simplify Maven dependencies in Camel CDI examples

[astefanutti]

Simplify Maven dependencies in Camel CDI examples


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/664562d3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/664562d3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/664562d3

Branch: refs/heads/master
Commit: 664562d3c3c80bcea4670c99920e67340f934e1f
Parents: a48b1ff
Author: Antonin Stefanutti 
Authored: Thu Mar 3 15:17:30 2016 +0100
Committer: Antonin Stefanutti 
Committed: Thu Mar 3 15:17:30 2016 +0100

--
 examples/camel-example-cdi-metrics/pom.xml  | 63 +++-
 examples/camel-example-cdi-osgi/pom.xml | 53 +++---
 examples/camel-example-cdi-properties/pom.xml   | 55 +++---
 examples/camel-example-cdi-rest-servlet/pom.xml | 20 +++---
 examples/camel-example-cdi/pom.xml  | 64 +++--
 examples/camel-example-swagger-cdi/pom.xml  | 71 +-
 .../camel-example-widget-gadget-cdi/pom.xml | 76 
 7 files changed, 174 insertions(+), 228 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/664562d3/examples/camel-example-cdi-metrics/pom.xml
--
diff --git a/examples/camel-example-cdi-metrics/pom.xml 
b/examples/camel-example-cdi-metrics/pom.xml
index 9044e38..0c69cc9 100755
--- a/examples/camel-example-cdi-metrics/pom.xml
+++ b/examples/camel-example-cdi-metrics/pom.xml
@@ -33,11 +33,15 @@
 
   
 
-
+
 
-  org.apache.camel
-  camel-core
+  javax.enterprise
+  cdi-api
+  ${cdi-api-1.2-version}
+  provided
 
+
+
 
   org.apache.camel
   camel-cdi
@@ -54,47 +58,16 @@
   1.3.3
 
 
-
-
-  javax.enterprise
-  cdi-api
-  ${cdi-api-1.2-version}
-  provided
-
-
-
-
-
-  org.jboss.weld.se
-  weld-se
-  ${weld2-version}
-
-
-  org.jboss.weld
-  weld-core
-  ${weld2-version}
-
-
-  org.apache.deltaspike.core
-  deltaspike-core-api
-  ${deltaspike-version}
-  runtime
-
-
-  org.apache.deltaspike.cdictrl
-  deltaspike-cdictrl-weld
-  ${deltaspike-version}
-  runtime
-
-
 
 
   log4j
   log4j
+  runtime
 
 
   org.slf4j
   slf4j-log4j12
+  runtime
 
 
 
@@ -128,6 +101,12 @@
   ${arquillian-weld-se-embedded-version}
   test
 
+
+  org.jboss.weld
+  weld-core
+  ${weld2-version}
+  test
+
   
 
   
@@ -137,6 +116,18 @@
 org.apache.camel
 camel-maven-plugin
 ${project.version}
+
+  
+org.apache.deltaspike.cdictrl
+deltaspike-cdictrl-weld
+${deltaspike-version}
+  
+  
+org.jboss.weld.se
+weld-se
+${weld2-version}
+  
+
   
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/664562d3/examples/camel-example-cdi-osgi/pom.xml
--
diff --git a/examples/camel-example-cdi-osgi/pom.xml 
b/examples/camel-example-cdi-osgi/pom.xml
index 706b0b2..ea217cc 100755
--- a/examples/camel-example-cdi-osgi/pom.xml
+++ b/examples/camel-example-cdi-osgi/pom.xml
@@ -33,11 +33,15 @@
 
   
 
-
+
 
-  org.apache.camel
-  camel-core
+  javax.enterprise
+  cdi-api
+  ${cdi-api-1.2-version}
+  provided
 
+
+
 
   org.apache.camel
   camel-cdi
@@ -52,13 +56,10 @@
   org.apache.activemq
   activemq-client
 
-
-
 
-  javax.enterprise
-  cdi-api
-  ${cdi-api-1.2-version}
-  provided
+  org.apache.activemq
+  activemq-broker
+  runtime
 
 
 
@@ -77,10 +78,12 @@
 
   log4j
   log4j
+  runtime
 
 
   org.slf4j
   slf4j-log4j12
+  runtime
 
 
 
@@ -203,26 +206,6 @@
   
 
 
-
-
-  org.apache.deltaspike.cdictrl
-  deltaspike-cdictrl-weld
-  ${deltaspike-version}
-  runtime
-
-
-  org.jboss.weld.se
-  weld-se
-  ${weld2-version}
-  runtime
-
-
-  org.apache.activemq
-  activemq-broker
-  ${activemq-version}
-  runtime
-
-
   
 
   
@@ -236,6 +219,18 @@
 org.apache.camel
 camel-maven-plugin
 ${project.version}
+
+  
+org.apache.deltaspike.cdictrl
+deltaspike-cdictrl-weld
+${deltaspike-version}
+  
+  
+org.jboss.weld.se
+weld-se
+${weld2-version}
+  
+
   
 
   

[2/3] camel git commit: Fix CS error

[astefanutti]

Fix CS error


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a48b1ff1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a48b1ff1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a48b1ff1

Branch: refs/heads/master
Commit: a48b1ff1a60c64daa174a32db7b169000caf7ca5
Parents: b784eda
Author: Antonin Stefanutti 
Authored: Thu Mar 3 15:15:30 2016 +0100
Committer: Antonin Stefanutti 
Committed: Thu Mar 3 15:15:30 2016 +0100

--
 .../src/main/java/org/apache/camel/maven/RunMojo.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a48b1ff1/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
--
diff --git 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index 48d7839..0b0100c 100644
--- 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++ 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -524,7 +524,7 @@ public class RunMojo extends AbstractExecMojo {
 class IsolatedThreadGroup extends ThreadGroup {
 Throwable uncaughtException; // synchronize access to this
 
-public IsolatedThreadGroup(String name) {
+IsolatedThreadGroup(String name) {
 super(name);
 }
 

[1/3] camel git commit: Support adding direct Camel plugin dependencies to classpath

[astefanutti]

Repository: camel
Updated Branches:
  refs/heads/master 0a890e35e -> 664562d3c


Support adding direct Camel plugin dependencies to classpath


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b784eda3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b784eda3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b784eda3

Branch: refs/heads/master
Commit: b784eda396913722ef773028286b0f98eabee939
Parents: 0a890e3
Author: Antonin Stefanutti 
Authored: Thu Mar 3 14:55:37 2016 +0100
Committer: Antonin Stefanutti 
Committed: Thu Mar 3 14:55:37 2016 +0100

--
 tooling/maven/camel-maven-plugin/pom.xml| 12 ++
 .../java/org/apache/camel/maven/RunMojo.java| 23 ++--
 2 files changed, 33 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b784eda3/tooling/maven/camel-maven-plugin/pom.xml
--
diff --git a/tooling/maven/camel-maven-plugin/pom.xml 
b/tooling/maven/camel-maven-plugin/pom.xml
index 09574a2..ee4777d 100644
--- a/tooling/maven/camel-maven-plugin/pom.xml
+++ b/tooling/maven/camel-maven-plugin/pom.xml
@@ -35,6 +35,18 @@
 
   org.codehaus.mojo
   exec-maven-plugin
+  
+
+  org.apache.maven
+  maven-plugin-descriptor
+
+  
+
+
+
+  org.apache.maven
+  maven-plugin-api
+  3.1.1
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b784eda3/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
--
diff --git 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index e30359d..48d7839 100644
--- 
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++ 
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -49,6 +49,7 @@ import org.apache.maven.model.Exclusion;
 import org.apache.maven.model.Resource;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectBuilder;
 import org.apache.maven.project.artifact.MavenMetadataSource;
@@ -922,8 +923,26 @@ public class RunMojo extends AbstractExecMojo {
 relevantDependencies = 
this.resolveExecutableDependencies(executablePomArtifact, false);
 }
 } else {
-relevantDependencies = Collections.emptySet();
-getLog().debug("Plugin Dependencies will be excluded.");
+getLog().debug("Only Direct Plugin Dependencies will be 
included.");
+PluginDescriptor descriptor = (PluginDescriptor) 
getPluginContext().get("pluginDescriptor");
+try {
+relevantDependencies = artifactResolver
+.resolveTransitively(MavenMetadataSource
+.createArtifacts(this.artifactFactory,
+descriptor.getPlugin().getDependencies(),
+null, null, null),
+this.project.getArtifact(),
+Collections.emptyMap(),
+this.localRepository,
+this.remoteRepositories,
+metadataSource,
+new ScopeArtifactFilter(Artifact.SCOPE_RUNTIME),
+Collections.emptyList())
+.getArtifacts();
+} catch (Exception ex) {
+throw new MojoExecutionException("Encountered problems 
resolving dependencies of the plugin "
++ "in preparation for its execution.", ex);
+}
 }
 return relevantDependencies;
 }