You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by tw...@apache.org on 2009/09/04 17:21:47 UTC

svn commit: r811442 - in /incubator/uima/sandbox/trunk/SnowballAnnotator: LICENSE.txt NOTICE.txt

Author: twgoetz
Date: Fri Sep  4 15:21:45 2009
New Revision: 811442

URL: http://svn.apache.org/viewvc?rev=811442&view=rev
Log:
UIMA-1546: NOTICE file is for attributions only, license information goes in the LICENSE file.  LICENSE file needs to contain full text of license, not just a link.

https://issues.apache.org/jira/browse/UIMA-1546

Modified:
    incubator/uima/sandbox/trunk/SnowballAnnotator/LICENSE.txt
    incubator/uima/sandbox/trunk/SnowballAnnotator/NOTICE.txt

Modified: incubator/uima/sandbox/trunk/SnowballAnnotator/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SnowballAnnotator/LICENSE.txt?rev=811442&r1=811441&r2=811442&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SnowballAnnotator/LICENSE.txt (original)
+++ incubator/uima/sandbox/trunk/SnowballAnnotator/LICENSE.txt Fri Sep  4 15:21:45 2009
@@ -200,10 +200,37 @@
    See the License for the specific language governing permissions and
    limitations under the License.
    
-   ------------------------------------------------------------------------
+==========================================================================================
+
    Snowball license (from http://snowball.tartarus.org/license.php):
    
      All the software given out on this Snowball site is covered by the BSD License 
      (see http://www.opensource.org/licenses/bsd-license.html ), 
      with Copyright (c) 2001, Dr Martin Porter, 
      and (for the Java developments) Copyright (c) 2002, Richard Boulton. 
+     
+Copyright (c) <YEAR>, <OWNER>
+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 <ORGANIZATION> 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 HOLDER 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.
+
+

Modified: incubator/uima/sandbox/trunk/SnowballAnnotator/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SnowballAnnotator/NOTICE.txt?rev=811442&r1=811441&r2=811442&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SnowballAnnotator/NOTICE.txt (original)
+++ incubator/uima/sandbox/trunk/SnowballAnnotator/NOTICE.txt Fri Sep  4 15:21:45 2009
@@ -7,6 +7,5 @@
 This software includes the Snowball software from http://snowball.tartarus.org/.
 Copyright (c) 2001, Dr Martin Porter, and (for the Java developments) 
 Copyright (c) 2002, Richard Boulton.
-Licensed under BSD (see http://snowball.tartarus.org/license.php).
 Packages: org.tartarus.snowball