Author: eric
Date: Mon Mar 19 13:52:25 2012
New Revision: 1302441
URL: http://svn.apache.org/viewvc?rev=1302441&view=rev
Log:
revert the license/notice for binary to 3.0b3 state (JAMESAPP-4)
Modified:
james/app/trunk/src/main/licensing/app/license-for-binary.txt
james/app/trunk/src/main/licensing/app/notice-for-binary.txt
Modified: james/app/trunk/src/main/licensing/app/license-for-binary.txt
URL:
http://svn.apache.org/viewvc/james/app/trunk/src/main/licensing/app/license-for-binary.txt?rev=1302441&r1=1302440&r2=1302441&view=diff
==============================================================================
--- james/app/trunk/src/main/licensing/app/license-for-binary.txt (original)
+++ james/app/trunk/src/main/licensing/app/license-for-binary.txt Mon Mar 19
13:52:25 2012
@@ -1081,75 +1081,3 @@ Within the lib directory
wrapper-windows-x86-32.dll
wrapper.jar
-
-
-
- This product includes HSQL library
- Copyright The HSQL Development Group distributed under the HSQL License.
- See http://hsqldb.org/web/hsqlLicense.html.
-
- For work developed by the HSQL Development Group:
-
- Copyright (c) 2001-2010,
- 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 HSQL Development Group 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 HSQL DEVELOPMENT GROUP,
HSQLDB.ORG,
- 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.
-
- For work originally developed by the Hypersonic SQL Group:
-
- Copyright (c) 1995-2000 by the Hypersonic SQL Group.
- 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 Hypersonic SQL Group 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 HYPERSONIC SQL GROUP,
- 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.
-
- This software consists of voluntary contributions made by many
individuals on behalf of the
- Hypersonic SQL Group.
-
Modified: james/app/trunk/src/main/licensing/app/notice-for-binary.txt
URL:
http://svn.apache.org/viewvc/james/app/trunk/src/main/licensing/app/notice-for-binary.txt?rev=1302441&r1=1302440&r2=1302441&view=diff
==============================================================================
--- james/app/trunk/src/main/licensing/app/notice-for-binary.txt (original)
+++ james/app/trunk/src/main/licensing/app/notice-for-binary.txt Mon Mar 19
13:52:25 2012
@@ -128,25 +128,3 @@
software without prior written permission. For written permission,
please contact [email protected].
-
- This product includes SLF4J software developed by QOS.ch.
- Copyright 2004-2008 QOS.ch. All rights reserved.
-
-
- This product includes activation library used by javamail,
- jersey (core, json and server) libraries, JAXB (API and Impl),
- JSR311 api, javax.servlet package and javax.jsp used by Jetty.
- Copyright Oracle Corporation. It is distributed under the
- Common Development and Distribution License.
-
-
- This product includes Eclipse JDT core library distributed
- Copyright Eclipse Foundation distributed under the Eclipse
- Public License EPL1.
- See http://www.apache.org/legal/resolved.html#category-b.
-
-
- This product includes HSQL library
- Copyright The HSQL Development Group distributed under the HSQL License.
- See http://hsqldb.org/web/hsqlLicense.html.
-
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
