incubator-ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chen...@apache.org
Subject svn commit: r1431381 - in /incubator/ctakes/branches/ctakes-3.0.0-incubating: DISCLAIMER NOTICE ctakes-distribution/DISCLAIMER ctakes-distribution/NOTICE ctakes-distribution/src/main/assembly/bin.xml
Date Thu, 10 Jan 2013 14:21:18 GMT
Author: chenpei
Date: Thu Jan 10 14:21:18 2013
New Revision: 1431381

URL: http://svn.apache.org/viewvc?rev=1431381&view=rev
Log:
CTAKES-125 - Move DISCLAIMER to root in SVN.  Updated 2013 copyright ASF in Notice.
CTAKES-75 - Removed unnecessary items in NOTICE (uima, opennlp, lucene, jvinci since they
are covered by the second paragraph already.) Removed items not included- svg icons, junit.
added newline to disclaimer.

Added:
    incubator/ctakes/branches/ctakes-3.0.0-incubating/DISCLAIMER
      - copied, changed from r1431344, incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/DISCLAIMER
Removed:
    incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/DISCLAIMER
Modified:
    incubator/ctakes/branches/ctakes-3.0.0-incubating/NOTICE
    incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/NOTICE
    incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/src/main/assembly/bin.xml

Copied: incubator/ctakes/branches/ctakes-3.0.0-incubating/DISCLAIMER (from r1431344, incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/DISCLAIMER)
URL: http://svn.apache.org/viewvc/incubator/ctakes/branches/ctakes-3.0.0-incubating/DISCLAIMER?p2=incubator/ctakes/branches/ctakes-3.0.0-incubating/DISCLAIMER&p1=incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/DISCLAIMER&r1=1431344&r2=1431381&rev=1431381&view=diff
==============================================================================
--- incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/DISCLAIMER (original)
+++ incubator/ctakes/branches/ctakes-3.0.0-incubating/DISCLAIMER Thu Jan 10 14:21:18 2013
@@ -1 +1,6 @@
-Apache cTAKES is an effort undergoing incubation at The Apache Software Foundation (ASF),
sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects
until a further review indicates that the infrastructure, communications, and decision making
process have stabilized in a manner consistent with other successful ASF projects. While incubation
status is not necessarily a reflection of the completeness or stability of the code, it does
indicate that the project has yet to be fully endorsed by the ASF.
\ No newline at end of file
+Apache cTAKES is an effort undergoing incubation at The Apache Software Foundation (ASF),
+sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted
+projects until a further review indicates that the infrastructure, communications, and decision
making 
+process have stabilized in a manner consistent with other successful ASF projects. While

+incubation status is not necessarily a reflection of the completeness or stability of the
code, it does 
+indicate that the project has yet to be fully endorsed by the ASF.
\ No newline at end of file

Modified: incubator/ctakes/branches/ctakes-3.0.0-incubating/NOTICE
URL: http://svn.apache.org/viewvc/incubator/ctakes/branches/ctakes-3.0.0-incubating/NOTICE?rev=1431381&r1=1431380&r2=1431381&view=diff
==============================================================================
--- incubator/ctakes/branches/ctakes-3.0.0-incubating/NOTICE (original)
+++ incubator/ctakes/branches/ctakes-3.0.0-incubating/NOTICE Thu Jan 10 14:21:18 2013
@@ -1,5 +1,5 @@
 Apache cTAKES
-Copyright 2012 The Apache Software Foundation
+Copyright 2013 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -21,7 +21,8 @@ Foundation under the "Software Grant Lic
 Copyright (c) 2012 University of Colorado.
 
 Portions of cTAKES were originally developed by
-The MITRE corporation. 
+The MITRE corporation  and are licensed to the Apache Software
+Foundation under the "Software Grant License Agreement".
 Copyright (c) 2012 The MITRE Corporation.
 
-Please see the NOTICE file within each PEAR file for the other notices.
+Please see the NOTICE file within each module for the other notices.

Modified: incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/NOTICE
URL: http://svn.apache.org/viewvc/incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/NOTICE?rev=1431381&r1=1431380&r2=1431381&view=diff
==============================================================================
--- incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/NOTICE (original)
+++ incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/NOTICE Thu Jan 10
14:21:18 2013
@@ -1,5 +1,5 @@
 Apache cTAKES
