svn commit: r1154212 - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker: console/ internal/launching/ launching/

2011-08-05 Thread joern 
Author: joern
Date: Fri Aug  5 13:49:39 2011
New Revision: 1154212

URL: http://svn.apache.org/viewvc?rev=1154212&view=rev
Log:
UIMA-2201 Removed empty packages

Removed:

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/console/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/internal/launching/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/src/main/java/org/apache/uima/tm/dltk/textmarker/launching/

svn commit: r1154334 - /uima/addons/trunk/TikaAnnotator/README.txt

2011-08-05 Thread schor 
Author: schor
Date: Fri Aug  5 18:22:47 2011
New Revision: 1154334

URL: http://svn.apache.org/viewvc?rev=1154334&view=rev
Log:
[UIMA-2192] add crypto notice - needed due to distribution of Tika Jars

Modified:
uima/addons/trunk/TikaAnnotator/README.txt

Modified: uima/addons/trunk/TikaAnnotator/README.txt
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/TikaAnnotator/README.txt?rev=1154334&r1=1154333&r2=1154334&view=diff
==
--- uima/addons/trunk/TikaAnnotator/README.txt (original)
+++ uima/addons/trunk/TikaAnnotator/README.txt Fri Aug  5 18:22:47 2011
@@ -43,3 +43,31 @@ For more information on UIMA, see:
 
 For more information on Tika, see:
   http://incubator.apache.org/tika/
+  
+Crypto Notice
+-
+
+The binary distributions include cryptographic software.  The country in 
+   which you currently reside may have restrictions on the import, 
+   possession, use, and/or re-export to another country, of 
+   encryption software.  BEFORE using any encryption software, please 
+   check your country's laws, regulations and policies concerning the
+   import, possession, or use, and re-export of encryption software, to 
+   see if this is permitted.  See  for more
+   information.
+
+   The U.S. Government Department of Commerce, Bureau of Industry and
+   Security (BIS), has classified this software as Export Commodity 
+   Control Number (ECCN) 5D002.C.1, which includes information security
+   software using or performing cryptographic functions with asymmetric
+   algorithms.  The form and manner of this Apache Software Foundation
+   distribution makes it eligible for export under the License Exception
+   ENC Technology Software Unrestricted (TSU) exception (see the BIS 
+   Export Administration Regulations, Section 740.13) for both object 
+   code and source code.
+
+   The following provides more details on the included cryptographic
+   software:
+   
+   The binary distributions include portions of Apache Tika, which, in
+   turn, is classified as being controlled under ECCN 5D002.

svn commit: r1154337 - /uima/addons/trunk/uima-addons-parent/pom.xml

2011-08-05 Thread schor 
Author: schor
Date: Fri Aug  5 18:31:10 2011
New Revision: 1154337

URL: http://svn.apache.org/viewvc?rev=1154337&view=rev
Log:
[UIMA-2185] add uimaDependencyVersion property; exclude -osgi.jar when 
copying jars to lib; Change to use uimaBuildResources version 2 when building 
single project binary; add uimaj-core jar to lib/ for osgi build; add 
Include-Resource to include the uimaj-core jar; attach the xxx.pear after it is 
built, so it gets deployed to the maven repo.

Modified:
uima/addons/trunk/uima-addons-parent/pom.xml

Modified: uima/addons/trunk/uima-addons-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/uima-addons-parent/pom.xml?rev=1154337&r1=1154336&r2=1154337&view=diff
==
--- uima/addons/trunk/uima-addons-parent/pom.xml (original)
+++ uima/addons/trunk/uima-addons-parent/pom.xml Fri Aug  5 18:31:10 2011
@@ -129,7 +129,8 @@
 
   
 addons
-${project.artifactId}   
+${project.artifactId}
+2.3.1   
   
 
   
@@ -296,7 +297,10 @@
  
${project.build.directory}
*.jar
-   *-sources.jar   
  
+   
+ *-sources.jar
+ *-osgi.jar
+
  

  
@@ -375,7 +379,7 @@
 
   
   
-1 
+2 
   
 
 
@@ -389,23 +393,11 @@
   marker-file-identifying-osgi-project
 
   
-  
- 
- 
-   
-   
- org.apache.uima
- uimaj-core
- ${project.parent.version}
- compile
-   
- 

 
 
-  
- 
+ 
+
   
 maven-resources-plugin
 
@@ -434,6 +426,34 @@
 
   
   
+  
+ 
+  
+maven-dependency-plugin
+
+  
+Copy uima dependencies to osgi/lib
+copy
+   process-resources
+   
+ 
${project.build.directory}/osgi/lib
+ 
+   
+ org.apache.uima
+  uimaj-core
+  ${uimaDependencyVersion}
+   
+ 
+   
+  
+
+   
+  
   
 org.apache.felix
  maven-bundle-plugin
@@ -453,7 +473,11 @@
  lib
  
J2SE-1.5
  true
-
.,lib/${project.build.finalName}.jar,{maven-dependencies}
+
.,lib/${project.build.finalName}.jar,{maven-dependencies},lib/uimaj-core-${uimaDependencyVersion}.jar
+
+  {maven-resources}, {maven-dependencies},
+  
lib/uimaj-core-${uimaDependencyVersion}.jar=${settings.localRepository}/org/apache/uima/uimaj-core/${uimaDependencyVersion}/uimaj-core-${uimaDependencyVersion}.jar
+
  registered
  
