Author: schor
Date: Thu Nov 18 16:46:42 2010
New Revision: 1036525
URL: http://svn.apache.org/viewvc?rev=1036525&view=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=1036525&r1=1036524&r2=1036525&view=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=1036525&r1=1036524&r2=1036525&view=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=1036525&r1=1036524&r2=1036525&view=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=1036525&r1=1036524&r2=1036525&view=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: UIMA_CLASSPATH uima activemq(optional)
tomcat(optional) CLASSPATH
@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;%CATALINA_HOME%\webapps\axis\WEB-INF\classes)
+...@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;%CATALINA_HOME%\webapps\axis\WEB-INF\classes")
@set UIMA_CLASSPATH=%UIMA_CLASSPATH%;%CLASSPATH%
@rem Set path to support running C++ annotators
@@ -50,7 +50,7 @@
@if "%UIMA_JVM_OPTS%"=="" set UIMA_JVM_OPTS=-Xms128M -Xmx800M
@rem Check if Uima AS is installed, and if so set the default log4j
configuration file
-...@if EXIST "%UIMA_HOME%"\as_config (set
LOG4J_CONFIG_FILE=-Dlog4j.configuration=file:%UIMA_HOME%\as_config\uimaAsLog4j.properties)
else (set LOG4J_CONFIG_FILE=-DNoOp)
+...@if EXIST "%UIMA_HOME%"\as_config (set
"LOG4J_CONFIG_FILE=-Dlog4j.configuration=file:%UIMA_HOME%\as_config\uimaAsLog4j.properties")
else (set LOG4J_CONFIG_FILE=-DNoOp)
@if "%UIMA_CVDMAN%"=="" set UIMA_CVDMAN=-Duima.tools.cvd.manpath.notset
Modified: uima/uimaj/trunk/uimaj-distr/src/main/scripts/startVNS.bat
URL:
http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/src/main/scripts/startVNS.bat?rev=1036525&r1=1036524&r2=1036525&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-distr/src/main/scripts/startVNS.bat (original)
+++ uima/uimaj/trunk/uimaj-distr/src/main/scripts/startVNS.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/jVinci.jar"
org.apache.vinci.transport.vns.service.VNS %1 %2 %3 %4 %5 %6 %7 %8 %9
:EXIT
