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/09/18 22:25:08 UTC
svn commit: r816773 - in /felix/trunk/karaf: ./ assembly/ client/ demos/web/
deployer/blueprint/ deployer/features/ deployer/spring/ features/command/
features/core/ features/management/ itests/ jaas/boot/ jaas/config/
jaas/modules/ main/ management/ s...
Author: gnodet
Date: Fri Sep 18 20:25:06 2009
New Revision: 816773
URL: http://svn.apache.org/viewvc?rev=816773&view=rev
Log:
[karaf] fix NOTICE files (first pass)
Added:
felix/trunk/karaf/demos/web/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/deployer/blueprint/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/deployer/features/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/deployer/spring/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/features/command/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/features/core/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/features/management/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/itests/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/jaas/boot/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/jaas/config/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/jaas/modules/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/management/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/shell/admin/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/shell/commands/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/shell/config/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/shell/console/NOTICE
- copied, changed from r816769, felix/trunk/karaf/NOTICE
felix/trunk/karaf/shell/log/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/shell/obr/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/shell/osgi/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/shell/packages/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/shell/ssh/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/shell/wrapper/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/webconsole/admin/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/webconsole/branding/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/webconsole/features/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/webconsole/gogo/NOTICE
- copied, changed from r816769, felix/trunk/karaf/assembly/NOTICE
Removed:
felix/trunk/karaf/shell/src/test/configs/services/org.apache.servicemix.shell.properties
felix/trunk/karaf/shell/src/test/configs/services/org.ops4j.pax.logging.properties
felix/trunk/karaf/tooling/features-maven-plugin/LICENSE
Modified:
felix/trunk/karaf/NOTICE
felix/trunk/karaf/assembly/NOTICE
felix/trunk/karaf/assembly/pom.xml
felix/trunk/karaf/client/pom.xml
felix/trunk/karaf/demos/web/pom.xml
felix/trunk/karaf/deployer/blueprint/pom.xml
felix/trunk/karaf/deployer/features/pom.xml
felix/trunk/karaf/deployer/spring/pom.xml
felix/trunk/karaf/features/command/pom.xml
felix/trunk/karaf/features/core/pom.xml
felix/trunk/karaf/features/management/pom.xml
felix/trunk/karaf/itests/pom.xml
felix/trunk/karaf/jaas/boot/pom.xml
felix/trunk/karaf/jaas/config/pom.xml
felix/trunk/karaf/jaas/modules/pom.xml
felix/trunk/karaf/main/pom.xml
felix/trunk/karaf/management/pom.xml
felix/trunk/karaf/pom.xml
felix/trunk/karaf/shell/admin/pom.xml
felix/trunk/karaf/shell/commands/pom.xml
felix/trunk/karaf/shell/config/pom.xml
felix/trunk/karaf/shell/console/pom.xml
felix/trunk/karaf/shell/log/pom.xml
felix/trunk/karaf/shell/obr/pom.xml
felix/trunk/karaf/shell/osgi/pom.xml
felix/trunk/karaf/shell/packages/pom.xml
felix/trunk/karaf/shell/ssh/pom.xml
felix/trunk/karaf/shell/wrapper/pom.xml
felix/trunk/karaf/tooling/features-maven-plugin/NOTICE
felix/trunk/karaf/tooling/features-maven-plugin/pom.xml
felix/trunk/karaf/webconsole/admin/pom.xml
felix/trunk/karaf/webconsole/branding/pom.xml
felix/trunk/karaf/webconsole/features/pom.xml
felix/trunk/karaf/webconsole/gogo/pom.xml
Modified: felix/trunk/karaf/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/NOTICE?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/NOTICE (original)
+++ felix/trunk/karaf/NOTICE Fri Sep 18 20:25:06 2009
@@ -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
Modified: felix/trunk/karaf/assembly/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/NOTICE?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/assembly/NOTICE Fri Sep 18 20:25:06 2009
@@ -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
Modified: felix/trunk/karaf/assembly/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/assembly/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/pom.xml (original)
+++ felix/trunk/karaf/assembly/pom.xml Fri Sep 18 20:25:06 2009
@@ -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>
Modified: felix/trunk/karaf/client/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/client/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/client/pom.xml (original)
+++ felix/trunk/karaf/client/pom.xml Fri Sep 18 20:25:06 2009
@@ -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>
Copied: felix/trunk/karaf/demos/web/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/demos/web/NOTICE?p2=felix/trunk/karaf/demos/web/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/demos/web/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/demos/web/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/demos/web/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/demos/web/pom.xml (original)
+++ felix/trunk/karaf/demos/web/pom.xml Fri Sep 18 20:25:06 2009
@@ -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>
Copied: felix/trunk/karaf/deployer/blueprint/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/blueprint/NOTICE?p2=felix/trunk/karaf/deployer/blueprint/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/deployer/blueprint/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/deployer/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/blueprint/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/blueprint/pom.xml (original)
+++ felix/trunk/karaf/deployer/blueprint/pom.xml Fri Sep 18 20:25:06 2009
@@ -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>
Copied: felix/trunk/karaf/deployer/features/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/features/NOTICE?p2=felix/trunk/karaf/deployer/features/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/deployer/features/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/deployer/features/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/features/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/features/pom.xml (original)
+++ felix/trunk/karaf/deployer/features/pom.xml Fri Sep 18 20:25:06 2009
@@ -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>
Copied: felix/trunk/karaf/deployer/spring/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/spring/NOTICE?p2=felix/trunk/karaf/deployer/spring/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/deployer/spring/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/deployer/spring/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/deployer/spring/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/deployer/spring/pom.xml (original)
+++ felix/trunk/karaf/deployer/spring/pom.xml Fri Sep 18 20:25:06 2009
@@ -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>
Copied: felix/trunk/karaf/features/command/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/features/command/NOTICE?p2=felix/trunk/karaf/features/command/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/features/command/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/features/command/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/features/command/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/features/command/pom.xml (original)
+++ felix/trunk/karaf/features/command/pom.xml Fri Sep 18 20:25:06 2009
@@ -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,
Copied: felix/trunk/karaf/features/core/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/features/core/NOTICE?p2=felix/trunk/karaf/features/core/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/features/core/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/features/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/features/core/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/features/core/pom.xml (original)
+++ felix/trunk/karaf/features/core/pom.xml Fri Sep 18 20:25:06 2009
@@ -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,
Copied: felix/trunk/karaf/features/management/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/features/management/NOTICE?p2=felix/trunk/karaf/features/management/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/features/management/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/features/management/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/features/management/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/features/management/pom.xml (original)
+++ felix/trunk/karaf/features/management/pom.xml Fri Sep 18 20:25:06 2009
@@ -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>
Copied: felix/trunk/karaf/itests/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/itests/NOTICE?p2=felix/trunk/karaf/itests/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/itests/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/itests/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/itests/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/itests/pom.xml (original)
+++ felix/trunk/karaf/itests/pom.xml Fri Sep 18 20:25:06 2009
@@ -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 -->
Copied: felix/trunk/karaf/jaas/boot/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/boot/NOTICE?p2=felix/trunk/karaf/jaas/boot/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/jaas/boot/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/jaas/boot/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/boot/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/jaas/boot/pom.xml (original)
+++ felix/trunk/karaf/jaas/boot/pom.xml Fri Sep 18 20:25:06 2009
@@ -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>
Copied: felix/trunk/karaf/jaas/config/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/NOTICE?p2=felix/trunk/karaf/jaas/config/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/jaas/config/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/jaas/config/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/config/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/jaas/config/pom.xml (original)
+++ felix/trunk/karaf/jaas/config/pom.xml Fri Sep 18 20:25:06 2009
@@ -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>
Copied: felix/trunk/karaf/jaas/modules/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/modules/NOTICE?p2=felix/trunk/karaf/jaas/modules/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/jaas/modules/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/jaas/modules/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/jaas/modules/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/jaas/modules/pom.xml (original)
+++ felix/trunk/karaf/jaas/modules/pom.xml Fri Sep 18 20:25:06 2009
@@ -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,
*
Modified: felix/trunk/karaf/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/main/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/main/pom.xml (original)
+++ felix/trunk/karaf/main/pom.xml Fri Sep 18 20:25:06 2009
@@ -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,
Copied: felix/trunk/karaf/management/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/management/NOTICE?p2=felix/trunk/karaf/management/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/management/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/management/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/management/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/management/pom.xml (original)
+++ felix/trunk/karaf/management/pom.xml Fri Sep 18 20:25:06 2009
@@ -69,6 +69,7 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Import-Package>
+ !${pom.artifactId}*,
javax.management,
*
</Import-Package>
Modified: felix/trunk/karaf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/pom.xml (original)
+++ felix/trunk/karaf/pom.xml Fri Sep 18 20:25:06 2009
@@ -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>
Copied: felix/trunk/karaf/shell/admin/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/NOTICE?p2=felix/trunk/karaf/shell/admin/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/shell/admin/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/shell/admin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/admin/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/shell/admin/pom.xml (original)
+++ felix/trunk/karaf/shell/admin/pom.xml Fri Sep 18 20:25:06 2009
@@ -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,
Copied: felix/trunk/karaf/shell/commands/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/NOTICE?p2=felix/trunk/karaf/shell/commands/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/shell/commands/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/commands/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/shell/commands/pom.xml (original)
+++ felix/trunk/karaf/shell/commands/pom.xml Fri Sep 18 20:25:06 2009
@@ -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,
Copied: felix/trunk/karaf/shell/config/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/NOTICE?p2=felix/trunk/karaf/shell/config/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/shell/config/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/config/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/shell/config/pom.xml (original)
+++ felix/trunk/karaf/shell/config/pom.xml Fri Sep 18 20:25:06 2009
@@ -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,
Copied: felix/trunk/karaf/shell/console/NOTICE (from r816769, felix/trunk/karaf/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/NOTICE?p2=felix/trunk/karaf/shell/console/NOTICE&p1=felix/trunk/karaf/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/NOTICE (original)
+++ felix/trunk/karaf/shell/console/NOTICE Fri Sep 18 20:25:06 2009
@@ -9,10 +9,13 @@
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).
+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
Modified: felix/trunk/karaf/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/console/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/shell/console/pom.xml (original)
+++ felix/trunk/karaf/shell/console/pom.xml Fri Sep 18 20:25:06 2009
@@ -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,
Copied: felix/trunk/karaf/shell/log/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/NOTICE?p2=felix/trunk/karaf/shell/log/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/shell/log/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/shell/log/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/log/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/shell/log/pom.xml (original)
+++ felix/trunk/karaf/shell/log/pom.xml Fri Sep 18 20:25:06 2009
@@ -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,
Copied: felix/trunk/karaf/shell/obr/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/NOTICE?p2=felix/trunk/karaf/shell/obr/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/shell/obr/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/obr/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/shell/obr/pom.xml (original)
+++ felix/trunk/karaf/shell/obr/pom.xml Fri Sep 18 20:25:06 2009
@@ -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,
Copied: felix/trunk/karaf/shell/osgi/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/NOTICE?p2=felix/trunk/karaf/shell/osgi/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/shell/osgi/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/shell/osgi/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/osgi/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/shell/osgi/pom.xml (original)
+++ felix/trunk/karaf/shell/osgi/pom.xml Fri Sep 18 20:25:06 2009
@@ -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,
Copied: felix/trunk/karaf/shell/packages/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/packages/NOTICE?p2=felix/trunk/karaf/shell/packages/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/shell/packages/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/shell/packages/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/packages/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/shell/packages/pom.xml (original)
+++ felix/trunk/karaf/shell/packages/pom.xml Fri Sep 18 20:25:06 2009
@@ -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,
Copied: felix/trunk/karaf/shell/ssh/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/NOTICE?p2=felix/trunk/karaf/shell/ssh/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/shell/ssh/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/ssh/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/shell/ssh/pom.xml (original)
+++ felix/trunk/karaf/shell/ssh/pom.xml Fri Sep 18 20:25:06 2009
@@ -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,
Copied: felix/trunk/karaf/shell/wrapper/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/NOTICE?p2=felix/trunk/karaf/shell/wrapper/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/shell/wrapper/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/shell/wrapper/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/shell/wrapper/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/shell/wrapper/pom.xml (original)
+++ felix/trunk/karaf/shell/wrapper/pom.xml Fri Sep 18 20:25:06 2009
@@ -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,
Modified: felix/trunk/karaf/tooling/features-maven-plugin/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/NOTICE?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/features-maven-plugin/NOTICE (original)
+++ felix/trunk/karaf/tooling/features-maven-plugin/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,9 +1,16 @@
- =========================================================================
- == NOTICE file for use with the Apache License, Version 2.0, ==
- == in this case for the Apache Felix Karaf distribution. ==
- =========================================================================
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
- This product contains software developed by
- The Apache Software Foundation (http://www.apache.org/).
+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
Modified: felix/trunk/karaf/tooling/features-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/tooling/features-maven-plugin/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/tooling/features-maven-plugin/pom.xml (original)
+++ felix/trunk/karaf/tooling/features-maven-plugin/pom.xml Fri Sep 18 20:25:06 2009
@@ -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>
Copied: felix/trunk/karaf/webconsole/admin/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/admin/NOTICE?p2=felix/trunk/karaf/webconsole/admin/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/webconsole/admin/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/webconsole/admin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/admin/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/admin/pom.xml (original)
+++ felix/trunk/karaf/webconsole/admin/pom.xml Fri Sep 18 20:25:06 2009
@@ -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. -->
Copied: felix/trunk/karaf/webconsole/branding/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/branding/NOTICE?p2=felix/trunk/karaf/webconsole/branding/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/webconsole/branding/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/webconsole/branding/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/branding/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/branding/pom.xml (original)
+++ felix/trunk/karaf/webconsole/branding/pom.xml Fri Sep 18 20:25:06 2009
@@ -38,6 +38,9 @@
through the /META-INF/webconsole.properties.
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
<build>
<plugins>
Copied: felix/trunk/karaf/webconsole/features/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/features/NOTICE?p2=felix/trunk/karaf/webconsole/features/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/webconsole/features/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,21 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/webconsole/features/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/features/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/features/pom.xml (original)
+++ felix/trunk/karaf/webconsole/features/pom.xml Fri Sep 18 20:25:06 2009
@@ -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. -->
Copied: felix/trunk/karaf/webconsole/gogo/NOTICE (from r816769, felix/trunk/karaf/assembly/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/gogo/NOTICE?p2=felix/trunk/karaf/webconsole/gogo/NOTICE&p1=felix/trunk/karaf/assembly/NOTICE&r1=816769&r2=816773&rev=816773&view=diff
==============================================================================
--- felix/trunk/karaf/assembly/NOTICE (original)
+++ felix/trunk/karaf/webconsole/gogo/NOTICE Fri Sep 18 20:25:06 2009
@@ -1,22 +1,25 @@
-Apache Felix Karaf :: Assembly
-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
-
-
+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
Modified: felix/trunk/karaf/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/karaf/webconsole/gogo/pom.xml?rev=816773&r1=816772&r2=816773&view=diff
==============================================================================
--- felix/trunk/karaf/webconsole/gogo/pom.xml (original)
+++ felix/trunk/karaf/webconsole/gogo/pom.xml Fri Sep 18 20:25:06 2009
@@ -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. -->