Fix license issue
Update changelog
Upgrade some settings in the configuration test suite
Add the obr.xml file for the web console plugin
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@795564 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/online-manipulator/LICENSE.asm b/ipojo/online-manipulator/LICENSE.asm
new file mode 100644
index 0000000..cc529ed
--- /dev/null
+++ b/ipojo/online-manipulator/LICENSE.asm
@@ -0,0 +1,29 @@
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/ipojo/online-manipulator/NOTICE b/ipojo/online-manipulator/NOTICE
index 06496a3..4feafa6 100644
--- a/ipojo/online-manipulator/NOTICE
+++ b/ipojo/online-manipulator/NOTICE
@@ -24,5 +24,5 @@
III. License Summary
- Apache License 2.0
-- BSD Licence
+- BSD License
diff --git a/ipojo/online-manipulator/doc/changelog.txt b/ipojo/online-manipulator/doc/changelog.txt
new file mode 100644
index 0000000..ce9d069
--- /dev/null
+++ b/ipojo/online-manipulator/doc/changelog.txt
@@ -0,0 +1,7 @@
+Version 1.4.0
+-------------
+** Improvement
+ * Update parent pom
+ * Initial commit
+
+
diff --git a/ipojo/online-manipulator/pom.xml b/ipojo/online-manipulator/pom.xml
index 1052810..cc49182 100644
--- a/ipojo/online-manipulator/pom.xml
+++ b/ipojo/online-manipulator/pom.xml
@@ -29,6 +29,12 @@
<artifactId>org.apache.felix.ipojo.online.manipulator</artifactId>
<version>1.3.0-SNAPSHOT</version>
<name>Apache Felix iPOJO URL Handler</name>
+
+ <description>
+ iPOJO online manipulator allowing install time manipulation of iPOJO bundle.
+ </description>
+ <url>http://felix.apache.org/site/apache-felix-ipojo-online-manipulator.html</url>
+
<build>
<plugins>
<plugin>
@@ -40,6 +46,9 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Private-Package>org.apache.felix.ipojo.online.manipulator</Private-Package>
+ <Bundle-DocURL>
+ http://felix.apache.org/site/apache-felix-ipojo-online-manipulator.html
+ </Bundle-DocURL>
<Export-Package> org.apache.felix.ipojo.manipulator,
org.apache.felix.ipojo.xml.parser,
org.apache.felix.ipojo.manipulation,
@@ -47,6 +56,10 @@
org.objectweb.asm.commons, org.objectweb.asm </Export-Package>
<Import-Package> !org.objectweb.asm.tree, !sun.io, org.osgi.framework;version=1.3, *
</Import-Package>
+ <Include-Resource> META-INF/LICENSE=LICENSE,
+ META-INF/LICENSE.asm=LICENSE.asm,
+ META-INF/NOTICE=NOTICE
+ </Include-Resource>
<!-- <Embed-Dependency>xercesImpl|xml-resolver</Embed-Dependency> -->
</instructions>
</configuration>
@@ -71,10 +84,11 @@
<useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
<useMavenDefaultExcludes>true</useMavenDefaultExcludes>
<excludes>
- <param>doc/*</param>
+ <param>doc/**/*</param>
<param>maven-eclipse.xml</param>
<param>.checkstyle</param>
<param>.externalToolBuilders/*</param>
+ <param>LICENSE.asm</param>
</excludes>
</configuration>
</plugin>