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/08/02 06:11:46 UTC
[1/3] camel git commit: CAMEL-10081: Update Readme for Karaf 4 style
Repository: camel
Updated Branches:
refs/heads/master dc7770149 -> 089f93edb
CAMEL-10081: Update Readme for Karaf 4 style
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/089f93ed
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/089f93ed
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/089f93ed
Branch: refs/heads/master
Commit: 089f93edb3c4935169d9fc312baac0c0c3190537
Parents: 0264a03
Author: Darius <da...@gmail.com>
Authored: Mon Aug 1 15:25:07 2016 -0400
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Aug 2 08:11:26 2016 +0200
----------------------------------------------------------------------
examples/camel-example-box-osgi/README.md | 4 ++--
examples/camel-example-cxf-blueprint/README.md | 2 +-
examples/camel-example-cxf-osgi/README.md | 2 +-
examples/camel-example-netty-http/README.md | 12 ++++++------
examples/camel-example-osgi-rmi/README.md | 2 +-
.../README.md | 20 ++++++++++----------
.../README.md | 12 ++++++------
examples/camel-example-sql/README.md | 16 ++++++++--------
examples/camel-example-ssh-security/README.md | 4 ++--
examples/camel-example-ssh/README.md | 6 +++---
.../README.md | 10 +++++-----
11 files changed, 45 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/089f93ed/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 a0e8a32..a6368e5 100644
--- a/examples/camel-example-box-osgi/README.md
+++ b/examples/camel-example-box-osgi/README.md
@@ -44,9 +44,9 @@ set to your box account credentials.
#### Step 4
-Deploy the example into Karak
+Deploy the example into Karaf
- osgi:install -s mvn:org.apache.camel/camel-example-box-osgi/${version}
+ install -s mvn:org.apache.camel/camel-example-box-osgi/${version}
#### Step 5
http://git-wip-us.apache.org/repos/asf/camel/blob/089f93ed/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 6aa6015..cc25867 100644
--- a/examples/camel-example-cxf-blueprint/README.md
+++ b/examples/camel-example-cxf-blueprint/README.md
@@ -40,7 +40,7 @@ Add features required
#### Step 3: Deploy
Deploy the example
- osgi:install -s mvn:org.apache.camel/camel-example-cxf-blueprint/${version}
+ install -s mvn:org.apache.camel/camel-example-cxf-blueprint/${version}
#### Step 4: Verify that your service is available using the following url in the browser.
http://git-wip-us.apache.org/repos/asf/camel/blob/089f93ed/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 4536166..0acf52a 100644
--- a/examples/camel-example-cxf-osgi/README.md
+++ b/examples/camel-example-cxf-osgi/README.md
@@ -44,7 +44,7 @@ To run the example on Apache Karaf 3.x or newer
#### Step 3: Deploy the example
- osgi:install -s mvn:org.apache.camel/camel-example-cxf-osgi/${version}
+ install -s mvn:org.apache.camel/camel-example-cxf-osgi/${version}
#### Step 4: Verify that your service is available using the following url in the browser.
We assume you're using Karaf's default PAX Web configuration which uses
http://git-wip-us.apache.org/repos/asf/camel/blob/089f93ed/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 57eebe4..de6cf7f 100644
--- a/examples/camel-example-netty-http/README.md
+++ b/examples/camel-example-netty-http/README.md
@@ -31,7 +31,7 @@ karaf@root()> feature:install camel
Then you need to install the following features in Karaf/ServiceMix:
```sh
-karaf@root()> features:install camel-netty-http
+karaf@root()> feature:install camel-netty-http
```
Then you can install the shared Netty HTTP server which by default runs on port `8888`.
@@ -42,26 +42,26 @@ The port number can be changed by editing the following source file:
In the Apache Karaf / ServiceMix shell type:
```sh
-karaf@root()> osgi:install -s mvn:org.apache.camel/camel-example-netty-http-shared/2.17.0
+karaf@root()> install -s mvn:org.apache.camel/camel-example-netty-http-shared/2.17.0
```
Then you can install the Camel applications:
```sh
-karaf@root()> osgi:install -s mvn:org.apache.camel/camel-example-netty-myapp-one/2.17.0
-karaf@root()> osgi:install -s mvn:org.apache.camel/camel-example-netty-myapp-two/2.17.0
+karaf@root()> install -s mvn:org.apache.camel/camel-example-netty-myapp-one/2.17.0
+karaf@root()> install -s mvn:org.apache.camel/camel-example-netty-myapp-two/2.17.0
```
If you want to test the Camel CDI application, you first need to install the required features:
```sh
-karaf@root()> features:install pax-cdi-weld camel-cdi
+karaf@root()> feature:install pax-cdi-weld camel-cdi
```
And then install the Camel CDI application:
```sh
-karaf@root()> osgi:install -s mvn:org.apache.camel/camel-example-netty-myapp-cdi/2.17.0
+karaf@root()> install -s mvn:org.apache.camel/camel-example-netty-myapp-cdi/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/089f93ed/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 438350d..add7d99 100644
--- a/examples/camel-example-osgi-rmi/README.md
+++ b/examples/camel-example-osgi-rmi/README.md
@@ -41,7 +41,7 @@ First the camel-rmi feature must be installed
Then install the example
- osgi:install -s mvn:org.apache.camel/camel-example-osgi-rmi/${version}
+ install -s mvn:org.apache.camel/camel-example-osgi-rmi/${version}
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/089f93ed/examples/camel-example-reportincident-wssecurity/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-reportincident-wssecurity/README.md b/examples/camel-example-reportincident-wssecurity/README.md
index 9146ac6..27e7b22 100644
--- a/examples/camel-example-reportincident-wssecurity/README.md
+++ b/examples/camel-example-reportincident-wssecurity/README.md
@@ -41,22 +41,22 @@ To run the example on Apache ServiceMix 4.x or Apache Karaf 2.x
#### Step 2: Add features required
- features:addUrl mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
- features:install http
- features:install camel
- features:install camel-cxf
- features:install camel-mail
- features:install camel-velocity
- features:install cxf-bindings-corba
- features:install cxf-transports-jms
- features:install cxf-ws-security
+ feature:repo-add mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
+ feature:install http
+ feature:install camel
+ feature:install camel-cxf
+ feature:install camel-mail
+ feature:install camel-velocity
+ feature:install cxf-bindings-corba
+ feature:install cxf-transports-jms
+ feature:install cxf-ws-security
remark: As the camel route sends email to a SMTP server, you must configure a user/password in your favorite
SMTP Server (James by example). User = someone and password = secret
#### Step 3: Deploy our example
- osgi:install -s mvn:org.apache.camel/camel-example-reportincident-wssecurity/${project.version}
+ install -s mvn:org.apache.camel/camel-example-reportincident-wssecurity/${project.version}
#### Step 4: Verify that your service is available using in the browser the following url
http://git-wip-us.apache.org/repos/asf/camel/blob/089f93ed/examples/camel-example-servlet-rest-blueprint/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-blueprint/README.md b/examples/camel-example-servlet-rest-blueprint/README.md
index 0890c7c..e4737ce 100644
--- a/examples/camel-example-servlet-rest-blueprint/README.md
+++ b/examples/camel-example-servlet-rest-blueprint/README.md
@@ -14,18 +14,18 @@ You will need to compile this example first:
### run
To install Apache Camel in Karaf you type in the shell (we use version ${project.version}):
- features:chooseurl camel ${project.version}
- features:install camel
+ feature:repo-add camel ${project.version}
+ feature:install camel
First you need to install the following features in Karaf/ServiceMix with:
- features:install camel-servlet
- features:install camel-jackson
- features:install war
+ feature:install camel-servlet
+ feature:install camel-jackson
+ feature:install war
Then you can install the Camel example:
- osgi:install -s mvn:org.apache.camel/camel-example-servlet-rest-blueprint/${project.version}
+ install -s mvn:org.apache.camel/camel-example-servlet-rest-blueprint/${project.version}
And you can see the application running by tailing the logs
http://git-wip-us.apache.org/repos/asf/camel/blob/089f93ed/examples/camel-example-sql/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-sql/README.md b/examples/camel-example-sql/README.md
index 62b575a..f2d0bd4 100644
--- a/examples/camel-example-sql/README.md
+++ b/examples/camel-example-sql/README.md
@@ -32,23 +32,23 @@ In the src/main/resources/META-INF/spring/camel-context.xml
To install Apache Camel in Karaf you type in the shell (we use version ${project.version}):
- features:chooseurl camel ${project.version}
- features:install camel
+ feature:repo-add camel ${project.version}
+ feature:install camel
First you need to install the following features in Karaf/ServiceMix with:
- features:install camel-spring
- features:install camel-sql
+ feature:install camel-spring
+ feature:install camel-sql
Then you need to install JDBC connection pool and the Derby Database:
- osgi:install -s mvn:commons-pool/commons-pool/1.6
- osgi:install -s mvn:commons-dbcp/commons-dbcp/1.4
- osgi:install -s mvn:org.apache.derby/derby/10.10.1.1
+ install -s mvn:commons-pool/commons-pool/1.6
+ install -s mvn:commons-dbcp/commons-dbcp/1.4
+ install -s mvn:org.apache.derby/derby/10.10.1.1
Then you can install the Camel example:
- osgi:install -s mvn:org.apache.camel/camel-example-sql/${project.version}
+ install -s mvn:org.apache.camel/camel-example-sql/${project.version}
And you can see the application running by tailing the logs
http://git-wip-us.apache.org/repos/asf/camel/blob/089f93ed/examples/camel-example-ssh-security/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-ssh-security/README.md b/examples/camel-example-ssh-security/README.md
index df8c7a8..126c864 100644
--- a/examples/camel-example-ssh-security/README.md
+++ b/examples/camel-example-ssh-security/README.md
@@ -78,8 +78,8 @@ the `<karaf_home>` directory.
From the running Karaf console, run the following commands to install this example into your
running Karaf server.
- features:addurl mvn:org.apache.camel/camel-example-ssh-security/<camel version>/xml/features
- features:install camel-example-ssh-security
+ feature:repo-add mvn:org.apache.camel/camel-example-ssh-security/<camel version>/xml/features
+ feature:install camel-example-ssh-security
This example outputs into the Karaf log file so you can either `tail -f <karaf_home>data/log/karaf.log`
or from the Karaf console run the following command
http://git-wip-us.apache.org/repos/asf/camel/blob/089f93ed/examples/camel-example-ssh/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-ssh/README.md b/examples/camel-example-ssh/README.md
index b04cecb..93f3219 100644
--- a/examples/camel-example-ssh/README.md
+++ b/examples/camel-example-ssh/README.md
@@ -23,9 +23,9 @@ To stop the example hit <kbd>ctrl</kbd>+<kbd>c</kbd>
If using Apache Karaf / Apache ServiceMix you can install this example
from the shell
- features:chooseurl camel <camel version>
- features:addurl mvn:org.apache.camel/camel-example-ssh/<camel version>/xml/features
- features:install camel-example-ssh
+ feature:repo-add camel <camel version>
+ feature:repo-add mvn:org.apache.camel/camel-example-ssh/<camel version>/xml/features
+ feature:install camel-example-ssh
### Forum, Help, etc
http://git-wip-us.apache.org/repos/asf/camel/blob/089f93ed/examples/camel-example-twitter-websocket-blueprint/README.md
----------------------------------------------------------------------
diff --git a/examples/camel-example-twitter-websocket-blueprint/README.md b/examples/camel-example-twitter-websocket-blueprint/README.md
index 862b501..b670270 100644
--- a/examples/camel-example-twitter-websocket-blueprint/README.md
+++ b/examples/camel-example-twitter-websocket-blueprint/README.md
@@ -22,17 +22,17 @@ This example requires running in Apache Karaf / ServiceMix
To install Apache Camel in Karaf you type in the shell (as an example here we make use of
Camel version 2.12.0):
- features:chooseurl camel 2.12.0
+ feature:repo-add camel 2.12.0
First you need to install the following features in Karaf/ServiceMix with:
- features:install camel-blueprint
- features:install camel-twitter
- features:install camel-websocket
+ feature:install camel-blueprint
+ feature:install camel-twitter
+ feature:install camel-websocket
Then you can install the Camel example:
- osgi:install -s mvn:org.apache.camel/camel-example-twitter-websocket-blueprint/2.12.0
+ install -s mvn:org.apache.camel/camel-example-twitter-websocket-blueprint/2.12.0
Then open a browser to see live twitter updates in the web page
[2/3] camel git commit: fix two typos in comments of
GenericFileConsumer and FilerConsumerDoneFileNameTest
Posted by da...@apache.org.
fix two typos in comments of GenericFileConsumer and FilerConsumerDoneFileNameTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0264a03c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0264a03c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0264a03c
Branch: refs/heads/master
Commit: 0264a03cfcee5ef072820db8f57fdfadda2bd810
Parents: 120728a
Author: Pascal Schumacher <pa...@gmx.net>
Authored: Mon Aug 1 19:57:09 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Aug 2 08:11:26 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/component/file/GenericFileConsumer.java | 2 +-
.../apache/camel/component/file/FilerConsumerDoneFileNameTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0264a03c/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
index 72d4ed1..82d94f6 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConsumer.java
@@ -125,7 +125,7 @@ public abstract class GenericFileConsumer<T> extends ScheduledBatchPollingConsum
List<GenericFile<T>> files = new ArrayList<GenericFile<T>>();
String name = endpoint.getConfiguration().getDirectory();
- // time how long time it takes to poll
+ // time how long it takes to poll
StopWatch stop = new StopWatch();
boolean limitHit;
try {
http://git-wip-us.apache.org/repos/asf/camel/blob/0264a03c/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerDoneFileNameTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerDoneFileNameTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerDoneFileNameTest.java
index 18ca116..cff4f26 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerDoneFileNameTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FilerConsumerDoneFileNameTest.java
@@ -38,7 +38,7 @@ public class FilerConsumerDoneFileNameTest extends ContextTestSupport {
template.sendBodyAndHeader("file:target/done", "Hello World", Exchange.FILE_NAME, "hello.txt");
- // wait a bit and it should not pickup the written file as there are no done file
+ // wait a bit and it should not pickup the written file as there is no done file
Thread.sleep(250);
assertMockEndpointsSatisfied();
[3/3] camel git commit: fix typo in text method name of
FileConsumeDoneFileIssueTest
Posted by da...@apache.org.
fix typo in text method name of FileConsumeDoneFileIssueTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/120728af
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/120728af
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/120728af
Branch: refs/heads/master
Commit: 120728af5cc7f14fbefd3bf0fec532dfd0f77d69
Parents: dc77701
Author: Pascal Schumacher <pa...@gmx.net>
Authored: Mon Aug 1 19:56:22 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Aug 2 08:11:26 2016 +0200
----------------------------------------------------------------------
.../apache/camel/component/file/FileConsumeDoneFileIssueTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/120728af/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
index d57781a..4f05221 100644
--- a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDoneFileIssueTest.java
@@ -60,7 +60,7 @@ public class FileConsumeDoneFileIssueTest extends ContextTestSupport {
assertFalse("Done file should be deleted", new File("target/done/foo.done").exists());
}
- public void testFileConsumseDynamicDoneFileName() throws Exception {
+ public void testFileConsumeDynamicDoneFileName() throws Exception {
NotifyBuilder notify = new NotifyBuilder(context).whenDone(3).create();
template.sendBodyAndHeader("file:target/done2", "A", Exchange.FILE_NAME, "a.txt");