You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2009/11/03 22:21:12 UTC
svn commit: r832564 - in
/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts: cvd.bat cvd.sh
runUimaClass.bat runUimaClass.sh
Author: schor
Date: Tue Nov 3 21:21:10 2009
New Revision: 832564
URL: http://svn.apache.org/viewvc?rev=832564&view=rev
Log:
UIMA-1647 UIMA-1650 fix quotes and where they're used, fix classpath setup issues
Modified:
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cvd.bat
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cvd.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.bat
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.sh
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cvd.bat
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cvd.bat?rev=832564&r1=832563&r2=832564&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cvd.bat (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cvd.bat Tue Nov 3 21:21:10 2009
@@ -28,7 +28,7 @@
setlocal
@REM the quotes in the next line become part of the value and
@REM are needed in case UIMA_HOME has blanks
-set UIMA_JVM_OPTS="-Duima.tools.cvd.manpath=%UIMA_HOME%/docs/html" %UIMA_JVM_OPTS%
+set UIMA_CVDMAN="-Duima.tools.cvd.manpath=%UIMA_HOME%/docs/html"
@call "%UIMA_HOME%\bin\runUimaClass.bat" org.apache.uima.tools.cvd.CVD %*
:EXIT
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cvd.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cvd.sh?rev=832564&r1=832563&r2=832564&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cvd.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cvd.sh Tue Nov 3 21:21:10 2009
@@ -23,6 +23,6 @@
exit 1
fi
-UIMA_JVM_OPTS="\"-Duima.tools.cvd.manpath=$UIMA_HOME/docs/html\" $UIMA_JVM_OPTS"
-export UIMA_JVM_OPTS
+UIMA_CVDMAN="-Duima.tools.cvd.manpath=$UIMA_HOME/docs/html"
+export UIMA_CVDMAN
"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.cvd.CVD $*
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.bat
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.bat?rev=832564&r1=832563&r2=832564&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.bat (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.bat Tue Nov 3 21:21:10 2009
@@ -32,7 +32,7 @@
@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\examples\resources
@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%UIMA_HOME%\lib
@if EXIST "%ACTIVEMQ_HOME%" (set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%ACTIVEMQ_HOME%;%ACTIVEMQ_HOME%\lib;%ACTIVEMQ_HOME%\lib\optional)
-@if NOT "%CATALINA_HOME%"=="" (set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%CATALINA_HOME%\webapps\axis\WEB-INF\lib)
+@if NOT "%CATALINA_HOME%"=="" (set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%CATALINA_HOME%\webapps\axis\WEB-INF\lib;%CATALINA_HOME%\webapps\axis\WEB-INF\classes)
@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%CLASSPATH%
@rem Set path to support running C++ annotators
@@ -50,4 +50,4 @@
@set UIMA_JVM_OPTS=%UIMA_JVM_OPTS% -Xms128M -Xmx800M
@rem Finally load the jars and run the class
-@"%UIMA_JAVA_CALL%" -DVNS_HOST=%VNS_HOST% -DVNS_PORT=%VNS_PORT% "-Duima.home=%UIMA_HOME%" "-Duima.datapath=%UIMA_DATAPATH%" "-Djava.util.logging.config.file=%UIMA_LOGGER_CONFIG_FILE%" %UIMA_JVM_OPTS% -DUimaBootstrapSuppressClassPathDisplay -Dorg.apache.uima.jarpath="%UIMA_CLASSPATH%" -jar "%UIMA_HOME%\lib\uimaj-bootstrap.jar" %*
+@"%UIMA_JAVA_CALL%" -DVNS_HOST=%VNS_HOST% -DVNS_PORT=%VNS_PORT% "-Duima.home=%UIMA_HOME%" "-Duima.datapath=%UIMA_DATAPATH%" "-Djava.util.logging.config.file=%UIMA_LOGGER_CONFIG_FILE%" "%UIMA_CVDMAN%" %UIMA_JVM_OPTS% -DUimaBootstrapSuppressClassPathDisplay -Dorg.apache.uima.jarpath="%UIMA_CLASSPATH%" -jar "%UIMA_HOME%\lib\uimaj-bootstrap.jar" %*
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.sh?rev=832564&r1=832563&r2=832564&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.sh Tue Nov 3 21:21:10 2009
@@ -38,10 +38,6 @@
#Set jar search order of: UIMA_CLASSPATH uima activemq(optional) tomcat(optional) CLASSPATH
UIMA_CLASSPATH=$UIMA_CLASSPATH:$UIMA_HOME/examples/resources
-
-
-#LOCAL_SAVED_UIMA_CLASSPATH=$UIMA_CLASSPATH
-UIMA_CLASSPATH=$UIMA_HOME/examples/resources
UIMA_CLASSPATH=$UIMA_CLASSPATH:$UIMA_HOME/lib
if [ -e "$ACTIVEMQ_HOME" ]
then
@@ -51,7 +47,7 @@
# -n: true if string has non-zero length
if [ -n "$CATALINA_HOME" ]
then
- UIMA_CLASSPATH=$UIMA_CLASSPATH:$CATALINA_HOME/webapps/axis/WEB-INF/lib
+ UIMA_CLASSPATH=$UIMA_CLASSPATH:$CATALINA_HOME/webapps/axis/WEB-INF/lib:$CATALINA_HOME/webapps/axis/WEB-INF/classes
fi
UIMA_CLASSPATH=$UIMA_CLASSPATH:$CLASSPATH
@@ -93,5 +89,5 @@
UIMA_JVM_OPTS="$UIMA_JVM_OPTS -Xms128M -Xmx800M"
# Finally load the jars and run the class
-"$UIMA_JAVA_CALL" -DVNS_HOST=$VNS_HOST -DVNS_PORT=$VNS_PORT "-Duima.home=$UIMA_HOME" "-Duima.datapath=$UIMA_DATAPATH" "-Djava.util.logging.config.file=$UIMA_LOGGER_CONFIG_FILE" $UIMA_JVM_OPTS -DUimaBootstrapSuppressClassPathDisplay -Dorg.apache.uima.jarpath="$UIMA_CLASSPATH" -jar "$UIMA_HOME/lib/uimaj-bootstrap.jar" $*
+"$UIMA_JAVA_CALL" -DVNS_HOST=$VNS_HOST -DVNS_PORT=$VNS_PORT "-Duima.home=$UIMA_HOME" "-Duima.datapath=$UIMA_DATAPATH" "-Djava.util.logging.config.file=$UIMA_LOGGER_CONFIG_FILE" "$UIMA_CVDMAN" $UIMA_JVM_OPTS -DUimaBootstrapSuppressClassPathDisplay -Dorg.apache.uima.jarpath="$UIMA_CLASSPATH" -jar "$UIMA_HOME/lib/uimaj-bootstrap.jar" $*