FELIX-1743: include the karaf manual into the distribution
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@825655 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/assembly/NOTICE b/karaf/assembly/NOTICE
index bb8ec5a..fc4a28a 100644
--- a/karaf/assembly/NOTICE
+++ b/karaf/assembly/NOTICE
@@ -31,6 +31,12 @@
SLF4J (http://www.slf4j.org/).
Licensed under the MIT License.
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+
+The PDF manual has been generated using http://www.princexml.com/
+and contains an attribution which should not be removed by
+licensee.
II. Used Software
@@ -42,9 +48,6 @@
Antony Lesuisse.
Licensed under Public Domain.
-This product includes software from http://www.json.org.
-Copyright (c) 2002 JSON.org
-
III. License Summary
- Apache License 2.0
diff --git a/karaf/assembly/pom.xml b/karaf/assembly/pom.xml
index b288ad8..c02d90b 100644
--- a/karaf/assembly/pom.xml
+++ b/karaf/assembly/pom.xml
@@ -39,6 +39,16 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf</groupId>
+ <artifactId>manual</artifactId>
+ <type>pdf</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>manual</artifactId>
+ <type>html</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf</groupId>
<artifactId>org.apache.felix.karaf.main</artifactId>
</dependency>
<dependency>
@@ -301,21 +311,35 @@
<artifactItem>
<groupId>org.apache.felix.karaf</groupId>
<artifactId>org.apache.felix.karaf.main</artifactId>
- <outputDirectory>target/dependencies</outputDirectory>
+ <outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>karaf.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.felix.karaf</groupId>
<artifactId>org.apache.felix.karaf.client</artifactId>
- <outputDirectory>target/dependencies</outputDirectory>
+ <outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>karaf-client.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.felix.karaf.jaas</groupId>
<artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
- <outputDirectory>target/dependencies</outputDirectory>
+ <outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>karaf-jaas-boot.jar</destFileName>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>manual</artifactId>
+ <type>pdf</type>
+ <outputDirectory>target/dependencies</outputDirectory>
+ <destFileName>manual.pdf</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>manual</artifactId>
+ <type>html</type>
+ <outputDirectory>target/dependencies</outputDirectory>
+ <destFileName>manual.html</destFileName>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
diff --git a/karaf/assembly/src/main/descriptors/unix-bin.xml b/karaf/assembly/src/main/descriptors/unix-bin.xml
index a9d0fe9..ab92574 100644
--- a/karaf/assembly/src/main/descriptors/unix-bin.xml
+++ b/karaf/assembly/src/main/descriptors/unix-bin.xml
@@ -93,7 +93,7 @@
<!-- Copy over jar files -->
<fileSet>
<directory>target/dependencies</directory>
- <outputDirectory>/lib/</outputDirectory>
+ <outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
diff --git a/karaf/assembly/src/main/descriptors/windows-bin.xml b/karaf/assembly/src/main/descriptors/windows-bin.xml
index 40d09d1..232cc76 100644
--- a/karaf/assembly/src/main/descriptors/windows-bin.xml
+++ b/karaf/assembly/src/main/descriptors/windows-bin.xml
@@ -84,7 +84,7 @@
<!-- Copy over jar files -->
<fileSet>
<directory>target/dependencies</directory>
- <outputDirectory>/lib/</outputDirectory>
+ <outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>