svn commit: r650318 - in /felix/trunk/main: NOTICE doc/changelog.txt src/main/resources/META-INF/

[pa...@apache.org]

Author: pauls
Date: Mon Apr 21 16:43:37 2008
New Revision: 650318

URL: http://svn.apache.org/viewvc?rev=650318&view=rev
Log:
Update NOTICE to new layout, update changelog for 1.0.4 release, and delete redundant NOTICE and LICENSE files.

Removed:
    felix/trunk/main/src/main/resources/META-INF/
Modified:
    felix/trunk/main/NOTICE
    felix/trunk/main/doc/changelog.txt

Modified: felix/trunk/main/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/main/NOTICE?rev=650318&r1=650317&r2=650318&view=diff
==============================================================================
--- felix/trunk/main/NOTICE (original)
+++ felix/trunk/main/NOTICE Mon Apr 21 16:43:37 2008
@@ -1,10 +1,26 @@
 Apache Felix Main
 Copyright 2008 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 2006 The OSGi Alliance.
 Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright 2006 The OSGi Alliance.
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0

Modified: felix/trunk/main/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/main/doc/changelog.txt?rev=650318&r1=650317&r2=650318&view=diff
==============================================================================
--- felix/trunk/main/doc/changelog.txt (original)
+++ felix/trunk/main/doc/changelog.txt Mon Apr 21 16:43:37 2008
@@ -1,3 +1,8 @@
+Changes from 1.0.3 to 1.0.4
+---------------------------
+
+* [2008-04-22] Update to framework version 1.0.4.
+
 Changes from 1.0.1 to 1.0.3
 ---------------------------