diff options
| author | Aidan Skinner <aidan@apache.org> | 2008-04-07 16:27:20 +0000 |
|---|---|---|
| committer | Aidan Skinner <aidan@apache.org> | 2008-04-07 16:27:20 +0000 |
| commit | a13bb7a175c7db7446fb0b6b1632f42e9ffbbafd (patch) | |
| tree | d0cad5e9be580a8c621bcdc47db039d940f0e27a | |
| parent | 1ab0fd2f41d33cf6995e4ce44cd5601d1249503f (diff) | |
| download | qpid-python-a13bb7a175c7db7446fb0b6b1632f42e9ffbbafd.tar.gz | |
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
| -rw-r--r-- | LICENSE | 7 | ||||
| -rw-r--r-- | NOTICE | 8 | ||||
| -rw-r--r-- | java/distribution/src/main/assembly/src.xml | 3 | ||||
| -rw-r--r-- | java/resources/NOTICE | 8 |
4 files changed, 24 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..5f84a6564b --- /dev/null +++ b/LICENSE @@ -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 diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000000..ff65d299a9 --- /dev/null +++ b/NOTICE @@ -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 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. |