Update NOTICE to new layout, update changelog for 1.0.4 release, and delete redundant NOTICE and LICENSE files.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@650318 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main/NOTICE b/main/NOTICE
index 6e7f08e..22149e5 100644
--- a/main/NOTICE
+++ b/main/NOTICE
@@ -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