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 2010/01/27 22:17:32 UTC

svn commit: r903842 [20/20] - in /incubator/uima/site/trunk/uima-website: docs/ docs/downloads/releaseDocs/2.2.1-incubating/docs/api/ docs/downloads/releaseDocs/2.2.1-incubating/docs/pdf/ docs/downloads/releaseDocs/2.2.2-incubating/docs/api/ docs/downl...

Added: incubator/uima/site/trunk/uima-website/docs/downloads/releaseDocs/2.3.0-incubating/docs/pdf/overview_and_setup.pdf
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/downloads/releaseDocs/2.3.0-incubating/docs/pdf/overview_and_setup.pdf?rev=903842&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/uima/site/trunk/uima-website/docs/downloads/releaseDocs/2.3.0-incubating/docs/pdf/overview_and_setup.pdf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/uima/site/trunk/uima-website/docs/downloads/releaseDocs/2.3.0-incubating/docs/pdf/references.pdf
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/downloads/releaseDocs/2.3.0-incubating/docs/pdf/references.pdf?rev=903842&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/uima/site/trunk/uima-website/docs/downloads/releaseDocs/2.3.0-incubating/docs/pdf/references.pdf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/uima/site/trunk/uima-website/docs/downloads/releaseDocs/2.3.0-incubating/docs/pdf/tools.pdf
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/downloads/releaseDocs/2.3.0-incubating/docs/pdf/tools.pdf?rev=903842&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/uima/site/trunk/uima-website/docs/downloads/releaseDocs/2.3.0-incubating/docs/pdf/tools.pdf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/uima/site/trunk/uima-website/docs/downloads/releaseDocs/2.3.0-incubating/docs/pdf/tutorials_and_users_guides.pdf
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/downloads/releaseDocs/2.3.0-incubating/docs/pdf/tutorials_and_users_guides.pdf?rev=903842&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/uima/site/trunk/uima-website/docs/downloads/releaseDocs/2.3.0-incubating/docs/pdf/tutorials_and_users_guides.pdf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/uima/site/trunk/uima-website/docs/sandbox.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/sandbox.html?rev=903842&r1=903841&r2=903842&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/sandbox.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/sandbox.html Wed Jan 27 21:17:17 2010
@@ -204,11 +204,11 @@
 		  <li><a href="#snowball.annotator">Snowball Annotator</a></li>
 		  <li><a href="#regex.annotator">Regular Expression Annotator</a></li>
       <li><a href="#dict.annotator">Dictionary Annotator</a></li>
-      <li><a href="#tagger.annotator">Tagger Annotator</a></li>
+      <li><a href="#tagger.annotator">Hidden Markov Model Tagger Annotator</a></li>
       <li><a href="#bsf.annotator">BSF Annotator</a></li>
       <li><a href="#opencalais.annotator">OpenCalais Annotator</a></li>
       <li><a href="#concept.mapper.annotator">Concept Mapper Annotator</a></li>
-      <li><a href="#tika.annotator">Tika Annotator</a></li>
+      <li><a href="#configurable.feature.extractor.annotator">Configurable Feature Extractor Annotator</a></li>      <li><a href="#tika.annotator">Tika Annotator</a></li>
       <li><a href="#lucas.consumer">Lucene CAS indexer (Lucas)</a></li>
     </ul>
                                                 <h4>Servers</h4>
@@ -294,8 +294,8 @@
 		  detects entities like email addresses, URLs, phone numbers, zip codes or any other entity 
 		  based on regular expressions and concepts. For each entity that was detected an annotation
 		  can be created or an already existing annotation can be updated with feature values.
-		   <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/RegularExpressionAnnotator/doc/pdf/RegexAnnotatorUserGuide.pdf">
-		  Click here to access the user documentation</a> for the Regular Expression Annotator.
+		   <a href="downloads/sandbox/RegexAnnotatorUserGuide/RegexAnnotatorUserGuide.html">
+		  Click here to access the user documentation</a>.
 		  The Java source of the annotator can be accessed in the SVN repository at 
 		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/RegularExpressionAnnotator">
 		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/RegularExpressionAnnotator</a>.
@@ -320,8 +320,9 @@
 		  during a component build using a custom 
 		  <a class="external" href="http://ant.apache.org/">Apache ANT</a> task. With this task, 
 		  users are able to build their components from the source and then package them 
-		  automatically as UIMA PEAR package. <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingAntTask/doc/pdf/PearPackagingAntTaskUserGuide.pdf">
-		  Click here to access the user documentation</a> for the PEAR packaging ANT task.
+		  automatically as UIMA PEAR package. 
+      <a href="downloads/sandbox/PearPackagingAntTaskUserGuide/PearPackagingAntTaskUserGuide.html">
+		  Click here to access the user documentation</a>.
 		  The Java source of the PEAR packaging task can be accessed in the SVN repository at 
 		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingAntTask">
 		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingAntTask</a>. 
@@ -341,16 +342,17 @@
       </td></tr>
       <tr><td>
         <blockquote class="subsectionBody">
-                                    <p>
+                                    <p>Note: The PEAR Packaging Maven Plugin has been moved to the main UIMA Java Framework and SDK package.</p>
+                                                <p>
 		  The PEAR packaging Maven plugin component is a project to create UIMA PEAR packages automatically 
 		  during a component build using a custom Maven plugin.
 		  With this plugin, users are able to build their components from the source and then package them 
 		  automatically as UIMA PEAR package. 
-		  <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingMavenPlugin/doc/pdf/PearPackagingMavenPluginUserGuide.pdf">
-		  Click here to access the user documentation</a> of the PEAR packaging Maven plugin.
+		  <a href="http://incubator.apache.org/uima/downloads/releaseDocs/2.2.2-incubating/docs/html/tools/tools.html#ugr.tools.pear">
+		  Click here to access the user documentation</a>.
 		  The Java source of the PEAR packaging Maven plugin can be accessed in the SVN repository at 
-		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingMavenPlugin">
-		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingMavenPlugin</a>. 
+		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/uimaj/trunk/PearPackagingMavenPlugin">
+		  http://svn.apache.org/repos/asf/incubator/uima/uimaj/trunk/PearPackagingMavenPlugin</a>. 
 		</p>
                             </blockquote>
         </td></tr>
@@ -371,8 +373,8 @@
 		  The Dictionary Annotator is an Apache UIMA analysis engine that creates annotations based on word lists 
 		  that are compiled to simple dictionaries. The output annotation type for the annotations that are created
 		  and the input annotation type where the dictionary lookup is executed on, can be specified individually.