${parsedVersion.osgiVersion}
  
${project.groupId}.${project.artifactId};singleton:=true
@@ -461,6 +485,7 @@
  

  
+

 
 
@@ -497,7 +522,7 @@
   marker-file-identifying-standard-pear
 
   
-
+  
 
   
 
@@ -578,6 +603,27 @@
   
 
   
+  
+  
+  
+org.codehaus.mojo
+build-helper-maven-plugin
+
+ 
+   attach-pear-artifact
+   post-integration-test  
+   attach-artifact
+   
+ 
+   
+ 
${project.build.directory}/${project.artifactId}.pear
+ pear
+   
+ 
+   
+ 
+   
+

svn commit: r1154338 - /uima/addons/trunk/README.txt

2011-08-05 Thread schor 
Author: schor
Date: Fri Aug  5 18:32:12 2011
New Revision: 1154338

URL: http://svn.apache.org/viewvc?rev=1154338&view=rev
Log:
[UIMA-2192] add crypto notice - needed due to distribution of Tika Jars

Added:
uima/addons/trunk/README.txt   (with props)

Added: uima/addons/trunk/README.txt
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/README.txt?rev=1154338&view=auto
==
--- uima/addons/trunk/README.txt (added)
+++ uima/addons/trunk/README.txt Fri Aug  5 18:32:12 2011
@@ -0,0 +1,27 @@
+Crypto Notice
+-
+
+This distribution includes cryptographic software.  The country in 
+   which you currently reside may have restrictions on the import, 
+   possession, use, and/or re-export to another country, of 
+   encryption software.  BEFORE using any encryption software, please 
+   check your country's laws, regulations and policies concerning the
+   import, possession, or use, and re-export of encryption software, to 
+   see if this is permitted.  See  for more
+   information.
+
+   The U.S. Government Department of Commerce, Bureau of Industry and
+   Security (BIS), has classified this software as Export Commodity 
+   Control Number (ECCN) 5D002.C.1, which includes information security
+   software using or performing cryptographic functions with asymmetric
+   algorithms.  The form and manner of this Apache Software Foundation
+   distribution makes it eligible for export under the License Exception
+   ENC Technology Software Unrestricted (TSU) exception (see the BIS 
+   Export Administration Regulations, Section 740.13) for both object 
+   code and source code.
+
+   The following provides more details on the included cryptographic
+   software:
+   
+   This distribution includes portions of Apache Tika, which, in
+   turn, is classified as being controlled under ECCN 5D002.
\ No newline at end of file

Propchange: uima/addons/trunk/README.txt
--
svn:eol-style = native

svn commit: r1154340 - /uima/addons/trunk/pom.xml

2011-08-05 Thread schor 
Author: schor
Date: Fri Aug  5 18:33:01 2011
New Revision: 1154340

URL: http://svn.apache.org/viewvc?rev=1154340&view=rev
Log:
[UIMA-2185] remove unneeded directive (defaults)

Modified:
uima/addons/trunk/pom.xml

Modified: uima/addons/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/pom.xml?rev=1154340&r1=1154339&r2=1154340&view=diff
==
--- uima/addons/trunk/pom.xml (original)
+++ uima/addons/trunk/pom.xml Fri Aug  5 18:33:01 2011
@@ -81,9 +81,6 @@
   
 
   apache-release
-  
-false
-  
   
 12316093
 
@@ -102,8 +99,7 @@
   
 
   
-
-
+

svn commit: r1154348 - in /uima/site/trunk/uima-website: docs/sandbox.html xdocs/sandbox.xml

2011-08-05 Thread schor 
Author: schor
Date: Fri Aug  5 18:44:39 2011
New Revision: 1154348

URL: http://svn.apache.org/viewvc?rev=1154348&view=rev
Log:
[UIMA-2203] fix dead links to svn due to move of some things from sandbox -> 
addons

Modified:
uima/site/trunk/uima-website/docs/sandbox.html
uima/site/trunk/uima-website/xdocs/sandbox.xml

Modified: uima/site/trunk/uima-website/docs/sandbox.html
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/sandbox.html?rev=1154348&r1=1154347&r2=1154348&view=diff
==
--- uima/site/trunk/uima-website/docs/sandbox.html (original)
+++ uima/site/trunk/uima-website/docs/sandbox.html Fri Aug  5 18:44:39 2011
@@ -261,8 +261,8 @@ http://svn.apache.org/repos/asf/uima/san
  text documents using a simple whitespace segmentation. During 
the tokenization, the annotator creates
  token and sentence annotations as result. The Java source of 
the annotator
  can be accessed in the SVN repository at 
- http://svn.apache.org/repos/asf/uima/sandbox/trunk/WhitespaceTokenizer";>
- 
http://svn.apache.org/repos/asf/uima/sandbox/trunk/WhitespaceTokenizer.
+ http://svn.apache.org/repos/asf/uima/addons/trunk/WhitespaceTokenizer";>
+ 
http://svn.apache.org/repos/asf/uima/addons/trunk/WhitespaceTokenizer.

 
 
