manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1560670 - in /manifoldcf/branches/release-1.5-branch: ./ CHANGES.txt framework/example-multiprocess-file-common/lock-clean.bat framework/example-multiprocess-file-common/lock-clean.sh
Date Thu, 23 Jan 2014 12:40:26 GMT
Author: kwright
Date: Thu Jan 23 12:40:26 2014
New Revision: 1560670

URL: http://svn.apache.org/r1560670
Log:
Pull up CONNECTORS-866 fix from trunk.

Modified:
    manifoldcf/branches/release-1.5-branch/   (props changed)
    manifoldcf/branches/release-1.5-branch/CHANGES.txt
    manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-file-common/lock-clean.bat
    manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-file-common/lock-clean.sh

Propchange: manifoldcf/branches/release-1.5-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1559909,1560663

Modified: manifoldcf/branches/release-1.5-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/CHANGES.txt?rev=1560670&r1=1560669&r2=1560670&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.5-branch/CHANGES.txt Thu Jan 23 12:40:26 2014
@@ -1,8 +1,12 @@
 ManifoldCF Change Log
 $Id$
 
+
 ======================= Release 1.5 =====================
 
+CONNECTORS-866: Fix lock-clean scripts.
+(Karl Wright)
+
 CONNECTORS-864: Alfresco only provides 100 search results using CMIS connector with Apache
ManifoldCF
 (Piergiorgio Lucidi)
 

Modified: manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-file-common/lock-clean.bat
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-file-common/lock-clean.bat?rev=1560670&r1=1560669&r2=1560670&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-file-common/lock-clean.bat
(original)
+++ manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-file-common/lock-clean.bat
Thu Jan 23 12:40:26 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/branches/release-1.5-branch/framework/example-multiprocess-file-common/lock-clean.sh
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-file-common/lock-clean.sh?rev=1560670&r1=1560669&r2=1560670&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-file-common/lock-clean.sh
(original)
+++ manifoldcf/branches/release-1.5-branch/framework/example-multiprocess-file-common/lock-clean.sh
Thu Jan 23 12:40:26 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



Mime
View raw message