Author: kwright
Date: Tue Apr 18 21:44:26 2017
New Revision: 1791837
URL: http://svn.apache.org/viewvc?rev=1791837&view=rev
Log:
Fix UI version display for Zookeeper example
Modified:
manifoldcf/trunk/framework/build.xml
manifoldcf/trunk/framework/example-multiprocess-zk-common/properties-global.xml
manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml
manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml
Modified: manifoldcf/trunk/framework/build.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1791837&r1=1791836&r2=1791837&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Tue Apr 18 21:44:26 2017
@@ -1649,7 +1649,7 @@
<include name="properties.xml"/>
</fileset>
</copy>
- <replace file="dist/multiprocess-zk-example/properties.xml"
token="unknown version" value="${release-version}"/>
+ <replace file="dist/multiprocess-zk-example/properties-global.xml"
token="unknown version" value="${release-version}"/>
<mkdir dir="dist/multiprocess-zk-example/logs"/>
<chmod dir="dist/multiprocess-zk-example" perm="a+x"
includes="**/*.sh"/>
</target>
@@ -1681,7 +1681,7 @@
<include name="properties.xml"/>
</fileset>
</copy>
- <replace
file="dist/multiprocess-zk-example-proprietary/properties.xml" token="unknown
version" value="${release-version}"/>
+ <replace
file="dist/multiprocess-zk-example-proprietary/properties-global.xml"
token="unknown version" value="${release-version}"/>
<mkdir dir="dist/multiprocess-zk-example-proprietary/logs"/>
<chmod dir="dist/multiprocess-zk-example-proprietary" perm="a+x"
includes="**/*.sh"/>
</target>
Modified:
manifoldcf/trunk/framework/example-multiprocess-zk-common/properties-global.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk-common/properties-global.xml?rev=1791837&r1=1791836&r2=1791837&view=diff
==============================================================================
---
manifoldcf/trunk/framework/example-multiprocess-zk-common/properties-global.xml
(original)
+++
manifoldcf/trunk/framework/example-multiprocess-zk-common/properties-global.xml
Tue Apr 18 21:44:26 2017
@@ -19,6 +19,8 @@
<!-- This file contains ONLY global (shared) configuration, for use on systems
using
ZooKeeper to coordinate ManifoldCF processes. -->
<configuration>
+ <!-- Version string for UI -->
+ <property name="org.apache.manifoldcf.versionstring" value="unknown
version"/>
<!-- Select HSQLDB as the database implementation, and specify multiprocess
access -->
<property name="org.apache.manifoldcf.databaseimplementationclass"
value="org.apache.manifoldcf.core.database.DBInterfaceHSQLDB"/>
<property name="org.apache.manifoldcf.hsqldbdatabaseprotocol" value="hsql"/>
Modified:
manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml?rev=1791837&r1=1791836&r2=1791837&view=diff
==============================================================================
---
manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml
(original)
+++
manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml
Tue Apr 18 21:44:26 2017
@@ -19,8 +19,6 @@
<!-- This configuration file contains only non-global configuration
information,
which is basically limited to file paths and ZooKeeper configuration -->
<configuration>
- <!-- Version string for UI -->
- <property name="org.apache.manifoldcf.versionstring" value="unknown
version"/>
<!-- Point to the wars and configure Jetty -->
<property name="org.apache.manifoldcf.crawleruiwarpath"
value="../web-proprietary/war/mcf-crawler-ui.war"/>
<property name="org.apache.manifoldcf.authorityservicewarpath"
value="../web-proprietary/war/mcf-authority-service.war"/>
Modified: manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml?rev=1791837&r1=1791836&r2=1791837&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml (original)
+++ manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml Tue Apr
18 21:44:26 2017
@@ -19,8 +19,6 @@
<!-- This configuration file contains only non-global configuration
information,
which is basically limited to file paths and ZooKeeper configuration -->
<configuration>
- <!-- Version string for UI -->
- <property name="org.apache.manifoldcf.versionstring" value="unknown
version"/>
<!-- Point to the wars and configure Jetty -->
<property name="org.apache.manifoldcf.crawleruiwarpath"
value="../web/war/mcf-crawler-ui.war"/>
<property name="org.apache.manifoldcf.authorityservicewarpath"
value="../web/war/mcf-authority-service.war"/>