-		   <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/DictionaryAnnotator/doc/pdf/DictionaryAnnotatorUserGuide.pdf">
-		  Click here to access the user documentation</a> for the Dictionary Annotator.
+		   <a href="downloads/sandbox/DictionaryAnnotatorUserGuide/DictionaryAnnotatorUserGuide.html">
+		  Click here to access the user documentation</a>.
 		  The Java source of the annotator can be accessed in the SVN repository at 
 		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/DictionaryAnnotator">
 		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/DictionaryAnnotator</a>.
@@ -396,6 +398,8 @@
 		  The Feature Structure variables project allows you to create named feature structure instances.
 		  It further allows you to refer to individual feature structures or annotations across annotators, 
 		  without creating a special index.
+      <a href="downloads/sandbox/FsVariablesUserGuide/FsVariablesUserGuide.html">
+      Click here to access the user documentation</a>.
 		  The Java source of the project can be accessed in the SVN repository at 
 		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/FsVariables">
 		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/FsVariables</a>.
@@ -408,8 +412,8 @@
        
        
        
-          <a name="Tagger Annotator">
-            <h2>Tagger Annotator
+          <a name="Hidden Markov Model Tagger Annotator">
+            <h2>Hidden Markov Model Tagger Annotator
                         </h2>
           </a>
       </td></tr>
@@ -422,7 +426,9 @@
           tagger on this list. The HMM tagger employs the Viterbi algorithm to calculate the most probable tag sequence. 
           For each Token it updates the posTag field with the part of speech tag. 
           Model training is happening outside of UIMA, the tagger just receives statistical information from 
-          a model file which is passed to the tagger along with some further parameters through a properties file. 
+          a model file which is passed to the tagger along with some further parameters through a properties file.
+          <a href="downloads/sandbox/hmmTaggerUsersGuide/hmmTaggerUsersGuide.html">
+      Click here to access the user documentation</a>. 
           The Java source of the annotator can be accessed in the SVN repository at 
           <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/Tagger">
           http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/Tagger</a>.
@@ -521,8 +527,10 @@
             by token filters. Lucas comes with a set of its own token filters and
             integrations for some Lucene token filters. Furthermore, you can
             deploy your own token filters. The mapping between UIMA annotations and Lucene
-            tokens and token filtering is configured by a xml mapping file. The
-            Java source of the consumer can be accessed in the 
+            tokens and token filtering is configured by a xml mapping file.</p>
+                                                <p><a href="downloads/sandbox/LuceneCASConsumerUserGuide/LuceneCASConsumerUserGuide.html">
+      Click here to access the user documentation</a>.
+          The Java source of the consumer can be accessed in the 
             <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/Lucas">
             SVN repository</a>.
         </p>
@@ -547,10 +555,9 @@
 			the the Simple Server is to provide UIMA analysis as a REST
 			service. The Simple Server is implemented as a Java Servlet,
 			and can be deployed into any Servlet container (such as
-			Apache Tomcat or Jetty).  <a href="downloads/sandbox/simple-server/simpleServerUserGuide/simpleServerUserGuide.html">
-			Click here to access the user documentation</a> of the Simple Server.
-		</p>
-                                                <p>
+			Apache Tomcat or Jetty).</p>
+                                                <p><a href="downloads/sandbox/simpleServerUserGuide/simpleServerUserGuide.html">
+      Click here to access the user documentation</a>.
 			The Java source of the annotator can be accessed from the
 			SVN repository at
 			<a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/SimpleServer">
@@ -616,6 +623,38 @@
 	  Additionally, ConceptMapper can be configured to use any tokenizer annotator, 
       enabling tokenization of the dictionary identically with the input text.
     </p>
+                                                <p><a href="downloads/sandbox/ConceptMapperAnnotatorUserGuide/ConceptMapperAnnotatorUserGuide.html">
+      Click here to access the user documentation</a>.</p>
+                            </blockquote>
+        </td></tr>
+    </table>
+                                                      <table class="subsectionTable" id='configurable.feature.extractor.annotator'>
+        <tr><td>
+       
+       
+       
+          <a name="Configurable Feature Extractor Annotator">
+            <h2>Configurable Feature Extractor Annotator
+                        </h2>
+          </a>
+      </td></tr>
+      <tr><td>
+        <blockquote class="subsectionBody">
+                                    <p>
+      The Configurable Feature Extractor (CFE) Annotator is a multipurpose tool 
+      that enables feature extraction from a UIMA CAS in a very generalized and 
+      application independent way. </p>
+                                                <p>The extraction process is performed according to rules expressed using the 
+      <bold>Feature Extraction Specification Language (FESL)</bold> that are stored 
+      in configuration files.</p>
+                                                <p>Using CFE eliminates the need for creating customized CAS consumers and 
+      writing Java code for every application. Instead, by using FESL rules in XML format, 
+      users can customize the information extraction process to suit their application. 
+      FESL's rule semantics allow the precise identification of the information that 
+      is required to be extracted by specifying precise multi-parameter criteria. 
+    </p>
+                                                <p><a href="downloads/sandbox/CFE_UG/CFE_UG.html">
+      Click here to access the user documentation</a>.</p>
                             </blockquote>
         </td></tr>
     </table>

Modified: incubator/uima/site/trunk/uima-website/docs/toolsServers.html
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/docs/toolsServers.html?rev=903842&r1=903841&r2=903842&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/docs/toolsServers.html (original)
+++ incubator/uima/site/trunk/uima-website/docs/toolsServers.html Wed Jan 27 21:17:17 2010
@@ -169,143 +169,12 @@
 <a href="downloads.cgi">downloadable</a>; this page describes those components.
 </p>
                                                 <ul>
-        <li><a href="#CAS Editor">CAS Editor</a></li>
-	    	<li><a href="#pear.package.task">PEAR Packaging ANT Task</a></li>
-        <li><a href="#pear.maven.task">PEAR Packaging Maven Plugin</a></li>
-        <li><a href="#fs.variables">Feature Structure Variables</a></li>
-        <li><a href="#simple-server">Simple Server (UIMA REST service)</a></li>
+        <li><a href="downloads/releaseDocs/2.3.0-incubating/docs/html/tools/tools.html#ugr.tools.ce">CAS Editor (moved to main Java SDK)</a></li>
+	    	<li><a href="sandbox.html#pear.package.task">PEAR Packaging ANT Task</a></li>
+        <li><a href="downloads/releaseDocs/2.3.0-incubating/docs/html/tools/tools.html#ugr.tools.pear.packager.maven.plugin.usage">PEAR Packaging Maven Plugin (moved to main Java SDK)</a></li>
+        <li><a href="sandbox.html#fs.variables">Feature Structure Variables</a></li>
+        <li><a href="sandbox.html#simple-server">Simple Server (UIMA REST service)</a></li>
       </ul>
