Author: kwright
Date: Wed Nov 13 13:16:59 2013
New Revision: 1541511
URL: http://svn.apache.org/r1541511
Log:
Flesh out specific properties for each example
Added:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/properties-global.xml
(with props)
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/runzookeeper.bat
(with props)
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/runzookeeper.sh
(with props)
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/zookeeper.cfg
(with props)
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-proprietary/properties.xml
(with props)
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk/properties.xml
(with props)
Modified:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/setglobalproperties.bat
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/setglobalproperties.sh
Added:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/properties-global.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/properties-global.xml?rev=1541511&view=auto
==============================================================================
---
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/properties-global.xml
(added)
+++
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/properties-global.xml
Wed Nov 13 13:16:59 2013
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- This file contains ONLY global (shared) configuration, for use on systems
using
+ ZooKeeper to coordinate ManifoldCF processes. -->
+<configuration>
+ <!-- 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"/>
+ <property name="org.apache.manifoldcf.hsqldbdatabaseserver"
value="localhost"/>
+ <property name="org.apache.manifoldcf.hsqldbdatabaseinstance" value="xdb"/>
+ <property name="org.apache.manifoldcf.dbsuperusername" value="sa"/>
+ <property name="org.apache.manifoldcf.dbsuperuserpassword" value=""/>
+ <property name="org.apache.manifoldcf.database.maxhandles" value="100"/>
+ <property name="org.apache.manifoldcf.crawler.threads" value="50"/>
+ <!-- Any additional global properties go here -->
+</configuration>
Propchange:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/properties-global.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/properties-global.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/runzookeeper.bat
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/runzookeeper.bat?rev=1541511&view=auto
==============================================================================
---
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/runzookeeper.bat
(added)
+++
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/runzookeeper.bat
Wed Nov 13 13:16:59 2013
@@ -0,0 +1,31 @@
+@echo off
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+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 RegisterAll command
+cmd /c "processes\executecommand.bat
org.apache.zookeeper.server.quorum.QuorumPeerMain zookeeper.cfg"
+goto done
+:nojavahome
+echo Environment variable JAVA_HOME is not set properly.
+goto done
+:nolcfhome
+echo Current working directory does not contain a properties.xml file.
+goto done
+:done
Propchange:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/runzookeeper.bat
------------------------------------------------------------------------------
svn:eol-style = CRLF
Added:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/runzookeeper.sh
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/runzookeeper.sh?rev=1541511&view=auto
==============================================================================
---
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/runzookeeper.sh
(added)
+++
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/runzookeeper.sh
Wed Nov 13 13:16:59 2013
@@ -0,0 +1,34 @@
+#!/bin/bash -e
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#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.zookeeper.server.quorum.QuorumPeerMain zookeeper.cfg
+ exit $?
+
+ else
+ echo "Working directory contains no properties.xml file." 1>&2
+ exit 1
+ fi
+
+else
+ echo "Environment variable JAVA_HOME is not properly set." 1>&2
+ exit 1
+fi
Propchange:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/runzookeeper.sh
------------------------------------------------------------------------------
svn:eol-style = LF
Propchange:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/runzookeeper.sh
------------------------------------------------------------------------------
svn:executable = *
Modified:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/setglobalproperties.bat
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/setglobalproperties.bat?rev=1541511&r1=1541510&r2=1541511&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/setglobalproperties.bat
(original)
+++
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/setglobalproperties.bat
Wed Nov 13 13:16:59 2013
@@ -20,7 +20,7 @@ if not exist ".\properties.xml" goto nol
rem set MCF_HOME
set MCF_HOME=%CD%
rem invoke the RegisterAll command
-cmd /c "processes\executecommand.bat
org.apache.manifoldcf.core.lockmanager.ZooKeeperLockManager %1"
+cmd /c "processes\executecommand.bat
org.apache.manifoldcf.core.lockmanager.ZooKeeperLockManager
properties-global.xml"
goto done
:nojavahome
echo Environment variable JAVA_HOME is not set properly.
Modified:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/setglobalproperties.sh
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/setglobalproperties.sh?rev=1541511&r1=1541510&r2=1541511&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/setglobalproperties.sh
(original)
+++
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/setglobalproperties.sh
Wed Nov 13 13:16:59 2013
@@ -20,7 +20,7 @@ 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.lockmanager.ZooKeeperLockManager $1
+ processes/executecommand.sh
org.apache.manifoldcf.core.lockmanager.ZooKeeperLockManager
properties-global.xml
exit $?
else
Added:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/zookeeper.cfg
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/zookeeper.cfg?rev=1541511&view=auto
==============================================================================
---
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/zookeeper.cfg
(added)
+++
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/zookeeper.cfg
Wed Nov 13 13:16:59 2013
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+tickTime=2000
+dataDir=zookeeper
+clientPort=8349
Propchange:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/zookeeper.cfg
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-common/zookeeper.cfg
------------------------------------------------------------------------------
svn:keywords = Id
Added:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-proprietary/properties.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-proprietary/properties.xml?rev=1541511&view=auto
==============================================================================
---
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-proprietary/properties.xml
(added)
+++
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-proprietary/properties.xml
Wed Nov 13 13:16:59 2013
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- This configuration file contains only non-global configuration
information,
+ which is basically limited to file paths and ZooKeeper configuration -->
+<configuration>
+ <!-- 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"/>
+ <property name="org.apache.manifoldcf.apiservicewarpath"
value="../web-proprietary/war/mcf-api-service.war"/>
+ <property name="org.apache.manifoldcf.usejettyparentclassloader"
value="false"/>
+ <property name="org.apache.manifoldcf.jettyport" value="8345"/>
+ <!-- ZooKeeper lock manager configuration -->
+ <property name="org.apache.manifoldcf.lockmanagerclass"
value="org.apache.manifoldcf.core.lockmanager.ZooKeeperLockManager"/>
+ <property name="org.apache.manifoldcf.zookeeper.connectstring"
value="localhost:8349"/>
+ <property name="org.apache.manifoldcf.zookeeper.sessiontimeout"
value="2000"/>
+ <!-- Point to a specific (common) logging file -->
+ <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
+ <!-- Specify the connectors to be loaded -->
+ <property name="org.apache.manifoldcf.connectorsconfigurationfile"
value="../connectors-proprietary.xml"/>
+ <!-- Tell MCF where to find the connector jars -->
+ <libdir path="../connector-lib"/>
+ <libdir path="../connector-lib-proprietary"/>
+ <!-- Any additional local properties go here -->
+</configuration>
Propchange:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-proprietary/properties.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk-proprietary/properties.xml
------------------------------------------------------------------------------
svn:keywords = Id
Added:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk/properties.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk/properties.xml?rev=1541511&view=auto
==============================================================================
---
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk/properties.xml
(added)
+++
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk/properties.xml
Wed Nov 13 13:16:59 2013
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- This configuration file contains only non-global configuration
information,
+ which is basically limited to file paths and ZooKeeper configuration -->
+<configuration>
+ <!-- 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"/>
+ <property name="org.apache.manifoldcf.apiservicewarpath"
value="../web/war/mcf-api-service.war"/>
+ <property name="org.apache.manifoldcf.usejettyparentclassloader"
value="false"/>
+ <property name="org.apache.manifoldcf.jettyport" value="8345"/>
+ <!-- ZooKeeper lock manager configuration -->
+ <property name="org.apache.manifoldcf.lockmanagerclass"
value="org.apache.manifoldcf.core.lockmanager.ZooKeeperLockManager"/>
+ <property name="org.apache.manifoldcf.zookeeper.connectstring"
value="localhost:8349"/>
+ <property name="org.apache.manifoldcf.zookeeper.sessiontimeout"
value="2000"/>
+ <!-- Point to a specific (common) logging file -->
+ <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
+ <!-- Specify the connectors to be loaded -->
+ <property name="org.apache.manifoldcf.connectorsconfigurationfile"
value="../connectors.xml"/>
+ <!-- Tell MCF where to find the connector jars -->
+ <libdir path="../connector-lib"/>
+ <libdir path="../connector-lib-proprietary"/>
+ <!-- Any additional local properties go here -->
+</configuration>
Propchange:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk/properties.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
manifoldcf/branches/CONNECTORS-13/framework/example-multiprocess-zk/properties.xml
------------------------------------------------------------------------------
svn:keywords = Id
