Author: rdonkin
Date: Mon Feb 23 21:54:35 2009
New Revision: 747155
URL: http://svn.apache.org/viewvc?rev=747155&view=rev
Log:
Fix licenses and notices JSIEVE-48
https://issues.apache.org/jira/browse/JSIEVE-48
Added:
james/jsieve/trunk/LICENSE.txt
- copied, changed from r747105, james/jsieve/trunk/main/LICENSE.txt
james/jsieve/trunk/NOTICE.txt
- copied unchanged from r747105, james/jsieve/trunk/main/NOTICE.txt
Removed:
james/jsieve/trunk/mailet/LICENSE.txt
james/jsieve/trunk/mailet/NOTICE.txt
james/jsieve/trunk/main/LICENSE.txt
james/jsieve/trunk/main/NOTICE.txt
james/jsieve/trunk/util/LICENSE.txt
james/jsieve/trunk/util/NOTICE.txt
Copied: james/jsieve/trunk/LICENSE.txt (from r747105,
james/jsieve/trunk/main/LICENSE.txt)
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/LICENSE.txt?p2=james/jsieve/trunk/LICENSE.txt&p1=james/jsieve/trunk/main/LICENSE.txt&r1=747105&r2=747155&rev=747155&view=diff
==============================================================================
--- james/jsieve/trunk/main/LICENSE.txt (original)
+++ james/jsieve/trunk/LICENSE.txt Mon Feb 23 21:54:35 2009
@@ -174,13 +174,38 @@
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:
-
+
+ JMock, JMock License (jmock-1.1.0)
+ http://jmock.org
+ 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.
+
JUnit, Common Public License Version 1.0 (junit-3.8.1.jar)
http://junit.org
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