-                                                <p>Each of these components is described in more detail below.</p>
-                                                      <table class="subsectionTable">
-        <tr><td>
-       
-       
-       
-          <a name="CAS Editor">
-            <h2>CAS Editor
-                        </h2>
-          </a>
-      </td></tr>
-      <tr><td>
-        <blockquote class="subsectionBody">
-                                    <p>
-        The Cas Editor is an annotation tool which supports manual and automatic
-          annotation of CAS files. The CAS Editor can visualize and edit
-          all feature structures, annotations can be viewed and edited directly
-          on text. Currently, only text based CASes are supported. 
-          The Java source of the CAS Editor can be accessed in the SVN repository at 
-          <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/CasEditor">
-          http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/CasEditor</a>. 
-        </p>
-                            </blockquote>
-        </td></tr>
-    </table>
-                                                      <table class="subsectionTable" id='pear.package.task'>
-        <tr><td>
-       
-       
-       
-          <a name="PEAR Packaging ANT Task">
-            <h2>PEAR Packaging ANT Task
-                        </h2>
-          </a>
-      </td></tr>
-      <tr><td>
-        <blockquote class="subsectionBody">
-                                    <p>
-		  The PEAR packaging ANT task component is a project to create UIMA PEAR packages automatically 
-		  during a component build using a custom 
-		  <a class="external" href="http://ant.apache.org/">Apache ANT</a> task. With this task, 
-		  users are able to build their components from the source and then package them 
-		  automatically as UIMA PEAR package. <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingAntTask/doc/pdf/PearPackagingAntTaskUserGuide.pdf">
-		  Click here to access the user documentation</a> for the PEAR packaging ANT task.
-		  The Java source of the PEAR packaging task can be accessed in the SVN repository at 
-		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingAntTask">
-		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingAntTask</a>. 
-		</p>
-                            </blockquote>
-        </td></tr>
-    </table>
-                                                      <table class="subsectionTable" id='pear.maven.task'>
-        <tr><td>
-       
-       
-       
-          <a name="PEAR Packaging Maven Plugin">
-            <h2>PEAR Packaging Maven Plugin
-                        </h2>
-          </a>
-      </td></tr>
-      <tr><td>
-        <blockquote class="subsectionBody">
-                                    <p>
-		  The PEAR packaging Maven plugin component is a project to create UIMA PEAR packages automatically 
-		  during a component build using a custom Maven plugin.
-		  With this plugin, users are able to build their components from the source and then package them 
-		  automatically as UIMA PEAR package. 
-		  <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingMavenPlugin/doc/pdf/PearPackagingMavenPluginUserGuide.pdf">
-		  Click here to access the user documentation</a> of the PEAR packaging Maven plugin.
-		  The Java source of the PEAR packaging Maven plugin can be accessed in the SVN repository at 
-		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingMavenPlugin">
-		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingMavenPlugin</a>. 
-		</p>
-                            </blockquote>
-        </td></tr>
-    </table>
-                                                      <table class="subsectionTable" id='fs.variables'>
-        <tr><td>
-       
-       
-       
-          <a name="Feature Structure Variables">
-            <h2>Feature Structure Variables
-                        </h2>
-          </a>
-      </td></tr>
-      <tr><td>
-        <blockquote class="subsectionBody">
-                                    <p>
-		  The Feature Structure variables project allows you to create named feature structure instances.
-		  It further allows you to refer to individual feature structures or annotations across annotators, 
-		  without creating a special index.
-		  The Java source of the project can be accessed in the SVN repository at 
-		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/FsVariables">
-		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/FsVariables</a>.
-		</p>
-                            </blockquote>
-        </td></tr>
-    </table>
-                                                      <table class="subsectionTable" id='simple-server'>
-        <tr><td>
-       
-       
-       
-          <a name="Simple Server (UIMA REST Service)">
-            <h2>Simple Server (UIMA REST Service)
-                        </h2>
-          </a>
-      </td></tr>
-      <tr><td>
-        <blockquote class="subsectionBody">
-                                    <p>
-			The UIMA Simple Server makes results of UIMA processing
-			available in a simple, XML-based format. The intended use of
-			the the Simple Server is to provide UIMA analysis as a REST
-			service. The Simple Server is implemented as a Java Servlet,
-			and can be deployed into any Servlet container (such as
-			Apache Tomcat or Jetty).  <a href="downloads/sandbox/simple-server/simpleServerUserGuide.html">
-			Click here to access the user documentation</a> of the Simple Server.
-		</p>
-                                                <p>
-			The Java source of the annotator can be accessed from the
-			SVN repository at
-			<a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/SimpleServer">
-				http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/SimpleServer
-			</a>.
-		</p>
-                            </blockquote>
-        </td></tr>
-    </table>
                             </blockquote>
         </p>
       </td></tr>

Modified: incubator/uima/site/trunk/uima-website/xdocs/annotators.xml
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/xdocs/annotators.xml?rev=903842&r1=903841&r2=903842&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/xdocs/annotators.xml (original)
+++ incubator/uima/site/trunk/uima-website/xdocs/annotators.xml Wed Jan 27 21:17:17 2010
@@ -44,145 +44,26 @@
      http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/</a>. 
 </p>
 
-<p>Here are the annotators available here:</p>
+<p>The annotators available here are:</p>
 
       <ul>
-		<li><a href="#whitespace.tokenizer">Whitespace Tokenizer Annotator</a>
+		<li><a href="sandbox.html#whitespace.tokenizer">Whitespace Tokenizer Annotator</a>
       </li>
-		<li><a href="#snowball.annotator">Snowball Annotator</a></li>
-		<li><a href="#regex.annotator">Regular Expression Annotator</a></li>
-        <li><a href="#tagger.annotator">Tagger Annotator</a></li>
-        <li><a href="#bsf.annotator">BSF Annotator</a>.  BSF stands for
+		<li><a href="sandbox.html#snowball.annotator">Snowball Annotator</a></li>
+		<li><a href="sandbox.html#regex.annotator">Regular Expression Annotator</a></li>
+        <li><a href="sandbox.html#tagger.annotator">Hidden Markov Model Tagger Annotator</a></li>
+        <li><a href="sandbox.html#bsf.annotator">BSF Annotator</a>.  BSF stands for
           the Java Bean Scripting Framework; this annotator allows you to write
           annotators using scripting languages supported by that framework.</li>