@@ -286,8 +286,8 @@ http://svn.apache.org/repos/asf/uima/san
  The stemming algorithm is avaialble for several languages. 
For details about Snowball please see 
  http://snowball.tartarus.org/";>http://snowball.tartarus.org/.
  The Java source of the annotator can be accessed in the SVN 
repository at 
- http://svn.apache.org/repos/asf/uima/sandbox/trunk/SnowballAnnotator";>
- 
http://svn.apache.org/repos/asf/uima/sandbox/trunk/SnowballAnnotator. 
+ http://svn.apache.org/repos/asf/uima/addons/trunk/SnowballAnnotator";>
+ 
http://svn.apache.org/repos/asf/uima/addons/trunk/SnowballAnnotator. 

 
  Note: the used implementation of the Snowball stemming 
algorithm is licensed under the BSD license.
@@ -315,8 +315,8 @@ http://svn.apache.org/repos/asf/uima/san
   
  Click here to access the user documentation.
  The Java source of the annotator can be accessed in the SVN 
repository at 
- http://svn.apache.org/repos/asf/uima/sandbox/trunk/RegularExpressionAnnotator";>
- 
http://svn.apache.org/repos/asf/uima/sandbox/trunk/RegularExpressionAnnotator.
+ http://svn.apache.org/repos/asf/uima/addons/trunk/RegularExpressionAnnotator";>
+ 
http://svn.apache.org/repos/asf/uima/addons/trunk/RegularExpressionAnnotator.

 
 
@@ -342,8 +342,8 @@ http://svn.apache.org/repos/asf/uima/san
   
  Click here to access the user documentation.
  The Java source of the PEAR packaging task can be accessed in 
the SVN repository at 
- http://svn.apache.org/repos/asf/uima/sandbox/trunk/PearPackagingAntTask";>
- 
http://svn.apache.org/repos/asf/uima/sandbox/trunk/PearPackagingAntTask. 
+ http://svn.apache.org/repos/asf/uima/addons/trunk/PearPackagingAntTask";>
+ 
http://svn.apache.org/repos/asf/uima/addons/trunk/PearPackagingAntTask. 

 
 
@@ -394,8 +394,8 @@ http://svn.apache.org/repos/asf/uima/san
   
  Click here to access the user documentation.
  The Java source of the annotator can be accessed in the SVN 
repository at 
- http://svn.apache.org/repos/asf/uima/sandbox/trunk/DictionaryAnnotator";>
- 
http://svn.apache.org/repos/asf/uima/sandbox/trunk/DictionaryAnnotator.
+ http://svn.apache.org/repos/asf/uima/addons/trunk/DictionaryAnnotator";>
+ 
http://svn.apache.org/repos/asf/uima/addons/trunk/DictionaryAnnotator.

 
 
@@ -419,8 +419,8 @@ http://svn.apache.org/repos/asf/uima/san
   
   Click here to access the user documentation.
  The Java source of the project can be accessed in the SVN 
repository at 
- http://svn.apache.org/repos/asf/uima/sandbox/trunk/FsVariables";>
- 
http://svn.apache.org/repos/asf/uima/sandbox/trunk/FsVariables.
+ http://svn.apache.org/repos/asf/uima/addons/trunk/FsVariables";>
+ 
http://svn.apache.org/repos/asf/uima/addons/trunk/FsVariables.

 
 
@@ -448

svn commit: r1154352 - in /uima/site/trunk/uima-website: docs/svn.html xdocs/svn.xml

2011-08-05 Thread schor 
Author: schor
Date: Fri Aug  5 18:51:01 2011
New Revision: 1154352

URL: http://svn.apache.org/viewvc?rev=1154352&view=rev
Log:
[UIMA-2203] updates due to move of some things from sandbox -> addons

Modified:
uima/site/trunk/uima-website/docs/svn.html
uima/site/trunk/uima-website/xdocs/svn.xml

Modified: uima/site/trunk/uima-website/docs/svn.html
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/svn.html?rev=1154352&r1=1154351&r2=1154352&view=diff
==
--- uima/site/trunk/uima-website/docs/svn.html (original)
+++ uima/site/trunk/uima-website/docs/svn.html Fri Aug  5 18:51:01 2011
@@ -239,7 +239,8 @@ If you're new to Subversion, you can che
 
 http://svn.apache.org/repos/asf/uima/uimaj - the Java code for base 
UIMA
 http://svn.apache.org/repos/asf/uima/uima-as - the Asynchronous 
Scaleout add-on for base UIMA
-http://svn.apache.org/repos/asf/uima/sandbox - a collection of add-ons 
for UIMA including annotators
+http://svn.apache.org/repos/asf/uima/addons - a collection of add-ons 
for UIMA including annotators
+http://svn.apache.org/repos/asf/uima/sandbox - a collection of new 
things for UIMA, not yet released
 http://svn.apache.org/repos/asf/uima/uimacpp - the C++ framework 
supporting Annotators written in C++
 http://svn.apache.org/repos/asf/uima/build - Build information and 
configurations used in building from sources
   

