svn commit: r1036522 - /uima/uimacpp/trunk/src/framework/uima/annotator_abase.hpp

[bhavani]

Author: bhavani
Date: Thu Nov 18 16:38:41 2010
New Revision: 1036522

URL: http://svn.apache.org/viewvc?rev=1036522view=rev
Log:
UIMA-1943 provide default implementations for all methods in the Annotator 
interface

Modified:
uima/uimacpp/trunk/src/framework/uima/annotator_abase.hpp

Modified: uima/uimacpp/trunk/src/framework/uima/annotator_abase.hpp
URL: 
http://svn.apache.org/viewvc/uima/uimacpp/trunk/src/framework/uima/annotator_abase.hpp?rev=1036522r1=1036521r2=1036522view=diff
==
--- uima/uimacpp/trunk/src/framework/uima/annotator_abase.hpp (original)
+++ uima/uimacpp/trunk/src/framework/uima/annotator_abase.hpp Thu Nov 18 
16:38:41 2010
@@ -87,18 +87,18 @@ namespace uima {
 
 /** Call the annotator to initialize itself based on an AnnotatorContext. 
*/
 virtual
-TyErrorId   initialize(AnnotatorContext  rclAnnotatorContext) 
= 0;
+TyErrorId   initialize(AnnotatorContext  
rclAnnotatorContext); // = 0;
 
 /**
  * Call the annotator to cache type/feature objects used in subsequent 
process() calls.
  */
 virtual
-TyErrorId   typeSystemInit(TypeSystem const ) = 0;
+TyErrorId   typeSystemInit(TypeSystem const ); // = 0;
 
 /** Call the annotator to deinitialize itself.
  */
 virtual
-TyErrorId   destroy(void) = 0;
+TyErrorId   destroy(void); // = 0;
 
 /** Call the annotator to reconfigure itself.(optional method)
  */
@@ -112,7 +112,7 @@ namespace uima {
  * view of the CAS.
  */
 virtual
-TyErrorId   process(CAS  cas, ResultSpecification const  
crResultSpecification) = 0;
+TyErrorId   process(CAS  cas, ResultSpecification const  
crResultSpecification); // = 0;
 
 
 /** Call the annotator to perform a batchProcessComplete operation. */
@@ -164,10 +164,26 @@ namespace uima {
 ;
   }
 
+  inline TyErrorId Annotator::initialize(AnnotatorContext  
rclAnnotatorContext) {
+return (TyErrorId)UIMA_ERR_NONE;
+  }
+
+  inline TyErrorId Annotator::typeSystemInit(TypeSystem const ) {
+return (TyErrorId)UIMA_ERR_NONE;
+  }
+
+  inline TyErrorId Annotator::destroy() {
+return (TyErrorId)UIMA_ERR_NONE;
+  }
+
   inline TyErrorId Annotator::reconfigure() {
 return (TyErrorId)UIMA_ERR_NONE;
   }
 
+  inline TyErrorId Annotator::process(CAS  cas, ResultSpecification const  
crResultSpecification) {
+return (TyErrorId) UIMA_ERR_NONE;
+  }
+
   inline TyErrorId Annotator::batchProcessComplete() {
 return (TyErrorId)UIMA_ERR_NONE;
   }

svn commit: r1036525 - in /uima/uimaj/trunk/uimaj-distr/src/main/scripts: adjustExamplePaths.bat ibmUimaToApacheUima.bat jcasgen_merge.bat runUimaClass.bat startVNS.bat

[schor]

Author: schor
Date: Thu Nov 18 16:46:42 2010
New Revision: 1036525

URL: http://svn.apache.org/viewvc?rev=1036525view=rev
Log:
[UIMA-1942] add quotes so paths containing parenthesis work in Windows

Modified:
uima/uimaj/trunk/uimaj-distr/src/main/scripts/adjustExamplePaths.bat
uima/uimaj/trunk/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.bat
uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.bat
uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.bat
uima/uimaj/trunk/uimaj-distr/src/main/scripts/startVNS.bat

Modified: uima/uimaj/trunk/uimaj-distr/src/main/scripts/adjustExamplePaths.bat
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/src/main/scripts/adjustExamplePaths.bat?rev=1036525r1=1036524r2=1036525view=diff
==
--- uima/uimaj/trunk/uimaj-distr/src/main/scripts/adjustExamplePaths.bat 
(original)
+++ uima/uimaj/trunk/uimaj-distr/src/main/scripts/adjustExamplePaths.bat Thu 
Nov 18 16:46:42 2010
@@ -27,7 +27,7 @@ goto EXIT
 :RUN
 @echo on
 setlocal
-if %JAVA_HOME%== (set UIMA_JAVA_CALL=java) else (set 
UIMA_JAVA_CALL=%JAVA_HOME%\bin\java)
+if %JAVA_HOME%== (set UIMA_JAVA_CALL=java) else (set 
UIMA_JAVA_CALL=%JAVA_HOME%\bin\java)
 %UIMA_JAVA_CALL% -cp %UIMA_HOME%/lib/uima-core.jar 
org.apache.uima.internal.util.ReplaceStringInFiles %UIMA_HOME%/examples .xml 
C:/Program Files/apache-uima %UIMA_HOME% -ignorecase
 %UIMA_JAVA_CALL% -cp %UIMA_HOME%/lib/uima-core.jar 
org.apache.uima.internal.util.ReplaceStringInFiles %UIMA_HOME%/examples 
.classpath C:/Program Files/apache-uima %UIMA_HOME% -ignorecase
 %UIMA_JAVA_CALL% -cp %UIMA_HOME%/lib/uima-core.jar 
org.apache.uima.internal.util.ReplaceStringInFiles %UIMA_HOME%/examples 
.launch C:/Program Files/apache-uima %UIMA_HOME% -ignorecase

Modified: uima/uimaj/trunk/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.bat
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.bat?rev=1036525r1=1036524r2=1036525view=diff
==
--- uima/uimaj/trunk/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.bat 
(original)
+++ uima/uimaj/trunk/uimaj-distr/src/main/scripts/ibmUimaToApacheUima.bat Thu 
Nov 18 16:46:42 2010
@@ -27,6 +27,6 @@ goto EXIT
 :RUN
 @echo on
 setlocal
-if %JAVA_HOME%== (set UIMA_JAVA_CALL=java) else (set 
UIMA_JAVA_CALL=%JAVA_HOME%\bin\java)
+if %JAVA_HOME%== (set UIMA_JAVA_CALL=java) else (set 
UIMA_JAVA_CALL=%JAVA_HOME%\bin\java)
 %UIMA_JAVA_CALL% -cp 
%UIMA_HOME%/lib/uima-core.jar;%UIMA_HOME%/lib/uima-tools.jar 
org.apache.uima.tools.migration.IbmUimaToApacheUima %1 -ext 
java,xml,xmi,wsdd,properties,launch,bat,cmd,sh,ksh,csh,
 :EXIT
\ No newline at end of file

Modified: uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.bat
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.bat?rev=1036525r1=1036524r2=1036525view=diff
==
--- uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.bat (original)
+++ uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.bat Thu Nov 18 
16:46:42 2010
@@ -49,7 +49,7 @@ goto exit1
 @set ARGS=-data %ECLIPSE_TEMP_WORKSPACE% -noupdate -nosplash -consolelog 
-application org.apache.uima.jcas.jcasgenp.JCasGen %firstarg% %secondarg%
 @set 
logger=-Djava.util.logging.config.file=%UIMA_HOME%/config\FileConsoleLogger.properties
 @rmdir /S /Q %ECLIPSE_TEMP_WORKSPACE%
-if %JAVA_HOME%== (set UIMA_JAVA_CALL=java) else (set 
UIMA_JAVA_CALL=%JAVA_HOME%\bin\java)
+if %JAVA_HOME%== (set UIMA_JAVA_CALL=java) else (set 
UIMA_JAVA_CALL=%JAVA_HOME%\bin\java)
 %UIMA_JAVA_CALL% %logger% -cp %ECLIPSE_HOME%\startup.jar 
-Duima.datapath=%UIMA_DATAPATH% org.eclipse.core.launcher.Main %ARGS%
 @rem %ECLIPSE_HOME%\eclipse.exe -data %ECLIPSE_TEMP_WORKSPACE% -noupdate 
-nosplash -consolelog -application org.apache.uima.jcas.jcasgenp.JCasGen 
%firstarg% %secondarg%
 @:exit1

Modified: uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.bat
URL: 
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.bat?rev=1036525r1=1036524r2=1036525view=diff
==
--- uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.bat (original)
+++ uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.bat Thu Nov 18 
16:46:42 2010
@@ -24,15 +24,15 @@
 @setlocal
 
 @rem Set ActiveMQ home
-...@if %ACTIVEMQ_HOME%== (set 
ACTIVEMQ_HOME=%UIMA_HOME%\apache-activemq-4.1.1)
+...@if %ACTIVEMQ_HOME%== (set 
ACTIVEMQ_HOME=%UIMA_HOME%\apache-activemq-4.1.1)
 
-...@if %JAVA_HOME%== (set UIMA_JAVA_CALL=java) else (set 
UIMA_JAVA_CALL=%JAVA_HOME%\bin\java)
+...@if %JAVA_HOME%== (set UIMA_JAVA_CALL=java) else (set 
UIMA_JAVA_CALL=%JAVA_HOME%\bin\java)
 
 @rem Set jar search order of: