From a13bb7a175c7db7446fb0b6b1632f42e9ffbbafd Mon Sep 17 00:00:00 2001
From: Aidan Skinner <aidan@apache.org>
Date: Mon, 7 Apr 2008 16:27:20 +0000
Subject: Add toplevel NOTICE and LICENSE files, add Felix to
 java/resources/NOTICE, make sure all spec files are included in java source
 distribution

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1-release@645593 13f79535-47bb-0310-9956-ffa450edef68
---
 java/distribution/src/main/assembly/src.xml | 3 +--
 java/resources/NOTICE                       | 8 ++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'java')

diff --git a/java/distribution/src/main/assembly/src.xml b/java/distribution/src/main/assembly/src.xml
index efdc4d98f4..a9db9c79c1 100644
--- a/java/distribution/src/main/assembly/src.xml
+++ b/java/distribution/src/main/assembly/src.xml
@@ -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>
 
diff --git a/java/resources/NOTICE b/java/resources/NOTICE
index 8ec21adde2..2011629076 100644
--- a/java/resources/NOTICE
+++ b/java/resources/NOTICE
@@ -63,6 +63,10 @@ This product includes/uses software, Xalan - xalan:xalan:jar:2.7.0
 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 @@ This product includes/uses software, ICU4J - ICU4J 3.4.4
 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.
-- 
cgit v1.2.1