You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2009/10/16 16:20:03 UTC
svn commit: r825909 - in
/incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts:
deployAsyncService.cmd deployAsyncService.sh runRemoteAsyncAE.cmd
runRemoteAsyncAE.sh runRemoteAsyncAEmultiple.cmd
Author: cwiklik
Date: Fri Oct 16 14:20:02 2009
New Revision: 825909
URL: http://svn.apache.org/viewvc?rev=825909&view=rev
Log:
UIMA-1531 Simplified to use runUimaClass where the environment is set up and the program is executed
Modified:
incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/deployAsyncService.cmd
incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/deployAsyncService.sh
incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAE.cmd
incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAE.sh
incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAEmultiple.cmd
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/deployAsyncService.cmd
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/deployAsyncService.cmd?rev=825909&r1=825908&r2=825909&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/deployAsyncService.cmd (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/deployAsyncService.cmd Fri Oct 16 14:20:02 2009
@@ -15,36 +15,12 @@
@REM specific language governing permissions and limitations
@REM under the License.
+
@if .%1 == . goto usage
@if NOT exist %1 goto usage
-@if not defined UIMA_HOME goto USAGE_UIMA
-@goto RUN
-
-:USAGE_UIMA
-@echo UIMA_HOME environment variable is not set
-@goto end
-
-:RUN
-@setlocal
-
-@call "%UIMA_HOME%\bin\setUimaClassPath"
-
-@rem set spring_file=%~n1_spring.xml
-@rem ddmake does not work because it will not rebuild if the component descriptor changed
-@rem but the deployment descriptor did not. For now we always build the Spring XML.
-@rem call ddmake %1
-@rem call dd2spring %1 %spring_file%
-
-@rem Set ActiveMQ home
-
-
-@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)
-echo %ACTIVEMQ_HOME%
-
-@"%UIMA_JAVA_CALL%" "-Duima.datapath=%UIMA_DATAPATH%" "-Djava.util.logging.config.file=%UIMA_LOGGER_CONFIG_FILE%" %UIMA_JVM_OPTS% -DUimaBootstrapSuppressClassPathDisplay -Dorg.apache.uima.jarpath="%UIMA_CLASSPATH%;%ACTIVEMQ_HOME%;%ACTIVEMQ_HOME%\lib;%ACTIVEMQ_HOME%\lib\optional;%UIMA_JAR_PATH%" -jar "%UIMA_HOME%\lib\uimaj-bootstrap.jar" org.apache.uima.adapter.jms.service.UIMA_Service -saxonURL "file:%UIMA_HOME%\saxon\saxon8.jar" -xslt "%UIMA_HOME%\bin\dd2spring.xsl" -dd %*
+@rem call common script that will launch the Uima AS service
+@call runUimaClass org.apache.uima.adapter.jms.service.UIMA_Service -saxonURL file:%UIMA_HOME%\saxon\saxon8.jar -xslt %UIMA_HOME%\bin\dd2spring.xsl -dd %*
@goto end
:usage
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/deployAsyncService.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/deployAsyncService.sh?rev=825909&r1=825908&r2=825909&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/deployAsyncService.sh (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/deployAsyncService.sh Fri Oct 16 14:20:02 2009
@@ -16,33 +16,13 @@
# specific language governing permissions and limitations
# under the License.
-if [ "$UIMA_HOME" = "" ]
-then
- echo UIMA_HOME environment variable is not set
- exit 1
-fi
-
if [ $# -lt 1 ]
then echo "You must specify one or more deployment descriptors. Usage: deployAsyncService.sh file-path-of-deployment-descriptor [another-dd ...]"
- exit;
+ exit 1;
fi;
if [ ! -f $1 ]
then echo "File '"$1"' does not exist";
- exit;
+ exit 1;
fi;
-. "$UIMA_HOME/bin/setUimaClassPath.sh"
-
-if [ "$JAVA_HOME" = "" ]
-then
- UIMA_JAVA_CALL=java
-else
- UIMA_JAVA_CALL="$JAVA_HOME/bin/java"
-fi
-
-if [ "$ACTIVEMQ_HOME" = "" ]
-then
- ACTIVEMQ_HOME=$UIMA_HOME/apache-activemq-4.1.1
-fi
-
-"$UIMA_JAVA_CALL" "-Duima.datapath=$UIMA_DATAPATH" "-Djava.util.logging.config.file=$UIMA_LOGGER_CONFIG_FILE" $UIMA_JVM_OPTS -DUimaBootstrapSuppressClassPathDisplay -Dorg.apache.uima.jarpath="$UIMA_CLASSPATH:$ACTIVEMQ_HOME:$ACTIVEMQ_HOME/lib:$ACTIVEMQ_HOME/lib/optional:$UIMA_JAR_PATH" -jar "$UIMA_HOME/lib/uimaj-bootstrap.jar" org.apache.uima.adapter.jms.service.UIMA_Service -saxonURL "file:$UIMA_HOME/saxon/saxon8.jar" -xslt "$UIMA_HOME/bin/dd2spring.xsl" -dd $*
+. runUimaClass.sh org.apache.uima.adapter.jms.service.UIMA_Service -saxonURL "file:$UIMA_HOME/saxon/saxon8.jar" -xslt "$UIMA_HOME/bin/dd2spring.xsl" -dd $*
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAE.cmd
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAE.cmd?rev=825909&r1=825908&r2=825909&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAE.cmd (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAE.cmd Fri Oct 16 14:20:02 2009
@@ -15,24 +15,4 @@
@REM specific language governing permissions and limitations
@REM under the License.
-@if not defined UIMA_HOME goto USAGE_UIMA
-@goto RUN
-
-:USAGE_UIMA
-@echo UIMA_HOME environment variable is not set
-@goto EXIT
-
-:RUN
-@setlocal
-@call "%UIMA_HOME%\bin\setUimaClassPath"
-
-@rem Set ActiveMQ home
-@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)
-
-echo %ACTIVEMQ_HOME%
-
-
-@"%UIMA_JAVA_CALL%" "-Duima.datapath=%UIMA_DATAPATH%" "-Djava.util.logging.config.file=%UIMA_LOGGER_CONFIG_FILE%" %UIMA_JVM_OPTS% -DUimaBootstrapSuppressClassPathDisplay -Dorg.apache.uima.jarpath="%UIMA_CLASSPATH%;%ACTIVEMQ_HOME%;%ACTIVEMQ_HOME%\lib;%ACTIVEMQ_HOME%\lib\optional;%UIMA_JAR_PATH%" -jar "%UIMA_HOME%\lib\uimaj-bootstrap.jar" org.apache.uima.examples.as.RunRemoteAsyncAE %*
-:EXIT
+@call runUimaClass org.apache.uima.examples.as.RunRemoteAsyncAE %*
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAE.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAE.sh?rev=825909&r1=825908&r2=825909&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAE.sh (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAE.sh Fri Oct 16 14:20:02 2009
@@ -17,24 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-if [ "$UIMA_HOME" = "" ]
-then
- echo UIMA_HOME environment variable is not set
- exit 1
-fi
-
-. "$UIMA_HOME/bin/setUimaClassPath.sh"
-
-if [ "$JAVA_HOME" = "" ]
-then
- UIMA_JAVA_CALL=java
-else
- UIMA_JAVA_CALL="$JAVA_HOME/bin/java"
-fi
-
-if [ "$ACTIVEMQ_HOME" = "" ]
-then
- ACTIVEMQ_HOME=$UIMA_HOME/apache-activemq-4.1.1
-fi
-
-"$UIMA_JAVA_CALL" "-Duima.datapath=$UIMA_DATAPATH" "-Djava.util.logging.config.file=$UIMA_LOGGER_CONFIG_FILE" $UIMA_JVM_OPTS -DUimaBootstrapSuppressClassPathDisplay -Dorg.apache.uima.jarpath="$UIMA_CLASSPATH:$ACTIVEMQ_HOME:$ACTIVEMQ_HOME/lib:$ACTIVEMQ_HOME/lib/optional:$UIMA_JAR_PATH" -jar "$UIMA_HOME/lib/uimaj-bootstrap.jar" org.apache.uima.examples.as.RunRemoteAsyncAE $*
+. runUimaClass.sh org.apache.uima.examples.as.RunRemoteAsyncAE $*
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAEmultiple.cmd
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAEmultiple.cmd?rev=825909&r1=825908&r2=825909&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAEmultiple.cmd (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAEmultiple.cmd Fri Oct 16 14:20:02 2009
@@ -15,16 +15,4 @@
@REM specific language governing permissions and limitations
@REM under the License.
-@if not defined UIMA_HOME goto USAGE_UIMA
-@goto RUN
-
-:USAGE_UIMA
-@echo UIMA_HOME environment variable is not set
-@goto EXIT
-
-:RUN
-@setlocal
-@call "%UIMA_HOME%\bin\setUimaClassPath"
-@if "%JAVA_HOME%"=="" (set UIMA_JAVA_CALL=java) else (set UIMA_JAVA_CALL=%JAVA_HOME%\bin\java)
-for /L %%i in (0, 1, 10) do "%UIMA_JAVA_CALL%" -cp "%UIMA_CLASSPATH%" "-Duima.datapath=%UIMA_DATAPATH%" "-Djava.util.logging.config.file=%UIMA_LOGGER_CONFIG_FILE%" %UIMA_JVM_OPTS% org.apache.uima.examples.as.RunRemoteAsyncAE %*
-:EXIT
+for /L %%i in (0, 1, 10) do @call runUimaClass org.apache.uima.examples.as.RunRemoteAsyncAE %*