Author: gnodet
Date: Fri Nov 27 16:38:37 2009
New Revision: 884904
URL: http://svn.apache.org/viewvc?rev=884904&view=rev
Log:
FELIX-1902: [karaf] sanitize web demo README of references to FUSE SNAPSHOT
version
Added:
felix/trunk/karaf/assembly/src/main/filtered-resources/demos/
felix/trunk/karaf/assembly/src/main/filtered-resources/demos/web/
felix/trunk/karaf/assembly/src/main/filtered-resources/demos/web/README.txt
- copied, changed from r884878, felix/trunk/karaf/demos/web/README.txt
Removed:
felix/trunk/karaf/demos/web/README.txt
Modified:
felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml
felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml
Modified: felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml?rev=884904&r1=884903&r2=884904&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml (original)
+++ felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml Fri Nov 27
16:38:37 2009
@@ -61,6 +61,11 @@
<!-- Copy over the examples -->
<fileSet>
+ <directory>target/classes/demos</directory>
+ <outputDirectory>/demos/</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+ <fileSet>
<directory>../demos</directory>
<outputDirectory>/demos/</outputDirectory>
<lineEnding>unix</lineEnding>
Modified: felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml?rev=884904&r1=884903&r2=884904&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml (original)
+++ felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml Fri Nov 27
16:38:37 2009
@@ -61,6 +61,12 @@
<!-- Copy over the examples -->
<fileSet>
+ <directory>target/classes/demos</directory>
+ <outputDirectory>/demos/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <fileSet>
<directory>../demos</directory>
<outputDirectory>/demos/</outputDirectory>
<lineEnding>dos</lineEnding>
Copied:
felix/trunk/karaf/assembly/src/main/filtered-resources/demos/web/README.txt
(from r884878, felix/trunk/karaf/demos/web/README.txt)
URL:
http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/src/main/filtered-resources/demos/web/README.txt?p2=felix/trunk/karaf/assembly/src/main/filtered-resources/demos/web/README.txt&p1=felix/trunk/karaf/demos/web/README.txt&r1=884878&r2=884904&rev=884904&view=diff
==============================================================================
--- felix/trunk/karaf/demos/web/README.txt (original)
+++ felix/trunk/karaf/assembly/src/main/filtered-resources/demos/web/README.txt
Fri Nov 27 16:38:37 2009
@@ -79,14 +79,15 @@
In this case, you should see output similar to the following:
-[uninstalled] [2.5.6.SEC01 ] spring karaf-${version}
-[uninstalled] [1.2.0 ] spring-dm karaf-${version}
-[uninstalled] [1.1.0.1-fuse-SNAPSHOT] wrapper karaf-${version}
-[uninstalled] [1.1.0.1-fuse-SNAPSHOT] obr karaf-${version}
-[uninstalled] [1.1.0.1-fuse-SNAPSHOT] http karaf-${version}
-[uninstalled] [1.1.0.1-fuse-SNAPSHOT] webconsole karaf-${version}
-[installed ] [1.1.0.1-fuse-SNAPSHOT] ssh karaf-${version}
-[installed ] [1.1.0.1-fuse-SNAPSHOT] management karaf-${version}
+State Version Name Repository
+[uninstalled] [2.5.6.SEC01] spring karaf-${version}
+[uninstalled] [1.2.0 ] spring-dm karaf-${version}
+[uninstalled] [${pom.version}] wrapper karaf-${pom.version}
+[uninstalled] [${pom.version}] obr karaf-${pom.version}
+[uninstalled] [${pom.version}] http karaf-${pom.version}
+[uninstalled] [${pom.version}] webconsole karaf-${pom.version}
+[installed ] [${pom.version}] ssh karaf-${pom.version}
+[installed ] [${pom.version}] management karaf-${pom.version}
B. Using Your Favorite Web Container
@@ -105,4 +106,4 @@
saves it in the target directory of this example. Deploy this
WAR file to your favorite web container. Once the application
is running, you can test it using the Apache Felix Karaf client
-as described in the "Running a Client" section above.
\ No newline at end of file
+as described in the "Running a Client" section above.
