You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2013/10/21 16:52:03 UTC

git commit: CAMEL-6882: Make camel-example-etl work properly inside Karaf.

Updated Branches:
  refs/heads/master 5e9553582 -> 92b291074


CAMEL-6882: Make camel-example-etl work properly inside Karaf.

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

Branch: refs/heads/master
Commit: 92b29107494e9d062dfdcce48daa3648517a7f41
Parents: 5e95535
Author: Babak Vahdat <bv...@apache.org>
Authored: Mon Oct 21 16:51:53 2013 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Mon Oct 21 16:51:53 2013 +0200

----------------------------------------------------------------------
 examples/camel-example-etl/README.txt           | 17 ++++++++++++
 .../src/main/resources/features.xml             | 28 +++-----------------
 2 files changed, 20 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/92b29107/examples/camel-example-etl/README.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-etl/README.txt b/examples/camel-example-etl/README.txt
index 1d6d533..1378a9e 100644
--- a/examples/camel-example-etl/README.txt
+++ b/examples/camel-example-etl/README.txt
@@ -19,6 +19,23 @@ directory and the Spring XML configuration lives in
 
 To stop the example hit ctrl + c
 
+Running inside OSGi container
+=============================
+
+You will need to compile and install this example first:
+  mvn install
+
+If using Apache Karaf / Apache ServiceMix you can install this example
+from the shell using this example's "features.xml" for easy provisioning.
+
+  features:addUrl mvn:org.apache.camel/camel-example-etl/${version}/xml/features
+  features:install camel-example-etl
+
+The example outputs logs into the console. When you're done just hit ctrl + d to exit the container.
+Next time you start the container again use the 'clean' option so that this example's bundle gets
+removed and you don't see the logs anymore written into the console, e.g. in case of Karaf start it
+again using:
+  karaf clean
 
 If you hit any problems please let us know on the Camel Forums
   http://camel.apache.org/discussion-forums.html

http://git-wip-us.apache.org/repos/asf/camel/blob/92b29107/examples/camel-example-etl/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-etl/src/main/resources/features.xml b/examples/camel-example-etl/src/main/resources/features.xml
index c236825..fb2fe69 100644
--- a/examples/camel-example-etl/src/main/resources/features.xml
+++ b/examples/camel-example-etl/src/main/resources/features.xml
@@ -19,35 +19,13 @@
 
     <repository>mvn:org.apache.camel.karaf/apache-camel/${project.version}/xml/features</repository>
 
-    <feature name='openjpa-feature' version='${project.version}'>
-       <bundle>mvn:org.eclipse.persistence/javax.persistence/1.2.0</bundle>
-       <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.antlr/1.2.0</bundle>
-       <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.asm/1.2.0</bundle>
-       <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.core/1.2.0</bundle>
-       <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.jpa/1.2.0</bundle>
-    </feature>
-    
-    <feature name='hibernate-feauture' version='${project.version}'>
-       <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.java-persistence-api-1.1.1/1.4.0</bundle>
-       <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-dbcp/1.2.2_5</bundle>
-       <bundle>mvn:org.springframework/spring-jdbc/${spring-version}</bundle>
-       <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_2</bundle>
-       <bundle>mvn:org.antlr/com.springsource.antlr/2.7.7</bundle>
-       <bundle>mvn:org.objectweb.asm/com.springsource.org.objectweb.asm/1.5.3</bundle>
-       <bundle>mvn:net.sourceforge.cglib/com.springsource.net.sf.cglib/2.2.0</bundle>
-       <bundle>mvn:org.jboss.javassist/com.springsource.javassist/3.9.0.GA</bundle>
-       <bundle>mvn:org.hibernate/com.springsource.org.hibernate.annotations.common/3.3.0.ga</bundle>
-       <bundle>mvn:org.hibernate/com.springsource.org.hibernate.annotations/3.4.0.GA</bundle>
-       <bundle>mvn:org.hibernate/com.springsource.org.hibernate.ejb/3.4.0.GA</bundle>
-       <bundle>mvn:org.hibernate/com.springsource.org.hibernate/3.3.2.GA</bundle>
-       <bundle>mvn:org.springframework/spring-orm/${spring-version}</bundle>
-    </feature>
-    
     <feature name='camel-example-etl' version='${project.version}'>
-        <feature version="${project.version}">camel</feature>
         <feature version="${project.version}">camel-jaxb</feature>
         <feature version="${project.version}">camel-jpa</feature>
         <feature version="${project.version}">camel-juel</feature>
+        <feature version="${project.version}">camel-spring</feature>
+        <bundle>mvn:org.apache.derby/derby/${derby-version}</bundle>
+        <bundle>mvn:org.apache.openjpa/openjpa/${openjpa-version}</bundle>
         <bundle>mvn:org.apache.camel/camel-example-etl/${project.version}</bundle>
     </feature>