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/09 23:21:36 UTC
svn commit: r1242561 - in /incubator/lcf/trunk: ./ connectors/
connectors/documentum/registry-scripts/
connectors/documentum/server-scripts/ connectors/filenet/registry-scripts/
connectors/filenet/server-scripts/
Author: kwright
Date: Thu Feb 9 22:21:35 2012
New Revision: 1242561
URL: http://svn.apache.org/viewvc?rev=1242561&view=rev
Log:
Fix for CONNECTORS-403.
Modified:
incubator/lcf/trunk/CHANGES.txt
incubator/lcf/trunk/connectors/connector-build.xml
incubator/lcf/trunk/connectors/documentum/registry-scripts/run.bat
incubator/lcf/trunk/connectors/documentum/registry-scripts/run.sh
incubator/lcf/trunk/connectors/documentum/registry-scripts/setclasspath.bat
incubator/lcf/trunk/connectors/documentum/server-scripts/run.bat
incubator/lcf/trunk/connectors/documentum/server-scripts/run.sh
incubator/lcf/trunk/connectors/documentum/server-scripts/setclasspath.bat
incubator/lcf/trunk/connectors/filenet/registry-scripts/run.bat
incubator/lcf/trunk/connectors/filenet/registry-scripts/run.sh
incubator/lcf/trunk/connectors/filenet/registry-scripts/setclasspath.bat
incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat
incubator/lcf/trunk/connectors/filenet/server-scripts/run.sh
incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat
Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1242561&r1=1242560&r2=1242561&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Thu Feb 9 22:21:35 2012
@@ -3,6 +3,11 @@ $Id$
======================= 0.5-dev =====================
+CONNECTORS-403: Fix the sidecar process scripts to use the same
+definition for MCF_HOME as everything else uses. Also promote these
+scripts to the root level in their individual process directory.
+(Karl Wright)
+
CONNECTORS-401: Update the website with some material about the project
(Piergiorgio Lucidi)
Modified: incubator/lcf/trunk/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/connector-build.xml?rev=1242561&r1=1242560&r2=1242561&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/connector-build.xml (original)
+++ incubator/lcf/trunk/connectors/connector-build.xml Thu Feb 9 22:21:35 2012
@@ -452,7 +452,6 @@
<target name="server-process" depends="jar-interface,jar-implementation,jar-rmiskel,jar-server,has-RMI-check" if="hasRMI">
<mkdir dir="dist/server-process/jar"/>
- <mkdir dir="dist/server-process/script"/>
<copy todir="dist/server-process/jar">
<fileset dir="build/jar">
<include name="mcf-${ant.project.name}-connector-server.jar"/>
@@ -461,7 +460,7 @@
<include name="mcf-${ant.project.name}-connector-implementation.jar"/>
</fileset>
</copy>
- <copy todir="dist/server-process/script">
+ <copy todir="dist/server-process">
<fileset dir="server-scripts">
<include name="*.sh"/>
<include name="*.bat"/>
@@ -471,14 +470,13 @@
<target name="registry-process" depends="jar-registry,has-RMI-check" if="hasRMI">
<mkdir dir="dist/registry-process/jar"/>
- <mkdir dir="dist/registry-process/script"/>
<copy todir="dist/registry-process/jar">
<fileset dir="build/jar">
<include name="mcf-${ant.project.name}-connector-registry.jar"/>
<include name="mcf-${ant.project.name}-connector-interface.jar"/>
</fileset>
</copy>
- <copy todir="dist/registry-process/script">
+ <copy todir="dist/registry-process">
<fileset dir="registry-scripts">
<include name="*.sh"/>
<include name="*.bat"/>
Modified: incubator/lcf/trunk/connectors/documentum/registry-scripts/run.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/registry-scripts/run.bat?rev=1242561&r1=1242560&r2=1242561&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/registry-scripts/run.bat (original)
+++ incubator/lcf/trunk/connectors/documentum/registry-scripts/run.bat Thu Feb 9 22:21:35 2012
@@ -19,9 +19,9 @@ if not exist "%JAVA_HOME%\bin\java.exe"
if not exist "%MCF_HOME%\properties.xml" goto nolcfhome
rem save existing path here
set OLDDIR=%CD%
-cd "%MCF_HOME%\documentum-registry-process"
+cd "%MCF_HOME%\..\documentum-registry-process"
set CLASSPATH=.
-for %%f in (jar/*) do call script\setclasspath.bat %%f
+for %%f in (jar/*) do call setclasspath.bat %%f
rem restore old path here
cd "%OLDDIR%"
"%JAVA_HOME%\bin\java" -Xmx32m -Xms32m -classpath "%CLASSPATH%" org.apache.manifoldcf.crawler.registry.DCTM.DCTM
Modified: incubator/lcf/trunk/connectors/documentum/registry-scripts/run.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/registry-scripts/run.sh?rev=1242561&r1=1242560&r2=1242561&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/registry-scripts/run.sh (original)
+++ incubator/lcf/trunk/connectors/documentum/registry-scripts/run.sh Thu Feb 9 22:21:35 2012
@@ -27,11 +27,11 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
# Build the classpath
CLASSPATH=""
- for filename in $(ls -1 "$MCF_HOME"/documentum-registry-process/jar) ; do
+ for filename in $(ls -1 "$MCF_HOME"/../documentum-registry-process/jar) ; do
if [ -n "$CLASSPATH" ] ; then
- CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/documentum-registry-process/jar/"$filename"
+ CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../documentum-registry-process/jar/"$filename"
else
- CLASSPATH="$MCF_HOME"/documentum-registry-process/jar/"$filename"
+ CLASSPATH="$MCF_HOME"/../documentum-registry-process/jar/"$filename"
fi
done
Modified: incubator/lcf/trunk/connectors/documentum/registry-scripts/setclasspath.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/registry-scripts/setclasspath.bat?rev=1242561&r1=1242560&r2=1242561&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/registry-scripts/setclasspath.bat (original)
+++ incubator/lcf/trunk/connectors/documentum/registry-scripts/setclasspath.bat Thu Feb 9 22:21:35 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%\documentum-registry-process\jar\%1
+set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\documentum-registry-process\jar\%1
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=1242561&r1=1242560&r2=1242561&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/server-scripts/run.bat (original)
+++ incubator/lcf/trunk/connectors/documentum/server-scripts/run.bat Thu Feb 9 22:21:35 2012
@@ -21,9 +21,9 @@ rem TODO: Check this on a windows system
if not exist "%DOCUMENTUM%\dmcl.ini" goto nodctmhome
rem save existing path here
set OLDDIR=%CD%
-cd "%MCF_HOME%\documentum-server-process"
+cd "%MCF_HOME%\..\documentum-server-process"
set CLASSPATH=.
-for %%f in (jar/*) do call script\setclasspath.bat %%f
+for %%f in (jar/*) do call setclasspath.bat %%f
rem restore old path here
cd "%OLDDIR%"
set LIB_STATEMENT=
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=1242561&r1=1242560&r2=1242561&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/server-scripts/run.sh (original)
+++ incubator/lcf/trunk/connectors/documentum/server-scripts/run.sh Thu Feb 9 22:21:35 2012
@@ -29,11 +29,11 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
# Build the classpath
CLASSPATH=""
- for filename in $(ls -1 "$MCF_HOME"/documentum-server-process/jar) ; do
+ for filename in $(ls -1 "$MCF_HOME"/../documentum-server-process/jar) ; do
if [ -n "$CLASSPATH" ] ; then
- CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/documentum-server-process/jar/"$filename"
+ CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../documentum-server-process/jar/"$filename"
else
- CLASSPATH="$MCF_HOME"/documentum-server-process/jar/"$filename"
+ CLASSPATH="$MCF_HOME"/../documentum-server-process/jar/"$filename"
fi
done
Modified: incubator/lcf/trunk/connectors/documentum/server-scripts/setclasspath.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/server-scripts/setclasspath.bat?rev=1242561&r1=1242560&r2=1242561&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/server-scripts/setclasspath.bat (original)
+++ incubator/lcf/trunk/connectors/documentum/server-scripts/setclasspath.bat Thu Feb 9 22:21:35 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%\documentum-server-process\jar\%1
+set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\documentum-server-process\jar\%1
Modified: incubator/lcf/trunk/connectors/filenet/registry-scripts/run.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/registry-scripts/run.bat?rev=1242561&r1=1242560&r2=1242561&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/registry-scripts/run.bat (original)
+++ incubator/lcf/trunk/connectors/filenet/registry-scripts/run.bat Thu Feb 9 22:21:35 2012
@@ -19,9 +19,9 @@ if not exist "%JAVA_HOME%\bin\java.exe"
if not exist "%MCF_HOME%\properties.xml" goto nolcfhome
rem save existing path here
set OLDDIR=%CD%
-cd "%MCF_HOME%\filenet-registry-process"
+cd "%MCF_HOME%\..\filenet-registry-process"
set CLASSPATH=.
-for %%f in (jar/*) do call script\setclasspath.bat %%f
+for %%f in (jar/*) do call setclasspath.bat %%f
rem restore old path here
cd "%OLDDIR%"
"%JAVA_HOME%\bin\java" -Xmx32m -Xms32m -classpath "%CLASSPATH%" org.apache.manifoldcf.crawler.registry.filenet.Filenet
Modified: incubator/lcf/trunk/connectors/filenet/registry-scripts/run.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/registry-scripts/run.sh?rev=1242561&r1=1242560&r2=1242561&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/registry-scripts/run.sh (original)
+++ incubator/lcf/trunk/connectors/filenet/registry-scripts/run.sh Thu Feb 9 22:21:35 2012
@@ -27,11 +27,11 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
# Build the classpath
CLASSPATH=""
- for filename in $(ls -1 "$MCF_HOME"/filenet-registry-process/jar) ; do
+ for filename in $(ls -1 "$MCF_HOME"/../filenet-registry-process/jar) ; do
if [ -n "$CLASSPATH" ] ; then
- CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/filenet-registry-process/jar/"$filename"
+ CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../filenet-registry-process/jar/"$filename"
else
- CLASSPATH="$MCF_HOME"/filenet-registry-process/jar/"$filename"
+ CLASSPATH="$MCF_HOME"/../filenet-registry-process/jar/"$filename"
fi
done
Modified: incubator/lcf/trunk/connectors/filenet/registry-scripts/setclasspath.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/registry-scripts/setclasspath.bat?rev=1242561&r1=1242560&r2=1242561&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/registry-scripts/setclasspath.bat (original)
+++ incubator/lcf/trunk/connectors/filenet/registry-scripts/setclasspath.bat Thu Feb 9 22:21:35 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%\filenet-registry-process\jar\%1
+set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\filenet-registry-process\jar\%1
Modified: incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat?rev=1242561&r1=1242560&r2=1242561&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat (original)
+++ incubator/lcf/trunk/connectors/filenet/server-scripts/run.bat Thu Feb 9 22:21:35 2012
@@ -19,9 +19,9 @@ if not exist "%JAVA_HOME%\bin\java.exe"
if not exist "%MCF_HOME%\properties.xml" goto nolcfhome
rem save existing path here
set OLDDIR=%CD%
-cd "%MCF_HOME%\filenet-server-process"
+cd "%MCF_HOME%\..\filenet-server-process"
set CLASSPATH=.
-for %%f in (jar/*) do call script\setclasspath.bat %%f
+for %%f in (jar/*) do call setclasspath.bat %%f
rem restore old path here
cd "%OLDDIR%"
set WASP_STATEMENT=
Modified: incubator/lcf/trunk/connectors/filenet/server-scripts/run.sh
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/server-scripts/run.sh?rev=1242561&r1=1242560&r2=1242561&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/server-scripts/run.sh (original)
+++ incubator/lcf/trunk/connectors/filenet/server-scripts/run.sh Thu Feb 9 22:21:35 2012
@@ -27,11 +27,11 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
# Build the classpath
CLASSPATH=""
- for filename in $(ls -1 "$MCF_HOME"/filenet-server-process/jar) ; do
+ for filename in $(ls -1 "$MCF_HOME"/../filenet-server-process/jar) ; do
if [ -n "$CLASSPATH" ] ; then
- CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/filenet-server-process/jar/"$filename"
+ CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/../filenet-server-process/jar/"$filename"
else
- CLASSPATH="$MCF_HOME"/filenet-server-process/jar/"$filename"
+ CLASSPATH="$MCF_HOME"/../filenet-server-process/jar/"$filename"
fi
done
Modified: incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat?rev=1242561&r1=1242560&r2=1242561&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat (original)
+++ incubator/lcf/trunk/connectors/filenet/server-scripts/setclasspath.bat Thu Feb 9 22:21:35 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%\filenet-server-process\jar\%1
+set CLASSPATH=%CLASSPATH%;%MCF_HOME%\..\filenet-server-process\jar\%1