Author: jbonofre
Date: Thu Aug 25 06:43:18 2011
New Revision: 1161410
URL: http://svn.apache.org/viewvc?rev=1161410&view=rev
Log:
[KARAF-824] Fix demos/web assembly and update the README file
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml?rev=1161410&r1=1161409&r2=1161410&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
Thu Aug 25 06:43:18 2011
@@ -70,7 +70,7 @@
<lineEnding>unix</lineEnding>
</fileSet>
<fileSet>
- <directory>../demos</directory>
+ <directory>../../demos</directory>
<outputDirectory>/demos/</outputDirectory>
<lineEnding>unix</lineEnding>
<excludes>
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml?rev=1161410&r1=1161409&r2=1161410&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
Thu Aug 25 06:43:18 2011
@@ -69,7 +69,7 @@
</fileSet>
<fileSet>
- <directory>../demos</directory>
+ <directory>../../demos</directory>
<outputDirectory>/demos/</outputDirectory>
<lineEnding>dos</lineEnding>
<excludes>
Modified:
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt
URL:
http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt?rev=1161410&r1=1161409&r2=1161410&view=diff
==============================================================================
---
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt
(original)
+++
karaf/branches/karaf-2.2.x/assemblies/apache-karaf/src/main/filtered-resources/demos/web/README.txt
Thu Aug 25 06:43:18 2011
@@ -73,9 +73,16 @@ try executing the "features:list" comman
1. In a command prompt/shell, change to your product
installation directory.
-2. Run the following command:
+2. Run the following commands:
- java -jar lib/karaf-client.jar features:list
+ Unix:
+ ${KARAF_HOME}/bin/client features:list
+
+ Windows:
+ %KARAF_HOME%\bin\client.bat features:list
+
+ Using JDK:
+ java -jar lib/bin/karaf-client.jar features:list
In this case, you should see output similar to the following:
