james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r718398 - in /james/protocols/imap/trunk: LICENSE.base LICENSE.txt NOTICE.base NOTICE.txt stage/jmock/jars/jmock-1.1.0.LICENSE stage/village/jars/village-2.0.LICENSE
Date Mon, 17 Nov 2008 21:49:55 GMT
Author: rdonkin
Date: Mon Nov 17 13:49:54 2008
New Revision: 718398

URL: http://svn.apache.org/viewvc?rev=718398&view=rev
Log:
Correct license information

Added:
    james/protocols/imap/trunk/LICENSE.base
      - copied, changed from r718392, james/protocols/imap/trunk/LICENSE.txt
    james/protocols/imap/trunk/NOTICE.base
      - copied, changed from r718392, james/protocols/imap/trunk/NOTICE.txt
    james/protocols/imap/trunk/stage/jmock/jars/jmock-1.1.0.LICENSE
    james/protocols/imap/trunk/stage/village/jars/village-2.0.LICENSE
Modified:
    james/protocols/imap/trunk/LICENSE.txt
    james/protocols/imap/trunk/NOTICE.txt

Copied: james/protocols/imap/trunk/LICENSE.base (from r718392, james/protocols/imap/trunk/LICENSE.txt)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/LICENSE.base?p2=james/protocols/imap/trunk/LICENSE.base&p1=james/protocols/imap/trunk/LICENSE.txt&r1=718392&r2=718398&rev=718398&view=diff
==============================================================================
--- james/protocols/imap/trunk/LICENSE.txt (original)
+++ james/protocols/imap/trunk/LICENSE.base Mon Nov 17 13:49:54 2008
@@ -174,59 +174,4 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-   
-   
-   
-
-   THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
-   FOLLOWING LICENSES:
-   
-   
-   
-   Concurrent, Public Domain 
-     (see stage/concurrent/jars/concurrent.LICENSE)
-   
-   BouncyCastle, MIT License 
-     (see stage/org.bouncycastle/jars/BouncyCastle.LICENSE)
-     http://www.bouncycastle.org/licence.html
-     
-   DnsJava, BSD License 
-     (see stage/dnsjava/jars/dnsjava.LICENSE)
-     http://www.dnsjava.org/README 
-     
-   JavaBeans Activation Framework, CDDL License
-     http://glassfish.dev.java.net/public/CDDLv1.0.html
-     
-   JavaMail, CDDL License
-     http://glassfish.dev.java.net/public/CDDLv1.0.html
-   
-   QDox, ASL 1.1 License
-     (see phoenix-deployment/tools/lib/qdox.LICENSE)
-     http://qdox.codehaus.org/license.html
-     
-   MX4J, ASL 1.1 License
-     (see phoenix-deployment/phoenix-bin/bin/lib/mx4j.LICENSE)
-   
-   Spice, ASL 1.1 License
-     (see phoenix-deployment/phoenix-bin/bin/lib/spice.LICENSE)
-     http://spice.codehaus.org/license.html
-     
-   Wrapper, MIT License
-     (see phoenix-deployment/phoenix-bin/bin/Wrapper.LICENSE)
-     http://wrapper.tanukisoftware.org/doc/english/license.html
-     
-   ISO-Relax, MIT License
-     (see phoenix-deployment/phoenix-bin/tools/lib/isorelax.LICENSE)
-
-   MSV, BSD License
-     (see phoenix-deployment/phoenix-bin/tools/lib/msv.LICENSE)
-
-   RelaxNG-Datatype, BSD License
-     (see phoenix-deployment/phoenix-bin/tools/lib/relaxngDatatype.LICENSE)
-   
-   XSDLib, BSD License
-     (see phoenix-deployment/phoenix-bin/tools/lib/xsdlib.LICENSE)
      
-   XStream, BSD License
-     (see stage/com.thoughtworks.xstream/jars/xstream.LICENSE)
-     
\ No newline at end of file

Modified: james/protocols/imap/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/LICENSE.txt?rev=718398&r1=718397&r2=718398&view=diff
==============================================================================
--- james/protocols/imap/trunk/LICENSE.txt (original)
+++ james/protocols/imap/trunk/LICENSE.txt Mon Nov 17 13:49:54 2008
@@ -181,52 +181,74 @@
    THIS PRODUCT ALSO INCLUDES THIRD PARTY SOFTWARE REDISTRIBUTED UNDER THE
    FOLLOWING LICENSES:
    
-   
-   
+   JUnit, Common Public License Version 1.0  (junit-3.8.1.jar)
+     http://junit.org
+
    Concurrent, Public Domain 
      (see stage/concurrent/jars/concurrent.LICENSE)
    
-   BouncyCastle, MIT License 
-     (see stage/org.bouncycastle/jars/BouncyCastle.LICENSE)
-     http://www.bouncycastle.org/licence.html
-     
-   DnsJava, BSD License 
-     (see stage/dnsjava/jars/dnsjava.LICENSE)
-     http://www.dnsjava.org/README 
-     
    JavaBeans Activation Framework, CDDL License
      http://glassfish.dev.java.net/public/CDDLv1.0.html
      
    JavaMail, CDDL License
      http://glassfish.dev.java.net/public/CDDLv1.0.html
-   
-   QDox, ASL 1.1 License
-     (see phoenix-deployment/tools/lib/qdox.LICENSE)
-     http://qdox.codehaus.org/license.html
-     
-   MX4J, ASL 1.1 License
-     (see phoenix-deployment/phoenix-bin/bin/lib/mx4j.LICENSE)
-   
-   Spice, ASL 1.1 License
-     (see phoenix-deployment/phoenix-bin/bin/lib/spice.LICENSE)
-     http://spice.codehaus.org/license.html
-     
-   Wrapper, MIT License
-     (see phoenix-deployment/phoenix-bin/bin/Wrapper.LICENSE)
-     http://wrapper.tanukisoftware.org/doc/english/license.html
-     
-   ISO-Relax, MIT License
-     (see phoenix-deployment/phoenix-bin/tools/lib/isorelax.LICENSE)
 
-   MSV, BSD License
-     (see phoenix-deployment/phoenix-bin/tools/lib/msv.LICENSE)
+   Bnd, Bundle Tool http://www.aqute.biz/Code/Bnd, The Apache License, Version 2.0     
+
+   JMock, http://www.jmock.org BSD License
+     (see stage/jmock/jars/jmock-1.1.0.LICENSE)
+
+   Village 2.0, The Working-Dogs.com License, Version 1.1
+/*
+ * The Working-Dogs.com License, Version 1.1
+ *
+ * Copyright (c) 1999 Working-Dogs.com.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 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 end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Working-Dogs.com <http://www.Working-Dogs.com/>."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "Working-Dogs.com" and "Village" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    jon@working-dogs.com.
+ *
+ * 5. Products derived from this software may not be called
+ *    "Working-Dogs.com" nor may "Village" appear in their names
+ *    without prior written permission of Working-Dogs.com.
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 THE APACHE SOFTWARE FOUNDATION 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.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Working-Dogs.com.  For more
+ * information on the Working-Dogs.com, please see
+ * <http://www.Working-Dogs.com/>.
+ */
 
-   RelaxNG-Datatype, BSD License
-     (see phoenix-deployment/phoenix-bin/tools/lib/relaxngDatatype.LICENSE)
-   
-   XSDLib, BSD License
-     (see phoenix-deployment/phoenix-bin/tools/lib/xsdlib.LICENSE)
-     
-   XStream, BSD License
-     (see stage/com.thoughtworks.xstream/jars/xstream.LICENSE)
-     
\ No newline at end of file

Copied: james/protocols/imap/trunk/NOTICE.base (from r718392, james/protocols/imap/trunk/NOTICE.txt)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/NOTICE.base?p2=james/protocols/imap/trunk/NOTICE.base&p1=james/protocols/imap/trunk/NOTICE.txt&r1=718392&r2=718398&rev=718398&view=diff
==============================================================================
--- james/protocols/imap/trunk/NOTICE.txt (original)
+++ james/protocols/imap/trunk/NOTICE.base Mon Nov 17 13:49:54 2008
@@ -8,30 +8,5 @@
    This product includes software developed at
    The Apache Software Foundation (http://www.apache.org/).
 
-   This product also includes software developed by :
-     - Sun Microsystems (http://java.sun.com/)
-     - Codehaus (http://qdox.codehaus.org/)
-     - Doug Lea / State University of New York
-       (http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html)
-     - The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-     - Brian Wellington (http://www.dnsjava.org)
-
-   This product also includes Apache Phoenix application container that
-   includes the following software:
-     - the ISO-RELAX project (http://iso-relax.sourceforge.net/)
-     - the Thai Open Source Software Center Ltd. 
-       (http://www.thaiopensource.com/relaxng/jing.html)
-     - the MX4J project (http://mx4j.sourceforge.net/)
-     - the W3C consortium (http://www.w3c.org/),
-     - the SAX project (http://www.saxproject.org/)
-     - the The Spice Group
-     - Sun Microsystems (http://java.sun.com/)
-     
-   This product includes software developed by the MX4J project 
-       (http://mx4j.sourceforge.net)
-   
-   This product includes software developed by the RealityForge Group
-       (http://www.realityforge.org/).
-
    Please read the LICENSE.txt and README.txt files in the root directory of 
-   this distribution.
\ No newline at end of file
+   this distribution.

Modified: james/protocols/imap/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/NOTICE.txt?rev=718398&r1=718397&r2=718398&view=diff
==============================================================================
--- james/protocols/imap/trunk/NOTICE.txt (original)
+++ james/protocols/imap/trunk/NOTICE.txt Mon Nov 17 13:49:54 2008
@@ -10,28 +10,16 @@
 
    This product also includes software developed by :
      - Sun Microsystems (http://java.sun.com/)
-     - Codehaus (http://qdox.codehaus.org/)
      - Doug Lea / State University of New York
        (http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html)
-     - The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-     - Brian Wellington (http://www.dnsjava.org)
 
-   This product also includes Apache Phoenix application container that
-   includes the following software:
-     - the ISO-RELAX project (http://iso-relax.sourceforge.net/)
-     - the Thai Open Source Software Center Ltd. 
-       (http://www.thaiopensource.com/relaxng/jing.html)
-     - the MX4J project (http://mx4j.sourceforge.net/)
-     - the W3C consortium (http://www.w3c.org/),
-     - the SAX project (http://www.saxproject.org/)
-     - the The Spice Group
-     - Sun Microsystems (http://java.sun.com/)
-     
-   This product includes software developed by the MX4J project 
-       (http://mx4j.sourceforge.net)
-   
-   This product includes software developed by the RealityForge Group
-       (http://www.realityforge.org/).
+   This product may include software developed at
+   aQute / Peter Kriens (http://www.aqute.biz/)
+   Package in stage\biz.aQute\jars\bnd-0.0.249.jar
+   License in stage\biz.aQute\jars\bnd-0.0.249.LICENSE
+
+   This product includes software developed by 
+   the Working-Dogs.com <http://www.Working-Dogs.com/>.
 
    Please read the LICENSE.txt and README.txt files in the root directory of 
-   this distribution.
\ No newline at end of file
+   this distribution.

Added: james/protocols/imap/trunk/stage/jmock/jars/jmock-1.1.0.LICENSE
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/stage/jmock/jars/jmock-1.1.0.LICENSE?rev=718398&view=auto
==============================================================================
--- james/protocols/imap/trunk/stage/jmock/jars/jmock-1.1.0.LICENSE (added)
+++ james/protocols/imap/trunk/stage/jmock/jars/jmock-1.1.0.LICENSE Mon Nov 17 13:49:54 2008
@@ -0,0 +1,25 @@
+Copyright (c) 2000-2007, jMock.org
+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 jMock 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 COPYRIGHT OWNER 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.

Added: james/protocols/imap/trunk/stage/village/jars/village-2.0.LICENSE
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/stage/village/jars/village-2.0.LICENSE?rev=718398&view=auto
==============================================================================
--- james/protocols/imap/trunk/stage/village/jars/village-2.0.LICENSE (added)
+++ james/protocols/imap/trunk/stage/village/jars/village-2.0.LICENSE Mon Nov 17 13:49:54
2008
@@ -0,0 +1,52 @@
+/*
+ * The Working-Dogs.com License, Version 1.1
+ *
+ * Copyright (c) 1999 Working-Dogs.com.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 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 end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Working-Dogs.com <http://www.Working-Dogs.com/>."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "Working-Dogs.com" and "Village" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    jon@working-dogs.com.
+ *
+ * 5. Products derived from this software may not be called
+ *    "Working-Dogs.com" nor may "Village" appear in their names
+ *    without prior written permission of Working-Dogs.com.
+ *
+ * THIS SOFTWARE IS PROVIDED ``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 THE APACHE SOFTWARE FOUNDATION 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.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Working-Dogs.com.  For more
+ * information on the Working-Dogs.com, please see
+ * <http://www.Working-Dogs.com/>.
+ */



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message