Modified: uima/site/trunk/uima-website/xdocs/svn.xml
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/svn.xml?rev=1154352&r1=1154351&r2=1154352&view=diff
==
--- uima/site/trunk/uima-website/xdocs/svn.xml (original)
+++ uima/site/trunk/uima-website/xdocs/svn.xml Fri Aug  5 18:51:01 2011
@@ -86,7 +86,8 @@ If you're new to Subversion, you can che
   
 http://svn.apache.org/repos/asf/uima/uimaj - the Java code for base 
UIMA
 http://svn.apache.org/repos/asf/uima/uima-as - the Asynchronous 
Scaleout add-on for base UIMA
-http://svn.apache.org/repos/asf/uima/sandbox - a collection of add-ons 
for UIMA including annotators
+http://svn.apache.org/repos/asf/uima/addons - a collection of add-ons 
for UIMA including annotators
+http://svn.apache.org/repos/asf/uima/sandbox - a collection of new 
things for UIMA, not yet released
 http://svn.apache.org/repos/asf/uima/uimacpp - the C++ framework 
supporting Annotators written in C++
 http://svn.apache.org/repos/asf/uima/build - Build information and 
configurations used in building from sources

svn commit: r1154374 - in /uima/site/trunk/uima-website: docs/maven-design.html xdocs/maven-design.xml

2011-08-05 Thread schor 
Author: schor
Date: Fri Aug  5 20:31:51 2011
New Revision: 1154374

URL: http://svn.apache.org/viewvc?rev=1154374&view=rev
Log:
no Jira - update the docs on how we use maven, with respect to the addons build 
process details

Modified:
uima/site/trunk/uima-website/docs/maven-design.html
uima/site/trunk/uima-website/xdocs/maven-design.xml

Modified: uima/site/trunk/uima-website/docs/maven-design.html
URL: 
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/maven-design.html?rev=1154374&r1=1154373&r2=1154374&view=diff
==
--- uima/site/trunk/uima-website/docs/maven-design.html (original)
+++ uima/site/trunk/uima-website/docs/maven-design.html Fri Aug  5 20:31:51 2011
@@ -186,6 +186,29 @@ building the various parts of UIMA.
   http://www.apache.org/dev/publishing-maven-artifacts.html";>
   http://www.apache.org/dev/publishing-maven-artifacts.html.
 This document covers how we 
use Maven for building Version: 2.3.1 and onwards.
+
+Nexus use
+POM Conventions
+POM Hierarchy
+Selecting 
build alternatives based on the project
+POM style
+Release artifacts
+
+   LICENSE and NOTICE 
files
+   Standard Artifacts
+ 
+Handling Documentation
+Packaging Individual 
Projects
+  
+Common 
conventions for structuring individually releaseable project
+Conventions for structuring 
individual projects released as PEARs
+  
+
+Building Assemblies 
for Distribution
+Special resources for 
build
+Using the Release Audit 
Tool (RAT)
+Lifecycle for building 
addons
+  
   
 

@@ -252,7 +275,7 @@ for purposes of building multi-module th
   For clarity,
 we mostly keep these two uses in separate POMs:  parent POMs do not do 
aggregation, 
 and aggregation POMs do not do common factoring.
-The UIMA Project as one 
common parent pom, called "parent-pom", that contains common
+The UIMA Project has one 
common parent pom, called "parent-pom", that contains common
 things for all the sub-projects.  Each multi-module sub-project, for instance, 
the UIMA Java SDK (uimaj),
 contains, in turn, a sub-project common parent pom for all the modules in that 
project.
 The Project-wide parent pom 
and related build artifacts are kept in a separate part of
@@ -287,11 +310,12 @@ our svn tree, in a top level directory n
existence of the directory src/docbook in the project.
 These are the current 
marker-file kinds:
  
-   marker-file-identifying-standard-pear
-   marker-file-identifying-single-project
marker-file-identifying-parent-pom
marker-file-identifying-eclipse-plugin
marker-file-identifying-eclipse-feature
+   marker-file-identifying-single-project
+   marker-file-identifying-standard-pear
+   marker-file-identifying-osgi-project
  

 
@@ -318,7 +342,7 @@ our svn tree, in a top level directory n
 So, If this does not correspond to how the website is set up,
 please specify the url that is correct for the new project.
   
-  The SCM connection is needed for releasing - and needs to be 
accurate for this
+  The SCM connection is needed for doing releases - and needs to be 
accurate for this
 component.  The same defaulting is applied as above, which is 
incorrect for our
 flat layout, so each POM needs to have an explicit SCM element.
   The POM's "version" is stated literally, not via a "property", etc.  
@@ -328,7 +352,9 @@ our svn tree, in a top level directory n
   The POM's groupId is omitted if it's the same as the parent pom's
 (which is true for all of our projects except our top-most parent 
pom); 
 if omitted, it inherits from the parent.
-  The packaging is omitted if it is "jar".  
+  The packaging is omitted if it is "jar".
+  In the build section, the  
for 
+  standard maven plugins is omitted.  
 
   
 
@@ -344,21 +370,26 @@ our svn tree, in a top level directory n
 
 We follow the standard release process 
for Maven-based artifacts at Apache,
 documented http://www.apache.org/dev/publishing-maven-artifacts.html";>here.
