You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/04/22 12:50:27 UTC

[2/3] camel git commit: Polished example and fixed not to use bundle packaging as we switched to make this transparent when using jar with the new version of felix-bundle-plugin. Then they are like the other OSGi examples.

Polished example and fixed not to use bundle packaging as we switched to make this transparent when using jar with the new version of felix-bundle-plugin. Then they are like the other OSGi examples.


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

Branch: refs/heads/master
Commit: 5c15cf61e0ced99c08afd0e09847f93a6a21e842
Parents: 4d2984c
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Apr 22 14:46:47 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Apr 22 14:46:47 2017 +0200

----------------------------------------------------------------------
 examples/camel-example-netty-http/myapp-cdi/pom.xml    | 5 ++---
 examples/camel-example-transformer-blueprint/README.md | 9 +++++++--
 examples/camel-example-transformer-blueprint/pom.xml   | 3 +--
 3 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/5c15cf61/examples/camel-example-netty-http/myapp-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-netty-http/myapp-cdi/pom.xml b/examples/camel-example-netty-http/myapp-cdi/pom.xml
index a6daccf..54e198a 100644
--- a/examples/camel-example-netty-http/myapp-cdi/pom.xml
+++ b/examples/camel-example-netty-http/myapp-cdi/pom.xml
@@ -27,8 +27,8 @@
   </parent>
 
   <artifactId>camel-example-netty-myapp-cdi</artifactId>
-  <name>Camel :: Example :: Netty HTTP :: My Application CDI</name>
-  <packaging>bundle</packaging>
+  <name>Camel :: Example :: Netty HTTP :: My Application CDI (deprecated)</name>
+  <packaging>jar</packaging>
 
   <dependencies>
 
@@ -60,7 +60,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>

http://git-wip-us.apache.org/repos/asf/camel/blob/5c15cf61/examples/camel-example-transformer-blueprint/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-transformer-blueprint/README.md b/examples/camel-example-transformer-blueprint/README.md
index 663bfdc..6234932 100644
--- a/examples/camel-example-transformer-blueprint/README.md
+++ b/examples/camel-example-transformer-blueprint/README.md
@@ -27,12 +27,17 @@ To run the example on the karaf container
 
     karaf / karaf.bat
 
-#### Step 2: Deploy
+#### Step 2: Install Came;
+
+     feature:repo-add camel ${version}
+     feature:install camel
+
+#### Step 3: Deploy
 
     feature:repo-add mvn:org.apache.camel/camel-example-transformer-blueprint/${version}/xml/features
     feature:install camel-example-transformer-blueprint
 
-#### Step 3: Check the output
+#### Step 4: Check the output
 
 You will see the output in ${karaf}/data/karaf.log
 

http://git-wip-us.apache.org/repos/asf/camel/blob/5c15cf61/examples/camel-example-transformer-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-transformer-blueprint/pom.xml b/examples/camel-example-transformer-blueprint/pom.xml
index a74cc08..fa5b9fe 100644
--- a/examples/camel-example-transformer-blueprint/pom.xml
+++ b/examples/camel-example-transformer-blueprint/pom.xml
@@ -26,7 +26,7 @@
   </parent>
 
   <artifactId>camel-example-transformer-blueprint</artifactId>
-  <packaging>bundle</packaging>
+  <packaging>jar</packaging>
   <name>Camel :: Example :: Transformer :: Blueprint</name>
   <description>An example demonstrating declarative transformation along data type declaration using OSGi Blueprint XML</description>
 
@@ -106,7 +106,6 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>