Author: kwright
Date: Sat Sep 27 12:36:18 2014
New Revision: 1627959
URL: http://svn.apache.org/r1627959
Log:
Fix for CONNECTORS-1048.
Added:
manifoldcf/trunk/framework/scripts-hsqldb/
- copied from r1627957,
manifoldcf/branches/CONNECTORS-1048/framework/scripts-hsqldb/
manifoldcf/trunk/framework/scripts-zookeeper/
- copied from r1627957,
manifoldcf/branches/CONNECTORS-1048/framework/scripts-zookeeper/
Removed:
manifoldcf/trunk/framework/example-multiprocess-common/start-database.bat
manifoldcf/trunk/framework/example-multiprocess-common/start-database.sh
manifoldcf/trunk/framework/example-multiprocess-zk-common/runzookeeper.bat
manifoldcf/trunk/framework/example-multiprocess-zk-common/runzookeeper.sh
Modified:
manifoldcf/trunk/ (props changed)
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
manifoldcf/trunk/common-build.xml
manifoldcf/trunk/framework/build.xml
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/CONNECTORS-1048:r1627756-1627957
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1627959&r1=1627958&r2=1627959&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sat Sep 27 12:36:18 2014
@@ -3,6 +3,9 @@ $Id$
======================= 2.0-dev =====================
+CONNECTORS-1048: Use full paths for all downloaded jars.
+(Shinichiro Abe, Karl Wright)
+
CONNECTORS-1047: Upgrade to Tika 1.6.
(Shinichiro Abe)
Modified: manifoldcf/trunk/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1627959&r1=1627958&r2=1627959&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Sat Sep 27 12:36:18 2014
@@ -31,18 +31,18 @@
<target name="downloaded-condition">
<!-- Spot check a few of the dependent jars; no point including ALL of
them here... -->
- <available file="lib/hsqldb.jar" property="hsqldb-found"/>
+ <!--available file="lib/hsqldb.jar" property="hsqldb-found"/>
<available file="lib/jetty-server.jar" property="jetty-found"/>
<available file="lib/httpclient.jar" property="httpclient-found"/>
- <available file="lib/xercesImpl.jar" property="xerces-found"/>
- <available file="lib/fop.jar" property="fop-found"/>
+ <available file="lib/xercesImpl.jar" property="xerces-found"/ -->
+ <available file="lib/zookeeper-3.4.6.jar" property="zookeeper-found"/>
<condition property="downloaded">
<and>
- <isset property="hsqldb-found"/>
+ <!--isset property="hsqldb-found"/>
<isset property="jetty-found"/>
<isset property="httpclient-found"/>
- <isset property="xerces-found"/>
- <isset property="fop-found"/>
+ <isset property="xerces-found"/ -->
+ <isset property="zookeeper-found"/>
</and>
</condition>
</target>
Modified: manifoldcf/trunk/common-build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/common-build.xml?rev=1627959&r1=1627958&r2=1627959&view=diff
==============================================================================
--- manifoldcf/trunk/common-build.xml (original)
+++ manifoldcf/trunk/common-build.xml Sat Sep 27 12:36:18 2014
@@ -22,7 +22,7 @@
</target>
<target name="download-via-maven" depends="setup-maven-url">
- <get
src="${maven-base-url}/${project-path}/${artifact-name}/${artifact-version}/${artifact-name}-${artifact-version}.${artifact-type}"
dest="${target}/${artifact-name}.${artifact-type}"/>
+ <get
src="${maven-base-url}/${project-path}/${artifact-name}/${artifact-version}/${artifact-name}-${artifact-version}.${artifact-type}"
dest="${target}/${artifact-name}-${artifact-version}.${artifact-type}"/>
</target>
<target name="checkout-source-via-svn">
Modified: manifoldcf/trunk/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1627959&r1=1627958&r2=1627959&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Sat Sep 27 12:36:18 2014
@@ -928,40 +928,36 @@
</copy>
</target>
- <target name="general-add-lib-classpath">
- <replace file="${processes-dir}/options.env.win" token=".;"
value=".;..\lib\${lib-jar};"/>
- <replace file="${processes-dir}/options.env.unix" token=".:"
value=".:../lib/${lib-jar}:"/>
+ <target name="general-set-classpath">
+ <replace file="${processes-dir}/options.env.win" token=".;"
value=".;${win-classpath};"/>
+ <replace file="${processes-dir}/options.env.unix" token=".:"
value=".:${unix-classpath}:"/>
</target>
- <target name="general-add-lib-proprietary-classpath">
- <replace file="${processes-dir}/options.env.win" token=".;"
value=".;..\lib-proprietary\${lib-proprietary-jar};"/>
- <replace file="${processes-dir}/options.env.unix" token=".:"
value=".:../lib-proprietary/${lib-proprietary-jar}:"/>
+ <target name="general-set-engine-classpath">
+ <replace file="${processes-dir}/options.env.win" token=".;"
value=".;${win-classpath};"/>
+ <replace file="${processes-dir}/options.env.unix" token=".:"
value=".:${unix-classpath}:"/>
</target>
- <target name="general-engine-add-lib-classpath">
- <replace file="${processes-dir}/options.env.win" token=".;"
value=".;..\lib\${lib-jar};"/>
- <replace file="${processes-dir}/options.env.unix" token=".:"
value=".:../lib/${lib-jar}:"/>
+ <target name="general-set-jetty-classpath">
+ <replace file="${processes-dir}/jetty-options.env.win" token=".;"
value=".;${win-classpath};"/>
+ <replace file="${processes-dir}/jetty-options.env.unix" token=".:"
value=".:${unix-classpath}:"/>
</target>
- <target name="general-jetty-add-lib-classpath">
- <replace file="${processes-dir}/jetty-options.env.win" token=".;"
value=".;..\lib\${lib-jar};"/>
- <replace file="${processes-dir}/jetty-options.env.unix" token=".:"
value=".:../lib/${lib-jar}:"/>
+ <target name="general-set-hsqldb-classpath">
+ <replace file="${processes-dir}/hsqldb-options.env.win" token=".;"
value=".;${win-classpath};"/>
+ <replace file="${processes-dir}/hsqldb-options.env.unix" token=".:"
value=".:${unix-classpath}:"/>
</target>
- <target name="general-jetty-add-lib-proprietary-classpath">
- <replace file="${processes-dir}/jetty-options.env.win" token=".;"
value=".;..\lib-proprietary\${lib-proprietary-jar};"/>
- <replace file="${processes-dir}/jetty-options.env.unix" token=".:"
value=".:../lib-proprietary/${lib-proprietary-jar}:"/>
+ <target name="general-set-zookeeper-classpath">
+ <replace file="${processes-dir}/zk-options.env.win" token=".;"
value=".;${win-classpath};"/>
+ <replace file="${processes-dir}/zk-options.env.unix" token=".:"
value=".:${unix-classpath}:"/>
</target>
- <target name="general-combined-add-lib-classpath">
- <replace file="${processes-dir}/combined-options.env.win" token=".;"
value=".;..\lib\${lib-jar};"/>
- <replace file="${processes-dir}/combined-options.env.unix" token=".:"
value=".:../lib/${lib-jar}:"/>
+ <target name="general-set-combined-classpath">
+ <replace file="${processes-dir}/combined-options.env.win" token=".;"
value=".;${win-classpath};"/>
+ <replace file="${processes-dir}/combined-options.env.unix" token=".:"
value=".:${unix-classpath}:"/>
</target>
- <target name="general-combined-add-lib-proprietary-classpath">
- <replace file="${processes-dir}/combined-options.env.win" token=".;"
value=".;..\lib-proprietary\${lib-proprietary-jar};"/>
- <replace file="${processes-dir}/combined-options.env.unix" token=".:"
value=".:../lib-proprietary/${lib-proprietary-jar}:"/>
- </target>
<target name="preclean-processes">
<mkdir dir="${processes-dir}"/>
@@ -981,6 +977,18 @@
<delete file="${processes-dir}/jetty-options.env.unix"/>
</target>
+ <target name="preclean-hsqldb-processes">
+ <mkdir dir="${processes-dir}"/>
+ <delete file="${processes-dir}/hsqldb-options.env.win"/>
+ <delete file="${processes-dir}/hsqldb-options.env.unix"/>
+ </target>
+
+ <target name="preclean-zookeeper-processes">
+ <mkdir dir="${processes-dir}"/>
+ <delete file="${processes-dir}/zk-options.env.win"/>
+ <delete file="${processes-dir}/zk-options.env.unix"/>
+ </target>
+
<target name="preclean-combined-processes">
<mkdir dir="${processes-dir}"/>
<delete file="${processes-dir}/combined-options.env.win"/>
@@ -1008,6 +1016,20 @@
</copy>
</target>
+ <target name="scripts-hsqldb" depends="scripts-common">
+ <mkdir dir="${processes-dir}"/>
+ <copy todir="${processes-dir}">
+ <fileset dir="scripts-hsqldb"/>
+ </copy>
+ </target>
+
+ <target name="scripts-zookeeper" depends="scripts-common">
+ <mkdir dir="${processes-dir}"/>
+ <copy todir="${processes-dir}">
+ <fileset dir="scripts-zookeeper"/>
+ </copy>
+ </target>
+
<target name="scripts-combined" depends="scripts-common">
<mkdir dir="${processes-dir}"/>
<copy todir="${processes-dir}">
@@ -1022,162 +1044,295 @@
</copy>
</target>
- <target name="setup-engine-processes"
depends="preclean-engine-processes,scripts-engine">
- <antcall target="general-engine-add-lib-classpath"><param
name="lib-jar" value="json.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-engine-add-lib-classpath"><param
name="lib-jar" value="json-simple.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-engine-add-lib-classpath"><param
name="lib-jar" value="commons-codec.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-engine-add-lib-classpath"><param
name="lib-jar" value="commons-collections.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-engine-add-lib-classpath"><param
name="lib-jar" value="httpcore.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-engine-add-lib-classpath"><param
name="lib-jar" value="httpclient.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-engine-add-lib-classpath"><param
name="lib-jar" value="commons-io.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-engine-add-lib-classpath"><param
name="lib-jar" value="commons-lang.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-engine-add-lib-classpath"><param
name="lib-jar" value="commons-logging.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-engine-add-lib-classpath"><param
name="lib-jar" value="mcf-core.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-engine-add-lib-classpath"><param
name="lib-jar" value="mcf-script-engine.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- </target>
-
- <target name="setup-jetty-processes"
depends="preclean-jetty-processes,scripts-jetty">
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="castor.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="geronimo-javamail_1.4_spec.jar"/><param
name="processes-dir" value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="commons-discovery.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="axis-jaxrpc.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="axis.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="wss4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="xmlsec.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="opensaml.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="wsdl4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="saaj-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="saaj-impl.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="activation.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="zookeeper.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="json.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="json-simple.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="commons-logging.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="log4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="slf4j-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="slf4j-simple.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="servlet-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="ecj.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jetty-continuation.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jetty-http.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jetty-io.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jetty-jndi.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jetty-jsp-2.1.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jetty-plus.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jetty-security.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jetty-server.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jetty-servlet.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jetty-util.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jetty-webapp.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jetty-xml.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jasper.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jasper-el.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="juli.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="jsp-api-2.1-glassfish.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="mcf-core.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="mcf-ui-core.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="mcf-agents.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="mcf-pull-agent.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-jetty-add-lib-classpath"><param
name="lib-jar" value="mcf-jetty-runner.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- </target>
-
- <target name="setup-combined-processes"
depends="preclean-combined-processes,scripts-combined">
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="castor.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="geronimo-javamail_1.4_spec.jar"/><param
name="processes-dir" value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="commons-discovery.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="axis-jaxrpc.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="axis.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="wss4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="xmlsec.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="opensaml.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="wsdl4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="saaj-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="saaj-impl.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="activation.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="zookeeper.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="json.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="json-simple.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="commons-logging.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="log4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="slf4j-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="slf4j-simple.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="servlet-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="ecj.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jetty-continuation.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jetty-http.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jetty-io.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jetty-jndi.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jetty-jsp-2.1.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jetty-plus.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jetty-security.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jetty-server.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jetty-servlet.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jetty-util.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jetty-webapp.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jetty-xml.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jasper.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jasper-el.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="juli.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="jsp-api-2.1-glassfish.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="mcf-core.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="mcf-ui-core.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="mcf-agents.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="mcf-pull-agent.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-combined-add-lib-classpath"><param
name="lib-jar" value="mcf-jetty-runner.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- </target>
-
- <target name="setup-processes" depends="preclean-processes,scripts">
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="castor.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="geronimo-javamail_1.4_spec.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="commons-discovery.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="axis-jaxrpc.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="axis.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="wss4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="xmlsec.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="opensaml.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="wsdl4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="saaj-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="saaj-impl.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="activation.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="zookeeper.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="json.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="json-simple.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="commons-codec.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="commons-collections.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="commons-el.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="commons-fileupload.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="httpcore.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="httpclient.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="commons-io.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="commons-lang.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="commons-logging.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="log4j.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="serializer.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="servlet-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="xalan.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="xercesImpl.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="xml-apis.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="velocity.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="slf4j-api.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="slf4j-simple.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="mail.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="postgresql.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="hsqldb.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="mcf-core.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="mcf-agents.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-classpath"><param name="lib-jar"
value="mcf-pull-agent.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <target name="jetty-lib" depends="lib">
+ <mkdir dir="build/lib/jetty"/>
+ <copy todir="build/lib/jetty">
+ <fileset dir="../lib">
+ <include name="jetty*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="database-lib" depends="lib">
+ <mkdir dir="build/lib/database"/>
+ <copy todir="build/lib/database">
+ <fileset dir="../lib">
+ <include name="hsqldb*.jar"/>
+ <include name="postgresql*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="hsqldb-lib" depends="lib">
+ <mkdir dir="build/lib/hsqldb"/>
+ <copy todir="build/lib/hsqldb">
+ <fileset dir="../lib">
+ <include name="hsqldb*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="zookeeper-lib" depends="lib">
+ <mkdir dir="build/lib/zookeeper"/>
+ <copy todir="build/lib/zookeeper">
+ <fileset dir="../lib">
+ <include name="zookeeper*.jar"/>
+ <include name="slf4j-api*.jar"/>
+ <include name="slf4j-simple*.jar"/>
+ <include name="log4j*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="process-lib" depends="lib">
+ <mkdir dir="build/lib/process"/>
+ <copy todir="build/lib/process">
+ <fileset dir="../lib">
+ <include name="commons-lang*.jar"/>
+ <include name="commons-codec*.jar"/>
+ <include name="commons-collections*.jar"/>
+ <include name="commons-el*.jar"/>
+ <include name="commons-fileupload*.jar"/>
+ <include name="commons-io*.jar"/>
+ <include name="commons-logging*.jar"/>
+ <include name="commons-discovery*.jar"/>
+ <include name="jasper*.jar"/>
+ <include name="jsp-api-2.1-glassfish*.jar"/>
+ <include name="json*.jar"/>
+ <include name="log4j*.jar"/>
+ <include name="serializer*.jar"/>
+ <include name="servlet-api*.jar"/>
+ <include name="juli*.jar"/>
+ <include name="xalan*.jar"/>
+ <include name="xercesImpl*.jar"/>
+ <include name="xml-apis*.jar"/>
+ <include name="ecj*.jar"/>
+ <include name="velocity*.jar"/>
+ <include name="slf4j-api*.jar"/>
+ <include name="slf4j-simple*.jar"/>
+ <include name="httpcore*.jar"/>
+ <include name="httpclient*.jar"/>
+ <include name="mail*.jar"/>
+ <include name="zookeeper*.jar"/>
+ <include name="castor*.jar"/>
+ <include name="geronimo-javamail_1.4_spec*.jar"/>
+ <include name="axis*.jar"/>
+ <include name="wsdl4j*.jar"/>
+ <include name="saaj-api*.jar"/>
+ <include name="saaj-impl*.jar"/>
+ <include name="activation*.jar"/>
+ <include name="wss4j*.jar"/>
+ <include name="xmlsec*.jar"/>
+ <include name="opensaml*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="process-lib-proprietary" depends="lib-proprietary">
+ <mkdir dir="build/lib-proprietary/process"/>
+ <copy todir="build/lib-proprietary/process">
+ <fileset dir="../lib-proprietary">
+ <include name="mysql-connector-java*.jar"/>
+ <include name="ojdbc*.jar"/>
+ <include name="jtds*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="engine-lib" depends="lib">
+ <mkdir dir="build/lib/engine"/>
+ <copy todir="build/lib/engine">
+ <fileset dir="../lib">
+ <include name="commons-lang*.jar"/>
+ <include name="commons-codec*.jar"/>
+ <include name="commons-collections*.jar"/>
+ <include name="commons-io*.jar"/>
+ <include name="commons-logging*.jar"/>
+ <include name="json*.jar"/>
+ <include name="httpcore*.jar"/>
+ <include name="httpclient*.jar"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="jetty-lib-classpath" depends="jetty-lib">
+ <property name="jetty-lib-classpath" location="build/lib/jetty"/>
+ <pathconvert property="jetty-lib-classpath-win" dirsep="\" pathsep=";">
+ <path>
+ <fileset dir="${jetty-lib-classpath}" includes="*.jar"/>
+ </path>
+ <map from="${jetty-lib-classpath}" to="..\lib"/>
+ </pathconvert>
+ <pathconvert property="jetty-lib-classpath-unix" dirsep="/"
pathsep=":">
+ <path>
+ <fileset dir="${jetty-lib-classpath}" includes="*.jar"/>
+ </path>
+ <map from="${jetty-lib-classpath}" to="../lib"/>
+ </pathconvert>
+ </target>
+
+ <target name="hsqldb-lib-classpath" depends="hsqldb-lib">
+ <property name="hsqldb-lib-classpath" location="build/lib/hsqldb"/>
+ <pathconvert property="hsqldb-lib-classpath-win" dirsep="\"
pathsep=";">
+ <path>
+ <fileset dir="${hsqldb-lib-classpath}" includes="*.jar"/>
+ </path>
+ <map from="${hsqldb-lib-classpath}" to="..\lib"/>
+ </pathconvert>
+ <pathconvert property="hsqldb-lib-classpath-unix" dirsep="/"
pathsep=":">
+ <path>
+ <fileset dir="${hsqldb-lib-classpath}" includes="*.jar"/>
+ </path>
+ <map from="${hsqldb-lib-classpath}" to="../lib"/>
+ </pathconvert>
+ </target>
+
+ <target name="zookeeper-lib-classpath" depends="zookeeper-lib">
+ <property name="zookeeper-lib-classpath"
location="build/lib/zookeeper"/>
+ <pathconvert property="zookeeper-lib-classpath-win" dirsep="\"
pathsep=";">
+ <path>
+ <fileset dir="${zookeeper-lib-classpath}" includes="*.jar"/>
+ </path>
+ <map from="${zookeeper-lib-classpath}" to="..\lib"/>
+ </pathconvert>
+ <pathconvert property="zookeeper-lib-classpath-unix" dirsep="/"
pathsep=":">
+ <path>
+ <fileset dir="${zookeeper-lib-classpath}" includes="*.jar"/>
+ </path>
+ <map from="${zookeeper-lib-classpath}" to="../lib"/>
+ </pathconvert>
+ </target>
+
+ <target name="database-lib-classpath" depends="database-lib">
+ <property name="database-lib-classpath" location="build/lib/database"/>
+ <pathconvert property="database-lib-classpath-win" dirsep="\"
pathsep=";">
+ <path>
+ <fileset dir="${database-lib-classpath}" includes="*.jar"/>
+ </path>
+ <map from="${database-lib-classpath}" to="..\lib"/>
+ </pathconvert>
+ <pathconvert property="database-lib-classpath-unix" dirsep="/"
pathsep=":">
+ <path>
+ <fileset dir="${database-lib-classpath}" includes="*.jar"/>
+ </path>
+ <map from="${database-lib-classpath}" to="../lib"/>
+ </pathconvert>
+ </target>
+
+ <target name="process-lib-classpath" depends="process-lib">
+ <property name="process-lib-classpath" location="build/lib/process"/>
+ <pathconvert property="process-lib-classpath-win" dirsep="\"
pathsep=";">
+ <path>
+ <fileset dir="${process-lib-classpath}" includes="*.jar"/>
+ </path>
+ <map from="${process-lib-classpath}" to="..\lib"/>
+ </pathconvert>
+ <pathconvert property="process-lib-classpath-unix" dirsep="/"
pathsep=":">
+ <path>
+ <fileset dir="${process-lib-classpath}" includes="*.jar"/>
+ </path>
+ <map from="${process-lib-classpath}" to="../lib"/>
+ </pathconvert>
+ </target>
+
+ <target name="process-lib-proprietary-classpath"
depends="process-lib-proprietary">
+ <property name="process-lib-proprietary-classpath"
location="build/lib-proprietary/process"/>
+ <pathconvert property="process-lib-proprietary-classpath-win"
dirsep="\" pathsep=";">
+ <path>
+ <fileset dir="${process-lib-proprietary-classpath}"
includes="*.jar"/>
+ </path>
+ <map from="${process-lib-proprietary-classpath}" to="..\lib"/>
+ </pathconvert>
+ <pathconvert property="process-lib-proprietary-classpath-unix"
dirsep="/" pathsep=":">
+ <path>
+ <fileset dir="${process-lib-proprietary-classpath}"
includes="*.jar"/>
+ </path>
+ <map from="${process-lib-proprietary-classpath}" to="../lib"/>
+ </pathconvert>
+ </target>
+
+ <target name="engine-lib-classpath" depends="engine-lib">
+ <property name="engine-lib-classpath" location="build/lib/engine"/>
+ <pathconvert property="engine-lib-classpath-win" dirsep="\"
pathsep=";">
+ <path>
+ <fileset dir="${engine-lib-classpath}" includes="*.jar"/>
+ </path>
+ <map from="${engine-lib-classpath}" to="..\lib"/>
+ </pathconvert>
+ <pathconvert property="engine-lib-classpath-unix" dirsep="/"
pathsep=":">
+ <path>
+ <fileset dir="${engine-lib-classpath}" includes="*.jar"/>
+ </path>
+ <map from="${engine-lib-classpath}" to="../lib"/>
+ </pathconvert>
+ </target>
+
+ <target name="setup-engine-processes"
depends="preclean-engine-processes,scripts-engine,engine-lib-classpath">
+ <antcall target="general-set-engine-classpath">
+ <param name="processes-dir" value="${processes-dir}"/>
+ <param name="win-classpath"
value="..\lib\mcf-core.jar;..\lib\mcf-script-engine.jar;${engine-lib-classpath-win}"/>
+ <param name="unix-classpath"
value="../lib/mcf-core.jar:../lib/mcf-script-engine.jar:${engine-lib-classpath-unix}"/>
+ </antcall>
+ </target>
+
+ <target name="setup-jetty-processes"
depends="preclean-jetty-processes,scripts-jetty,process-lib-classpath,jetty-lib-classpath">
+ <antcall target="general-set-jetty-classpath">
+ <param name="processes-dir" value="${processes-dir}"/>
+ <param name="win-classpath"
value="..\lib\mcf-core.jar;..\lib\mcf-agents.jar;..\lib\mcf-pull-agent.jar;..\lib\mcf-ui-core.jar;..\lib\mcf-jetty-runner.jar;${jetty-lib-classpath-win};${process-lib-classpath-win}"/>
+ <param name="unix-classpath"
value="../lib/mcf-core.jar:../lib/mcf-agents.jar:../lib/mcf-pull-agent.jar:../lib/mcf-ui-core.jar:../lib/mcf-jetty-runner.jar:${jetty-lib-classpath-unix}:${process-lib-classpath-unix}"/>
+ </antcall>
+ </target>
+
+ <target name="setup-hsqldb-processes"
depends="preclean-hsqldb-processes,scripts-hsqldb,hsqldb-lib-classpath">
+ <antcall target="general-set-hsqldb-classpath">
+ <param name="processes-dir" value="${processes-dir}"/>
+ <param name="win-classpath" value="${hsqldb-lib-classpath-win}"/>
+ <param name="unix-classpath" value="${hsqldb-lib-classpath-unix}"/>
+ </antcall>
+ </target>
+
+ <target name="setup-zookeeper-processes"
depends="preclean-zookeeper-processes,scripts-zookeeper,zookeeper-lib-classpath">
+ <antcall target="general-set-zookeeper-classpath">
+ <param name="processes-dir" value="${processes-dir}"/>
+ <param name="win-classpath"
value="${zookeeper-lib-classpath-win}"/>
+ <param name="unix-classpath"
value="${zookeeper-lib-classpath-unix}"/>
+ </antcall>
+ </target>
+
+ <target name="setup-combined-processes"
depends="preclean-combined-processes,scripts-combined,process-lib-classpath,jetty-lib-classpath">
+ <antcall target="general-set-combined-classpath">
+ <param name="processes-dir" value="${processes-dir}"/>
+ <param name="win-classpath"
value="..\lib\mcf-core.jar;..\lib\mcf-agents.jar;..\lib\mcf-pull-agent.jar;..\lib\mcf-ui-core.jar;..\lib\mcf-jetty-runner.jar;${jetty-lib-classpath-win};${process-lib-classpath-win}"/>
+ <param name="unix-classpath"
value="../lib/mcf-core.jar:../lib/mcf-agents.jar:../lib/mcf-pull-agent.jar:../lib/mcf-ui-core.jar:../lib/mcf-jetty-runner.jar:${jetty-lib-classpath-unix}:${process-lib-classpath-unix}"/>
+ </antcall>
+ </target>
+
+ <target name="setup-processes"
depends="preclean-processes,scripts,process-lib-classpath,database-lib-classpath">
+ <antcall target="general-set-classpath">
+ <param name="processes-dir" value="${processes-dir}"/>
+ <param name="win-classpath"
value="..\lib\mcf-core.jar;..\lib\mcf-agents.jar;..\lib\mcf-pull-agent.jar;${database-lib-classpath-win};${process-lib-classpath-win}"/>
+ <param name="unix-classpath"
value="../lib/mcf-core.jar:../lib/mcf-agents.jar:../lib/mcf-pull-agent.jar:${database-lib-classpath-unix}:${process-lib-classpath-unix}"/>
+ </antcall>
</target>
<target name="setup-jetty-processes-proprietary"
depends="setup-jetty-processes">
</target>
+ <target name="setup-hsqldb-processes-proprietary"
depends="setup-hsqldb-processes">
+ </target>
+
+ <target name="setup-zookeeper-processes-proprietary"
depends="setup-zookeeper-processes">
+ </target>
+
<target name="setup-combined-processes-proprietary"
depends="setup-combined-processes">
</target>
- <target name="setup-processes-proprietary" depends="setup-processes">
- <antcall target="general-add-lib-proprietary-classpath"><param
name="lib-proprietary-jar" value="mysql-connector-java.jar"/><param
name="processes-dir" value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-proprietary-classpath"><param
name="lib-proprietary-jar" value="ojdbc.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
- <antcall target="general-add-lib-proprietary-classpath"><param
name="lib-proprietary-jar" value="jtds.jar"/><param name="processes-dir"
value="${processes-dir}"/></antcall>
+ <target name="setup-processes-proprietary"
depends="preclean-processes,scripts,process-lib-classpath,database-lib-classpath,process-lib-proprietary-classpath">
+ <antcall target="general-set-classpath">
+ <param name="processes-dir" value="${processes-dir}"/>
+ <param name="win-classpath"
value="..\lib\mcf-core.jar;..\lib\mcf-agents.jar;..\lib\mcf-pull-agent.jar;${database-lib-classpath-win};${process-lib-classpath-win};${process-lib-proprietary-classpath-win}"/>
+ <param name="unix-classpath"
value="../lib/mcf-core.jar:../lib/mcf-agents.jar:../lib/mcf-pull-agent.jar:${database-lib-classpath-unix}:${process-lib-classpath-unix}:${process-lib-proprietary-classpath-unix}"/>
+ </antcall>
</target>
<target name="example-common" depends="wars,wars-proprietary">
@@ -1220,6 +1375,9 @@
<antcall target="setup-jetty-processes">
<param name="processes-dir"
value="dist/multiprocess-file-example"/>
</antcall>
+ <antcall target="setup-hsqldb-processes">
+ <param name="processes-dir"
value="dist/multiprocess-file-example"/>
+ </antcall>
<mkdir dir="dist/multiprocess-file-example"/>
<copy todir="dist/multiprocess-file-example">
@@ -1245,6 +1403,9 @@
<antcall target="setup-jetty-processes-proprietary">
<param name="processes-dir"
value="dist/multiprocess-file-example-proprietary"/>
</antcall>
+ <antcall target="setup-hsqldb-processes-proprietary">
+ <param name="processes-dir"
value="dist/multiprocess-file-example-proprietary"/>
+ </antcall>
<mkdir dir="dist/multiprocess-file-example-proprietary"/>
<copy todir="dist/multiprocess-file-example-proprietary">
<fileset dir="example-multiprocess-common">
@@ -1268,6 +1429,12 @@
<antcall target="setup-jetty-processes">
<param name="processes-dir" value="dist/multiprocess-zk-example"/>
</antcall>
+ <antcall target="setup-hsqldb-processes">
+ <param name="processes-dir" value="dist/multiprocess-zk-example"/>
+ </antcall>
+ <antcall target="setup-zookeeper-processes">
+ <param name="processes-dir" value="dist/multiprocess-zk-example"/>
+ </antcall>
<mkdir dir="dist/multiprocess-zk-example"/>
<copy todir="dist/multiprocess-zk-example">
<fileset dir="example-multiprocess-common">
@@ -1293,6 +1460,12 @@
<antcall target="setup-jetty-processes-proprietary">
<param name="processes-dir"
value="dist/multiprocess-zk-example-proprietary"/>
</antcall>
+ <antcall target="setup-hsqldb-processes-proprietary">
+ <param name="processes-dir"
value="dist/multiprocess-zk-example-proprietary"/>
+ </antcall>
+ <antcall target="setup-zookeeper-processes-proprietary">
+ <param name="processes-dir"
value="dist/multiprocess-zk-example-proprietary"/>
+ </antcall>
<mkdir dir="dist/multiprocess-zk-example-proprietary"/>
<copy todir="dist/multiprocess-zk-example-proprietary">
<fileset dir="example-multiprocess-common">
@@ -1324,7 +1497,56 @@
<chmod dir="dist/script-engine" perm="a+x" includes="**/*.sh"/>
</target>
- <target name="single-process-example" depends="lib">
+ <target name="jetty-lib-manifest" depends="jetty-lib">
+ <property name="jetty-lib-manifest" location="build/lib/jetty"/>
+ <pathconvert property="jetty-manifest-cp" dirsep="/" pathsep=" ">
+ <path>
+ <fileset dir="${jetty-lib-manifest}" includes="*.jar"/>
+ </path>
+ <map from="${jetty-lib-manifest}" to="../lib"/>
+ </pathconvert>
+ </target>
+
+ <target name="database-lib-manifest" depends="database-lib">
+ <property name="database-lib-manifest" location="build/lib/database"/>
+ <pathconvert property="database-manifest-cp" dirsep="/" pathsep=" ">
+ <path>
+ <fileset dir="${database-lib-manifest}" includes="*.jar"/>
+ </path>
+ <map from="${database-lib-manifest}" to="../lib"/>
+ </pathconvert>
+ </target>
+
+ <target name="process-lib-manifest" depends="process-lib">
+ <property name="process-lib-manifest" location="build/lib/process"/>
+ <pathconvert property="process-manifest-cp" dirsep="/" pathsep=" ">
+ <path>
+ <fileset dir="${process-lib-manifest}" includes="*.jar"/>
+ </path>
+ <map from="${process-lib-manifest}" to="../lib"/>
+ </pathconvert>
+ </target>
+
+ <target name="process-lib-proprietary-manifest"
depends="process-lib-proprietary">
+ <property name="process-manifest-proprietary"
location="build/lib-proprietary/process" />
+ <pathconvert property="process-manifest-cp-proprietary" dirsep="/"
pathsep=" ">
+ <path>
+ <fileset dir="${process-manifest-proprietary}"
includes="*.jar"/>
+ </path>
+ <map from="${process-manifest-proprietary}"
to="../lib-proprietary"/>
+ </pathconvert>
+ </target>
+
+ <target name="single-process-start-jar"
depends="process-lib-manifest,jetty-lib-manifest,database-lib-manifest">
+ <mkdir dir="build/example"/>
+ <manifest file="build/example/manifest">
+ <attribute name="Main-Class"
value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
+ <attribute name="Class-Path" value="../lib/mcf-core.jar
../lib/mcf-agents.jar ../lib/mcf-pull-agent.jar ../lib/mcf-ui-core.jar
../lib/mcf-jetty-runner.jar ${database-manifest-cp} ${process-manifest-cp}
${jetty-manifest-cp}"/>
+ </manifest>
+ <jar destfile="dist/example/start.jar"
manifest="build/example/manifest"/>
+ </target>
+
+ <target name="single-process-example" depends="single-process-start-jar">
<antcall target="setup-combined-processes">
<param name="processes-dir" value="dist/example"/>
</antcall>
@@ -1340,77 +1562,20 @@
</fileset>
</copy>
- <!-- Build a manifest file. There doesn't seem to be any good way to
do this automatically in ant without developing my own
- custom task, so I've hard coded all the class path libs. -->
- <property name="manifest-cp-0" value=""/>
-
- <property name="manifest-cp-1" value="${manifest-cp-0}
../lib/commons-lang.jar"/>
- <property name="manifest-cp-2" value="${manifest-cp-1}
../lib/commons-codec.jar"/>
- <property name="manifest-cp-3" value="${manifest-cp-2}
../lib/commons-collections.jar"/>
- <property name="manifest-cp-4" value="${manifest-cp-3}
../lib/commons-el.jar"/>
- <property name="manifest-cp-5" value="${manifest-cp-4}
../lib/commons-fileupload.jar"/>
- <property name="manifest-cp-7" value="${manifest-cp-5}
../lib/commons-io.jar"/>
- <property name="manifest-cp-8" value="${manifest-cp-7}
../lib/commons-logging.jar"/>
- <property name="manifest-cp-9" value="${manifest-cp-8}
../lib/hsqldb.jar"/>
- <property name="manifest-cp-27" value="${manifest-cp-9}
../lib/jasper.jar"/>
- <property name="manifest-cp-28" value="${manifest-cp-27}
../lib/jasper-el.jar"/>
- <property name="manifest-cp-30" value="${manifest-cp-28}
../lib/jetty-server.jar"/>
- <property name="manifest-cp-31" value="${manifest-cp-30}
../lib/jetty-util.jar"/>
- <property name="manifest-cp-32" value="${manifest-cp-31}
../lib/jsp-api-2.1-glassfish.jar"/>
- <property name="manifest-cp-33" value="${manifest-cp-32}
../lib/json.jar"/>
- <property name="manifest-cp-34" value="${manifest-cp-33}
../lib/mcf-core.jar"/>
- <property name="manifest-cp-35" value="${manifest-cp-34}
../lib/mcf-agents.jar"/>
- <property name="manifest-cp-36" value="${manifest-cp-35}
../lib/mcf-jetty-runner.jar"/>
- <property name="manifest-cp-37" value="${manifest-cp-36}
../lib/mcf-pull-agent.jar"/>
- <property name="manifest-cp-38" value="${manifest-cp-37}
../lib/mcf-ui-core.jar"/>
- <property name="manifest-cp-39" value="${manifest-cp-38}
../lib/log4j.jar"/>
- <property name="manifest-cp-40" value="${manifest-cp-39}
../lib/postgresql.jar"/>
- <property name="manifest-cp-42" value="${manifest-cp-40}
../lib/serializer.jar"/>
- <property name="manifest-cp-43" value="${manifest-cp-42}
../lib/servlet-api.jar"/>
- <property name="manifest-cp-44" value="${manifest-cp-43}
../lib/juli.jar"/>
- <property name="manifest-cp-45" value="${manifest-cp-44}
../lib/xalan.jar"/>
- <property name="manifest-cp-46" value="${manifest-cp-45}
../lib/xercesImpl.jar"/>
- <property name="manifest-cp-47" value="${manifest-cp-46}
../lib/xml-apis.jar"/>
- <property name="manifest-cp-49" value="${manifest-cp-47}
../lib/ecj.jar"/>
- <property name="manifest-cp-50" value="${manifest-cp-49}
../lib/jetty-webapp.jar"/>
- <property name="manifest-cp-51" value="${manifest-cp-50}
../lib/jetty-servlet.jar"/>
- <property name="manifest-cp-52" value="${manifest-cp-51}
../lib/velocity.jar"/>
- <property name="manifest-cp-53" value="${manifest-cp-52}
../lib/jetty-http.jar"/>
- <property name="manifest-cp-54" value="${manifest-cp-53}
../lib/jetty-io.jar"/>
- <property name="manifest-cp-55" value="${manifest-cp-54}
../lib/jetty-security.jar"/>
- <property name="manifest-cp-56" value="${manifest-cp-55}
../lib/jetty-continuation.jar"/>
- <property name="manifest-cp-57" value="${manifest-cp-56}
../lib/jetty-xml.jar"/>
- <property name="manifest-cp-58" value="${manifest-cp-57}
../lib/slf4j-api.jar"/>
- <property name="manifest-cp-59" value="${manifest-cp-58}
../lib/slf4j-simple.jar"/>
- <property name="manifest-cp-60" value="${manifest-cp-59}
../lib/httpcore.jar"/>
- <property name="manifest-cp-61" value="${manifest-cp-60}
../lib/httpclient.jar"/>
- <property name="manifest-cp-62" value="${manifest-cp-61}
../lib/mail.jar"/>
- <property name="manifest-cp-63" value="${manifest-cp-62}
../lib/zookeeper.jar"/>
- <property name="manifest-cp-64" value="${manifest-cp-63}
../lib/castor.jar"/>
- <property name="manifest-cp-65" value="${manifest-cp-64}
../lib/geronimo-javamail_1.4_spec.jar"/>
- <property name="manifest-cp-66" value="${manifest-cp-65}
../lib/commons-discovery.jar"/>
- <property name="manifest-cp-67" value="${manifest-cp-66}
../lib/axis-jaxrpc.jar"/>
- <property name="manifest-cp-68" value="${manifest-cp-67}
../lib/axis.jar"/>
- <property name="manifest-cp-69" value="${manifest-cp-68}
../lib/wsdl4j.jar"/>
- <property name="manifest-cp-70" value="${manifest-cp-69}
../lib/saaj-api.jar"/>
- <property name="manifest-cp-71" value="${manifest-cp-70}
../lib/saaj-impl.jar"/>
- <property name="manifest-cp-72" value="${manifest-cp-71}
../lib/activation.jar"/>
- <property name="manifest-cp-73" value="${manifest-cp-72}
../lib/wss4j.jar"/>
- <property name="manifest-cp-74" value="${manifest-cp-73}
../lib/xmlsec.jar"/>
- <property name="manifest-cp-75" value="${manifest-cp-74}
../lib/opensaml.jar"/>
-
- <property name="manifest-cp" value="${manifest-cp-75}"/>
- <mkdir dir="build/example"/>
- <manifest file="build/example/manifest">
- <attribute name="Main-Class"
value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
- <attribute name="Class-Path" value="${manifest-cp}"/>
- </manifest>
- <jar destfile="dist/example/start.jar"
manifest="build/example/manifest"/>
<chmod dir="dist/example" perm="a+x" includes="**/*.sh"/>
</target>
- <target name="single-process-example-proprietary"
depends="lib,lib-proprietary">
+ <target name="single-process-start-jar-proprietary"
depends="process-lib-manifest,jetty-lib-manifest,process-lib-proprietary-manifest,database-lib-manifest">
+ <mkdir dir="build/example-proprietary"/>
+ <manifest file="build/example-proprietary/manifest">
+ <attribute name="Main-Class"
value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
+ <attribute name="Class-Path" value="../lib/mcf-core.jar
../lib/mcf-agents.jar ../lib/mcf-pull-agent.jar ../lib/mcf-ui-core.jar
../lib/mcf-jetty-runner.jar ${database-lib-manifest} ${process-manifest-cp}
${jetty-manifest-cp} ${process-manifest-cp-proprietary}"/>
+ </manifest>
+ <jar destfile="dist/example-proprietary/start.jar"
manifest="build/example-proprietary/manifest"/>
+ </target>
+
+ <target name="single-process-example-proprietary"
depends="single-process-start-jar-proprietary">
<antcall target="setup-combined-processes-proprietary">
<param name="processes-dir" value="dist/example-proprietary"/>
</antcall>
@@ -1426,75 +1591,6 @@
</fileset>
</copy>
- <!-- Build a manifest file. There doesn't seem to be any good way to
do this automatically in ant without developing my own
- custom task, so I've hard coded all the class path libs. -->
- <property name="manifest-cp-proprietary-0" value=""/>
-
- <property name="manifest-cp-proprietary-1"
value="${manifest-cp-proprietary-0} ../lib/commons-lang.jar"/>
- <property name="manifest-cp-proprietary-2"
value="${manifest-cp-proprietary-1} ../lib/commons-codec.jar"/>
- <property name="manifest-cp-proprietary-3"
value="${manifest-cp-proprietary-2} ../lib/commons-collections.jar"/>
- <property name="manifest-cp-proprietary-4"
value="${manifest-cp-proprietary-3} ../lib/commons-el.jar"/>
- <property name="manifest-cp-proprietary-5"
value="${manifest-cp-proprietary-4} ../lib/commons-fileupload.jar"/>
- <property name="manifest-cp-proprietary-7"
value="${manifest-cp-proprietary-5} ../lib/commons-io.jar"/>
- <property name="manifest-cp-proprietary-8"
value="${manifest-cp-proprietary-7} ../lib/commons-logging.jar"/>
- <property name="manifest-cp-proprietary-9"
value="${manifest-cp-proprietary-8} ../lib/hsqldb.jar"/>
- <property name="manifest-cp-proprietary-27"
value="${manifest-cp-proprietary-9} ../lib/jasper.jar"/>
- <property name="manifest-cp-proprietary-28"
value="${manifest-cp-proprietary-27} ../lib/jasper-el.jar"/>
- <property name="manifest-cp-proprietary-30"
value="${manifest-cp-proprietary-28} ../lib/jetty-server.jar"/>
- <property name="manifest-cp-proprietary-31"
value="${manifest-cp-proprietary-30} ../lib/jetty-util.jar"/>
- <property name="manifest-cp-proprietary-32"
value="${manifest-cp-proprietary-31} ../lib/jsp-api-2.1-glassfish.jar"/>
- <property name="manifest-cp-proprietary-33"
value="${manifest-cp-proprietary-32} ../lib/json.jar"/>
- <property name="manifest-cp-proprietary-34"
value="${manifest-cp-proprietary-33} ../lib/mcf-core.jar"/>
- <property name="manifest-cp-proprietary-35"
value="${manifest-cp-proprietary-34} ../lib/mcf-agents.jar"/>
- <property name="manifest-cp-proprietary-36"
value="${manifest-cp-proprietary-35} ../lib/mcf-jetty-runner.jar"/>
- <property name="manifest-cp-proprietary-37"
value="${manifest-cp-proprietary-36} ../lib/mcf-pull-agent.jar"/>
- <property name="manifest-cp-proprietary-38"
value="${manifest-cp-proprietary-37} ../lib/mcf-ui-core.jar"/>
- <property name="manifest-cp-proprietary-39"
value="${manifest-cp-proprietary-38} ../lib/log4j.jar"/>
- <property name="manifest-cp-proprietary-40"
value="${manifest-cp-proprietary-39} ../lib/postgresql.jar"/>
- <property name="manifest-cp-proprietary-41"
value="${manifest-cp-proprietary-40}
../lib-proprietary/mysql-connector-java.jar"/>
- <property name="manifest-cp-proprietary-42"
value="${manifest-cp-proprietary-41} ../lib/serializer.jar"/>
- <property name="manifest-cp-proprietary-43"
value="${manifest-cp-proprietary-42} ../lib/servlet-api.jar"/>
- <property name="manifest-cp-proprietary-44"
value="${manifest-cp-proprietary-43} ../lib/juli.jar"/>
- <property name="manifest-cp-proprietary-45"
value="${manifest-cp-proprietary-44} ../lib/xalan.jar"/>
- <property name="manifest-cp-proprietary-46"
value="${manifest-cp-proprietary-45} ../lib/xercesImpl.jar"/>
- <property name="manifest-cp-proprietary-47"
value="${manifest-cp-proprietary-46} ../lib/xml-apis.jar"/>
- <property name="manifest-cp-proprietary-49"
value="${manifest-cp-proprietary-47} ../lib/ecj.jar"/>
- <property name="manifest-cp-proprietary-50"
value="${manifest-cp-proprietary-49} ../lib-proprietary/ojdbc.jar"/>
- <property name="manifest-cp-proprietary-51"
value="${manifest-cp-proprietary-50} ../lib-proprietary/jtds.jar"/>
- <property name="manifest-cp-proprietary-52"
value="${manifest-cp-proprietary-51} ../lib/velocity.jar"/>
- <property name="manifest-cp-proprietary-53"
value="${manifest-cp-proprietary-52} ../lib/jetty-webapp.jar"/>
- <property name="manifest-cp-proprietary-54"
value="${manifest-cp-proprietary-53} ../lib/jetty-servlet.jar"/>
- <property name="manifest-cp-proprietary-55"
value="${manifest-cp-proprietary-54} ../lib/jetty-http.jar"/>
- <property name="manifest-cp-proprietary-56"
value="${manifest-cp-proprietary-55} ../lib/jetty-io.jar"/>
- <property name="manifest-cp-proprietary-57"
value="${manifest-cp-proprietary-56} ../lib/jetty-security.jar"/>
- <property name="manifest-cp-proprietary-58"
value="${manifest-cp-proprietary-57} ../lib/jetty-continuation.jar"/>
- <property name="manifest-cp-proprietary-59"
value="${manifest-cp-proprietary-58} ../lib/jetty-xml.jar"/>
- <property name="manifest-cp-proprietary-60"
value="${manifest-cp-proprietary-59} ../lib/slf4j-api.jar"/>
- <property name="manifest-cp-proprietary-61"
value="${manifest-cp-proprietary-60} ../lib/slf4j-simple.jar"/>
- <property name="manifest-cp-proprietary-62"
value="${manifest-cp-proprietary-61} ../lib/httpcore.jar"/>
- <property name="manifest-cp-proprietary-63"
value="${manifest-cp-proprietary-62} ../lib/httpclient.jar"/>
- <property name="manifest-cp-proprietary-64"
value="${manifest-cp-proprietary-63} ../lib/mail.jar"/>
- <property name="manifest-cp-proprietary-65"
value="${manifest-cp-proprietary-64} ../lib/zookeeper.jar"/>
- <property name="manifest-cp-proprietary-66"
value="${manifest-cp-proprietary-65} ../lib/castor.jar"/>
- <property name="manifest-cp-proprietary-67"
value="${manifest-cp-proprietary-66} ../lib/geronimo-javamail_1.4_spec.jar"/>
- <property name="manifest-cp-proprietary-68"
value="${manifest-cp-proprietary-67} ../lib/commons-discovery.jar"/>
- <property name="manifest-cp-proprietary-69"
value="${manifest-cp-proprietary-68} ../lib/axis-jaxrpc.jar"/>
- <property name="manifest-cp-proprietary-70"
value="${manifest-cp-proprietary-69} ../lib/axis.jar"/>
- <property name="manifest-cp-proprietary-71"
value="${manifest-cp-proprietary-70} ../lib/wsdl4j.jar"/>
- <property name="manifest-cp-proprietary-72"
value="${manifest-cp-proprietary-71} ../lib/saaj-api.jar"/>
- <property name="manifest-cp-proprietary-73"
value="${manifest-cp-proprietary-72} ../lib/saaj-impl.jar"/>
- <property name="manifest-cp-proprietary-74"
value="${manifest-cp-proprietary-73} ../lib/activation.jar"/>
- <property name="manifest-cp-proprietary-75"
value="${manifest-cp-proprietary-74} ../lib/wss4j.jar"/>
- <property name="manifest-cp-proprietary-76"
value="${manifest-cp-proprietary-75} ../lib/xmlsec.jar"/>
- <property name="manifest-cp-proprietary-77"
value="${manifest-cp-proprietary-76} ../lib/opensaml.jar"/>
-
- <property name="manifest-cp-proprietary"
value="${manifest-cp-proprietary-77}"/>
- <mkdir dir="build/example-proprietary"/>
- <manifest file="build/example-proprietary/manifest">
- <attribute name="Main-Class"
value="org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner"/>
- <attribute name="Class-Path" value="${manifest-cp-proprietary}"/>
- </manifest>
- <jar destfile="dist/example-proprietary/start.jar"
manifest="build/example-proprietary/manifest"/>
<chmod dir="dist/example-proprietary" perm="a+x" includes="**/*.sh"/>
</target>
Modified:
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml?rev=1627959&r1=1627958&r2=1627959&view=diff
==============================================================================
---
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
(original)
+++
manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
Sat Sep 27 12:36:18 2014
@@ -317,7 +317,7 @@
<source>
mvn clean install
</source>
- <p>This should generate all the necessary artifacts to run with, and
also run the Apache Derby-based tests.</p>
+ <p>This should generate all the necessary artifacts to run with, and
also run the Hsqldb-based tests.</p>
<p>To build and skip only the integration tests, type:</p>
<source>
mvn clean install -DskipITs
@@ -438,7 +438,7 @@ mvn clean package
<section>
<title>Quick-start single process model</title>
<p></p>
- <p>You can run most of ManifoldCF in a single process, for
evaluation and convenience. This single-process version uses Jetty to handle
its web applications, and Derby as
+ <p>You can run most of ManifoldCF in a single process, for
evaluation and convenience. This single-process version uses Jetty to handle
its web applications, and Hsqldb as
an embedded database. All you need to do to run this version of
ManifoldCF is to follow the Ant-based build instructions above, and then:</p>
<p></p>
<source>
@@ -452,8 +452,8 @@ cd example
<p></p>
<p>You can stop the quick-start ManifoldCF at any time using ^C.</p>
<p></p>
- <p>Bear in mind that Derby is not as full-featured a database as is
PostgreSQL. This means that any performance testing you may do against the
quick start example may
- not be applicable to a full installation. Furthermore, Derby only
permits one process at a time to be connected to its databases, so you
<strong>cannot</strong> use any
+ <p>Bear in mind that Hsqldb is not as full-featured a database as is
PostgreSQL. This means that any performance testing you may do against the
quick start example may
+ not be applicable to a full installation. Furthermore, embedded
Hsqldb only permits one process at a time to be connected to its databases, so
you <strong>cannot</strong> use any
of the ManifoldCF commands (as described below) while the
quick-start ManifoldCF is running.</p>
<p></p>
<p>Another caveat that you will need to be aware of with the
quick-start version of ManifoldCF is that it in no way removes the need for you
to run any separate processes
@@ -478,7 +478,7 @@ cd example
<p>The combined web service presents the crawler UI at the root path
for the web application, which is <em>http://<host>:8345/mcf/</em>.
The authority
service functionality can be found at
<em>http://<host>:8345/mcf/UserACLs</em>, similar to the quick-start
example. However, the programmatic API service has a path
other than the root:
<em>http://<host>:8345/mcf/api/</em>.</p>
- <p>The script that starts the combined-service web application uses
the same database instance (Derby by default) as does the quick-start, and the
same <em>properties.xml</em>
+ <p>The script that starts the combined-service web application uses
the same database instance (Hsqldb by default) as does the quick-start, and the
same <em>properties.xml</em>
file. The same caveats about required individual connector
processes also apply as they do for the quick-start example.</p>
<p></p>
@@ -828,7 +828,6 @@ cd example
<li>PostgreSQL (preferred)</li>
<li>MySQL (preferred)</li>
<li>HSQLDB</li>
- <li>Derby (not recommended for production)</li>
</ul>
<p>You can select the database of your choice by setting the
approprate properties in the applicable <em>properties.xml</em> file. The
choice of database is largely orthogonal
to the choice of deployment model. The ManifoldCF deployment
examples provided can thus be readily altered to use the database you desire.
The details and caveats of
@@ -916,16 +915,6 @@ cd example
process. See the <em>properties.xml</em> property descriptions
for configuration details.</p>
</section>
- <section>
- <title>Configuring an Apache Derby database</title>
- <p></p>
- <p>Apache Derby can be used with ManifoldCF only as an embedded
database, working with single-process deployments. Its performance currently
seems limited by
- issues related to its planner and to its handling of deadlock
conditions, but this situation could change any time there is a new release of
the Derby software. Nevertheless, even
- when operating without any apparent stalls due to the above
issues, Derby is still only about 1/4 as fast as PostgreSQL. At the moment
this limits Derby's utility for
- ManifoldCF to demonstration and testing.</p>
- </section>
-
-
</section>
<section>
@@ -971,7 +960,7 @@ cd example
<tr><td>org.apache.manifoldcf.dbsuperuserpassword</td><td>No</td><td>Database
superuser password, for QuickStart, so ManifoldCF can create database
instance.</td></tr>
<tr><td>org.apache.manifoldcf.ui.maxstatuscount</td><td>No</td><td>The maximum
number of documents ManifoldCF will try to count for the job status display.
Defaults to 500000.</td></tr>
<tr><td>org.apache.manifoldcf.databaseimplementationclass</td><td>No</td><td>Specifies
the class to use to implement database access.
- Default is a built-in Derby implementation. Supported choices
are: org.apache.manifoldcf.core.database.DBInterfaceDerby,
+ Default is a built-in Hsqldb implementation. Supported
choices are:
org.apache.manifoldcf.core.database.DBInterfacePostgreSQL,
org.apache.manifoldcf.core.database.DBInterfaceMySQL,
org.apache.manifoldcf.core.database.DBInterfaceHSQLDB</td></tr>
@@ -980,7 +969,6 @@ cd example
<tr><td>org.apache.manifoldcf.postgresql.ssl</td><td>No</td><td>Set to "true"
for ssl communication with PostgreSQL.</td></tr>
<tr><td>org.apache.manifoldcf.mysql.server</td><td>No</td><td>The
MySQL server name. Defaults to 'localhost'.</td></tr>
<tr><td>org.apache.manifoldcf.mysql.client</td><td>No</td><td>The
MySQL client property. Defaults to 'localhost'. You may want to set this to
'%' for a multi-machine setup.</td></tr>
-
<tr><td>org.apache.manifoldcf.derbydatabasepath</td><td>No</td><td>Absolute or
relative path to Derby database; default is '.'.</td></tr>
<tr><td>org.apache.manifoldcf.hsqldbdatabasepath</td><td>No</td><td>Absolute or
relative path to HSQLDB database; default is '.'.</td></tr>
<tr><td>org.apache.manifoldcf.hsqldbdatabaseprotocol</td><td>Yes,
for remote HSQLDB connection</td><td>The HSQLDB JDBC protocol; choices are
'hsql', 'http', or 'https'. Default is blank (which means an embedded
instance)</td></tr>
<tr><td>org.apache.manifoldcf.hsqldbdatabaseserver</td><td>Yes,
for remote HSQLDB connection</td><td>The HSQLDB remote server name.</td></tr>