-For each artifact, the 
release process builds additional artifacts, and
- attaches them to the main one, so they will "go along with" the main 
artifact during 
- Maven deployment to repositories.
+Fo

svn commit: r1154384 - /uima/addons/trunk/Solrcas/pom.xml

2011-08-05 Thread schor 
Author: schor
Date: Fri Aug  5 21:30:53 2011
New Revision: 1154384

URL: http://svn.apache.org/viewvc?rev=1154384&view=rev
Log:
[UIMA-2205] fix uimaDependencyVersion

Modified:
uima/addons/trunk/Solrcas/pom.xml

Modified: uima/addons/trunk/Solrcas/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/Solrcas/pom.xml?rev=1154384&r1=1154383&r2=1154384&view=diff
==
--- uima/addons/trunk/Solrcas/pom.xml (original)
+++ uima/addons/trunk/Solrcas/pom.xml Fri Aug  5 21:30:53 2011
@@ -54,7 +54,7 @@
 
   
 ${project.artifactId}
-2.3.1-SNAPSHOT
+2.3.1
 desc/SolrCASConsumerAE.xml
 SolrcasUserGuide

svn commit: r1154399 - in /uima/addons/trunk/Solrcas: LICENSE.txt NOTICE.txt

2011-08-05 Thread schor 
Author: schor
Date: Fri Aug  5 22:26:42 2011
New Revision: 1154399

URL: http://svn.apache.org/viewvc?rev=1154399&view=rev
Log:
[UIMA-2204] fix Solrcas license and notice to account for CDDL license for 
servlet-api-2.5.jar and MIT license for SLF4j

Modified:
uima/addons/trunk/Solrcas/LICENSE.txt
uima/addons/trunk/Solrcas/NOTICE.txt

Modified: uima/addons/trunk/Solrcas/LICENSE.txt
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/Solrcas/LICENSE.txt?rev=1154399&r1=1154398&r2=1154399&view=diff
==
--- uima/addons/trunk/Solrcas/LICENSE.txt (original)
+++ uima/addons/trunk/Solrcas/LICENSE.txt Fri Aug  5 22:26:42 2011
@@ -199,3 +199,339 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
+===
+for slf4j
+
+ Copyright (c) 2004-2008 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free  of charge, to any person obtaining
+ a  copy  of this  software  and  associated  documentation files  (the
+ "Software"), to  deal in  the Software without  restriction, including
+ without limitation  the rights to  use, copy, modify,  merge, publish,
+ distribute,  sublicense, and/or sell  copies of  the Software,  and to
+ permit persons to whom the Software  is furnished to do so, subject to
+ the following conditions:
+ 
+ The  above  copyright  notice  and  this permission  notice  shall  be
+ included in all copies or substantial portions of the Software.
+ 
+ THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+ EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+ MERCHANTABILITY,FITNESSFORA   PARTICULARPURPOSEAND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+===
+
+for servlet-api-2.5.jar:
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+1.1. “Contributor” means each individual or entity that creates or contributes 
+to the creation of Modifications.
+
+1.2. “Contributor Version” means the combination of the Original Software, 
+prior Modifications used by a Contributor (if any), and the Modifications made 
by 
+that particular Contributor.
+
+1.3. “Covered Software” means (a) the Original Software, or (b) Modifications, 
+or (c) the combination of files containing Original Software with files 
containing 
+Modifications, in each case including portions thereof.
+
+1.4. “Executable” means the Covered Software in any form other than Source 
Code.
+
+1.5. “Initial Developer” means the individual or entity that first makes 
+Original Software available under this License.
+
+1.6. “Larger Work” means a work which combines Covered Software or portions 
thereof 
+with code not governed by the terms of this License.
+
+1.7. “License” means this document.
+
+1.8. “Licensable” means having the right to grant, to the maximum extent 
possible, 
+whether at the time of the initial grant or subsequently acquired, any and all 
+of the rights conveyed herein.
+
+1.9. “Modifications” means the Source Code and Executable form of any of the 
following:
+
+A. Any file that results from an addition to, deletion from or modification 
+of the contents of a file containing Original Software or previous 
Modifications;
+
+B. Any new file that contains any part of the Original Software or previous 
Modification; or
+
+C. Any new file that is contributed or otherwise made available under the 
terms of this License.
+
+1.10. “Original Software” means the Source Code and Executable form of 
+computer software code that is originally released under this License.
+
+1.11. “Patent Claims” means any patent claim(s), now owned or hereafter 
acquired, 
+including without limitation, method, process, and apparatus claims, 
+in any patent Licensable by grantor.
+
+1.12. “Source Code” means (a) the common form of computer software code 
+in which modifications are made and (b) associated documentation included in 
or with such code.
+
+1.13. “You” (or “Your”) means an individual or a legal entity exercising 
rights under, 
+and complying with all of the terms of, this License. For legal entities, 
+“You” includes any entity which controls, is controlled by, or is under 
+common control with You. For purposes of this definition, “control” means 
+(a) the power, direct or indirect, to cause the direction or management of 
+such entity, whether by contract or otherwise, or (b) ownership of more than 
+fifty percent (50%) of the outstanding shar

