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 2014/01/21 03:45:21 UTC

svn commit: r1559909 - in /manifoldcf/trunk: CHANGES.txt framework/example-multiprocess-file-common/lock-clean.bat framework/example-multiprocess-file-common/lock-clean.sh

Author: kwright
Date: Tue Jan 21 02:45:21 2014
New Revision: 1559909

URL: http://svn.apache.org/r1559909
Log:
Fix for CONNECTORS-866.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/example-multiprocess-file-common/lock-clean.bat
    manifoldcf/trunk/framework/example-multiprocess-file-common/lock-clean.sh

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1559909&r1=1559908&r2=1559909&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Jan 21 02:45:21 2014
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 1.6-dev =====================
 
+CONNECTORS-866: Fix lock-clean scripts.
+(Karl Wright)
+
 ======================= Release 1.5 =====================
 
 CONNECTORS-864: Alfresco only provides 100 search results using CMIS connector with Apache ManifoldCF

Modified: manifoldcf/trunk/framework/example-multiprocess-file-common/lock-clean.bat
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-file-common/lock-clean.bat?rev=1559909&r1=1559908&r2=1559909&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-file-common/lock-clean.bat (original)
+++ manifoldcf/trunk/framework/example-multiprocess-file-common/lock-clean.bat Tue Jan 21 02:45:21 2014
@@ -17,10 +17,8 @@ rem limitations under the License.
 rem check that JAVA_HOME is set, and that the current directory is correct
 if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
 if not exist ".\properties.xml" goto nolcfhome
-rem set MCF_HOME
-set MCF_HOME=%CD%
 rem invoke the LockClean command
-cmd /c "processes\executecommand.bat org.apache.manifoldcf.core.LockClean"
+cmd /c "executecommand.bat org.apache.manifoldcf.core.LockClean"
 goto done
 :nojavahome
 echo Environment variable JAVA_HOME is not set properly.

Modified: manifoldcf/trunk/framework/example-multiprocess-file-common/lock-clean.sh
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-file-common/lock-clean.sh?rev=1559909&r1=1559908&r2=1559909&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-file-common/lock-clean.sh (original)
+++ manifoldcf/trunk/framework/example-multiprocess-file-common/lock-clean.sh Tue Jan 21 02:45:21 2014
@@ -18,9 +18,7 @@
 #Make sure environment variables are properly set
 if [ -e "$JAVA_HOME"/bin/java ] ; then
     if [ -f ./properties.xml ] ; then
-        # Set the MCF_HOME variable
-        export MCF_HOME=$PWD
-        processes/executecommand.sh org.apache.manifoldcf.core.LockClean
+        ./executecommand.sh org.apache.manifoldcf.core.LockClean
         exit $?
         
     else