svn commit: r1245894 - in /incubator/lcf/trunk: CHANGES.txt connectors/documentum/server-scripts/run.bat connectors/documentum/server-scripts/run.sh

[kw...@apache.org]

Author: kwright
Date: Sat Feb 18 09:20:39 2012
New Revision: 1245894

URL: http://svn.apache.org/viewvc?rev=1245894&view=rev
Log:
Fix for CONNECTORS-410.  Look for both dmcl.ini and dfc.properties in determining correct value for DOCUMENTUM.

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/connectors/documentum/server-scripts/run.bat
    incubator/lcf/trunk/connectors/documentum/server-scripts/run.sh

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1245894&r1=1245893&r2=1245894&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Sat Feb 18 09:20:39 2012
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-410: Allow dfc.properties to be used instead of dmcl.ini for
+determination of correct value of the DOCUMENTUM environment variable.
+(Karl Wright)
+
 CONNECTORS-411: Execution of integration tests from Maven is broken
 (Piergiorgio Lucidi)
 

Modified: incubator/lcf/trunk/connectors/documentum/server-scripts/run.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/server-scripts/run.bat?rev=1245894&r1=1245893&r2=1245894&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/server-scripts/run.bat (original)
+++ incubator/lcf/trunk/connectors/documentum/server-scripts/run.bat Sat Feb 18 09:20:39 2012
@@ -18,7 +18,9 @@ rem check that JAVA_HOME and MCF_HOME ar
 if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome
 if not exist "%MCF_HOME%\properties.xml" goto nolcfhome
 rem TODO: Check this on a windows system!
-if not exist "%DOCUMENTUM%\dmcl.ini" goto nodctmhome
+if exist "%DOCUMENTUM%\dmcl.ini" goto dctmhomefound
+if not exist "%DOCUMENTUM%\dfc.properties" goto nodctmhome
+:dctmhomefound
 rem save existing path here
 set OLDDIR=%CD%
 cd "%MCF_HOME%\..\documentum-server-process"

Modified: incubator/lcf/trunk/connectors/documentum/server-scripts/run.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/server-scripts/run.sh?rev=1245894&r1=1245893&r2=1245894&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/server-scripts/run.sh (original)
+++ incubator/lcf/trunk/connectors/documentum/server-scripts/run.sh Sat Feb 18 09:20:39 2012
@@ -25,7 +25,7 @@ fi
 if [ -e "$JAVA_HOME"/bin/java ] ; then
     if [ -f "$MCF_HOME"/properties.xml ] ; then
         # TODO: Check this on both Windows and Redhat
-        if [ -f "$DOCUMENTUM"/dmcl.ini ] ; then
+        if [ -f "$DOCUMENTUM"/dmcl.ini -o -f "$DOCUMENTUM"/dfc.properties ] ; then
     
             # Build the classpath
             CLASSPATH=""