felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r983932 - in /felix/trunk/scr: DEPENDENCIES LICENSE LICENSE.kxml2 NOTICE
Date Tue, 10 Aug 2010 11:30:49 GMT
Author: fmeschbe
Date: Tue Aug 10 11:30:48 2010
New Revision: 983932

URL: http://svn.apache.org/viewvc?rev=983932&view=rev
Log:
FELIX-2534 Fix legal files to comply with ASF standards

Added:
    felix/trunk/scr/DEPENDENCIES
Removed:
    felix/trunk/scr/LICENSE.kxml2
Modified:
    felix/trunk/scr/LICENSE
    felix/trunk/scr/NOTICE

Added: felix/trunk/scr/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/scr/DEPENDENCIES?rev=983932&view=auto
==============================================================================
--- felix/trunk/scr/DEPENDENCIES (added)
+++ felix/trunk/scr/DEPENDENCIES Tue Aug 10 11:30:48 2010
@@ -0,0 +1,35 @@
+Apache Felix Declarative Services
+Copyright 2006-2010 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+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 Software
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+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
+- BSD License

Modified: felix/trunk/scr/LICENSE
URL: http://svn.apache.org/viewvc/felix/trunk/scr/LICENSE?rev=983932&r1=983931&r2=983932&view=diff
==============================================================================
--- felix/trunk/scr/LICENSE (original)
+++ felix/trunk/scr/LICENSE Tue Aug 10 11:30:48 2010
@@ -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 DECLARATIVE SERVICES SUBCOMPONENTS: 
+
+The Apache Felix Declarative Services 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 KXml component:
+
+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/scr/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/scr/NOTICE?rev=983932&r1=983931&r2=983932&view=diff
==============================================================================
--- felix/trunk/scr/NOTICE (original)
+++ felix/trunk/scr/NOTICE Tue Aug 10 11:30:48 2010
@@ -1,8 +1,5 @@
 Apache Felix Declarative Services
-Copyright 2006-2009 The Apache Software Foundation
-
-
-I. Included Software
+Copyright 2006-2010 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -12,24 +9,3 @@ This product includes software developed
 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 Software
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-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
-- BSD License



Mime
View raw message