You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/02/12 21:35:23 UTC
svn commit: r1243320 - in /incubator/lcf/trunk: CHANGES.txt
framework/build.xml framework/engine-scripts/run-script.bat
framework/engine-scripts/run-script.sh
framework/engine-scripts/setclasspath.bat
Author: kwright
Date: Sun Feb 12 20:35:23 2012
New Revision: 1243320
URL: http://svn.apache.org/viewvc?rev=1243320&view=rev
Log:
Fix for CONNECTORS-408.
Modified:
incubator/lcf/trunk/CHANGES.txt
incubator/lcf/trunk/framework/build.xml
incubator/lcf/trunk/framework/engine-scripts/run-script.bat
incubator/lcf/trunk/framework/engine-scripts/run-script.sh
incubator/lcf/trunk/framework/engine-scripts/setclasspath.bat
Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1243320&r1=1243319&r2=1243320&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Sun Feb 12 20:35:23 2012
@@ -3,6 +3,11 @@ $Id$
======================= 0.5-dev =====================
+CONNECTORS-408: Rearrange the script-engine directory in a manner
+consistent with other dist directories, and also use a different env variable
+(ENGINE_HOME) so that we don't conflict with MCF_HOME.
+(Karl Wright)
+
CONNECTORS-407: Set the executable bit in the distribution directory
for .sh files during ant build.
(Karl Wright)
Modified: incubator/lcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/build.xml?rev=1243320&r1=1243319&r2=1243320&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/build.xml (original)
+++ incubator/lcf/trunk/framework/build.xml Sun Feb 12 20:35:23 2012
@@ -735,8 +735,8 @@
</target>
<target name="script-engine" depends="jar-script-engine,jar-core">
- <mkdir dir="dist/script-engine/jar"/>
- <copy todir="dist/script-engine/jar">
+ <mkdir dir="dist/script-engine/lib"/>
+ <copy todir="dist/script-engine/lib">
<fileset dir="../build/jar">
<include name="json.jar"/>
</fileset>
@@ -753,7 +753,7 @@
<include name="mcf-script-engine.jar"/>
</fileset>
</copy>
- <copy todir="dist/script-engine/script">
+ <copy todir="dist/script-engine">
<fileset dir="engine-scripts"/>
</copy>
<copy todir="dist/script-engine">
Modified: incubator/lcf/trunk/framework/engine-scripts/run-script.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/engine-scripts/run-script.bat?rev=1243320&r1=1243319&r2=1243320&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/engine-scripts/run-script.bat (original)
+++ incubator/lcf/trunk/framework/engine-scripts/run-script.bat Sun Feb 12 20:35:23 2012
@@ -16,12 +16,12 @@ rem limitations under the License.
rem check that JAVA_HOME is set
if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
-if not exist "%MCF_HOME%\script-engine\jar" goto nolcfhome
+if not exist "%ENGINE_HOME%\lib" goto nolcfhome
rem save existing path here
set OLDDIR=%CD%
-cd "%MCF_HOME%\script-engine"
+cd "%ENGINE_HOME%"
set CLASSPATH=.
-for %%f in (jar/*) do call script\setclasspath.bat %%f
+for %%f in (lib/*) do call setclasspath.bat %%f
rem restore old path here
cd "%OLDDIR%"
"%JAVA_HOME%\bin\java" -classpath "%CLASSPATH%" org.apache.manifoldcf.scriptengine.ScriptParser %*
@@ -30,6 +30,6 @@ goto done
echo Environment variable JAVA_HOME is not set properly.
goto done
:nolcfhome
-echo Environment variable MCF_HOME is not set properly.
+echo Environment variable ENGINE_HOME is not set properly.
goto done
:done
Modified: incubator/lcf/trunk/framework/engine-scripts/run-script.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/engine-scripts/run-script.sh?rev=1243320&r1=1243319&r2=1243320&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/engine-scripts/run-script.sh (original)
+++ incubator/lcf/trunk/framework/engine-scripts/run-script.sh Sun Feb 12 20:35:23 2012
@@ -23,15 +23,15 @@ fi
#Make sure environment variables are properly set
if [ -e "$JAVA_HOME"/bin/java ] ; then
- if [ -e "$MCF_HOME"/script-engine/jar ] ; then
+ if [ -e "$ENGINE_HOME"/lib ] ; then
# Build the classpath
CLASSPATH=""
- for filename in $(ls -1 "$MCF_HOME"/script-engine/jar) ; do
+ for filename in $(ls -1 "$ENGINE_HOME"/lib) ; do
if [ -n "$CLASSPATH" ] ; then
- CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/script-engine/jar/"$filename"
+ CLASSPATH="$CLASSPATH""$PATHSEP""$ENGINE_HOME"/lib/"$filename"
else
- CLASSPATH="$MCF_HOME"/script-engine/jar/"$filename"
+ CLASSPATH="$ENGINE_HOME"/lib/"$filename"
fi
done
@@ -39,7 +39,7 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
exit $?
else
- echo "Environment variable MCF_HOME is not properly set." 1>&2
+ echo "Environment variable ENGINE_HOME is not properly set." 1>&2
exit 1
fi
Modified: incubator/lcf/trunk/framework/engine-scripts/setclasspath.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/engine-scripts/setclasspath.bat?rev=1243320&r1=1243319&r2=1243320&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/engine-scripts/setclasspath.bat (original)
+++ incubator/lcf/trunk/framework/engine-scripts/setclasspath.bat Sun Feb 12 20:35:23 2012
@@ -13,4 +13,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF
rem See the License for the specific language governing permissions and
rem limitations under the License.
-set CLASSPATH=%CLASSPATH%;%MCF_HOME%\script-engine\jar\%1
+set CLASSPATH=%CLASSPATH%;%ENGINE_HOME%\lib\%1