-Copyright 2012 The Apache Software Foundation
+Copyright 2013 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -20,6 +20,11 @@ University of Colorado and are licensed 
 Foundation under the "Software Grant License Agreement".
 Copyright (c) 2012 University of Colorado.
 
+Portions of cTAKES were originally developed by
+The MITRE corporation  and are licensed to the Apache Software
+Foundation under the "Software Grant License Agreement".
+Copyright (c) 2012 The MITRE Corporation.
+
 This product contains hsqldb developed by the HSQL Development Group 
 (http://hsqldb.org), licensed based on the
 BSD license (see LICENSE file).
@@ -27,24 +32,10 @@ BSD license (see LICENSE file).
 This product contains med-facts developed by the MITRE med-facts project,
 licensed under a ASF 2.0 license.
 
-This product contains icons developed by the SVG Icons project 
-(http://sourceforge.net/projects/svgicons), licensed under the 
-BSD license (see LICENSE file).
-
 This product contains jdom developed by the JDOM Project
 (http://www.jdom.org), licensed under a Apache-style license 
 (see LICENSE file).
 
-This product contains junit developed by the junit Project
-(http://www.junit.org), licensed under a CPL 1.0 license 
-(see LICENSE file).
-
-This product contains log4j developed by the log4j Project
-(http://logging.apache.org/log4j), licensed under a ASF 2.0 license.
-
-This product contains lucene developed by the lucene Project
-(http://lucene.apache.org), licensed under a ASF 2.0 license.
-
 This product contains LVG developed by the NLM's Lexical Tools Project
 (http://lexsrv3.nlm.nih.gov/LexSysGroup/Projects/lvg/current/web/index.html),
 licensed under the terms and conditions (see LICENSE file).
@@ -53,15 +44,6 @@ This product contains OpenAi developed b
 (http://openai.sourceforge.net), licensed based on the 
 BSD license (see LICENSE file).
 
-This product contains OpenNLP developed by the OpenNLP Project
-(http://opennlp.apache.org), licensed under a ASF 2.0 license.
-
-This product contains UIMA developed by the UIMA Project
-(http://uima.apache.org), licensed under a ASF 2.0 license.
-
-This product contains jVinci developed by the UIMA Project
-(http://uima.apache.org), licensed under a ASF 2.0 license.
-
 This product contains xerces developed by the xerces Project
 (http://xerces.apache.org), licensed under a ASF 2.0 license.
 
@@ -69,7 +51,7 @@ This product contains AOP Alliance devel
 (http://aopalliance.sourceforge.net), licensed under a 
 Public Domain license (see LICENSE file).
 
-This product contains xerces developed by the xerces Project
+This product contains args4j developed by the args4j Project
 (http://java.net/projects/args4j), licensed under a MIT license 
 (see LICENSE file).
 

Modified: incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/src/main/assembly/bin.xml?rev=1431381&r1=1431380&r2=1431381&view=diff
==============================================================================
--- incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/src/main/assembly/bin.xml
(original)
+++ incubator/ctakes/branches/ctakes-3.0.0-incubating/ctakes-distribution/src/main/assembly/bin.xml
Thu Jan 10 14:21:18 2013
@@ -56,9 +56,10 @@
 				<include>org.apache.ctakes:ctakes-type-system</include>
 				<include>org.apache.ctakes:ctakes-utils</include>
 			</includes>
-			<excludes>
-				<exclude>net.sourceforge.ctakesresources:*</exclude>
-			</excludes>
+			
+            <excludes>
+	        	<exclude>net.sourceforge.ctakesresources:*</exclude>
+	        </excludes>			
 			<unpack>false</unpack>
 			<useProjectArtifact>false</useProjectArtifact>
 			<useTransitiveFiltering>true</useTransitiveFiltering>
@@ -111,6 +112,7 @@
 			<directoryMode>755</directoryMode>
 			<includes>
 				<include>README</include>
+				<include>DISCLAIMER</include>				
 			</includes>
 		</fileSet>
 		<fileSet>
@@ -121,7 +123,6 @@
 			<directoryMode>755</directoryMode>
 			<includes>
 				<include>RELEASE_NOTES.html</include>
-				<include>DISCLAIMER</include>
 				<include>LICENSE</include>
 				<include>NOTICE</include>				
 			</includes>



Mime
View raw message