Author: pkluegl
Date: Tue Feb 18 16:30:57 2014
New Revision: 1569416
URL: http://svn.apache.org/r1569416
Log:
UIMA-3621
- fixed the mention of Mark James
- removed mention of BSD stuff, but not CPL stuff, in notice file
Modified:
uima/ruta/trunk/LICENSE
uima/ruta/trunk/NOTICE
uima/ruta/trunk/ruta-ep-addons/src/main/readme_bin/LICENSE
uima/ruta/trunk/ruta-ep-addons/src/main/readme_src/META-INF/LICENSE
uima/ruta/trunk/ruta-ep-caseditor/src/main/readme_bin/LICENSE
uima/ruta/trunk/ruta-ep-caseditor/src/main/readme_src/META-INF/LICENSE
uima/ruta/trunk/ruta-ep-engine/pom.xml
uima/ruta/trunk/ruta-ep-engine/src/main/readme_bin/NOTICE
uima/ruta/trunk/ruta-ep-ide-ui/src/main/readme_bin/LICENSE
uima/ruta/trunk/ruta-ep-ide-ui/src/main/readme_src/META-INF/LICENSE
uima/ruta/trunk/ruta-ep-textruler/src/main/readme_bin/LICENSE
uima/ruta/trunk/ruta-ep-textruler/src/main/readme_src/META-INF/LICENSE
uima/ruta/trunk/ruta-parent/pom.xml
uima/ruta/trunk/src/main/readme/LICENSE
uima/ruta/trunk/src/main/readme/NOTICE
Modified: uima/ruta/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/LICENSE?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/LICENSE (original)
+++ uima/ruta/trunk/LICENSE Tue Feb 18 16:30:57 2014
@@ -203,7 +203,7 @@
====================================================================================================
-This product contains icons developed by the Mark James
+This product contains icons developed by Mark James
(http://www.famfamfam.com/lab/icons/silk/), licensed under the
Creative Commons Attribution 3.0 License
(http://creativecommons.org/licenses/by/3.0/).
Modified: uima/ruta/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/NOTICE?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/NOTICE (original)
+++ uima/ruta/trunk/NOTICE Tue Feb 18 16:30:57 2014
@@ -8,6 +8,6 @@ Portions of UIMA Ruta were originally de
the Universität Würzburg.
Copyright (c) 2006, 2011 Universität Würzburg.
-This product contains icons developed by the Mark James
+This product contains icons developed by Mark James
(http://www.famfamfam.com/lab/icons/silk/), licensed under the
Creative Commons Attribution 3.0 License.
Modified: uima/ruta/trunk/ruta-ep-addons/src/main/readme_bin/LICENSE
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-addons/src/main/readme_bin/LICENSE?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-addons/src/main/readme_bin/LICENSE (original)
+++ uima/ruta/trunk/ruta-ep-addons/src/main/readme_bin/LICENSE Tue Feb 18
16:30:57 2014
@@ -203,7 +203,7 @@
====================================================================================================
-This product contains icons developed by the Mark James
+This product contains icons developed by Mark James
(http://www.famfamfam.com/lab/icons/silk/), licensed under the
Creative Commons Attribution 3.0 License
(http://creativecommons.org/licenses/by/3.0/).
Modified: uima/ruta/trunk/ruta-ep-addons/src/main/readme_src/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-addons/src/main/readme_src/META-INF/LICENSE?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-addons/src/main/readme_src/META-INF/LICENSE
(original)
+++ uima/ruta/trunk/ruta-ep-addons/src/main/readme_src/META-INF/LICENSE Tue Feb
18 16:30:57 2014
@@ -203,7 +203,7 @@
====================================================================================================
-This product contains icons developed by the Mark James
+This product contains icons developed by Mark James
(http://www.famfamfam.com/lab/icons/silk/), licensed under the
Creative Commons Attribution 3.0 License
(http://creativecommons.org/licenses/by/3.0/).
Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/readme_bin/LICENSE
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/readme_bin/LICENSE?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-caseditor/src/main/readme_bin/LICENSE (original)
+++ uima/ruta/trunk/ruta-ep-caseditor/src/main/readme_bin/LICENSE Tue Feb 18
16:30:57 2014
@@ -203,7 +203,7 @@
====================================================================================================
-This product contains icons developed by the Mark James
+This product contains icons developed by Mark James
(http://www.famfamfam.com/lab/icons/silk/), licensed under the
Creative Commons Attribution 3.0 License
(http://creativecommons.org/licenses/by/3.0/).
Modified: uima/ruta/trunk/ruta-ep-caseditor/src/main/readme_src/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-caseditor/src/main/readme_src/META-INF/LICENSE?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-caseditor/src/main/readme_src/META-INF/LICENSE
(original)
+++ uima/ruta/trunk/ruta-ep-caseditor/src/main/readme_src/META-INF/LICENSE Tue
Feb 18 16:30:57 2014
@@ -203,7 +203,7 @@
====================================================================================================
-This product contains icons developed by the Mark James
+This product contains icons developed by Mark James
(http://www.famfamfam.com/lab/icons/silk/), licensed under the
Creative Commons Attribution 3.0 License
(http://creativecommons.org/licenses/by/3.0/).
Modified: uima/ruta/trunk/ruta-ep-engine/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-engine/pom.xml?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-engine/pom.xml (original)
+++ uima/ruta/trunk/ruta-ep-engine/pom.xml Tue Feb 18 16:30:57 2014
@@ -23,11 +23,9 @@
<properties>
<postNoticeText>${uniWueNoticeText}
-This product contains ANTLR libraries (http://www.antlr.org/),
-licensed under the BSD License.
-
This product contains htmlparser libraries
(http://htmlparser.sourceforge.net/),
-licensed under the Common Public License.</postNoticeText>
+licensed under the Common Public License.
+ </postNoticeText>
<uimaScmProject>${project.artifactId}</uimaScmProject>
</properties>
<name>Apache UIMA Ruta Eclipse: ${project.artifactId}</name>
Modified: uima/ruta/trunk/ruta-ep-engine/src/main/readme_bin/NOTICE
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-engine/src/main/readme_bin/NOTICE?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-engine/src/main/readme_bin/NOTICE (original)
+++ uima/ruta/trunk/ruta-ep-engine/src/main/readme_bin/NOTICE Tue Feb 18
16:30:57 2014
@@ -9,9 +9,6 @@ Portions of UIMA Ruta were originally de
the Universität Würzburg.
Copyright (c) 2006, 2011 Universität Würzburg.
-This product contains ANTLR libraries (http://www.antlr.org/),
-licensed under the BSD License.
-
This product contains htmlparser libraries
(http://htmlparser.sourceforge.net/),
licensed under the Common Public License.
Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/readme_bin/LICENSE
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/readme_bin/LICENSE?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/readme_bin/LICENSE (original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/readme_bin/LICENSE Tue Feb 18
16:30:57 2014
@@ -203,7 +203,7 @@
====================================================================================================
-This product contains icons developed by the Mark James
+This product contains icons developed by Mark James
(http://www.famfamfam.com/lab/icons/silk/), licensed under the
Creative Commons Attribution 3.0 License
(http://creativecommons.org/licenses/by/3.0/).
Modified: uima/ruta/trunk/ruta-ep-ide-ui/src/main/readme_src/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-ide-ui/src/main/readme_src/META-INF/LICENSE?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-ide-ui/src/main/readme_src/META-INF/LICENSE
(original)
+++ uima/ruta/trunk/ruta-ep-ide-ui/src/main/readme_src/META-INF/LICENSE Tue Feb
18 16:30:57 2014
@@ -203,7 +203,7 @@
====================================================================================================
-This product contains icons developed by the Mark James
+This product contains icons developed by Mark James
(http://www.famfamfam.com/lab/icons/silk/), licensed under the
Creative Commons Attribution 3.0 License
(http://creativecommons.org/licenses/by/3.0/).
Modified: uima/ruta/trunk/ruta-ep-textruler/src/main/readme_bin/LICENSE
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-textruler/src/main/readme_bin/LICENSE?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-textruler/src/main/readme_bin/LICENSE (original)
+++ uima/ruta/trunk/ruta-ep-textruler/src/main/readme_bin/LICENSE Tue Feb 18
16:30:57 2014
@@ -203,7 +203,7 @@
====================================================================================================
-This product contains icons developed by the Mark James
+This product contains icons developed by Mark James
(http://www.famfamfam.com/lab/icons/silk/), licensed under the
Creative Commons Attribution 3.0 License
(http://creativecommons.org/licenses/by/3.0/).
Modified: uima/ruta/trunk/ruta-ep-textruler/src/main/readme_src/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-textruler/src/main/readme_src/META-INF/LICENSE?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-ep-textruler/src/main/readme_src/META-INF/LICENSE
(original)
+++ uima/ruta/trunk/ruta-ep-textruler/src/main/readme_src/META-INF/LICENSE Tue
Feb 18 16:30:57 2014
@@ -203,7 +203,7 @@
====================================================================================================
-This product contains icons developed by the Mark James
+This product contains icons developed by Mark James
(http://www.famfamfam.com/lab/icons/silk/), licensed under the
Creative Commons Attribution 3.0 License
(http://creativecommons.org/licenses/by/3.0/).
Modified: uima/ruta/trunk/ruta-parent/pom.xml
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-parent/pom.xml?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-parent/pom.xml (original)
+++ uima/ruta/trunk/ruta-parent/pom.xml Tue Feb 18 16:30:57 2014
@@ -133,7 +133,7 @@ Copyright (c) 2006, 2011 Universität
</uniWueNoticeText>
<postNoticeText>${uniWueNoticeText}
-This product contains icons developed by the Mark James
+This product contains icons developed by Mark James
(http://www.famfamfam.com/lab/icons/silk/), licensed under the
Creative Commons Attribution 3.0 License.
</postNoticeText>
Modified: uima/ruta/trunk/src/main/readme/LICENSE
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/src/main/readme/LICENSE?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/src/main/readme/LICENSE (original)
+++ uima/ruta/trunk/src/main/readme/LICENSE Tue Feb 18 16:30:57 2014
@@ -203,7 +203,7 @@
====================================================================================================
-This product contains icons developed by the Mark James
+This product contains icons developed by Mark James
(http://www.famfamfam.com/lab/icons/silk/), licensed under the
Creative Commons Attribution 3.0 License
(http://creativecommons.org/licenses/by/3.0/).
Modified: uima/ruta/trunk/src/main/readme/NOTICE
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/src/main/readme/NOTICE?rev=1569416&r1=1569415&r2=1569416&view=diff
==============================================================================
--- uima/ruta/trunk/src/main/readme/NOTICE (original)
+++ uima/ruta/trunk/src/main/readme/NOTICE Tue Feb 18 16:30:57 2014
@@ -8,12 +8,6 @@ Portions of UIMA Ruta were originally de
the Universität Würzburg.
Copyright (c) 2006, 2011 Universität Würzburg.
-This product contains icons developed by the Mark James
+This product contains icons developed by Mark James
(http://www.famfamfam.com/lab/icons/silk/), licensed under the
Creative Commons Attribution 3.0 License.
-
-This product contains ANTLR libraries (http://www.antlr.org/),
-licensed under the BSD License.
-
-This product contains htmlparser libraries
(http://htmlparser.sourceforge.net/),
-licensed under the Common Public License.
