[karaf] fix NOTICE files (first pass)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@816773 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/NOTICE b/karaf/NOTICE
index 0e1c82c..547bae5 100644
--- a/karaf/NOTICE
+++ b/karaf/NOTICE
@@ -8,10 +8,9 @@
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2009).
-Licensed under the Apache License 2.0.
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
II. Used Software
diff --git a/karaf/assembly/NOTICE b/karaf/assembly/NOTICE
index 2e13739..ac41daf 100644
--- a/karaf/assembly/NOTICE
+++ b/karaf/assembly/NOTICE
@@ -7,16 +7,45 @@
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
+This product includes software developed at
+The Eclipse Foundation (http://www.eclipse.org/).
+Licensed under Eclipse Public License 1.0.
+
+This product includes software developed at
+OPS4J (http://www.ops4j.org/).
+Licensed under the Apache License 2.0.
+
+This products includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+This product includes software developed at
+SLF4J (http://www.slf4j.org/).
+Licensed under the MIT License.
+
II. Used Software
This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2009).
+SpringSource (http://www.springsource.org/).
Licensed under the Apache License 2.0.
+This product uses software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
III. License Summary
- Apache License 2.0
+- Eclipse Public License 1.0
+- Public Domain
diff --git a/karaf/assembly/pom.xml b/karaf/assembly/pom.xml
index 4923e8b..f2dca78 100644
--- a/karaf/assembly/pom.xml
+++ b/karaf/assembly/pom.xml
@@ -244,7 +244,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<id>create-prop</id>
@@ -274,18 +273,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b3</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
- <version>1.5.3-1</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/karaf/client/pom.xml b/karaf/client/pom.xml
index 3c851d2..bf034d8 100644
--- a/karaf/client/pom.xml
+++ b/karaf/client/pom.xml
@@ -82,7 +82,6 @@
META-INF;-split-package:=merge-first
</Private-Package>
<Import-Package>!*</Import-Package>
- <Include-Resource>{maven-resources},META-INF/NOTICE=NOTICE</Include-Resource>
</instructions>
<unpackBundle>true</unpackBundle>
</configuration>
diff --git a/karaf/demos/web/NOTICE b/karaf/demos/web/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/demos/web/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/demos/web/pom.xml b/karaf/demos/web/pom.xml
index 5358ac6..faaf9c4 100644
--- a/karaf/demos/web/pom.xml
+++ b/karaf/demos/web/pom.xml
@@ -36,8 +36,11 @@
<jetty.port>8080</jetty.port>
<jetty.version>6.1.12rc1</jetty.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
+
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
</properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf</groupId>
@@ -134,7 +137,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
<executions>
<execution>
<id>copy-karaf</id>
diff --git a/karaf/deployer/blueprint/NOTICE b/karaf/deployer/blueprint/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/deployer/blueprint/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/deployer/blueprint/pom.xml b/karaf/deployer/blueprint/pom.xml
index 70b9116..924c6b5 100644
--- a/karaf/deployer/blueprint/pom.xml
+++ b/karaf/deployer/blueprint/pom.xml
@@ -35,6 +35,10 @@
<description>This deployer transforms a plain blueprint xml file to a deployable bundle</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -68,6 +72,7 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+ <Import-Package>!${pom.artifactId}*,*</Import-Package>
<Private-Package>org.apache.felix.karaf.deployer.blueprint</Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
diff --git a/karaf/deployer/features/NOTICE b/karaf/deployer/features/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/deployer/features/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/deployer/features/pom.xml b/karaf/deployer/features/pom.xml
index 19cee2b..0e78670 100644
--- a/karaf/deployer/features/pom.xml
+++ b/karaf/deployer/features/pom.xml
@@ -35,6 +35,10 @@
<description>This deployer can deploy features descriptor on the fly</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -72,6 +76,7 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+ <Import-Package>!${pom.artifactId}*,*</Import-Package>
<Private-Package>org.apache.felix.karaf.deployer.features</Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
diff --git a/karaf/deployer/spring/NOTICE b/karaf/deployer/spring/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/deployer/spring/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/deployer/spring/pom.xml b/karaf/deployer/spring/pom.xml
index e3ee5a6..77156ae 100644
--- a/karaf/deployer/spring/pom.xml
+++ b/karaf/deployer/spring/pom.xml
@@ -35,6 +35,10 @@
<description>This deployer transforms a plain spring xml file to a deployable bundle</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -68,6 +72,7 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+ <Import-Package>!${pom.artifactId}*,*</Import-Package>
<Private-Package>org.apache.felix.karaf.deployer.spring</Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
diff --git a/karaf/features/command/NOTICE b/karaf/features/command/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/features/command/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/features/command/pom.xml b/karaf/features/command/pom.xml
index 6b676dd..4bbfe3f 100644
--- a/karaf/features/command/pom.xml
+++ b/karaf/features/command/pom.xml
@@ -33,6 +33,10 @@
<version>0.9.0-SNAPSHOT</version>
<name>Apache Felix Karaf :: Features Command</name>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -95,9 +99,10 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Package>${pom.artifactId}*;version=${pom.version}</Export-Package>
<Import-Package>
+ !${pom.artifactId}*,
javax.management,
javax.management.loading,
org.osgi.service.command,
diff --git a/karaf/features/core/NOTICE b/karaf/features/core/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/features/core/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/features/core/pom.xml b/karaf/features/core/pom.xml
index 9abb41d..bf32ce1 100644
--- a/karaf/features/core/pom.xml
+++ b/karaf/features/core/pom.xml
@@ -33,6 +33,10 @@
<version>0.9.0-SNAPSHOT</version>
<name>Apache Felix Karaf :: Features Core</name>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -90,9 +94,10 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.felix.karaf.features;version=${project.version}</Export-Package>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Package>org.apache.felix.karaf.features;version=${pom.version}</Export-Package>
<Import-Package>
+ !org.apache.felix.karaf.features,
javax.management,
javax.management.loading,
org.osgi.service.command,
diff --git a/karaf/features/management/NOTICE b/karaf/features/management/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/features/management/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/features/management/pom.xml b/karaf/features/management/pom.xml
index e0aff75..a5b3177 100644
--- a/karaf/features/management/pom.xml
+++ b/karaf/features/management/pom.xml
@@ -33,6 +33,10 @@
<version>0.9.0-SNAPSHOT</version>
<name>Apache Felix Karaf :: Features Management</name>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -95,17 +99,17 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>
- ${artifactId}*;version=${version}
+ ${pom.artifactId}*;version=${pom.version}
</Export-Package>
<Import-Package>
+ !${pom.artifactId}*,
javax.management,
javax.management.loading,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
- !${artifactId}*,
*
</Import-Package>
<Private-Package>org.apache.felix.karaf.features.management.internal</Private-Package>
diff --git a/karaf/itests/NOTICE b/karaf/itests/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/itests/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/itests/pom.xml b/karaf/itests/pom.xml
index 32dfc0a..584d64d 100644
--- a/karaf/itests/pom.xml
+++ b/karaf/itests/pom.xml
@@ -37,6 +37,10 @@
Integration tests
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<!-- This is required to be first so that pax-exam classloader is not messed up with a newer version of felix
which would lead to java.lang.NoSuchMethodError: org.apache.felix.framework.Logger.<init>(I)V -->
diff --git a/karaf/jaas/boot/NOTICE b/karaf/jaas/boot/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/jaas/boot/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/jaas/boot/pom.xml b/karaf/jaas/boot/pom.xml
index b69192e..f3a25df 100644
--- a/karaf/jaas/boot/pom.xml
+++ b/karaf/jaas/boot/pom.xml
@@ -37,6 +37,10 @@
Provides the JAAS Boot classes
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -52,9 +56,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
- <Import-Package>*</Import-Package>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Package>${pom.artifactId}*;version=${pom.version}</Export-Package>
+ <Import-Package>!${pom.artifactId}*,*</Import-Package>
<Private-Package>!*</Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
diff --git a/karaf/jaas/config/NOTICE b/karaf/jaas/config/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/jaas/config/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/jaas/config/pom.xml b/karaf/jaas/config/pom.xml
index 7c356a8..13880b5 100644
--- a/karaf/jaas/config/pom.xml
+++ b/karaf/jaas/config/pom.xml
@@ -37,6 +37,10 @@
Provides the JAAS Config
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf.jaas</groupId>
@@ -71,7 +75,7 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
- <Import-Package>*</Import-Package>
+ <Import-Package>!${pom.artifactId}*,*</Import-Package>
<Private-Package>${artifactId}.impl</Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
diff --git a/karaf/jaas/modules/NOTICE b/karaf/jaas/modules/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/jaas/modules/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/jaas/modules/pom.xml b/karaf/jaas/modules/pom.xml
index 72b9439..49965fc 100644
--- a/karaf/jaas/modules/pom.xml
+++ b/karaf/jaas/modules/pom.xml
@@ -37,6 +37,10 @@
Provides the JAAS Config
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf.jaas</groupId>
@@ -76,6 +80,7 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
+ !${pom.artifactId}*,
org.apache.felix.karaf.jaas.config,
org.apache.geronimo.blueprint.ext,
*
diff --git a/karaf/main/pom.xml b/karaf/main/pom.xml
index 5beddd4..7070f72 100644
--- a/karaf/main/pom.xml
+++ b/karaf/main/pom.xml
@@ -67,7 +67,6 @@
<Bundle-Description>OSGi R4 framework.</Bundle-Description>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.felix.karaf.main.spi.*;version=${pom.version}</Export-Package>
- <Include-Resource>{maven-resources},META-INF/NOTICE=NOTICE</Include-Resource>
<!--
<Private-Package>
org.apache.felix.*;-split-package:=merge-first,
diff --git a/karaf/management/NOTICE b/karaf/management/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/management/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/management/pom.xml b/karaf/management/pom.xml
index 76fbc71..19e1619 100644
--- a/karaf/management/pom.xml
+++ b/karaf/management/pom.xml
@@ -69,6 +69,7 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
+ !${pom.artifactId}*,
javax.management,
*
</Import-Package>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 5eb1e04..4e8f0a2 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -737,6 +737,23 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-3</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ <version>1.5.3-1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -768,6 +785,29 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-notice</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <tasks>
+ <copy file="NOTICE" todir="target/maven-shared-archive-resources/META-INF"
+ failonerror="false" overwrite="true" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
</plugins>
</build>
diff --git a/karaf/shell/admin/NOTICE b/karaf/shell/admin/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/shell/admin/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/shell/admin/pom.xml b/karaf/shell/admin/pom.xml
index f90cdf8..65252e7 100644
--- a/karaf/shell/admin/pom.xml
+++ b/karaf/shell/admin/pom.xml
@@ -37,6 +37,10 @@
Provides administration commands
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf.shell</groupId>
@@ -100,7 +104,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<id>create-prop</id>
@@ -130,18 +133,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b3</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
- <version>1.5.3-1</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -210,6 +201,7 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
+ !${pom.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/commands/NOTICE b/karaf/shell/commands/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/shell/commands/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/shell/commands/pom.xml b/karaf/shell/commands/pom.xml
index d703da1..b5f1ee3 100644
--- a/karaf/shell/commands/pom.xml
+++ b/karaf/shell/commands/pom.xml
@@ -37,6 +37,10 @@
Provides SSH support to the console
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf.shell</groupId>
@@ -62,6 +66,7 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
+ !${pom.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/config/NOTICE b/karaf/shell/config/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/shell/config/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/shell/config/pom.xml b/karaf/shell/config/pom.xml
index cf5efc5..f525e48 100644
--- a/karaf/shell/config/pom.xml
+++ b/karaf/shell/config/pom.xml
@@ -37,6 +37,10 @@
Provides the ConfigAdmin Shell commands
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf.shell</groupId>
@@ -72,6 +76,7 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
+ !${pom.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/console/NOTICE b/karaf/shell/console/NOTICE
new file mode 100644
index 0000000..b303416
--- /dev/null
+++ b/karaf/shell/console/NOTICE
@@ -0,0 +1,29 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+FUSE Source (http://www.fusesource.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+JLine (http://jline.sourceforge.net).
+Licensed under the BSD License.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/shell/console/pom.xml b/karaf/shell/console/pom.xml
index 902b38f..ea11520 100644
--- a/karaf/shell/console/pom.xml
+++ b/karaf/shell/console/pom.xml
@@ -37,6 +37,10 @@
Provides the OSGi Shell integration
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>jline</groupId>
@@ -101,10 +105,10 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Import-Package>
- !javax.swing,
!org.apache.felix.karaf.shell.console*,
- !org.fusesource.jansi*,
!org.apache.felix.gogo.commands*,
+ !org.fusesource.jansi*,
+ !javax.swing,
!jline,
com.sun.jna*;resolution:=optional,
org.apache.felix.karaf.branding;resolution:=optional,
diff --git a/karaf/shell/log/NOTICE b/karaf/shell/log/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/shell/log/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/shell/log/pom.xml b/karaf/shell/log/pom.xml
index bedb7f8..56bcd13 100644
--- a/karaf/shell/log/pom.xml
+++ b/karaf/shell/log/pom.xml
@@ -37,6 +37,10 @@
Provides the OSGi Log commands
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf.shell</groupId>
@@ -72,6 +76,7 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
+ !${pom.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/obr/NOTICE b/karaf/shell/obr/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/shell/obr/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/shell/obr/pom.xml b/karaf/shell/obr/pom.xml
index 0ab0f69..94fec6c 100644
--- a/karaf/shell/obr/pom.xml
+++ b/karaf/shell/obr/pom.xml
@@ -37,6 +37,10 @@
Provides the OBR Shell commands
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -67,6 +71,7 @@
${pom.artifactId}*;version=${project.version}
</Export-Package>
<Import-Package>
+ !${pom.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/osgi/NOTICE b/karaf/shell/osgi/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/shell/osgi/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/shell/osgi/pom.xml b/karaf/shell/osgi/pom.xml
index d9bd71d..73a0926 100644
--- a/karaf/shell/osgi/pom.xml
+++ b/karaf/shell/osgi/pom.xml
@@ -37,6 +37,10 @@
Provides the OSGi Shell commands
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf.shell</groupId>
@@ -76,6 +80,7 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
+ !${pom.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/packages/NOTICE b/karaf/shell/packages/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/shell/packages/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/shell/packages/pom.xml b/karaf/shell/packages/pom.xml
index 4f5b613..15f4cb2 100644
--- a/karaf/shell/packages/pom.xml
+++ b/karaf/shell/packages/pom.xml
@@ -37,6 +37,10 @@
Provides the PackageAdmin Shell commands
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf.shell</groupId>
@@ -66,6 +70,7 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
+ !${pom.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/src/test/configs/services/org.apache.servicemix.shell.properties b/karaf/shell/src/test/configs/services/org.apache.servicemix.shell.properties
deleted file mode 100644
index 7779a61..0000000
--- a/karaf/shell/src/test/configs/services/org.apache.servicemix.shell.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-#
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-startLocalConsole=false
diff --git a/karaf/shell/src/test/configs/services/org.ops4j.pax.logging.properties b/karaf/shell/src/test/configs/services/org.ops4j.pax.logging.properties
deleted file mode 100644
index d1f34a6..0000000
--- a/karaf/shell/src/test/configs/services/org.ops4j.pax.logging.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-#
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-log4j.rootLogger=DEBUG, out
-
-log4j.logger.org.springframework=DEBUG
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
-log4j.appender.out.file=target/shell.log
-log4j.appender.out.append=true
diff --git a/karaf/shell/ssh/NOTICE b/karaf/shell/ssh/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/shell/ssh/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/shell/ssh/pom.xml b/karaf/shell/ssh/pom.xml
index 3166527..6745f0a 100644
--- a/karaf/shell/ssh/pom.xml
+++ b/karaf/shell/ssh/pom.xml
@@ -37,6 +37,10 @@
Provides SSH support to the console
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf.shell</groupId>
@@ -85,6 +89,7 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
+ !${pom.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/shell/wrapper/NOTICE b/karaf/shell/wrapper/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/shell/wrapper/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/shell/wrapper/pom.xml b/karaf/shell/wrapper/pom.xml
index 765666c..31c9b4d 100644
--- a/karaf/shell/wrapper/pom.xml
+++ b/karaf/shell/wrapper/pom.xml
@@ -37,6 +37,10 @@
Provides the Service Wrapper Shell integration
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf.shell</groupId>
@@ -82,6 +86,7 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
+ !${pom.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,
diff --git a/karaf/tooling/features-maven-plugin/LICENSE b/karaf/tooling/features-maven-plugin/LICENSE
deleted file mode 100644
index 6b0b127..0000000
--- a/karaf/tooling/features-maven-plugin/LICENSE
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
diff --git a/karaf/tooling/features-maven-plugin/NOTICE b/karaf/tooling/features-maven-plugin/NOTICE
index 7d60d0c..801b82a 100644
--- a/karaf/tooling/features-maven-plugin/NOTICE
+++ b/karaf/tooling/features-maven-plugin/NOTICE
@@ -1,9 +1,16 @@
- =========================================================================
- == NOTICE file for use with the Apache License, Version 2.0, ==
- == in this case for the Apache Felix Karaf distribution. ==
- =========================================================================
-
- This product contains software developed by
- The Apache Software Foundation (http://www.apache.org/).
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/tooling/features-maven-plugin/pom.xml b/karaf/tooling/features-maven-plugin/pom.xml
index 8c7d8d7..e1b0667 100644
--- a/karaf/tooling/features-maven-plugin/pom.xml
+++ b/karaf/tooling/features-maven-plugin/pom.xml
@@ -34,6 +34,10 @@
A Maven 2 plugin for working with feature descriptors
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/karaf/webconsole/admin/NOTICE b/karaf/webconsole/admin/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/webconsole/admin/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/webconsole/admin/pom.xml b/karaf/webconsole/admin/pom.xml
index 2633291..2eeced8 100644
--- a/karaf/webconsole/admin/pom.xml
+++ b/karaf/webconsole/admin/pom.xml
@@ -33,6 +33,10 @@
<version>0.9.0-SNAPSHOT</version>
<name>Apache Felix Karaf :: Web Console :: Admin Plugin</name>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -82,7 +86,8 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.felix.karaf.webconsole.admin;version=${pom.version}</Export-Package>
+ <Import-Package>!${pom.artifactId}*,*</Import-Package>
+ <Export-Package>${pom.artifactId}*;version=${pom.version}</Export-Package>
<Embed-Dependency>
<!-- Required for JSON data transfer -->
<!-- TODO: this needs to be put in a common place for reuse. -->
diff --git a/karaf/webconsole/branding/NOTICE b/karaf/webconsole/branding/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/webconsole/branding/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/webconsole/branding/pom.xml b/karaf/webconsole/branding/pom.xml
index 3c1348b..7cac768 100644
--- a/karaf/webconsole/branding/pom.xml
+++ b/karaf/webconsole/branding/pom.xml
@@ -38,6 +38,9 @@
through the /META-INF/webconsole.properties.
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
<build>
<plugins>
diff --git a/karaf/webconsole/features/NOTICE b/karaf/webconsole/features/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/webconsole/features/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/webconsole/features/pom.xml b/karaf/webconsole/features/pom.xml
index a38aae4..c0cfc78 100644
--- a/karaf/webconsole/features/pom.xml
+++ b/karaf/webconsole/features/pom.xml
@@ -34,6 +34,10 @@
<version>0.9.0-SNAPSHOT</version>
<name>Apache Felix Karaf :: Web Console :: Features Plugin</name>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -86,7 +90,8 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.felix.karaf.webconsole.features;version=${pom.version}</Export-Package>
+ <Import-Package>!${pom.artifactId}*,*</Import-Package>
+ <Export-Package>${pom.artifactId}*;version=${pom.version}</Export-Package>
<Embed-Dependency>
<!-- Required for JSON data transfer -->
<!-- TODO: this needs to be put in a common place for reuse. -->
diff --git a/karaf/webconsole/gogo/NOTICE b/karaf/webconsole/gogo/NOTICE
new file mode 100644
index 0000000..547bae5
--- /dev/null
+++ b/karaf/webconsole/gogo/NOTICE
@@ -0,0 +1,25 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software written by
+Antony Lesuisse.
+Licensed under Public Domain.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/webconsole/gogo/pom.xml b/karaf/webconsole/gogo/pom.xml
index 35c8059..b201151 100644
--- a/karaf/webconsole/gogo/pom.xml
+++ b/karaf/webconsole/gogo/pom.xml
@@ -34,6 +34,10 @@
<version>0.9.0-SNAPSHOT</version>
<name>Apache Felix Karaf :: Web Console :: Gogo Plugin</name>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -86,7 +90,8 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.felix.karaf.webconsole.gogo;version=${pom.version}</Export-Package>
+ <Import-Package>!${pom.artifactId}*,*</Import-Package>
+ <Export-Package>${pom.artifactId}*;version=${pom.version}</Export-Package>
<Embed-Dependency>
<!-- Required for JSON data transfer -->
<!-- TODO: this needs to be put in a common place for reuse. -->