svn commit: r1154401 - in /uima/addons/trunk: BSFAnnotator/ ConceptMapper/ ConfigurableFeatureExtractor/ DictionaryAnnotator/ FsVariables/ Lucas/ OpenCalaisAnnotator/ PearPackagingAntTask/ RegularExpr

2011-08-05 Thread schor 
Author: schor
Date: Fri Aug  5 22:28:43 2011
New Revision: 1154401

URL: http://svn.apache.org/viewvc?rev=1154401&view=rev
Log:
[UIMA-2204] fix notice file copyright end dates

Modified:
uima/addons/trunk/BSFAnnotator/NOTICE
uima/addons/trunk/ConceptMapper/NOTICE.txt
uima/addons/trunk/ConfigurableFeatureExtractor/NOTICE.txt
uima/addons/trunk/DictionaryAnnotator/NOTICE.txt
uima/addons/trunk/FsVariables/NOTICE.txt
uima/addons/trunk/Lucas/NOTICE.txt
uima/addons/trunk/OpenCalaisAnnotator/NOTICE.txt
uima/addons/trunk/PearPackagingAntTask/NOTICE.txt
uima/addons/trunk/RegularExpressionAnnotator/NOTICE.txt
uima/addons/trunk/SimpleServer/NOTICE.txt
uima/addons/trunk/SnowballAnnotator/NOTICE.txt
uima/addons/trunk/Tagger/NOTICE.txt
uima/addons/trunk/TikaAnnotator/NOTICE.txt
uima/addons/trunk/WhitespaceTokenizer/NOTICE.txt

Modified: uima/addons/trunk/BSFAnnotator/NOTICE
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/BSFAnnotator/NOTICE?rev=1154401&r1=1154400&r2=1154401&view=diff
==
--- uima/addons/trunk/BSFAnnotator/NOTICE (original)
+++ uima/addons/trunk/BSFAnnotator/NOTICE Fri Aug  5 22:28:43 2011
@@ -1,5 +1,5 @@
 Apache UIMA BSFAnnotator software component
-Copyright 2007-2009 The Apache Software Foundation
+Copyright 2007-2011 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: uima/addons/trunk/ConceptMapper/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/ConceptMapper/NOTICE.txt?rev=1154401&r1=1154400&r2=1154401&view=diff
==
--- uima/addons/trunk/ConceptMapper/NOTICE.txt (original)
+++ uima/addons/trunk/ConceptMapper/NOTICE.txt Fri Aug  5 22:28:43 2011
@@ -1,5 +1,5 @@
 Apache UIMA ConceptMapper annotator software component
-Copyright 2008-2009 The Apache Software Foundation
+Copyright 2008-2011 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: uima/addons/trunk/ConfigurableFeatureExtractor/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/ConfigurableFeatureExtractor/NOTICE.txt?rev=1154401&r1=1154400&r2=1154401&view=diff
==
--- uima/addons/trunk/ConfigurableFeatureExtractor/NOTICE.txt (original)
+++ uima/addons/trunk/ConfigurableFeatureExtractor/NOTICE.txt Fri Aug  5 
22:28:43 2011
@@ -1,5 +1,5 @@
 Apache UIMA sandbox -- Configurable Feature Extractor component
-Copyright 2009 The Apache Software Foundation
+Copyright 2009-2011 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: uima/addons/trunk/DictionaryAnnotator/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/DictionaryAnnotator/NOTICE.txt?rev=1154401&r1=1154400&r2=1154401&view=diff
==
--- uima/addons/trunk/DictionaryAnnotator/NOTICE.txt (original)
+++ uima/addons/trunk/DictionaryAnnotator/NOTICE.txt Fri Aug  5 22:28:43 2011
@@ -1,5 +1,5 @@
 Apache UIMA DictionaryAnnotator software component
-Copyright 2007-2009 The Apache Software Foundation
+Copyright 2007-2011 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: uima/addons/trunk/FsVariables/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/FsVariables/NOTICE.txt?rev=1154401&r1=1154400&r2=1154401&view=diff
==
--- uima/addons/trunk/FsVariables/NOTICE.txt (original)
+++ uima/addons/trunk/FsVariables/NOTICE.txt Fri Aug  5 22:28:43 2011
@@ -1,5 +1,5 @@
 Apache UIMA FsVariable component
-Copyright 2006-2009 The Apache Software Foundation
+Copyright 2006-2011 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: uima/addons/trunk/Lucas/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/Lucas/NOTICE.txt?rev=1154401&r1=1154400&r2=1154401&view=diff
==
--- uima/addons/trunk/Lucas/NOTICE.txt (original)
+++ uima/addons/trunk/Lucas/NOTICE.txt Fri Aug  5 22:28:43 2011
@@ -1,5 +1,5 @@
 Apache UIMA Lucene CAS Indexer component
-Copyright 2009 The Apache Software Foundation
+Copyright 2009-2011 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: uima/addons/trunk/OpenCalaisAnnotator/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/OpenCalaisAnnotator/NOTICE.txt?rev=115

svn commit: r1154402 - in /uima/addons/trunk/src/main/readme: LICENSE NOTICE

2011-08-05 Thread schor 
Author: schor
Date: Fri Aug  5 22:30:01 2011
New Revision: 1154402

