fixed licenses
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1066995 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dependencymanager/runtime/DEPENDENCIES b/dependencymanager/runtime/DEPENDENCIES
new file mode 100644
index 0000000..429316b
--- /dev/null
+++ b/dependencymanager/runtime/DEPENDENCIES
@@ -0,0 +1,23 @@
+Apache Felix Dependency Manager Runtime
+Copyright 2011 The Apache Software Foundation
+
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
+
+I. Included Third-Party Software
+
+This product includes software from http://www.json.org.
+Copyright (c) 2002 JSON.org
+Licensed under the JSON License
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+III. Overall License Summary
+
+- Apache License 2.0
+- JSON License
diff --git a/dependencymanager/runtime/LICENSE b/dependencymanager/runtime/LICENSE
index d645695..d5afa1b 100644
--- a/dependencymanager/runtime/LICENSE
+++ b/dependencymanager/runtime/LICENSE
@@ -200,3 +200,34 @@
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.
+
+APACHE FELIX OSGI DEPENDENCY MANAGER RUNTIME SUBCOMPONENTS:
+
+The Apache Felix OSGi Dependency Manager Runtime includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+For the For the JSON component:
+
+Copyright (c) 2002 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/dependencymanager/runtime/LICENSE.json b/dependencymanager/runtime/LICENSE.json
deleted file mode 100644
index 87d1411..0000000
--- a/dependencymanager/runtime/LICENSE.json
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/dependencymanager/runtime/NOTICE b/dependencymanager/runtime/NOTICE
index cfc3633..0298840 100644
--- a/dependencymanager/runtime/NOTICE
+++ b/dependencymanager/runtime/NOTICE
@@ -1,8 +1,5 @@
-Apache Felix Dependency Manager
-Copyright 2009 The Apache Software Foundation
-
-
-I. Included Software
+Apache Felix Dependency Manager Runtime
+Copyright 2011 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -10,17 +7,6 @@
This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
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, 2007).
-Licensed under the Apache License 2.0.
-
-
-III. License Summary
-- Apache License 2.0
diff --git a/dependencymanager/runtime/doc/changelog.txt b/dependencymanager/runtime/doc/changelog.txt
new file mode 100644
index 0000000..0d7ca7e
--- /dev/null
+++ b/dependencymanager/runtime/doc/changelog.txt
@@ -0,0 +1,6 @@
+Initial Release 3.0.0
+---------------------
+
+** Bug
+
+** Improvement
diff --git a/dependencymanager/runtime/pom.xml b/dependencymanager/runtime/pom.xml
index 25fbbec..cdb26fd 100644
--- a/dependencymanager/runtime/pom.xml
+++ b/dependencymanager/runtime/pom.xml
@@ -28,7 +28,6 @@
<artifactId>org.apache.felix.dependencymanager.runtime</artifactId>
<packaging>bundle</packaging>
-
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -75,6 +74,7 @@
<Import-Package>org.apache.felix.dm;version="[3.0.0,4.0.0)",*</Import-Package>
<Embed-Dependency>json</Embed-Dependency>
<Bundle-Activator>org.apache.felix.dm.runtime.Activator</Bundle-Activator>
+ <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
</instructions>
</configuration>
</plugin>