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 2016/04/13 16:02:16 UTC
[3/3] camel git commit: CAMEL-9521: Move spring-dm out of
camel-spring into a new camel-spring-dm module.
CAMEL-9521: Move spring-dm out of camel-spring into a new camel-spring-dm module.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b1356591
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b1356591
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b1356591
Branch: refs/heads/9521
Commit: b135659101232dd9627c140dd5d1abfdd0dae1d7
Parents: bb473dd
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Apr 13 16:01:43 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Apr 13 16:01:43 2016 +0200
----------------------------------------------------------------------
components/camel-spring/pom.xml | 99 +++++++++++----------
examples/camel-example-box-osgi/README.md | 8 +-
examples/camel-example-cdi-osgi/README.md | 16 ----
examples/camel-example-cxf-blueprint/README.md | 14 +--
examples/camel-example-cxf-osgi/README.md | 15 ++--
examples/camel-example-etl/README.md | 6 +-
examples/camel-example-mybatis/README.md | 6 +-
examples/camel-example-netty-http/README.md | 12 +--
examples/camel-example-osgi-rmi/README.md | 5 +-
examples/camel-example-spring-dm/README.md | 4 +-
10 files changed, 89 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b1356591/components/camel-spring/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 1424ab6..5245295 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -30,30 +30,31 @@
<packaging>jar</packaging>
<properties>
- <camel.osgi.import>
- !org.apache.camel.spring.*,
- !org.apache.camel.component,
- !org.apache.camel.component.event,
- !org.apache.camel.language.spel,
- !org.apache.camel.core.xml*,
- org.apache.camel.*;${camel.osgi.import.strict.version},
- org.springframework*;version="${spring-all-version-range}",
- org.osgi.service.event;resolution:=optional,
- ${camel.osgi.import.defaults},
- *
- </camel.osgi.import>
- <camel.osgi.export>
- org.apache.camel.spring.*;${camel.osgi.version},
- org.apache.camel.util.spring.*;${camel.osgi.version},
- org.apache.camel.component.event;${camel.osgi.split.pkg};${camel.osgi.version},
- org.apache.camel.language.spel;${camel.osgi.split.pkg};${camel.osgi.version}
- </camel.osgi.export>
- <camel.osgi.export.service>
- org.apache.camel.spi.ComponentResolver;component=spring-event,
- org.apache.camel.spi.LanguageResolver;language=spel
- </camel.osgi.export.service>
- <!-- do not skip any tests by default -->
- <platform.skip.tests/>
+ <!-- use spring-all-version-range to support camel-spring-dm also -->
+ <camel.osgi.import>
+ !org.apache.camel.spring.*,
+ !org.apache.camel.component,
+ !org.apache.camel.component.event,
+ !org.apache.camel.language.spel,
+ !org.apache.camel.core.xml*,
+ org.apache.camel.*;${camel.osgi.import.strict.version},
+ org.springframework*;version="${spring-all-version-range}",
+ org.osgi.service.event;resolution:=optional,
+ ${camel.osgi.import.defaults},
+ *
+ </camel.osgi.import>
+ <camel.osgi.export>
+ org.apache.camel.spring.*;${camel.osgi.version},
+ org.apache.camel.util.spring.*;${camel.osgi.version},
+ org.apache.camel.component.event;${camel.osgi.split.pkg};${camel.osgi.version},
+ org.apache.camel.language.spel;${camel.osgi.split.pkg};${camel.osgi.version}
+ </camel.osgi.export>
+ <camel.osgi.export.service>
+ org.apache.camel.spi.ComponentResolver;component=spring-event,
+ org.apache.camel.spi.LanguageResolver;language=spel
+ </camel.osgi.export.service>
+ <!-- do not skip any tests by default -->
+ <platform.skip.tests/>
</properties>
<dependencies>
@@ -135,31 +136,31 @@
<scope>test</scope>
</dependency>
- <!-- for testing Spring AOP at class level -->
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjrt</artifactId>
- <version>${aspectj-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.aspectj</groupId>
- <artifactId>aspectjweaver</artifactId>
- <version>${aspectj-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>${cglib-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>${asm-version}</version>
- <scope>test</scope>
- </dependency>
+ <!-- for testing Spring AOP at class level -->
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjrt</artifactId>
+ <version>${aspectj-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.aspectj</groupId>
+ <artifactId>aspectjweaver</artifactId>
+ <version>${aspectj-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>${cglib-version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm-version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/b1356591/examples/camel-example-box-osgi/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-box-osgi/README.md b/examples/camel-example-box-osgi/README.md
index d161cca..a0e8a32 100644
--- a/examples/camel-example-box-osgi/README.md
+++ b/examples/camel-example-box-osgi/README.md
@@ -18,7 +18,7 @@ First you will need to compile the example:
### Run
-To run the example on Apache Karaf 2.4.x
+To run the example on Apache Karaf 3.x or newer
#### Step 1
@@ -28,9 +28,9 @@ Launch karaf
Add features required into Karak
- features:chooseurl camel ${version}
- features:install camel-spring
- features:install camel-box
+ feature:repo-add camel ${version}
+ feature:install camel-spring-dm
+ feature:install camel-box
#### Step 3
http://git-wip-us.apache.org/repos/asf/camel/blob/b1356591/examples/camel-example-cdi-osgi/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-cdi-osgi/README.md b/examples/camel-example-cdi-osgi/README.md
index 50a9bd2..00e07c7 100644
--- a/examples/camel-example-cdi-osgi/README.md
+++ b/examples/camel-example-cdi-osgi/README.md
@@ -58,22 +58,6 @@ To run the example, from the command line:
$ bin/karaf
```
-2. For Karaf 2.x, install the following pre-requisites:
-
- ```sh
- karaf@root()> chooseurl camel 2.17.0
- karaf@root()> chooseurl activemq 5.13.2
- karaf@root()> features:install activemq-broker-noweb pax-cdi-weld camel-sjms camel-cdi
- ```
-
-3. Then install and start the example:
-
- ```sh
- karaf@root()> install -s mvn:org.apache.camel/camel-example-cdi-osgi/2.17.0
- ```
-
-Alternatively, with the new commands introduced since Karaf 3.x:
-
2. Install the pre-requisites:
```sh
http://git-wip-us.apache.org/repos/asf/camel/blob/b1356591/examples/camel-example-cxf-blueprint/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-blueprint/README.md b/examples/camel-example-cxf-blueprint/README.md
index 1a387c7..6aa6015 100644
--- a/examples/camel-example-cxf-blueprint/README.md
+++ b/examples/camel-example-cxf-blueprint/README.md
@@ -18,7 +18,7 @@ You will need to compile this example first:
### Run
-To run the example on Apache Karaf 2.4.x
+To run the example on Apache Karaf 3.x or newer
#### Step 1: Laraf
@@ -30,12 +30,12 @@ Launch the server
Add features required
- features:chooseurl camel ${version}
- features:install war
- features:install cxf
- features:install camel-jaxb
- features:install camel-blueprint
- features:install camel-cxf
+ feature:repo-add camel ${version}
+ feature:install war
+ feature:install cxf
+ feature:install camel
+ feature:install camel-jaxb
+ feature:install camel-cxf
#### Step 3: Deploy
Deploy the example
http://git-wip-us.apache.org/repos/asf/camel/blob/b1356591/examples/camel-example-cxf-osgi/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-cxf-osgi/README.md b/examples/camel-example-cxf-osgi/README.md
index 27f2cff..4536166 100644
--- a/examples/camel-example-cxf-osgi/README.md
+++ b/examples/camel-example-cxf-osgi/README.md
@@ -25,7 +25,7 @@ Remarks:
### Run
-To run the example on Apache Karaf 2.4.x
+To run the example on Apache Karaf 3.x or newer
#### Step 1: launch the server
@@ -33,12 +33,13 @@ To run the example on Apache Karaf 2.4.x
#### Step 2: Add features required
- features:chooseurl camel ${version}
- features:install war
- features:install cxf
- features:install camel-spring
- features:install camel-jaxb
- features:install camel-cxf
+ feature:repo-add camel ${version}
+ feature:install camel
+ feature:install war
+ feature:install cxf
+ feature:install camel-spring-dm
+ feature:install camel-jaxb
+ feature:install camel-cxf
#### Step 3: Deploy the example
http://git-wip-us.apache.org/repos/asf/camel/blob/b1356591/examples/camel-example-etl/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-etl/README.md b/examples/camel-example-etl/README.md
index 4e02a28..c6bf63b 100644
--- a/examples/camel-example-etl/README.md
+++ b/examples/camel-example-etl/README.md
@@ -36,8 +36,10 @@ You will need to compile and install this example first:
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
+ feature:repo-add camel ${version}
+ feature:install camel
+ feature:repo-add mvn:org.apache.camel/camel-example-etl/${version}/xml/features
+ feature:install camel-example-etl
The example outputs logs into the console. When you're done just hit <kbd>ctrl</kbd>+<kbd>d</kbd>
to exit the container. Next time you start the container again use the 'clean' option so that
http://git-wip-us.apache.org/repos/asf/camel/blob/b1356591/examples/camel-example-mybatis/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-mybatis/README.md b/examples/camel-example-mybatis/README.md
index f0c1139..ff46185 100644
--- a/examples/camel-example-mybatis/README.md
+++ b/examples/camel-example-mybatis/README.md
@@ -24,8 +24,10 @@ This example requires running in Apache Karaf / 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-mybatis/${version}/xml/features
- features:install camel-example-mybatis
+ feature:repo-add camel ${version}
+ feature:install camel
+ feature:repo-add mvn:org.apache.camel/camel-example-mybatis/${version}/xml/features
+ feature:install camel-example-mybatis
And you can see the application running by tailing the logs
http://git-wip-us.apache.org/repos/asf/camel/blob/b1356591/examples/camel-example-netty-http/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-netty-http/README.md b/examples/camel-example-netty-http/README.md
index f5e3f4e..b760bc9 100644
--- a/examples/camel-example-netty-http/README.md
+++ b/examples/camel-example-netty-http/README.md
@@ -22,10 +22,10 @@ You will need to compile and prepared this example first:
This example requires running in Apache Karaf / ServiceMix
-To install Apache Camel in Karaf you type in the shell (we use version 2.12.0):
+To install Apache Camel in Karaf you type in the shell
- features:chooseurl camel 2.12.0
- features:install camel
+ feature:repo-add camel 2.17.0
+ feature:install camel
First you need to install the following features in Karaf/ServiceMix with:
@@ -38,12 +38,12 @@ The port number can be changed by editing the following source file:
In the Apache Karaf / ServiceMix shell type:
- osgi:install -s mvn:org.apache.camel/camel-example-netty-http-shared/2.12.0
+ osgi:install -s mvn:org.apache.camel/camel-example-netty-http-shared/2.17.0
Then you can install the Camel applications:
- osgi:install -s mvn:org.apache.camel/camel-example-netty-myapp-one/2.12.0
- osgi:install -s mvn:org.apache.camel/camel-example-netty-myapp-two/2.12.0
+ osgi:install -s mvn:org.apache.camel/camel-example-netty-myapp-one/2.17.0
+ osgi:install -s mvn:org.apache.camel/camel-example-netty-myapp-two/2.17.0
From a web browser you can then try the example by accessing the followign URLs:
http://git-wip-us.apache.org/repos/asf/camel/blob/b1356591/examples/camel-example-osgi-rmi/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-osgi-rmi/README.md b/examples/camel-example-osgi-rmi/README.md
index 9ae14b0..438350d 100644
--- a/examples/camel-example-osgi-rmi/README.md
+++ b/examples/camel-example-osgi-rmi/README.md
@@ -35,8 +35,9 @@ from the shell
First the camel-rmi feature must be installed
- features:chooseurl camel ${version}
- features:install camel-rmi
+ feature:repo-add camel ${version}
+ feature:install camel-spring-dm
+ feature:install camel-rmi
Then install the example
http://git-wip-us.apache.org/repos/asf/camel/blob/b1356591/examples/camel-example-spring-dm/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-dm/README.md b/examples/camel-example-spring-dm/README.md
index dcba1d7..bb40a8d 100644
--- a/examples/camel-example-spring-dm/README.md
+++ b/examples/camel-example-spring-dm/README.md
@@ -24,8 +24,10 @@ You will need to compile and install this example first:
If using Apache Karaf / Apache ServiceMix you can install this example
from the shell using this example's "features.xml" for easy provisioning.
+ feature:repo-add camel ${version}
+ feature:install camel
feature:repo-add mvn:org.apache.camel/camel-example-spring-dm/${version}/xml/features
- feature:install camel-example-osgi
+ feature:install camel-example-spring-dm
The example outputs to the log, which you can see using