URL: http://svn.apache.org/viewvc?rev=1154402&view=rev
Log:
[UIMA-2204] add missing parts to aggregate addons license and notice files

Modified:
uima/addons/trunk/src/main/readme/LICENSE
uima/addons/trunk/src/main/readme/NOTICE

Modified: uima/addons/trunk/src/main/readme/LICENSE
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/src/main/readme/LICENSE?rev=1154402&r1=1154401&r2=1154402&view=diff
==
--- uima/addons/trunk/src/main/readme/LICENSE (original)
+++ uima/addons/trunk/src/main/readme/LICENSE Fri Aug  5 22:30:01 2011
@@ -1609,5 +1609,163 @@ Charset detection code from ICU4J (http:
 
 
==
 
+ Copyright (c) 2004-2008 QOS.ch
+ All rights reserved.
 
+ Permission is hereby granted, free  of charge, to any person obtaining
+ a  copy  of this  software  and  associated  documentation files  (the
+ "Software"), to  deal in  the Software without  restriction, including
+ without limitation  the rights to  use, copy, modify,  merge, publish,
+ distribute,  sublicense, and/or sell  copies of  the Software,  and to
+ permit persons to whom the Software  is furnished to do so, subject to
+ the following conditions:
+ 
+ The  above  copyright  notice  and  this permission  notice  shall  be
+ included in all copies or substantial portions of the Software.
+ 
+ THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+ EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+ MERCHANTABILITY,FITNESSFORA   PARTICULARPURPOSEAND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+==
+
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+1.1. “Contributor” means each individual or entity that creates or contributes 
to the creation of Modifications.
+
+1.2. “Contributor Version” means the combination of the Original Software, 
prior Modifications used by a Contributor (if any), and the Modifications made 
by that particular Contributor.
+
+1.3. “Covered Software” means (a) the Original Software, or (b) Modifications, 
or (c) the combination of files containing Original Software with files 
containing Modifications, in each case including portions thereof.
+
+1.4. “Executable” means the Covered Software in any form other than Source 
Code.
+
+1.5. “Initial Developer” means the individual or entity that first makes 
Original Software available under this License.
+
+1.6. “Larger Work” means a work which combines Covered Software or portions 
thereof with code not governed by the terms of this License.
+
+1.7. “License” means this document.
+
+1.8. “Licensable” means having the right to grant, to the maximum extent 
possible, whether at the time of the initial grant or subsequently acquired, 
any and all of the rights conveyed herein.
+
+1.9. “Modifications” means the Source Code and Executable form of any of the 
following:
+
+A. Any file that results from an addition to, deletion from or modification of 
the contents of a file containing Original Software or previous Modifications;
+
+B. Any new file that contains any part of the Original Software or previous 
Modification; or
+
+C. Any new file that is contributed or otherwise made available under the 
terms of this License.
+
+1.10. “Original Software” means the Source Code and Executable form of 
computer software code that is originally released under this License.
+
+1.11. “Patent Claims” means any patent claim(s), now owned or hereafter 
acquired, including without limitation, method, process, and apparatus claims, 
in any patent Licensable by grantor.
+
+1.12. “Source Code” means (a) the common form of computer software code in 
which modifications are made and (b) associated documentation included in or 
with such code.
+
+1.13. “You” (or “Your”) means an individual or a legal entity exercising 
rights under, and complying with all of the terms of, this License. For legal 
entities, “You” includes any entity which controls, is controlled by, or is 
under common control with You. For purposes of this definition, “control” means 
(a) the power, direct or indirect, to cause the direction or management of such 
entity, whether by contract or otherwise, or (b) ownership of more than fifty 
percent (50%) of the outstanding shares or beneficial ownership of such entity.
+
+2. License Grants.
+
+2.1. The Initial Developer Grant.
+
+Conditioned upon Your compliance with Section 3.1 below and subject to third 
party intellec

svn commit: r1154438 - in /uima/addons/trunk/Lucas: LICENSE.txt NOTICE.txt

2011-08-05 Thread schor 
Author: schor
Date: Sat Aug  6 02:56:30 2011
New Revision: 1154438

URL: http://svn.apache.org/viewvc?rev=1154438&view=rev
Log:
[UIMA-2204] add missing licenses / notices to Lucas annotator, coming from 
included Lucene Jars

Modified:
uima/addons/trunk/Lucas/LICENSE.txt
uima/addons/trunk/Lucas/NOTICE.txt

Modified: uima/addons/trunk/Lucas/LICENSE.txt
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/Lucas/LICENSE.txt?rev=1154438&r1=1154437&r2=1154438&view=diff
==
--- uima/addons/trunk/Lucas/LICENSE.txt (original)
+++ uima/addons/trunk/Lucas/LICENSE.txt Sat Aug  6 02:56:30 2011
@@ -199,3 +199,116 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
+Some code in src/java/org/apache/lucene/util/UnicodeUtil.java was
+derived from unicode conversion examples available at
+http://www.unicode.org/Public/PROGRAMS/CVTUTF.  Here is the copyright
+from those sources:
+
+/*
+ * Copyright 2001-2004 Unicode, Inc.
+ *
+ * Disclaimer
+ *
+ * This source code is provided as is by Unicode, Inc. No claims are
+ * made as to fitness for any particular purpose. No warranties of any
+ * kind are expressed or implied. The recipient agrees to determine
+ * applicability of information provided. If this file has been
+ * purchased on magnetic or optical media from Unicode, Inc., the
+ * sole remedy for any claim will be exchange of defective media
+ * within 90 days of receipt.
+ *
+ * Limitations on Rights to Redistribute This Code
+ *
+ * Unicode, Inc. hereby grants the right to freely use the information
+ * supplied in this file in the creation of products supporting the
+ * Unicode Standard, and to make copies of this file in any form
+ * for internal or external distribution as long as this notice
+ * remains attached.
+ */
+
+
+Some code in src/java/org/apache/lucene/util/ArrayUtil.java was
+derived from Python 2.4.2 sources available at
+http://www.python.org. Full license is here:
+
+  http://www.python.org/download/releases/2.4.2/license/  
+  
+  PSF LICENSE AGREEMENT FOR PYTHON 2.4
+
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using Python 2.4 software in source or binary form and its
+associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python 2.4
+alone or in any derivative version, provided, however, that PSF's
+License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved"
+are retained in Python 2.4 alone or in any derivative version prepared
+by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python 2.4 or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python 2.4.
+
+4. PSF is making Python 2.4 available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.4 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+2.4 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.4,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee.  This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python 2.4, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
+ 
+for snowball:
+ 
+Copyright (c) 2001, Dr Martin Porter
+Copyright (c) 2002, Richard Boulton
+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 o

svn commit: r1154439 - in /uima/addons/trunk/src/main/readme: LICENSE NOTICE

2011-08-05 Thread schor 
Author: schor
Date: Sat Aug  6 02:57:25 2011
New Revision: 1154439

URL: http://svn.apache.org/viewvc?rev=1154439&view=rev
Log:
[UIMA-2204] add missing licenses / notices to uima-addons, coming from updates 
to the Lucas project

Modified:
uima/addons/trunk/src/main/readme/LICENSE
uima/addons/trunk/src/main/readme/NOTICE

Modified: uima/addons/trunk/src/main/readme/LICENSE
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/src/main/readme/LICENSE?rev=1154439&r1=1154438&r2=1154439&view=diff
==
--- uima/addons/trunk/src/main/readme/LICENSE (original)
+++ uima/addons/trunk/src/main/readme/LICENSE Sat Aug  6 02:57:25 2011
@@ -1767,5 +1767,118 @@ NOTICE PURSUANT TO SECTION 9 OF THE COMM
 
 The code released under the CDDL shall be governed by the laws of the State of 
California (excluding conflict-of-law provisions). Any litigation relating to 
this License shall be subject to the jurisdiction of the Federal Courts of the 
Northern District of California and the state courts of the State of 
California, with venue lying in Santa Clara County, California..
 
+==
+
+ Some code in src/java/org/apache/lucene/util/UnicodeUtil.java was
+derived from unicode conversion examples available at
+http://www.unicode.org/Public/PROGRAMS/CVTUTF.  Here is the copyright
+from those sources:
+
+/*
+ * Copyright 2001-2004 Unicode, Inc.
+ *
+ * Disclaimer
+ *
+ * This source code is provided as is by Unicode, Inc. No claims are
+ * made as to fitness for any particular purpose. No warranties of any
+ * kind are expressed or implied. The recipient agrees to determine
+ * applicability of information provided. If this file has been
+ * purchased on magnetic or optical media from Unicode, Inc., the
+ * sole remedy for any claim will be exchange of defective media
+ * within 90 days of receipt.
+ *
+ * Limitations on Rights to Redistribute This Code
+ *
+ * Unicode, Inc. hereby grants the right to freely use the information
+ * supplied in this file in the creation of products supporting the
+ * Unicode Standard, and to make copies of this file in any form
+ * for internal or external distribution as long as this notice
+ * remains attached.
+ */
+
+
+Some code in src/java/org/apache/lucene/util/ArrayUtil.java was
+derived from Python 2.4.2 sources available at
+http://www.python.org. Full license is here:
+
+  http://www.python.org/download/releases/2.4.2/license/  
+  
+  PSF LICENSE AGREEMENT FOR PYTHON 2.4
+
+
+1. This LICENSE AGREEMENT is between the Python Software Foundation
+("PSF"), and the Individual or Organization ("Licensee") accessing and
+otherwise using Python 2.4 software in source or binary form and its
+associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, PSF
+hereby grants Licensee a nonexclusive, royalty-free, world-wide
+license to reproduce, analyze, test, perform and/or display publicly,
+prepare derivative works, distribute, and otherwise use Python 2.4
+alone or in any derivative version, provided, however, that PSF's
+License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved"
+are retained in Python 2.4 alone or in any derivative version prepared
+by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+or incorporates Python 2.4 or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python 2.4.
+
+4. PSF is making Python 2.4 available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.4 WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+2.4 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.4,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material
+breach of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any
+relationship of agency, partnership, or joint venture between PSF and
+Licensee.  This License Agreement does not grant permission to use PSF
+trademarks or trade name in a trademark sense to endorse or promote
+products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using Python 2.4, Licensee
+agrees to be bound by the terms and conditions of this License