svn commit: r1082296 - in /uima/uimaj/trunk/uimaj-distr/src/main/scripts: expandFileName.cmd jcasgen_merge.bat jcasgen_merge.sh

[sc...@apache.org]

Author: schor
Date: Wed Mar 16 20:50:18 2011
New Revision: 1082296

URL: http://svn.apache.org/viewvc?rev=1082296&view=rev
Log:
[UIMA-513] fix launching scripts to find eclipse launcher, for Eclipse 3.3 and later.

Added:
    uima/uimaj/trunk/uimaj-distr/src/main/scripts/expandFileName.cmd
Modified:
    uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.bat
    uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.sh

Added: uima/uimaj/trunk/uimaj-distr/src/main/scripts/expandFileName.cmd
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/src/main/scripts/expandFileName.cmd?rev=1082296&view=auto
==============================================================================
--- uima/uimaj/trunk/uimaj-distr/src/main/scripts/expandFileName.cmd (added)
+++ uima/uimaj/trunk/uimaj-distr/src/main/scripts/expandFileName.cmd Wed Mar 16 20:50:18 2011
@@ -0,0 +1,21 @@
+@echo off
+
+REM   Licensed to the Apache Software Foundation (ASF) under one
+REM   or more contributor license agreements.  See the NOTICE file
+REM   distributed with this work for additional information
+REM   regarding copyright ownership.  The ASF licenses this file
+REM   to you under the Apache License, Version 2.0 (the
+REM   "License"); you may not use this file except in compliance
+REM   with the License.  You may obtain a copy of the License at
+REM
+REM    http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM   Unless required by applicable law or agreed to in writing,
+REM   software distributed under the License is distributed on an
+REM   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM   KIND, either express or implied.  See the License for the
+REM   specific language governing permissions and limitations
+REM   under the License.
+REM
+REM   helper file - to get the name of the eclipse launcher
+set expandedFileName=%~f1
\ 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=1082296&r1=1082295&r2=1082296&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 Wed Mar 16 20:50:18 2011
@@ -49,7 +49,8 @@ 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%"
+@call expandFileName "%ECLIPSE_HOME%\plugins\org.eclipse.equinox.launcher_*.jar"
 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%
+"%UIMA_JAVA_CALL%" "%logger%" -cp "%expandedFileName%" "-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/jcasgen_merge.sh
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.sh?rev=1082296&r1=1082295&r2=1082296&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.sh (original)
+++ uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen_merge.sh Wed Mar 16 20:50:18 2011
@@ -63,7 +63,8 @@ else
       UIMA_JAVA_CALL="$JAVA_HOME/bin/java"
     fi    
     J="$UIMA_JAVA_CALL"
-    ES="$ECLIPSE_HOME/startup.jar"
+#   Next line changed to use method for launching Eclipse in headless mode, as of Eclipse 3.3    
+    ES=`ls $ECLIPSE_HOME/plugins/org.eclipse.equinox.launcher_*.jar|head -1`
     MAIN=org.eclipse.core.launcher.Main
     LOGGER="-Djava.util.logging.config.file=$UIMA_HOME/config/FileConsoleLogger.properties"
     ARGS="-noupdate -nosplash -consolelog -application org.apache.uima.jcas.jcasgenp.JCasGen"