summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorMarnie McCormack <marnie@apache.org>2006-11-10 10:06:25 +0000
committerMarnie McCormack <marnie@apache.org>2006-11-10 10:06:25 +0000
commita51557c09acb97c2bc5c31b4821bcb467d738aa7 (patch)
tree917e97fac6be6e5a5c0b3845e3ebc8bfc18f4f58 /java
parentd87fca36a96c57ab9452d1cda82dde127b19a01a (diff)
downloadqpid-python-a51557c09acb97c2bc5c31b4821bcb467d738aa7.tar.gz
Added licenses for jython and jms cts and removed fscontext jars, updated to notice.txt
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@473296 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/NOTICE.txt14
-rw-r--r--java/client/test/lib/fscontext-1_2-beta3/fscontext.jarbin22769 -> 0 bytes
-rw-r--r--java/client/test/lib/fscontext-1_2-beta3/providerutil.jarbin77116 -> 0 bytes
-rw-r--r--java/client/test/lib/jmscts/license.jmscts.txt40
-rw-r--r--java/management/cli/lib/jython/license.jython.txt32
5 files changed, 84 insertions, 2 deletions
diff --git a/java/NOTICE.txt b/java/NOTICE.txt
index 85cc511516..5dcf55ec73 100644
--- a/java/NOTICE.txt
+++ b/java/NOTICE.txt
@@ -12,7 +12,7 @@ distribution.
Aside from contributions to the Apache Qpid project, this software also
-includes:
+includes (binary only):
- The SAXON XSLT Processor from Michael Kay distributed under the
Mozilla Public License v1.0, which is available for download at
@@ -26,4 +26,14 @@ includes:
- The Simple Logging Facade For Java (slf4j), Copyright (c)
2004-2005 SLF4J.ORG, Copyright (c) 2004-2005 QOS.ch. sljf4j is
licensed under identical terms to the MIT/X11 license and
- available for download at http://www.slf4j.org/ \ No newline at end of file
+ available for download at http://www.slf4j.org/
+
+ - The JMS Compliance Test Suite from the Exolab project.
+ Copyright 1999 (C) Exoffice Technologies Inc. All Rights Reserved.
+ JMS CTS is available from http://www.exolab.org/
+
+ - The jython java implementation of python, Copyright (c) 2000,
+ Jython Developers All rights reserved. Jython can be downloaded at
+ http://sourceforge.net/projects/jython/
+
+
diff --git a/java/client/test/lib/fscontext-1_2-beta3/fscontext.jar b/java/client/test/lib/fscontext-1_2-beta3/fscontext.jar
deleted file mode 100644
index 0efc25071a..0000000000
--- a/java/client/test/lib/fscontext-1_2-beta3/fscontext.jar
+++ /dev/null
Binary files differ
diff --git a/java/client/test/lib/fscontext-1_2-beta3/providerutil.jar b/java/client/test/lib/fscontext-1_2-beta3/providerutil.jar
deleted file mode 100644
index 0d6e48f388..0000000000
--- a/java/client/test/lib/fscontext-1_2-beta3/providerutil.jar
+++ /dev/null
Binary files differ
diff --git a/java/client/test/lib/jmscts/license.jmscts.txt b/java/client/test/lib/jmscts/license.jmscts.txt
new file mode 100644
index 0000000000..82e0def2c7
--- /dev/null
+++ b/java/client/test/lib/jmscts/license.jmscts.txt
@@ -0,0 +1,40 @@
+Copyright 1999 (C) Exoffice Technologies Inc. All Rights Reserved.
+
+Redistribution and use of this software and associated documentation
+("Software"), with or without modification, are permitted provided
+that the following conditions are met:
+
+1. Redistributions of source code must retain copyright
+statements and notices. Redistributions must also contain a
+copy of this document.
+
+2. Redistributions in binary form must reproduce the
+above copyright notice, this list of conditions and the
+following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+3. The name "Exolab" must not be used to endorse or promote
+products derived from this Software without prior written
+permission of Exoffice Technologies. For written permission,
+please contact info@exolab.org.
+
+4. Products derived from this Software may not be called "Exolab"
+nor may "Exolab" appear in their names without prior written
+permission of Exoffice Technologies. Exolab is a registered
+trademark of Exoffice Technologies.
+
+5. Due credit should be given to the Exolab Project
+(http://www.exolab.org/).
+
+THIS SOFTWARE IS PROVIDED BY EXOFFICE TECHNOLOGIES AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+EXOFFICE TECHNOLOGIES OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/java/management/cli/lib/jython/license.jython.txt b/java/management/cli/lib/jython/license.jython.txt
new file mode 100644
index 0000000000..48eb403585
--- /dev/null
+++ b/java/management/cli/lib/jython/license.jython.txt
@@ -0,0 +1,32 @@
+Jython changes Software License.
+================================
+
+Copyright (c) 2000, Jython Developers
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the distribution.
+
+ - Neither the name of the Jython Developers nor the names of
+ its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.