Author: aidan
Date: Mon Apr 7 09:27:20 2008
New Revision: 645593
URL: http://svn.apache.org/viewvc?rev=645593&view=rev
Log:
Add toplevel NOTICE and LICENSE files, add Felix to java/resources/NOTICE, make
sure all spec files are included in java source distribution
Added:
incubator/qpid/branches/M2.1-release/LICENSE
incubator/qpid/branches/M2.1-release/NOTICE
Modified:
incubator/qpid/branches/M2.1-release/java/distribution/src/main/assembly/src.xml
incubator/qpid/branches/M2.1-release/java/resources/NOTICE
Added: incubator/qpid/branches/M2.1-release/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1-release/LICENSE?rev=645593&view=auto
==============================================================================
--- incubator/qpid/branches/M2.1-release/LICENSE (added)
+++ incubator/qpid/branches/M2.1-release/LICENSE Mon Apr 7 09:27:20 2008
@@ -0,0 +1,7 @@
+Please see the individual LICENSE files for each language
+cpp/LICENSE
+dotnet/LICENSE.txt
+gentools/lib/LICENSE
+java/resources/LICENSE
+python/LICENSE.txt
+ruby/LICENSE.txt
Added: incubator/qpid/branches/M2.1-release/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1-release/NOTICE?rev=645593&view=auto
==============================================================================
--- incubator/qpid/branches/M2.1-release/NOTICE (added)
+++ incubator/qpid/branches/M2.1-release/NOTICE Mon Apr 7 09:27:20 2008
@@ -0,0 +1,8 @@
+Please see the individual NOTICE files for each language:
+
+cpp/NOTICE
+dotnet/NOTICE.txt
+gentools/lib/NOTICE
+java/resources/NOTICE
+python/NOTICE.txt
+ruby/NOTICE.txt
Modified:
incubator/qpid/branches/M2.1-release/java/distribution/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1-release/java/distribution/src/main/assembly/src.xml?rev=645593&r1=645592&r2=645593&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1-release/java/distribution/src/main/assembly/src.xml
(original)
+++
incubator/qpid/branches/M2.1-release/java/distribution/src/main/assembly/src.xml
Mon Apr 7 09:27:20 2008
@@ -93,8 +93,7 @@
<directory>../../specs</directory>
<outputDirectory>qpid-${qpid.version}-src/specs</outputDirectory>
<includes>
- <include>amqp.0-8.xml</include>
- <include>cluster.0-8.xml</include>
+ <include>*</include>
</includes>
</fileSet>
Modified: incubator/qpid/branches/M2.1-release/java/resources/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1-release/java/resources/NOTICE?rev=645593&r1=645592&r2=645593&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1-release/java/resources/NOTICE (original)
+++ incubator/qpid/branches/M2.1-release/java/resources/NOTICE Mon Apr 7
09:27:20 2008
@@ -63,6 +63,10 @@
developed by Apache Software Foundation (http://www.apache.org)
License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
+This product includes/uses software, Felix (http://felix.apache.org)
+developed by Apache Software Foundation (http://www.apache.org)
+License: Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
+
This product uses/references the following software from Eclipse.
License: Eclipse Public License - v 1.0
(http://www.eclipse.org/legal/epl-v10.html)
(Note: the versions are ommited and only the name is specified.)
@@ -77,3 +81,7 @@
developed by the ICU Project (http://icu-project.org/)
License: http://source.icu-project.org/repos/icu/icu/trunk/license.html
+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.
