You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@manifoldcf.apache.org by Jack Krupansky <ja...@lucidimagination.com> on 2010/10/05 06:39:26 UTC
Fw: svn commit: r1004504 - in /incubator/lcf/trunk/modules/framework/scripts: executecommand.bat executecommand.sh setclasspath.bat setdefine.bat
Should be MANIFOLDCF_HOME to be consistent with other project name usage?
-- Jack Krupansky
--------------------------------------------------
From: <kw...@apache.org>
Sent: Monday, October 04, 2010 9:42 PM
To: <co...@incubator.apache.org>
Subject: svn commit: r1004504 - in
/incubator/lcf/trunk/modules/framework/scripts: executecommand.bat
executecommand.sh setclasspath.bat setdefine.bat
> Author: kwright
> Date: Tue Oct 5 01:42:38 2010
> New Revision: 1004504
>
> URL: http://svn.apache.org/viewvc?rev=1004504&view=rev
> Log:
> Scripts should use MCF_HOME, not LCF_HOME
>
> Modified:
> incubator/lcf/trunk/modules/framework/scripts/executecommand.bat
> incubator/lcf/trunk/modules/framework/scripts/executecommand.sh
> incubator/lcf/trunk/modules/framework/scripts/setclasspath.bat
> incubator/lcf/trunk/modules/framework/scripts/setdefine.bat
>
> Modified: incubator/lcf/trunk/modules/framework/scripts/executecommand.bat
> URL:
> http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/scripts/executecommand.bat?rev=1004504&r1=1004503&r2=1004504&view=diff
> ==============================================================================
> --- incubator/lcf/trunk/modules/framework/scripts/executecommand.bat
> (original)
> +++ incubator/lcf/trunk/modules/framework/scripts/executecommand.bat Tue
> Oct 5 01:42:38 2010
> @@ -1,22 +1,22 @@
> @echo off
> -rem check that JAVA_HOME and LCF_HOME are set
> +rem check that JAVA_HOME and MCF_HOME are set
> if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
> -if not exist "%LCF_HOME%\properties.xml" goto nolcfhome
> +if not exist "%MCF_HOME%\properties.xml" goto nolcfhome
> rem save existing path here
> set OLDDIR=%CD%
> -cd "%LCF_HOME%\processes"
> +cd "%MCF_HOME%\processes"
> set CLASSPATH=.
> for %%f in (jar/*) do call script\setclasspath.bat %%f
> set JAVADEFINES=
> for %%g in (define/*) do call script\setdefine.bat %%g
> rem restore old path here
> cd "%OLDDIR%"
> -"%JAVA_HOME%\bin\java"
> "-Dorg.apache.lcf.configfile=%LCF_HOME%\properties.xml"
> %JAVADEFINES% -classpath "%CLASSPATH%" %*
> +"%JAVA_HOME%\bin\java"
> "-Dorg.apache.manifoldcf.configfile=%MCF_HOME%\properties.xml"
> %JAVADEFINES% -classpath "%CLASSPATH%" %*
> goto done
> :nojavahome
> echo Environment variable JAVA_HOME is not set properly.
> goto done
> :nolcfhome
> -echo Environment variable LCF_HOME is not set properly.
> +echo Environment variable MCF_HOME is not set properly.
> goto done
> :done
>
> Modified: incubator/lcf/trunk/modules/framework/scripts/executecommand.sh
> URL:
> http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/scripts/executecommand.sh?rev=1004504&r1=1004503&r2=1004504&view=diff
> ==============================================================================
> --- incubator/lcf/trunk/modules/framework/scripts/executecommand.sh
> (original)
> +++ incubator/lcf/trunk/modules/framework/scripts/executecommand.sh Tue
> Oct 5 01:42:38 2010
> @@ -8,23 +8,23 @@ fi
>
> #Make sure environment variables are properly set
> if [ -e "$JAVA_HOME"/bin/java ] ; then
> - if [ -f "$LCF_HOME"/properties.xml ] ; then
> + if [ -f "$MCF_HOME"/properties.xml ] ; then
>
> # Build the classpath
> CLASSPATH=""
> - for filename in $(ls -1 "$LCF_HOME"/processes/jar) ; do
> + for filename in $(ls -1 "$MCF_HOME"/processes/jar) ; do
> if [ -n "$CLASSPATH" ] ; then
> -
> CLASSPATH="$CLASSPATH""$PATHSEP""$LCF_HOME"/processes/jar/"$filename"
> +
> CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/processes/jar/"$filename"
> else
> - CLASSPATH="$LCF_HOME"/processes/jar/"$filename"
> + CLASSPATH="$MCF_HOME"/processes/jar/"$filename"
> fi
> done
>
> # Build the defines
> - DEFINES="-Dorg.apache.lcf.configfile=$LCF_HOME/properties.xml"
> - if [ -e "$LCF_HOME/processes/define" ] ; then
> - for filename in $(ls -1 "$LCF_HOME"/processes/define) ; do
> - DEFINEVAR=-D"$filename"=$(cat
> "$LCF_HOME"/processes/define/"$filename")
> +
> DEFINES="-Dorg.apache.manifoldcf.configfile=$MCF_HOME/properties.xml"
> + if [ -e "$MCF_HOME/processes/define" ] ; then
> + for filename in $(ls -1 "$MCF_HOME"/processes/define) ; do
> + DEFINEVAR=-D"$filename"=$(cat
> "$MCF_HOME"/processes/define/"$filename")
> DEFINES="$DEFINES $DEFINEVAR"
> done
> fi
> @@ -33,7 +33,7 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
> exit $?
>
> else
> - echo "Environment variable LCF_HOME is not properly set." 1>&2
> + echo "Environment variable MCF_HOME is not properly set." 1>&2
> exit 1
> fi
>
>
> Modified: incubator/lcf/trunk/modules/framework/scripts/setclasspath.bat
> URL:
> http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/scripts/setclasspath.bat?rev=1004504&r1=1004503&r2=1004504&view=diff
> ==============================================================================
> --- incubator/lcf/trunk/modules/framework/scripts/setclasspath.bat
> (original)
> +++ incubator/lcf/trunk/modules/framework/scripts/setclasspath.bat Tue Oct
> 5 01:42:38 2010
> @@ -1 +1 @@
> -set CLASSPATH=%CLASSPATH%;%LCF_HOME%\processes\jar\%1
> +set CLASSPATH=%CLASSPATH%;%MCF_HOME%\processes\jar\%1
>
> Modified: incubator/lcf/trunk/modules/framework/scripts/setdefine.bat
> URL:
> http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/scripts/setdefine.bat?rev=1004504&r1=1004503&r2=1004504&view=diff
> ==============================================================================
> --- incubator/lcf/trunk/modules/framework/scripts/setdefine.bat (original)
> +++ incubator/lcf/trunk/modules/framework/scripts/setdefine.bat Tue Oct 5
> 01:42:38 2010
> @@ -1,2 +1,2 @@
>
> -for /f "delims=" %%a in ('type %LCF_HOME%\processes\define\%1') do set
> JAVADEFINES=-D%1=%%a %JAVADEFINES%
> +for /f "delims=" %%a in ('type %MCF_HOME%\processes\define\%1') do set
> JAVADEFINES=-D%1=%%a %JAVADEFINES%
>
>