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 18:07:37 UTC
svn commit: r832476 - in /incubator/uima:
uima-as/trunk/uima-as-distr/src/main/scripts/
uimaj/trunk/uimaj-distr/src/main/scripts/
Author: schor
Date: Tue Nov 3 17:07:36 2009
New Revision: 832476
URL: http://svn.apache.org/viewvc?rev=832476&view=rev
Log:
UIMA-1647 make work with dash shell used by Ubuntu, by removing . invocations and adding exports of vars intended to be seen by runUimaClass script
Modified:
incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.sh
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.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/annotationViewer.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cpeGui.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cvd.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/deploytool.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/documentAnalyzer.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/jcasgen.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runAE.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runCPE.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearInstaller.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearMerger.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearPackager.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runUimaClass.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/startVinciService.sh
incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/validateDescriptor.sh
Modified: incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.sh?rev=832476&r1=832475&r2=832476&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.sh (original)
+++ incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/dd2spring.sh Tue Nov 3 17:07:36 2009
@@ -29,5 +29,5 @@
else
UIMA_JAVA_CALL="$JAVA_HOME/bin/java"
fi
-. "$UIMA_HOME/bin/setUimaClassPath.sh"
+"$UIMA_HOME/bin/setUimaClassPath.sh"
"$UIMA_JAVA_CALL" -cp "$UIMA_CLASSPATH:$UIMA_HOME/saxon/saxon8.jar" "-Duima.datapath=$UIMA_DATAPATH" -Xmx256M net.sf.saxon.Transform -l -s $1 -o $2 $UIMA_HOME/bin/dd2spring.xsl $3
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=832476&r1=832475&r2=832476&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 Tue Nov 3 17:07:36 2009
@@ -31,4 +31,4 @@
exit 1;
fi;
-. "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.adapter.jms.service.UIMA_Service -saxonURL "file:$UIMA_HOME/saxon/saxon8.jar" -xslt "$UIMA_HOME/bin/dd2spring.xsl" -dd $*
+"$UIMA_HOME/bin/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.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uima-as-distr/src/main/scripts/runRemoteAsyncAE.sh?rev=832476&r1=832475&r2=832476&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 Tue Nov 3 17:07:36 2009
@@ -23,4 +23,4 @@
exit 1
fi
-. "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.examples.as.RunRemoteAsyncAE $*
+"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.examples.as.RunRemoteAsyncAE $*
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/annotationViewer.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/annotationViewer.sh?rev=832476&r1=832475&r2=832476&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/annotationViewer.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/annotationViewer.sh Tue Nov 3 17:07:36 2009
@@ -23,4 +23,4 @@
exit 1
fi
-. "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.AnnotationViewerMain
+"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.AnnotationViewerMain
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cpeGui.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cpeGui.sh?rev=832476&r1=832475&r2=832476&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cpeGui.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/cpeGui.sh Tue Nov 3 17:07:36 2009
@@ -23,4 +23,4 @@
exit 1
fi
-. "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.cpm.CpmFrame
+"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.cpm.CpmFrame
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=832476&r1=832475&r2=832476&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 17:07:36 2009
@@ -24,4 +24,5 @@
fi
UIMA_JVM_OPTS="\"-Duima.tools.cvd.manpath=$UIMA_HOME/docs/html\" $UIMA_JVM_OPTS"
-. "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.cvd.CVD $*
+export UIMA_JVM_OPTS
+"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.cvd.CVD $*
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/deploytool.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/deploytool.sh?rev=832476&r1=832475&r2=832476&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/deploytool.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/deploytool.sh Tue Nov 3 17:07:36 2009
@@ -24,5 +24,5 @@
fi
UIMA_CLASSPATH=$UIMA_CLASSPATH;$CATALINA_HOME/webapps/axis/WEB-INF/classes
-
-. "$UIMA_HOME/bin/runUimaClass.sh" org.apache.axis.client.AdminClient -lhttp://localhost:8080/axis/services/AdminService $1
+export UIMA_CLASSPATH
+"$UIMA_HOME/bin/runUimaClass.sh" org.apache.axis.client.AdminClient -lhttp://localhost:8080/axis/services/AdminService $1
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/documentAnalyzer.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/documentAnalyzer.sh?rev=832476&r1=832475&r2=832476&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/documentAnalyzer.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/documentAnalyzer.sh Tue Nov 3 17:07:36 2009
@@ -23,4 +23,4 @@
exit 1
fi
-. "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.docanalyzer.DocumentAnalyzer
+"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.docanalyzer.DocumentAnalyzer
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=832476&r1=832475&r2=832476&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 Tue Nov 3 17:07:36 2009
@@ -35,12 +35,12 @@
MAIN=org.apache.uima.tools.jcasgen.Jg
if [ "$firstarg" = "" ]
then
- . "$UIMA_HOME/bin/runUimaClass.sh" $MAIN
+ "$UIMA_HOME/bin/runUimaClass.sh" $MAIN
else
if [ "$secondarg" = "" ]
then
- . "$UIMA_HOME/bin/runUimaClass.sh" $MAIN -jcasgeninput "$firstarg"
+ "$UIMA_HOME/bin/runUimaClass.sh" $MAIN -jcasgeninput "$firstarg"
else
- . "$UIMA_HOME/bin/runUimaClass.sh" $MAIN -jcasgeninput "$firstarg" -jcasgenoutput "$secondarg"
+ "$UIMA_HOME/bin/runUimaClass.sh" $MAIN -jcasgeninput "$firstarg" -jcasgenoutput "$secondarg"
fi
fi
\ No newline at end of file
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runAE.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runAE.sh?rev=832476&r1=832475&r2=832476&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runAE.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runAE.sh Tue Nov 3 17:07:36 2009
@@ -23,4 +23,4 @@
exit 1
fi
-. "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.RunAE $*
+"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.RunAE $*
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runCPE.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runCPE.sh?rev=832476&r1=832475&r2=832476&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runCPE.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runCPE.sh Tue Nov 3 17:07:36 2009
@@ -23,4 +23,4 @@
exit 1
fi
-. "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.examples.cpe.SimpleRunCPE $*
+"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.examples.cpe.SimpleRunCPE $*
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearInstaller.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearInstaller.sh?rev=832476&r1=832475&r2=832476&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearInstaller.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearInstaller.sh Tue Nov 3 17:07:36 2009
@@ -23,4 +23,4 @@
exit 1
fi
-. "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.pear.install.InstallPear
+"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.pear.install.InstallPear
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearMerger.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearMerger.sh?rev=832476&r1=832475&r2=832476&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearMerger.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearMerger.sh Tue Nov 3 17:07:36 2009
@@ -23,4 +23,4 @@
exit 1
fi
-. "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.pear.merger.PMController $*
+"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.pear.merger.PMController $*
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearPackager.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearPackager.sh?rev=832476&r1=832475&r2=832476&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearPackager.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/runPearPackager.sh Tue Nov 3 17:07:36 2009
@@ -23,4 +23,4 @@
exit 1
fi
-. "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.pear.packager.PearPackager $*
+"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.pear.packager.PearPackager $*
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=832476&r1=832475&r2=832476&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 17:07:36 2009
@@ -62,11 +62,18 @@
UIMACPP_HOME=$UIMA_HOME/uimacpp
fi
-export "PATH=$UIMACPP_HOME/bin:$UIMACPP_HOME/examples/tutorial/src:$PATH"
+# The exports here are done in 2 lines because on some shells (dash)
+# (used by Ubuntu) blanks in the substitutions (e.g., a dir whose name
+# includes a blank) causes a failure
+PATH=$UIMACPP_HOME/bin:$UIMACPP_HOME/examples/tutorial/src:$PATH
+export PATH
+
+LD_LIBRARY_PATH=$UIMACPP_HOME/lib:$UIMACPP_HOME/examples/tutorial/src:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
-export "LD_LIBRARY_PATH=$UIMACPP_HOME/lib:$UIMACPP_HOME/examples/tutorial/src:$LD_LIBRARY_PATH"
#also set DYLD_LIBRARY_PATH, used by Mac OSX
-export "DYLD_LIBRARY_PATH=$UIMACPP_HOME/lib:$UIMACPP_HOME/examples/tutorial/src:$DYLD_LIBRARY_PATH"
+DYLD_LIBRARY_PATH=$UIMACPP_HOME/lib:$UIMACPP_HOME/examples/tutorial/src:$DYLD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
#also set default values for VNS_HOST and VNS_PORT
if [ "$VNS_HOST" = "" ];
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/startVinciService.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/startVinciService.sh?rev=832476&r1=832475&r2=832476&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/startVinciService.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/startVinciService.sh Tue Nov 3 17:07:36 2009
@@ -42,6 +42,6 @@
then
VNS_HOST=$2
fi
-. "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.adapter.vinci.VinciAnalysisEngineService_impl $SERVICE $INSTANCEID
+"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.adapter.vinci.VinciAnalysisEngineService_impl $SERVICE $INSTANCEID
Modified: incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/validateDescriptor.sh
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/validateDescriptor.sh?rev=832476&r1=832475&r2=832476&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/validateDescriptor.sh (original)
+++ incubator/uima/uimaj/trunk/uimaj-distr/src/main/scripts/validateDescriptor.sh Tue Nov 3 17:07:36 2009
@@ -23,4 +23,4 @@
exit 1
fi
-. "$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.ValidateDescriptor $*
+"$UIMA_HOME/bin/runUimaClass.sh" org.apache.uima.tools.ValidateDescriptor $*