Repository: camel
Updated Branches:
  refs/heads/master 564c8c628 -> cae5ba22a


CAMEL-9030 The instructions for camel-example-box-osgi are incorrect


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

Branch: refs/heads/master
Commit: cae5ba22a892bd46cc2d90356ddce279770c954c
Parents: 564c8c6
Author: Tomas Rohovsky <troho...@redhat.com>
Authored: Tue Jul 28 19:37:40 2015 +0200
Committer: Andrea Cosentino <anco...@gmail.com>
Committed: Tue Jul 28 20:53:45 2015 +0200

----------------------------------------------------------------------
 examples/camel-example-box-osgi/README.txt                     | 6 +++---
 .../src/main/resources/META-INF/spring/camel-context.xml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/cae5ba22/examples/camel-example-box-osgi/README.txt
----------------------------------------------------------------------
diff --git a/examples/camel-example-box-osgi/README.txt 
b/examples/camel-example-box-osgi/README.txt
index ec3d6f3..90004c5 100644
--- a/examples/camel-example-box-osgi/README.txt
+++ b/examples/camel-example-box-osgi/README.txt
@@ -16,7 +16,7 @@ features:addUrl 
mvn:org.apache.camel.karaf/apache-camel/${version}/xml/features
 features:install camel-spring
 features:install camel-box
 
-3) Create a `box.properties` file in the Karaf working directory with the 
following properties
+3) Create a `box.properties` file in the Karaf base directory with the 
following properties
 set to your box account credentials.
 
         box.userName=
@@ -27,12 +27,12 @@ set to your box account credentials.
 3) Deploy the example
 osgi:install -s mvn:org.apache.camel/camel-example-box-osgi/${version}
 
-4) Copy files to the inbox directory in the Karaf working directory.
+4) Copy files to the `inbox` directory in the Karaf base directory.
 
 5) Watch them get transferred to your box.com account.
 
 Please help us make Apache Camel better - we appreciate any feedback you may
-have.  Enjoy!
+have. Enjoy!
 
 ------------------------
 The Camel Riders!

http://git-wip-us.apache.org/repos/asf/camel/blob/cae5ba22/examples/camel-example-box-osgi/src/main/resources/META-INF/spring/camel-context.xml
----------------------------------------------------------------------
diff --git 
a/examples/camel-example-box-osgi/src/main/resources/META-INF/spring/camel-context.xml
 
b/examples/camel-example-box-osgi/src/main/resources/META-INF/spring/camel-context.xml
index 6273825..1891ef7 100644
--- 
a/examples/camel-example-box-osgi/src/main/resources/META-INF/spring/camel-context.xml
+++ 
b/examples/camel-example-box-osgi/src/main/resources/META-INF/spring/camel-context.xml
@@ -26,7 +26,7 @@
   <bean id="placeholder" 
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
     <property name="locations">
       <list>
-        <value>file:box.com.properties</value>
+        <value>file:box.properties</value>
       </list>
     </property>
     <property name="ignoreResourceNotFound" value="true" />

Reply via email to