You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2009/09/25 18:19:01 UTC
svn commit: r818907 - in /incubator/uima/sandbox/trunk:
ConfigurableFeatureExtractor/ DictionaryAnnotator/
RegularExpressionAnnotator/ RegularExpressionAnnotator/docs/pdf/
SimpleServer/ SimpleServer/docs/pdf/
Author: schor
Date: Fri Sep 25 16:19:00 2009
New Revision: 818907
URL: http://svn.apache.org/viewvc?rev=818907&view=rev
Log:
UIMA-1546 make NOTICE file part for XMLBeans as we're using this, consistent, including just those parts needed from the XMLBeans Notice file
Modified:
incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NOTICE.txt
incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml
incubator/uima/sandbox/trunk/DictionaryAnnotator/NOTICE.txt
incubator/uima/sandbox/trunk/RegularExpressionAnnotator/NOTICE.txt
incubator/uima/sandbox/trunk/RegularExpressionAnnotator/docs/pdf/RegexAnnotatorUserGuide.pdf
incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml
incubator/uima/sandbox/trunk/SimpleServer/NOTICE.txt
incubator/uima/sandbox/trunk/SimpleServer/docs/pdf/simpleServerUserGuide.pdf
incubator/uima/sandbox/trunk/SimpleServer/pom.xml
Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NOTICE.txt?rev=818907&r1=818906&r2=818907&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NOTICE.txt (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/NOTICE.txt Fri Sep 25 16:19:00 2009
@@ -3,3 +3,14 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
+This software contains parts of Apache XMLBeans
+(http://xmlbeans.apache.org/), which contains the
+following software:
+
+ - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
+ Consortium (Massachusetts Institute of Technology, European Research
+ Consortium for Informatics and Mathematics, Keio University)
+
+ - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
+ Copyright 2002 Yuval Oren under the terms of the Apache Software License 2.0
Modified: incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml?rev=818907&r1=818906&r2=818907&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml (original)
+++ incubator/uima/sandbox/trunk/ConfigurableFeatureExtractor/pom.xml Fri Sep 25 16:19:00 2009
@@ -44,6 +44,7 @@
<artifactId>commons-jxpath</artifactId>
<version>1.3</version>
</dependency>
+
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
@@ -60,6 +61,7 @@
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
<version>1.0.1</version>
</dependency>
+
<dependency>
<groupId>org.eclipse.emf.ecore</groupId>
<artifactId>xmi</artifactId>
Modified: incubator/uima/sandbox/trunk/DictionaryAnnotator/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/DictionaryAnnotator/NOTICE.txt?rev=818907&r1=818906&r2=818907&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/DictionaryAnnotator/NOTICE.txt (original)
+++ incubator/uima/sandbox/trunk/DictionaryAnnotator/NOTICE.txt Fri Sep 25 16:19:00 2009
@@ -8,6 +8,10 @@
(http://xmlbeans.apache.org/), which contains the
following software:
- - JSR-173 Streaming API for XML from http://sourceforge.net/projects/xmlpullparser/,
- Copyright 2005 BEA under the terms of the Apache Software License 2.0
+ - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
+ Consortium (Massachusetts Institute of Technology, European Research
+ Consortium for Informatics and Mathematics, Keio University)
+
+ - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
+ Copyright 2002 Yuval Oren under the terms of the Apache Software License 2.0
\ No newline at end of file
Modified: incubator/uima/sandbox/trunk/RegularExpressionAnnotator/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/RegularExpressionAnnotator/NOTICE.txt?rev=818907&r1=818906&r2=818907&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/RegularExpressionAnnotator/NOTICE.txt (original)
+++ incubator/uima/sandbox/trunk/RegularExpressionAnnotator/NOTICE.txt Fri Sep 25 16:19:00 2009
@@ -8,5 +8,9 @@
(http://xmlbeans.apache.org/), which contains the
following software:
- - JSR-173 Streaming API for XML from http://sourceforge.net/projects/xmlpullparser/,
- Copyright 2005 BEA under the terms of the Apache Software License 2.0
+ - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
+ Consortium (Massachusetts Institute of Technology, European Research
+ Consortium for Informatics and Mathematics, Keio University)
+
+ - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
+ Copyright 2002 Yuval Oren under the terms of the Apache Software License 2.0
Modified: incubator/uima/sandbox/trunk/RegularExpressionAnnotator/docs/pdf/RegexAnnotatorUserGuide.pdf
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/RegularExpressionAnnotator/docs/pdf/RegexAnnotatorUserGuide.pdf?rev=818907&r1=818906&r2=818907&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml?rev=818907&r1=818906&r2=818907&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml (original)
+++ incubator/uima/sandbox/trunk/RegularExpressionAnnotator/pom.xml Fri Sep 25 16:19:00 2009
@@ -71,21 +71,6 @@
<version>1.0.1</version>
</dependency>
- <!--dependency>
- <groupId>local.xmlbeans.dependency</groupId>
- <artifactId>xsdbeans</artifactId>
- <version>2.2</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/xbean.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>local.xmlbeans.dependency</groupId>
- <artifactId>jsr173-api</artifactId>
- <version>2.2</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/jsr173_1.0_api.jar</systemPath>
- </dependency-->
-
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
Modified: incubator/uima/sandbox/trunk/SimpleServer/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/NOTICE.txt?rev=818907&r1=818906&r2=818907&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/NOTICE.txt (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/NOTICE.txt Fri Sep 25 16:19:00 2009
@@ -8,5 +8,9 @@
(http://xmlbeans.apache.org/), which contains the
following software:
- - JSR-173 Streaming API for XML from http://sourceforge.net/projects/xmlpullparser/,
- Copyright 2005 BEA under the terms of the Apache Software License 2.0
+ - W3C XML Schema documents Copyright 2001-2003 (c) World Wide Web
+ Consortium (Massachusetts Institute of Technology, European Research
+ Consortium for Informatics and Mathematics, Keio University)
+
+ - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
+ Copyright 2002 Yuval Oren under the terms of the Apache Software License 2.0
\ No newline at end of file
Modified: incubator/uima/sandbox/trunk/SimpleServer/docs/pdf/simpleServerUserGuide.pdf
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/docs/pdf/simpleServerUserGuide.pdf?rev=818907&r1=818906&r2=818907&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/uima/sandbox/trunk/SimpleServer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SimpleServer/pom.xml?rev=818907&r1=818906&r2=818907&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SimpleServer/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SimpleServer/pom.xml Fri Sep 25 16:19:00 2009
@@ -49,14 +49,6 @@
<artifactId>uimaj-component-test-util</artifactId>
</dependency>
- <!--dependency>
- <groupId>org.apache.uima.xmlbeans</groupId>
- <artifactId>uima-simple-server-xbean</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${basedir}/lib/uima-simple-server-xbean.jar</systemPath>
- </dependency-->
-
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
@@ -74,12 +66,6 @@
<version>1.0.1</version>
</dependency>
- <!--dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
- <version>1.0</version>
- </dependency-->
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>