You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by gn...@apache.org on 2009/10/15 23:01:10 UTC
svn commit: r825655 - in /felix/trunk/karaf: assembly/NOTICE
assembly/pom.xml assembly/src/main/descriptors/unix-bin.xml
assembly/src/main/descriptors/windows-bin.xml pom.xml
Author: gnodet
Date: Thu Oct 15 21:01:09 2009
New Revision: 825655
URL: http://svn.apache.org/viewvc?rev=825655&view=rev
Log:
FELIX-1743: include the karaf manual into the distribution
Modified:
felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/assembly/pom.xml
felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml
felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml
felix/trunk/karaf/pom.xml
Modified: felix/trunk/karaf/assembly/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/NOTICE?rev=825655&r1=825654&r2=825655&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/assembly/NOTICE Thu Oct 15 21:01:09 2009
@@ -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
Modified: felix/trunk/karaf/assembly/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/pom.xml?rev=825655&r1=825654&r2=825655&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/pom.xml (original)
+++ felix/trunk/karaf/assembly/pom.xml Thu Oct 15 21:01:09 2009
@@ -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>
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=825655&r1=825654&r2=825655&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml (original)
+++ felix/trunk/karaf/assembly/src/main/descriptors/unix-bin.xml Thu Oct 15 21:01:09 2009
@@ -93,7 +93,7 @@
<!-- Copy over jar files -->
<fileSet>
<directory>target/dependencies</directory>
- <outputDirectory>/lib/</outputDirectory>
+ <outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
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=825655&r1=825654&r2=825655&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml (original)
+++ felix/trunk/karaf/assembly/src/main/descriptors/windows-bin.xml Thu Oct 15 21:01:09 2009
@@ -84,7 +84,7 @@
<!-- Copy over jar files -->
<fileSet>
<directory>target/dependencies</directory>
- <outputDirectory>/lib/</outputDirectory>
+ <outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
Modified: felix/trunk/karaf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=825655&r1=825654&r2=825655&view=diff
==============================================================================
--- felix/trunk/karaf/pom.xml (original)
+++ felix/trunk/karaf/pom.xml Thu Oct 15 21:01:09 2009
@@ -149,6 +149,18 @@
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf</groupId>
+ <artifactId>manual</artifactId>
+ <type>pdf</type>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf</groupId>
+ <artifactId>manual</artifactId>
+ <type>html</type>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix.karaf</groupId>
<artifactId>org.apache.felix.karaf.main</artifactId>
<version>${pom.version}</version>
</dependency>