-        <li><a href="#dict.annotator">Dictionary Annotator</a></li>
-        <li><a href="#opencalais.annotator">OpenCalais Annotator</a> - an 
+        <li><a href="sandbox.html#dict.annotator">Dictionary Annotator</a></li>
+        <li><a href="sandbox.html#opencalais.annotator">OpenCalais Annotator</a> - an 
           experimental annotator that uses the 
           <a href="http://www.opencalais.com/">OpenCalais service</a> to 
           do the annotations.</li>
-        <li><a href="#concept.mapper.annotator">Concept Mapper Annotator</a></li>
+        <li><a href="sandbox.html#lucas.consumer">Lucene CAS indexer (Lucas)</a></li>
+        <li><a href="sandbox.html#concept.mapper.annotator">Concept Mapper Annotator</a></li>
+        <li><a href="sandbox.html#configurable.feature.extractor.annotator">Configurable Feature Extractor (CFE)</a></li>
       </ul>
-<p>Each of these annotators is described in more detail below.</p>
-
-
-	<subsection name='Whitespace Tokenizer Annotator' id="whitespace.tokenizer">
-		<p>
-		  The Whitespace tokenizer annotator component provides an UIMA annotator implementation that tokenizes 
-		  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 
-		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/WhitespaceTokenizer">
-		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/WhitespaceTokenizer</a>.
-		</p>	
-	</subsection>
-
-	<subsection name='Snowball Annotator' id="snowball.annotator">
-		<p>
-		  The Snowball annotator is an UIMA annotator component that wraps the Snowball stemming algorithm. The annotator
-		  iterates over the available token annotations in the CAS and creates for each token a feature 
-		  containing the stem.
-		  The stemming algorithm is avaialble for several languages. For details about Snowball please see 
-		  <a class="external" href="http://snowball.tartarus.org/">http://snowball.tartarus.org/</a>.
-		  The Java source of the annotator can be accessed in the SVN repository at 
-		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/SnowballAnnotator">
-		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/SnowballAnnotator</a>. 
-		</p>
-		<p>
-		  Note: the used implementation of the Snowball stemming algorithm is licensed under the BSD license.
-		</p>	
-	</subsection>
-
-	<subsection name='Regular Expression Annotator' id="regex.annotator">
-		<p>
-		  The Regular Expression Annotator (RegexAnnotator) is an Apache UIMA analysis engine that 
-		  detects entities like email addresses, URLs, phone numbers, zip codes or any other entity 
-		  based on regular expressions and concepts. For each entity that was detected an annotation
-		  can be created or an already existing annotation can be updated with feature values.
-		   <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/RegularExpressionAnnotator/doc/pdf/RegexAnnotatorUserGuide.pdf">
-		  Click here to access the user documentation</a> for the Regular Expression Annotator.
-		  The Java source of the annotator can be accessed in the SVN repository at 
-		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/RegularExpressionAnnotator">
-		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/RegularExpressionAnnotator</a>.
-		</p>	
-	</subsection>
-
-
-
-	<subsection name='Dictionary Annotator' id="dict.annotator">
-		<p>
-		  The Dictionary Annotator is an Apache UIMA analysis engine that creates annotations based on word lists 
-		  that are compiled to simple dictionaries. The output annotation type for the annotations that are created
-		  and the input annotation type where the dictionary lookup is executed on, can be specified individually.
-		   <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/DictionaryAnnotator/doc/pdf/DictionaryAnnotatorUserGuide.pdf">
-		  Click here to access the user documentation</a> for the Dictionary Annotator.
-		  The Java source of the annotator can be accessed in the SVN repository at 
-		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/DictionaryAnnotator">
-		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/DictionaryAnnotator</a>.
-		</p>	
-	</subsection>
-
-	<subsection name='Tagger Annotator' id="tagger.annotator">
-		<p>
-		  The Tagger Annotator component implements a Hidden Markov Model (HMM) tagger. The tagger assumes that 
-		  sentences and tokens have already been annotated in the CAS with sentence and token annotations. 
-          It iterates then in turn over sentences and tokens to accumulate a list of words, and then invokes the
-          tagger on this list. The HMM tagger employs the Viterbi algorithm to calculate the most probable tag sequence. 
-          For each Token it updates the posTag field with the part of speech tag. 
-          Model training is happening outside of UIMA, the tagger just receives statistical information from 
-          a model file which is passed to the tagger along with some further parameters through a properties file. 
-          The Java source of the annotator can be accessed in the SVN repository at 
-          <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/Tagger">
-          http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/Tagger</a>.
-		</p>	
-	</subsection>
-
-	<subsection name='BSF Annotator' id="bsf.annotator">
-		<p>
-		  The Bean Scripting Framework (BSF) Annotator is an Apache UIMA analysis engine that provides 
-		  a link between the UIMA framework and the scripting languages that are supported by
-		  Apache BSF (<a class="external" href="http://jakarta.apache.org/bsf">http://jakarta.apache.org/bsf</a>).
-		  The current implementation comes with examples in Beanshell 
-		  (<a class="external" href="http://www.beanshell.org">http://www.beanshell.org</a>) and Rhino Javascript
-		  (<a class="external" href="http://www.mozilla.org/rhino">http://www.mozilla.org/rhino</a>).
-		  Simple tests have also been conducted successfully with Jython
-		  (<a class="external" href="http://jython.sourceforge.net/Project/index.html">http://jython.sourceforge.net/Project/index.html</a>)
-		  and JRuby (<a class="external" href="http://jruby.codehaus.org">http://jruby.codehaus.org</a>).
-          The annotator takes as parameter the source file containing the script.
-		  The script is supposed to implement the initialize and process functions of the analysis engine.
-		  Using a scripting language can be very handy to do quick prototyping, pre/post processing, CAS cleaning tasks or 
-		  typeystem conversion/adaptation.
-		  The Java source of the annotator can be accessed from the SVN repository at
-		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/BSFAnnotator">
-          http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/BSFAnnotator</a>.
-		</p>	
-	</subsection>
-
-	<subsection name='OpenCalais Annotator' id="opencalais.annotator">
-		<p>	  
-		  The OpenCalais Annotator component wraps the 
-		  <a class="external" href="http://www.opencalais.com/Overview">OpenCalais</a>
-		  web service and makes the OpenCalais analysis results available in UIMA. OpenCalais can detect a large variety
-		  of entities, facts and events like for example Persons, Companies, Acquisitions, Mergers, etc.
-		  For details about the OpenCalais analytics and the license to use the service, please refer to the
-		  to the <a class="external" href="http://www.opencalais.com/Overview">OpenCalais</a> website.
-          The Java source of the annotator can be accessed in the SVN repository at 
-          <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/OpenCalaisAnnotator">
-          http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/OpenCalaisAnnotator</a>.
-       </p>
-	</subsection>
-  
-  <subsection name='Concept Mapper Annotator' id='concept.mapper.annotator'>
-    <p>
-      ConceptMapper is a powerful, highly configurable dictionary UIMA-based annotator.
-      </p><p>
-      Numerous parameters can be used to specify various aspects of the lookup algorithm, input processing and output options. 
-      The dictionary structure is flexible, allowing any number synonyms to be associated with an entry, 
-      and any number of attributes to be associated with entries or synonyms. 
-    </p><p>
-      Additionally, ConceptMapper can be used with any tokenizer, 
-      enabling tokenization of the dictionary identically with the input text.
-    </p>
-  </subsection>
 
 </section>
 

Modified: incubator/uima/site/trunk/uima-website/xdocs/documentation.xml
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/xdocs/documentation.xml?rev=903842&r1=903841&r2=903842&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/xdocs/documentation.xml (original)
+++ incubator/uima/site/trunk/uima-website/xdocs/documentation.xml Wed Jan 27 21:17:17 2010
@@ -45,21 +45,24 @@
   <subsection name="UIMA Manuals and Guides" id="manuals_and_guides">
        
    <p>
-     The current UIMA documentation version 2.2.2-incubating is available in two formats (HTML and PDF):
+     The current UIMA documentation version 2.3.0-incubating is available in two formats (HTML and PDF):
    </p>
    <ul>
-     <li><a href="downloads/releaseDocs/2.2.2-incubating/docs/html/index.html">HTML online version</a></li>       
+     <li><a href="downloads/releaseDocs/2.3.0-incubating/docs/html/index.html">HTML online version - UIMA Java SDK</a></li>
+     <li><a href="downloads/releaseDocs/2.3.0-incubating/docs-uima-as/html/uima_async_scaleout/uima_async_scaleout.html">HTML online version - UIMA Asynchronous Scaleout</a></li>       
    </ul>
    <p>PDF version for printing:</p> 
    <ul>
-     <li><a href="downloads/releaseDocs/2.2.2-incubating/docs/pdf/overview_and_setup.pdf">Overview and Setup</a></li>
-     <li><a href="downloads/releaseDocs/2.2.2-incubating/docs/pdf/tutorials_and_users_guides.pdf">Tutorials and Users&apos; Guides</a></li>
-     <li><a href="downloads/releaseDocs/2.2.2-incubating/docs/pdf/tools.pdf">Tools</a></li>
-     <li><a href="downloads/releaseDocs/2.2.2-incubating/docs/pdf/references.pdf">References</a></li>
+     <li><a href="downloads/releaseDocs/2.3.0-incubating/docs/pdf/overview_and_setup.pdf">Overview and Setup</a></li>
+     <li><a href="downloads/releaseDocs/2.3.0-incubating/docs/pdf/tutorials_and_users_guides.pdf">Tutorials and Users&apos; Guides</a></li>
+     <li><a href="downloads/releaseDocs/2.3.0-incubating/docs/pdf/tools.pdf">Tools</a></li>
+     <li><a href="downloads/releaseDocs/2.3.0-incubating/docs/pdf/references.pdf">References</a></li>
+     <li><a href="downloads/releaseDocs/2.3.0-incubating/docs-uima-as/pdf/uima_async_scaleout.pdf">UIMA Asynchronous Scaleout</a></li>
    </ul>
 
    <p>Previous releases (HTML only)</p>
      <ul>
+       <li><a href="downloads/releaseDocs/2.2.2-incubating/docs/html/index.html">Version 2.2.2-incubating</a></li> 
        <li><a href="downloads/releaseDocs/2.2.1-incubating/docs/html/index.html">Version 2.2.1-incubating</a></li> 
        <li><a href="downloads/releaseDocs/2.2.0-incubating/docs/html/index.html">Version 2.2.0-incubating</a></li>
        <li><a href="downloads/releaseDocs/2.1.0-incubating/docs/html/index.html">Version 2.1.0-incubating</a></li>
@@ -70,16 +73,18 @@
 
    <p>
      Apache UIMA Javadoc is supplied with the binary distribution, or can be built from the
-     source distribution.  We also make it available directly from this website, in two formats:
-     you can browse the Javadoc online, or you can download it as a .zip file and unzip it to a local directory.
+     source distribution.  We also make it available directly from this website.
     
    <ul>
-     <li><a href="downloads/releaseDocs/2.2.2-incubating/docs/api/index.html">Javadoc online</a></li>
-     <li><a href="downloads/releaseDocs/2.2.2-incubating/docs/apiDocs.zip">apiDocs.zip file</a></li>
+     <li><a href="downloads/releaseDocs/2.3.0-incubating/docs/api/index.html">Javadoc online</a></li>
    </ul>
    </p>
   </subsection>
-    
+  
+  <subsection name="Annotators, Web Servers, Tooling, and more" id="sandbox">
+    <p>Many of the additional components found in the sandbox have individual documentation files, which 
+      you can access from the <a href="sandbox.html">sandbox</a> page</p>
+  </subsection>  
   <subsection name="Getting Started" id="getting_started">
    <p>
     The UIMA "Getting Started" guides are intended to offer a quick overview of UIMA and how it works. 

Modified: incubator/uima/site/trunk/uima-website/xdocs/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/xdocs/downloads.xml?rev=903842&r1=903841&r2=903842&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/xdocs/downloads.xml (original)
+++ incubator/uima/site/trunk/uima-website/xdocs/downloads.xml Wed Jan 27 21:17:17 2010
@@ -99,7 +99,11 @@
 
 
 <!-- do not enter download info here, instead enter it in the project.xml file--> 
-<section name="Latest Official Releases">    
+<section name="Latest Official Releases">  
+  <p>Note: As of release 2.3.0, the CAS Editor and the Pear packaging maven plugin are now part of the UIMA Java framework and SDK.</p>
+  <subsection name="Apache UIMA Version 2.3.0-incubating - Release Date: 26-Jan-2010">
+    <insertDownloads version="2.3.0-incubating"/>
+  </subsection>
 
 	<subsection name="Apache UIMA Version 2.2.2-incubating">
     <insertDownloads version="2.2.2-incubating"/>

Modified: incubator/uima/site/trunk/uima-website/xdocs/sandbox.xml
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/xdocs/sandbox.xml?rev=903842&r1=903841&r2=903842&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/xdocs/sandbox.xml (original)
+++ incubator/uima/site/trunk/uima-website/xdocs/sandbox.xml Wed Jan 27 21:17:17 2010
@@ -69,11 +69,11 @@
 		  <li><a href="#snowball.annotator">Snowball Annotator</a></li>
 		  <li><a href="#regex.annotator">Regular Expression Annotator</a></li>
       <li><a href="#dict.annotator">Dictionary Annotator</a></li>
-      <li><a href="#tagger.annotator">Tagger Annotator</a></li>
+      <li><a href="#tagger.annotator">Hidden Markov Model Tagger Annotator</a></li>
       <li><a href="#bsf.annotator">BSF Annotator</a></li>
       <li><a href="#opencalais.annotator">OpenCalais Annotator</a></li>
       <li><a href="#concept.mapper.annotator">Concept Mapper Annotator</a></li>
-      <li><a href="#tika.annotator">Tika Annotator</a></li>
+      <li><a href="#configurable.feature.extractor.annotator">Configurable Feature Extractor Annotator</a></li>      <li><a href="#tika.annotator">Tika Annotator</a></li>
       <li><a href="#lucas.consumer">Lucene CAS indexer (Lucas)</a></li>
     </ul>
   <h4>Servers</h4>
@@ -126,8 +126,8 @@
 		  detects entities like email addresses, URLs, phone numbers, zip codes or any other entity 
 		  based on regular expressions and concepts. For each entity that was detected an annotation
 		  can be created or an already existing annotation can be updated with feature values.
-		   <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/RegularExpressionAnnotator/doc/pdf/RegexAnnotatorUserGuide.pdf">
-		  Click here to access the user documentation</a> for the Regular Expression Annotator.
+		   <a href="downloads/sandbox/RegexAnnotatorUserGuide/RegexAnnotatorUserGuide.html">
+		  Click here to access the user documentation</a>.
 		  The Java source of the annotator can be accessed in the SVN repository at 
 		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/RegularExpressionAnnotator">
 		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/RegularExpressionAnnotator</a>.
@@ -140,8 +140,9 @@
 		  during a component build using a custom 
 		  <a class="external" href="http://ant.apache.org/">Apache ANT</a> task. With this task, 
 		  users are able to build their components from the source and then package them 
-		  automatically as UIMA PEAR package. <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingAntTask/doc/pdf/PearPackagingAntTaskUserGuide.pdf">
-		  Click here to access the user documentation</a> for the PEAR packaging ANT task.
+		  automatically as UIMA PEAR package. 
+      <a href="downloads/sandbox/PearPackagingAntTaskUserGuide/PearPackagingAntTaskUserGuide.html">
+		  Click here to access the user documentation</a>.
 		  The Java source of the PEAR packaging task can be accessed in the SVN repository at 
 		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingAntTask">
 		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingAntTask</a>. 
@@ -149,16 +150,17 @@
 	</subsection>
 
 	<subsection name='PEAR Packaging Maven Plugin' id="pear.maven.task">
-		<p>
+		<p>Note: The PEAR Packaging Maven Plugin has been moved to the main UIMA Java Framework and SDK package.</p>
+    <p>
 		  The PEAR packaging Maven plugin component is a project to create UIMA PEAR packages automatically 
 		  during a component build using a custom Maven plugin.
 		  With this plugin, users are able to build their components from the source and then package them 
 		  automatically as UIMA PEAR package. 
-		  <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingMavenPlugin/doc/pdf/PearPackagingMavenPluginUserGuide.pdf">
-		  Click here to access the user documentation</a> of the PEAR packaging Maven plugin.
+		  <a href="http://incubator.apache.org/uima/downloads/releaseDocs/2.2.2-incubating/docs/html/tools/tools.html#ugr.tools.pear">
+		  Click here to access the user documentation</a>.
 		  The Java source of the PEAR packaging Maven plugin can be accessed in the SVN repository at 
-		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingMavenPlugin">
-		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingMavenPlugin</a>. 
+		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/uimaj/trunk/PearPackagingMavenPlugin">
+		  http://svn.apache.org/repos/asf/incubator/uima/uimaj/trunk/PearPackagingMavenPlugin</a>. 
 		</p>
 	</subsection>
 
@@ -167,8 +169,8 @@
 		  The Dictionary Annotator is an Apache UIMA analysis engine that creates annotations based on word lists 
 		  that are compiled to simple dictionaries. The output annotation type for the annotations that are created
 		  and the input annotation type where the dictionary lookup is executed on, can be specified individually.
-		   <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/DictionaryAnnotator/doc/pdf/DictionaryAnnotatorUserGuide.pdf">
-		  Click here to access the user documentation</a> for the Dictionary Annotator.
+		   <a href="downloads/sandbox/DictionaryAnnotatorUserGuide/DictionaryAnnotatorUserGuide.html">
+		  Click here to access the user documentation</a>.
 		  The Java source of the annotator can be accessed in the SVN repository at 
 		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/DictionaryAnnotator">
 		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/DictionaryAnnotator</a>.
@@ -179,14 +181,16 @@
 		<p>
 		  The Feature Structure variables project allows you to create named feature structure instances.
 		  It further allows you to refer to individual feature structures or annotations across annotators, 
-		  without creating a special index.
+		  without creating a special index.
+      <a href="downloads/sandbox/FsVariablesUserGuide/FsVariablesUserGuide.html">
+      Click here to access the user documentation</a>.
 		  The Java source of the project can be accessed in the SVN repository at 
 		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/FsVariables">
 		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/FsVariables</a>.
 		</p>	
 	</subsection>
 
-	<subsection name='Tagger Annotator' id="tagger.annotator">
+	<subsection name='Hidden Markov Model Tagger Annotator' id="tagger.annotator">
 		<p>
 		  The Tagger Annotator component implements a Hidden Markov Model (HMM) tagger. The tagger assumes that 
 		  sentences and tokens have already been annotated in the CAS with sentence and token annotations. 
@@ -194,7 +198,9 @@
           tagger on this list. The HMM tagger employs the Viterbi algorithm to calculate the most probable tag sequence. 
           For each Token it updates the posTag field with the part of speech tag. 
           Model training is happening outside of UIMA, the tagger just receives statistical information from 
-          a model file which is passed to the tagger along with some further parameters through a properties file. 
+          a model file which is passed to the tagger along with some further parameters through a properties file.
+          <a href="downloads/sandbox/hmmTaggerUsersGuide/hmmTaggerUsersGuide.html">
+      Click here to access the user documentation</a>. 
           The Java source of the annotator can be accessed in the SVN repository at 
           <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/Tagger">
           http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/Tagger</a>.
@@ -259,8 +265,11 @@
             by token filters. Lucas comes with a set of its own token filters and
             integrations for some Lucene token filters. Furthermore, you can
             deploy your own token filters. The mapping between UIMA annotations and Lucene
-            tokens and token filtering is configured by a xml mapping file. The
-            Java source of the consumer can be accessed in the 
+            tokens and token filtering is configured by a xml mapping file.</p>
+            
+        <p><a href="downloads/sandbox/LuceneCASConsumerUserGuide/LuceneCASConsumerUserGuide.html">
+      Click here to access the user documentation</a>.
+          The Java source of the consumer can be accessed in the 
             <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/Lucas">
             SVN repository</a>.
         </p>
@@ -274,10 +283,9 @@
 			the the Simple Server is to provide UIMA analysis as a REST
 			service. The Simple Server is implemented as a Java Servlet,
 			and can be deployed into any Servlet container (such as
-			Apache Tomcat or Jetty).  <a href="downloads/sandbox/simple-server/simpleServerUserGuide/simpleServerUserGuide.html">
-			Click here to access the user documentation</a> of the Simple Server.
-		</p>
-		<p>
+			Apache Tomcat or Jetty).</p>
+    <p><a href="downloads/sandbox/simpleServerUserGuide/simpleServerUserGuide.html">
+      Click here to access the user documentation</a>.
 			The Java source of the annotator can be accessed from the
 			SVN repository at
 			<a class="external"
@@ -317,8 +325,30 @@
 	  Additionally, ConceptMapper can be configured to use any tokenizer annotator, 
       enabling tokenization of the dictionary identically with the input text.
     </p>
+    <p><a href="downloads/sandbox/ConceptMapperAnnotatorUserGuide/ConceptMapperAnnotatorUserGuide.html">
+      Click here to access the user documentation</a>.</p>
+  </subsection>
+
+  <subsection name="Configurable Feature Extractor Annotator" id="configurable.feature.extractor.annotator">
+    <p>
+      The Configurable Feature Extractor (CFE) Annotator is a multipurpose tool 
+      that enables feature extraction from a UIMA CAS in a very generalized and 
+      application independent way. </p>
+        
+    <p>The extraction process is performed according to rules expressed using the 
+      <bold>Feature Extraction Specification Language (FESL)</bold> that are stored 
+      in configuration files.</p>
+      
+    <p>Using CFE eliminates the need for creating customized CAS consumers and 
+      writing Java code for every application. Instead, by using FESL rules in XML format, 
+      users can customize the information extraction process to suit their application. 
+      FESL's rule semantics allow the precise identification of the information that 
+      is required to be extracted by specifying precise multi-parameter criteria. 
+    </p>
+    <p><a href="downloads/sandbox/CFE_UG/CFE_UG.html">
+      Click here to access the user documentation</a>.</p>
+    
   </subsection>
-
 </section>
 
 </body>

Modified: incubator/uima/site/trunk/uima-website/xdocs/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/xdocs/stylesheets/project.xml?rev=903842&r1=903841&r2=903842&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/xdocs/stylesheets/project.xml (original)
+++ incubator/uima/site/trunk/uima-website/xdocs/stylesheets/project.xml Wed Jan 27 21:17:17 2010
@@ -71,6 +71,37 @@
         --> 
   </menus>
   
+    <downloads version="2.3.0-incubating" title="Apache UIMA Version 2.3.0-incubating">
+      
+    <download name="UIMA Java framework &amp; SDK" subdirectory="uimaj-2.3.0-incubating">
+      <releasenotes filename="RELEASE_NOTES-uimaj-2.3.0-incubating">           <f>html</f> <f>txt</f>                   </releasenotes>
+      <binary       filename="uimaj-2.3.0-incubating-bin">                     <f>zip</f>  <f>tar.gz</f>  </binary>   
+      <source       filename="uimaj-2.3.0-incubating-src">                     <f>zip</f>  <f>tar.gz</f>  </source>
+    </download>
+    
+    <download name="UIMA Annotator Addons &amp; Simple Server &amp; Pear packaging tools"         subdirectory="uimaj-annotator-addons-2.3.0-incubating">
+      <releasenotes filename="RELEASE_NOTES-uimaj-annotator-2.3.0-incubating"> <f>html</f> <f>txt</f>                   </releasenotes>
+      <binary       filename="uimaj-annotator-addons-2.3.0-incubating-bin">    <f>zip</f>  <f>tar.gz</f> </binary>    
+      <source       filename="uimaj-annotator-addons-2.3.0-incubating-src">    <f>zip</f>  <f>tar.gz</f> </source>
+    </download>
+    
+    <download name="UIMA AS Asynchronous Scaleout" subdirectory="uima-as-2.3.0-incubating">
+      <releasenotes filename="binaries/uima-as-2.3.0-incubating/README">README                                          </releasenotes>
+      <binary       filename="uima-as-2.3.0-incubating-bin">                   <f>zip</f>  <f>tar.gz</f>                </binary>   
+      <source       filename="uima-as-2.3.0-incubating-src">                   <f>zip</f>  <f>tar.gz</f>                </source>
+    </download>
+      
+    <download name="UIMA C++ Framework"            subdirectory="uimacpp-2.3.0-incubating">
+      <releasenotes filename="RELEASE_NOTES-uimacpp-2.3.0-incubating">         <f>html</f>                              </releasenotes>
+      <binary       filename="uimacpp-2.3.0-incubating-bin">                   <f platform="Windows 32-bit"  >zip</f>  
+                                                                               <f platform="Linux x86 32-bit">tgz</f>
+                                                                               <f platform="Linux x86 64-bit">tgz</f>   </binary>   
+      <source       filename="uimacpp-2.3.0-incubating-src">                   <f platform="Windows"  >zip</f>  
+                                                                               <f platform="Linux x86">tgz</f>                   </source>
+    </download>
+    
+  </downloads>
+  
   <downloads version="2.2.2-incubating" title="Apache UIMA Version 2.2.2-incubating">
   
     <download name="UIMA core hotfix 1"            subdirectory="uimaj-2.2.2-incubating">

Modified: incubator/uima/site/trunk/uima-website/xdocs/stylesheets/site.vsl
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/xdocs/stylesheets/site.vsl?rev=903842&r1=903841&r2=903842&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/xdocs/stylesheets/site.vsl (original)
+++ incubator/uima/site/trunk/uima-website/xdocs/stylesheets/site.vsl Wed Jan 27 21:17:17 2010
@@ -434,11 +434,18 @@
   #foreach ($suffix in $item.getChildren("f"))
     #set ($ft = $suffix.getText())
     #set ($filename = $item.getAttributeValue("filename"))
+    #set ($platform = $suffix.getAttributeValue("platform"))
+    #if ($platform.endsWith("64-bit"))
+      #set ($filenameType = "${filename}64.$ft")
+      
+    #else
+      #set ($filenameType = "${filename}.$ft")
+    #end
     <tr>
-     <td><a href='$drmirror/$dir/$subdirectory/${filename}.$ft'>$ft</a></td>
-     <td>[<a href='$dr/$dir/$subdirectory/$filename.${ft}.asc'>asc</a>]</td>
-     <td>[<a href='$dr/$dir/$subdirectory/$filename.${ft}.md5'>md5</a>]</td>
-     <td>[<a href='$dr/$dir/$subdirectory/$filename.${ft}.sha1'>sha1</a>]</td>
+     <td><a href='$drmirror/$dir/$subdirectory/${filenameType}'>$ft</a></td>
+     <td>[<a href='$dr/$dir/$subdirectory/${filenameType}.asc'>asc</a>]</td>
+     <td>[<a href='$dr/$dir/$subdirectory/${filenameType}.md5'>md5</a>]</td>
+     <td>[<a href='$dr/$dir/$subdirectory/${filenameType}.sha1'>sha1</a>]</td>
      #if ($suffix.getAttributeValue("platform"))
        <td>$suffix.getAttributeValue("platform")</td>
      #end

Modified: incubator/uima/site/trunk/uima-website/xdocs/toolsServers.xml
URL: http://svn.apache.org/viewvc/incubator/uima/site/trunk/uima-website/xdocs/toolsServers.xml?rev=903842&r1=903841&r2=903842&view=diff
==============================================================================
--- incubator/uima/site/trunk/uima-website/xdocs/toolsServers.xml (original)
+++ incubator/uima/site/trunk/uima-website/xdocs/toolsServers.xml Wed Jan 27 21:17:17 2010
@@ -34,95 +34,16 @@
 <p>
 There are some tools, add-ons, and servers which are separably 
 <a href="downloads.cgi">downloadable</a>; this page describes those components.
-</p>
-
-
+</p>
 
       <ul>
-        <li><a href="#CAS Editor">CAS Editor</a></li>
-	    	<li><a href="#pear.package.task">PEAR Packaging ANT Task</a></li>
-        <li><a href="#pear.maven.task">PEAR Packaging Maven Plugin</a></li>
-        <li><a href="#fs.variables">Feature Structure Variables</a></li>
-        <li><a href="#simple-server">Simple Server (UIMA REST service)</a></li>
+        <li><a href="downloads/releaseDocs/2.3.0-incubating/docs/html/tools/tools.html#ugr.tools.ce">CAS Editor (moved to main Java SDK)</a></li>
+	    	<li><a href="sandbox.html#pear.package.task">PEAR Packaging ANT Task</a></li>
+        <li><a href="downloads/releaseDocs/2.3.0-incubating/docs/html/tools/tools.html#ugr.tools.pear.packager.maven.plugin.usage">PEAR Packaging Maven Plugin (moved to main Java SDK)</a></li>
+        <li><a href="sandbox.html#fs.variables">Feature Structure Variables</a></li>
+        <li><a href="sandbox.html#simple-server">Simple Server (UIMA REST service)</a></li>
       </ul>
 
-<p>Each of these components is described in more detail below.</p>
-
-    <subsection name="CAS Editor">
-        <p>
-        The Cas Editor is an annotation tool which supports manual and automatic
-          annotation of CAS files. The CAS Editor can visualize and edit
-          all feature structures, annotations can be viewed and edited directly
-          on text. Currently, only text based CASes are supported. 
-          The Java source of the CAS Editor can be accessed in the SVN repository at 
-          <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/CasEditor">
-          http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/CasEditor</a>. 
-        </p>    
-    </subsection>
-
-
-	<subsection name='PEAR Packaging ANT Task' id="pear.package.task">
-		<p>
-		  The PEAR packaging ANT task component is a project to create UIMA PEAR packages automatically 
-		  during a component build using a custom 
-		  <a class="external" href="http://ant.apache.org/">Apache ANT</a> task. With this task, 
-		  users are able to build their components from the source and then package them 
-		  automatically as UIMA PEAR package. <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingAntTask/doc/pdf/PearPackagingAntTaskUserGuide.pdf">
-		  Click here to access the user documentation</a> for the PEAR packaging ANT task.
-		  The Java source of the PEAR packaging task can be accessed in the SVN repository at 
-		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingAntTask">
-		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingAntTask</a>. 
-		</p>
-	</subsection>
- 
-
-	<subsection name='PEAR Packaging Maven Plugin' id="pear.maven.task">
-		<p>
-		  The PEAR packaging Maven plugin component is a project to create UIMA PEAR packages automatically 
-		  during a component build using a custom Maven plugin.
-		  With this plugin, users are able to build their components from the source and then package them 
-		  automatically as UIMA PEAR package. 
-		  <a href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingMavenPlugin/doc/pdf/PearPackagingMavenPluginUserGuide.pdf">
-		  Click here to access the user documentation</a> of the PEAR packaging Maven plugin.
-		  The Java source of the PEAR packaging Maven plugin can be accessed in the SVN repository at 
-		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingMavenPlugin">
-		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/PearPackagingMavenPlugin</a>. 
-		</p>
-	</subsection>
-
-\
-	<subsection name='Feature Structure Variables' id="fs.variables">
-		<p>
-		  The Feature Structure variables project allows you to create named feature structure instances.
-		  It further allows you to refer to individual feature structures or annotations across annotators, 
-		  without creating a special index.
-		  The Java source of the project can be accessed in the SVN repository at 
-		  <a class="external" href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/FsVariables">
-		  http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/FsVariables</a>.
-		</p>	
-	</subsection>
-
-
-	<subsection name='Simple Server (UIMA REST Service)'
-		id="simple-server">
-		<p>
-			The UIMA Simple Server makes results of UIMA processing
-			available in a simple, XML-based format. The intended use of
-			the the Simple Server is to provide UIMA analysis as a REST
-			service. The Simple Server is implemented as a Java Servlet,
-			and can be deployed into any Servlet container (such as
-			Apache Tomcat or Jetty).  <a href="downloads/sandbox/simple-server/simpleServerUserGuide.html">
-			Click here to access the user documentation</a> of the Simple Server.
-		</p>
-		<p>
-			The Java source of the annotator can be accessed from the
-			SVN repository at
-			<a class="external"
-				href="http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/SimpleServer">
-				http://svn.apache.org/repos/asf/incubator/uima/sandbox/trunk/SimpleServer
-			</a>.
-		</p> 
-	</subsection>
 
 </section>