FELIX-1902: [karaf] sanitize web demo README of references to FUSE SNAPSHOT version
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@884904 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/src/main/descriptors/unix-bin.xml b/karaf/assembly/src/main/descriptors/unix-bin.xml
index a0289cf..9f16dcf 100644
--- a/karaf/assembly/src/main/descriptors/unix-bin.xml
+++ b/karaf/assembly/src/main/descriptors/unix-bin.xml
@@ -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>
diff --git a/karaf/assembly/src/main/descriptors/windows-bin.xml b/karaf/assembly/src/main/descriptors/windows-bin.xml
index 7adbe14..726e3f2 100644
--- a/karaf/assembly/src/main/descriptors/windows-bin.xml
+++ b/karaf/assembly/src/main/descriptors/windows-bin.xml
@@ -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>
diff --git a/karaf/demos/web/README.txt b/karaf/assembly/src/main/filtered-resources/demos/web/README.txt
similarity index 84%
rename from karaf/demos/web/README.txt
rename to karaf/assembly/src/main/filtered-resources/demos/web/README.txt
index 95a22c3..46635c7 100644
--- a/karaf/demos/web/README.txt
+++ b/karaf/assembly/src/main/filtered-resources/demos/web/README.txt
@@ -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.