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 2008/12/10 23:24:00 UTC
svn commit: r725468 - in
/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts: jcasgen.bat
jcasgen.sh jcasgen_merge.bat jcasgen_merge.sh
Author: schor
Date: Wed Dec 10 14:24:00 2008
New Revision: 725468
URL: http://svn.apache.org/viewvc?rev=725468&view=rev
Log:
[UIMA-852] support uima.datapath setting from environment variable in shell scripts for jcasgen - in an identical fashion to how it is supported in other shell scripts.
Modified:
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen.bat
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.bat
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.sh
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen.bat
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen.bat?rev=725468&r1=725467&r2=725468&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen.bat (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen.bat Wed Dec 10 14:24:00 2008
@@ -36,5 +36,5 @@
@set LOGGER=-Djava.util.logging.config.file=%UIMA_HOME%\config\FileConsoleLogger.properties
@echo Running JCasGen with no Java CAS Model merging. To run with merging, use jcasgen_merge (requires Eclipse, plus UIMA and EMF plugins).
@if "%JAVA_HOME%"=="" (set UIMA_JAVA_CALL=java) else (set UIMA_JAVA_CALL=%JAVA_HOME%\bin\java)
-"%UIMA_JAVA_CALL%" "%LOGGER%" -cp "%UIMA_CLASSPATH%" %UIMA_JVM_OPTS% org.apache.uima.tools.jcasgen.Jg %firstarg% %secondarg%
+"%UIMA_JAVA_CALL%" "%LOGGER%" -cp "%UIMA_CLASSPATH%" "-Duima.datapath=%UIMA_DATAPATH%" %UIMA_JVM_OPTS% org.apache.uima.tools.jcasgen.Jg %firstarg% %secondarg%
:EXIT
\ No newline at end of file
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen.sh?rev=725468&r1=725467&r2=725468&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen.sh Wed Dec 10 14:24:00 2008
@@ -47,12 +47,12 @@
MAIN=org.apache.uima.tools.jcasgen.Jg
if [ "$firstarg" = "" ]
then
- "$UIMA_JAVA_CALL" "$LOGGER" -cp "$UIMA_CLASSPATH" $MAIN
+ "$UIMA_JAVA_CALL" "$LOGGER" -cp "$UIMA_CLASSPATH" $MAIN "-Duima.datapath=$UIMA_DATAPATH"
else
if [ "$secondarg" = "" ]
then
- "$UIMA_JAVA_CALL" "$LOGGER" -cp "$UIMA_CLASSPATH" $MAIN -jcasgeninput "$firstarg"
+ "$UIMA_JAVA_CALL" "$LOGGER" -cp "$UIMA_CLASSPATH" $MAIN "-Duima.datapath=$UIMA_DATAPATH" -jcasgeninput "$firstarg"
else
- "$UIMA_JAVA_CALL" "$LOGGER" -cp "$UIMA_CLASSPATH" $MAIN -jcasgeninput "$firstarg" -jcasgenoutput "$secondarg"
+ "$UIMA_JAVA_CALL" "$LOGGER" -cp "$UIMA_CLASSPATH" $MAIN "-Duima.datapath=$UIMA_DATAPATH" -jcasgeninput "$firstarg" -jcasgenoutput "$secondarg"
fi
fi
\ No newline at end of file
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.bat
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.bat?rev=725468&r1=725467&r2=725468&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.bat (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.bat Wed Dec 10 14:24:00 2008
@@ -50,6 +50,6 @@
@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)
-"%UIMA_JAVA_CALL%" "%logger%" -cp "%ECLIPSE_HOME%\startup.jar" org.eclipse.core.launcher.Main %ARGS%
+"%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: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.sh?rev=725468&r1=725467&r2=725468&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.sh Wed Dec 10 14:24:00 2008
@@ -69,13 +69,13 @@
ARGS="-noupdate -nosplash -consolelog -application org.apache.uima.jcas.jcasgenp.JCasGen"
if [ "$firstarg" = "" ]
then
- "$J" "$LOGGER" -cp "$ES" $MAIN -data "$ECLIPSE_TEMP_WORKSPACE" $ARGS
+ "$J" "$LOGGER" -cp "$ES" $MAIN "-Duima.datapath=$UIMA_DATAPATH" -data "$ECLIPSE_TEMP_WORKSPACE" $ARGS
else
if [ "$secondarg" = "" ]
then
- "$J" "$LOGGER" -cp "$ES" $MAIN -data "$ECLIPSE_TEMP_WORKSPACE" $ARGS -jcasgeninput "$firstarg"
+ "$J" "$LOGGER" -cp "$ES" $MAIN "-Duima.datapath=$UIMA_DATAPATH" -data "$ECLIPSE_TEMP_WORKSPACE" $ARGS -jcasgeninput "$firstarg"
else
- "$J" "$LOGGER" -cp "$ES" $MAIN -data "$ECLIPSE_TEMP_WORKSPACE" $ARGS -jcasgeninput "$firstarg" -jcasgenoutput "$secondarg"
+ "$J" "$LOGGER" -cp "$ES" $MAIN "-Duima.datapath=$UIMA_DATAPATH" -data "$ECLIPSE_TEMP_WORKSPACE" $ARGS -jcasgeninput "$firstarg" -jcasgenoutput "$secondarg"
fi
fi
fi