felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1097637 - in /felix/trunk/deploymentadmin/autoconf: DEPENDENCIES LICENSE.kxml2 NOTICE pom.xml
Date Thu, 28 Apr 2011 22:06:27 GMT
Author: marrs
Date: Thu Apr 28 22:06:27 2011
New Revision: 1097637

URL: http://svn.apache.org/viewvc?rev=1097637&view=rev
Log:
Updated NOTICE, added DEPENDENCIES and LICENSE.kxml2, updated pom.

Added:
    felix/trunk/deploymentadmin/autoconf/DEPENDENCIES
    felix/trunk/deploymentadmin/autoconf/LICENSE.kxml2
Modified:
    felix/trunk/deploymentadmin/autoconf/NOTICE
    felix/trunk/deploymentadmin/autoconf/pom.xml

Added: felix/trunk/deploymentadmin/autoconf/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/autoconf/DEPENDENCIES?rev=1097637&view=auto
==============================================================================
--- felix/trunk/deploymentadmin/autoconf/DEPENDENCIES (added)
+++ felix/trunk/deploymentadmin/autoconf/DEPENDENCIES Thu Apr 28 22:06:27 2011
@@ -0,0 +1,30 @@
+Apache Felix AutoConf Resource Processor
+Copyright 2011 The Apache Software Foundation
+
+
+I. Included Third-Party 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
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product includes software from http://kxml.sourceforge.net.
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
+Licensed under BSD License.
+
+II. Used Third-Party 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. Overall License Summary
+
+- Apache License 2.0
+- BSD License

Added: felix/trunk/deploymentadmin/autoconf/LICENSE.kxml2
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/autoconf/LICENSE.kxml2?rev=1097637&view=auto
==============================================================================
--- felix/trunk/deploymentadmin/autoconf/LICENSE.kxml2 (added)
+++ felix/trunk/deploymentadmin/autoconf/LICENSE.kxml2 Thu Apr 28 22:06:27 2011
@@ -0,0 +1,19 @@
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+
+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 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. 

Modified: felix/trunk/deploymentadmin/autoconf/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/autoconf/NOTICE?rev=1097637&r1=1097636&r2=1097637&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/autoconf/NOTICE (original)
+++ felix/trunk/deploymentadmin/autoconf/NOTICE Thu Apr 28 22:06:27 2011
@@ -1,10 +1,6 @@
-Apache Felix Framework
-Copyright 2006 The Apache Software Foundation
+Apache Felix AutoConf Resource Processor
+Copyright 2011 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
-
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
 Licensed under the Apache License 2.0.

Modified: felix/trunk/deploymentadmin/autoconf/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/deploymentadmin/autoconf/pom.xml?rev=1097637&r1=1097636&r2=1097637&view=diff
==============================================================================
--- felix/trunk/deploymentadmin/autoconf/pom.xml (original)
+++ felix/trunk/deploymentadmin/autoconf/pom.xml Thu Apr 28 22:06:27 2011
@@ -78,6 +78,7 @@
                         <Export-Package>org.osgi.service.deploymentadmin.spi;version="1.0"</Export-Package>
                         <DeploymentPackage-Customizer>true</DeploymentPackage-Customizer>
                         <Deployment-ProvidesResourceProcessor>org.osgi.deployment.rp.autoconf</Deployment-ProvidesResourceProcessor>
+                        <Include-Resource>{maven-resources}, META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
                     </instructions>
                 </configuration>
             </plugin>



Mime
View raw message