Modified: manifoldcf/trunk/framework/example-multiprocess-common/initialize.bat URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-common/initialize.bat?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-common/initialize.bat (original) +++ manifoldcf/trunk/framework/example-multiprocess-common/initialize.bat Sun Jan 19 15:10:12 2014 @@ -17,10 +17,8 @@ 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.manifoldcf.crawler.InitializeAndRegister" +cmd /c ".\executecommand.bat org.apache.manifoldcf.crawler.InitializeAndRegister" goto done :nojavahome echo Environment variable JAVA_HOME is not set properly.
Modified: manifoldcf/trunk/framework/example-multiprocess-common/initialize.sh URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-common/initialize.sh?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-common/initialize.sh (original) +++ manifoldcf/trunk/framework/example-multiprocess-common/initialize.sh Sun Jan 19 15:10:12 2014 @@ -18,9 +18,7 @@ #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.manifoldcf.crawler.InitializeAndRegister + ./executecommand.sh org.apache.manifoldcf.crawler.InitializeAndRegister exit $? else Modified: manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.bat URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.bat?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.bat (original) +++ manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.bat Sun Jan 19 15:10:12 2014 @@ -17,10 +17,8 @@ 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 AgentRun command -cmd /c "processes\executecommand.bat -Dorg.apache.manifoldcf.processid=B org.apache.manifoldcf.agents.AgentRun" +cmd /c ".\executecommand.bat -Dorg.apache.manifoldcf.processid=B org.apache.manifoldcf.agents.AgentRun" goto done :nojavahome echo Environment variable JAVA_HOME is not set properly. Modified: manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.sh URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.sh?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.sh (original) +++ manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.sh Sun Jan 19 15:10:12 2014 @@ -18,9 +18,7 @@ #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 -Dorg.apache.manifoldcf.processid=B org.apache.manifoldcf.agents.AgentRun + ./executecommand.sh -Dorg.apache.manifoldcf.processid=B org.apache.manifoldcf.agents.AgentRun exit $? else Modified: manifoldcf/trunk/framework/example-multiprocess-common/start-agents.bat URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-common/start-agents.bat?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-common/start-agents.bat (original) +++ manifoldcf/trunk/framework/example-multiprocess-common/start-agents.bat Sun Jan 19 15:10:12 2014 @@ -17,10 +17,8 @@ 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 AgentRun command -cmd /c "processes\executecommand.bat -Dorg.apache.manifoldcf.processid=A org.apache.manifoldcf.agents.AgentRun" +cmd /c ".\executecommand.bat -Dorg.apache.manifoldcf.processid=A org.apache.manifoldcf.agents.AgentRun" goto done :nojavahome echo Environment variable JAVA_HOME is not set properly. Modified: manifoldcf/trunk/framework/example-multiprocess-common/start-agents.sh URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-common/start-agents.sh?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-common/start-agents.sh (original) +++ manifoldcf/trunk/framework/example-multiprocess-common/start-agents.sh Sun Jan 19 15:10:12 2014 @@ -18,9 +18,7 @@ #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 -Dorg.apache.manifoldcf.processid=A org.apache.manifoldcf.agents.AgentRun + ./executecommand.sh -Dorg.apache.manifoldcf.processid=A org.apache.manifoldcf.agents.AgentRun exit $? else Modified: manifoldcf/trunk/framework/example-multiprocess-common/start-database.bat URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-common/start-database.bat?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-common/start-database.bat (original) +++ manifoldcf/trunk/framework/example-multiprocess-common/start-database.bat Sun Jan 19 15:10:12 2014 @@ -17,7 +17,7 @@ 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 rem invoke java with the database class -"%JAVA_HOME%\bin\java" -cp processes\lib\hsqldb.jar org.hsqldb.Server -database.0 file:extdb;hsqldb.tx=mvcc;hsqldb.cache_file_scale=512 -dbname.0 xdb +"%JAVA_HOME%\bin\java" -cp ..\lib\hsqldb.jar org.hsqldb.Server -database.0 file:extdb;hsqldb.tx=mvcc;hsqldb.cache_file_scale=512 -dbname.0 xdb goto done :nojavahome echo Environment variable JAVA_HOME is not set properly. Modified: manifoldcf/trunk/framework/example-multiprocess-common/start-database.sh URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-common/start-database.sh?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-common/start-database.sh (original) +++ manifoldcf/trunk/framework/example-multiprocess-common/start-database.sh Sun Jan 19 15:10:12 2014 @@ -17,7 +17,7 @@ #Make sure environment variables are properly set if [ -e "$JAVA_HOME"/bin/java ] ; then - "$JAVA_HOME"/bin/java -cp processes/lib/hsqldb.jar org.hsqldb.Server -database.0 "file:extdb;hsqldb.tx=mvcc;hsqldb.cache_file_scale=512" -dbname.0 xdb + "$JAVA_HOME"/bin/java -cp ../lib/hsqldb.jar org.hsqldb.Server -database.0 "file:extdb;hsqldb.tx=mvcc;hsqldb.cache_file_scale=512" -dbname.0 xdb exit $? else Modified: manifoldcf/trunk/framework/example-multiprocess-common/stop-agents.bat URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-common/stop-agents.bat?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-common/stop-agents.bat (original) +++ manifoldcf/trunk/framework/example-multiprocess-common/stop-agents.bat Sun Jan 19 15:10:12 2014 @@ -17,10 +17,8 @@ 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 AgentStop command -cmd /c "processes\executecommand.bat org.apache.manifoldcf.agents.AgentStop" +cmd /c ".\executecommand.bat org.apache.manifoldcf.agents.AgentStop" goto done :nojavahome echo Environment variable JAVA_HOME is not set properly. Modified: manifoldcf/trunk/framework/example-multiprocess-common/stop-agents.sh URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-common/stop-agents.sh?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-common/stop-agents.sh (original) +++ manifoldcf/trunk/framework/example-multiprocess-common/stop-agents.sh Sun Jan 19 15:10:12 2014 @@ -18,9 +18,7 @@ #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.manifoldcf.agents.AgentStop + ./executecommand.sh org.apache.manifoldcf.agents.AgentStop exit $? else Modified: manifoldcf/trunk/framework/example-multiprocess-zk-common/runzookeeper.bat URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk-common/runzookeeper.bat?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-zk-common/runzookeeper.bat (original) +++ manifoldcf/trunk/framework/example-multiprocess-zk-common/runzookeeper.bat Sun Jan 19 15:10:12 2014 @@ -17,10 +17,7 @@ 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" +cmd /c ".\executecommand.bat org.apache.zookeeper.server.quorum.QuorumPeerMain zookeeper.cfg" goto done :nojavahome echo Environment variable JAVA_HOME is not set properly. Modified: manifoldcf/trunk/framework/example-multiprocess-zk-common/runzookeeper.sh URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk-common/runzookeeper.sh?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-zk-common/runzookeeper.sh (original) +++ manifoldcf/trunk/framework/example-multiprocess-zk-common/runzookeeper.sh Sun Jan 19 15:10:12 2014 @@ -18,9 +18,7 @@ #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 + ./executecommand.sh org.apache.zookeeper.server.quorum.QuorumPeerMain zookeeper.cfg exit $? else Modified: manifoldcf/trunk/framework/example-multiprocess-zk-common/setglobalproperties.bat URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk-common/setglobalproperties.bat?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-zk-common/setglobalproperties.bat (original) +++ manifoldcf/trunk/framework/example-multiprocess-zk-common/setglobalproperties.bat Sun Jan 19 15:10:12 2014 @@ -17,10 +17,7 @@ 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.manifoldcf.core.lockmanager.ZooKeeperLockManager properties-global.xml" +cmd /c ".\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/trunk/framework/example-multiprocess-zk-common/setglobalproperties.sh URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk-common/setglobalproperties.sh?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-zk-common/setglobalproperties.sh (original) +++ manifoldcf/trunk/framework/example-multiprocess-zk-common/setglobalproperties.sh Sun Jan 19 15:10:12 2014 @@ -18,9 +18,7 @@ #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.manifoldcf.core.lockmanager.ZooKeeperLockManager properties-global.xml + ./executecommand.sh org.apache.manifoldcf.core.lockmanager.ZooKeeperLockManager properties-global.xml exit $? else Added: manifoldcf/trunk/framework/scripts-combined/combined-options.env.unix URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/scripts-combined/combined-options.env.unix?rev=1559502&view=auto ============================================================================== --- manifoldcf/trunk/framework/scripts-combined/combined-options.env.unix (added) +++ manifoldcf/trunk/framework/scripts-combined/combined-options.env.unix Sun Jan 19 15:10:12 2014 @@ -0,0 +1,5 @@ +-Xms256m +-Xmx256m +-Dorg.apache.manifoldcf.configfile=./properties.xml +-cp +.: Propchange: manifoldcf/trunk/framework/scripts-combined/combined-options.env.unix ------------------------------------------------------------------------------ svn:eol-style = LF Added: manifoldcf/trunk/framework/scripts-combined/combined-options.env.win URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/scripts-combined/combined-options.env.win?rev=1559502&view=auto ============================================================================== --- manifoldcf/trunk/framework/scripts-combined/combined-options.env.win (added) +++ manifoldcf/trunk/framework/scripts-combined/combined-options.env.win Sun Jan 19 15:10:12 2014 @@ -0,0 +1,5 @@ +-Xms256m +-Xmx256m +-Dorg.apache.manifoldcf.configfile=.\properties.xml +-cp +.; Propchange: manifoldcf/trunk/framework/scripts-combined/combined-options.env.win ------------------------------------------------------------------------------ svn:eol-style = CRLF Copied: manifoldcf/trunk/framework/scripts-combined/start-combined.bat (from r1559055, manifoldcf/trunk/framework/example-singleprocess-common/start-combined.bat) URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/scripts-combined/start-combined.bat?p2=manifoldcf/trunk/framework/scripts-combined/start-combined.bat&p1=manifoldcf/trunk/framework/example-singleprocess-common/start-combined.bat&r1=1559055&r2=1559502&rev=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-singleprocess-common/start-combined.bat (original) +++ manifoldcf/trunk/framework/scripts-combined/start-combined.bat Sun Jan 19 15:10:12 2014 @@ -16,13 +16,16 @@ 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 - -set CLASSPATH=. -for %%f in (lib/*) do call setclasspath.bat %%f +if not exist ".\properties.xml" goto nolcfhome +set JAVAOPTIONS= +for /f "delims=" %%a in ('type combined-options.env.win') do call setjavaoption.bat "%%a" rem invoke java with the jetty class -"%JAVA_HOME%\bin\java" -cp "%CLASSPATH%" org.apache.manifoldcf.jettyrunner.ManifoldCFCombinedJettyRunner +"%JAVA_HOME%\bin\java" %JAVAOPTIONS% org.apache.manifoldcf.jettyrunner.ManifoldCFCombinedJettyRunner 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 Copied: manifoldcf/trunk/framework/scripts-combined/start-combined.sh (from r1559055, manifoldcf/trunk/framework/example-singleprocess-common/start-combined.sh) URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/scripts-combined/start-combined.sh?p2=manifoldcf/trunk/framework/scripts-combined/start-combined.sh&p1=manifoldcf/trunk/framework/example-singleprocess-common/start-combined.sh&r1=1559055&r2=1559502&rev=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-singleprocess-common/start-combined.sh (original) +++ manifoldcf/trunk/framework/scripts-combined/start-combined.sh Sun Jan 19 15:10:12 2014 @@ -16,26 +16,25 @@ # limitations under the License. if [[ $OSTYPE == "cygwin" ]] ; then - PATHSEP=";" + OPTIONSFILE="jetty-options.env.win" else - PATHSEP=":" + OPTIONSFILE="jetty-options.env.unix" fi #Make sure environment variables are properly set if [ -e "$JAVA_HOME"/bin/java ] ; then - - CLASSPATH="" - for filename in $(ls -1 ./lib) ; do - if [ -n "$CLASSPATH" ] ; then - CLASSPATH="$CLASSPATH""$PATHSEP"./lib/"$filename" - else - CLASSPATH=./lib/"$filename" - fi - done - - "$JAVA_HOME"/bin/java -cp "$CLASSPATH" org.apache.manifoldcf.jettyrunner.ManifoldCFCombinedJettyRunner - exit $? + if [ -f ./properties.xml ] ; then + # Build the global options + OPTIONS=$(cat "$OPTIONSFILE") + "$JAVA_HOME/bin/java" $OPTIONS org.apache.manifoldcf.jettyrunner.ManifoldCFCombinedJettyRunner + 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 Added: manifoldcf/trunk/framework/scripts-common/setjavaoption.bat URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/scripts-common/setjavaoption.bat?rev=1559502&view=auto ============================================================================== --- manifoldcf/trunk/framework/scripts-common/setjavaoption.bat (added) +++ manifoldcf/trunk/framework/scripts-common/setjavaoption.bat Sun Jan 19 15:10:12 2014 @@ -0,0 +1,16 @@ +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. + +set JAVAOPTIONS=%JAVAOPTIONS% %1 Propchange: manifoldcf/trunk/framework/scripts-common/setjavaoption.bat ------------------------------------------------------------------------------ svn:eol-style = CRLF Added: manifoldcf/trunk/framework/scripts-jetty/jetty-options.env.unix URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/scripts-jetty/jetty-options.env.unix?rev=1559502&view=auto ============================================================================== --- manifoldcf/trunk/framework/scripts-jetty/jetty-options.env.unix (added) +++ manifoldcf/trunk/framework/scripts-jetty/jetty-options.env.unix Sun Jan 19 15:10:12 2014 @@ -0,0 +1,5 @@ +-Xms256m +-Xmx256m +-Dorg.apache.manifoldcf.configfile=./properties.xml +-cp +.: Propchange: manifoldcf/trunk/framework/scripts-jetty/jetty-options.env.unix ------------------------------------------------------------------------------ svn:eol-style = LF Added: manifoldcf/trunk/framework/scripts-jetty/jetty-options.env.win URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/scripts-jetty/jetty-options.env.win?rev=1559502&view=auto ============================================================================== --- manifoldcf/trunk/framework/scripts-jetty/jetty-options.env.win (added) +++ manifoldcf/trunk/framework/scripts-jetty/jetty-options.env.win Sun Jan 19 15:10:12 2014 @@ -0,0 +1,5 @@ +-Xms256m +-Xmx256m +-Dorg.apache.manifoldcf.configfile=.\properties.xml +-cp +.; Propchange: manifoldcf/trunk/framework/scripts-jetty/jetty-options.env.win ------------------------------------------------------------------------------ svn:eol-style = CRLF Copied: manifoldcf/trunk/framework/scripts-jetty/start-webapps.bat (from r1559055, manifoldcf/trunk/framework/example-multiprocess-common/start-webapps.bat) URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/scripts-jetty/start-webapps.bat?p2=manifoldcf/trunk/framework/scripts-jetty/start-webapps.bat&p1=manifoldcf/trunk/framework/example-multiprocess-common/start-webapps.bat&r1=1559055&r2=1559502&rev=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-common/start-webapps.bat (original) +++ manifoldcf/trunk/framework/scripts-jetty/start-webapps.bat Sun Jan 19 15:10:12 2014 @@ -17,12 +17,10 @@ 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% -set CLASSPATH=. -for %%f in (lib/*) do call setclasspath.bat %%f +set JAVAOPTIONS= +for /f "delims=" %%a in ('type jetty-options.env.win') do call setjavaoption.bat "%%a" rem invoke java with the jetty class -"%JAVA_HOME%\bin\java" -cp "%CLASSPATH%" "-Dorg.apache.manifoldcf.configfile=%MCF_HOME%\properties.xml" org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner +"%JAVA_HOME%\bin\java" %JAVAOPTIONS% org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner goto done :nojavahome echo Environment variable JAVA_HOME is not set properly. Copied: manifoldcf/trunk/framework/scripts-jetty/start-webapps.sh (from r1559055, manifoldcf/trunk/framework/example-multiprocess-common/start-webapps.sh) URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/scripts-jetty/start-webapps.sh?p2=manifoldcf/trunk/framework/scripts-jetty/start-webapps.sh&p1=manifoldcf/trunk/framework/example-multiprocess-common/start-webapps.sh&r1=1559055&r2=1559502&rev=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/example-multiprocess-common/start-webapps.sh (original) +++ manifoldcf/trunk/framework/scripts-jetty/start-webapps.sh Sun Jan 19 15:10:12 2014 @@ -16,26 +16,18 @@ # limitations under the License. if [[ $OSTYPE == "cygwin" ]] ; then - PATHSEP=";" + OPTIONSFILE="jetty-options.env.win" else - PATHSEP=":" + OPTIONSFILE="jetty-options.env.unix" fi #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 - CLASSPATH="" - for filename in $(ls -1 ./lib) ; do - if [ -n "$CLASSPATH" ] ; then - CLASSPATH="$CLASSPATH""$PATHSEP"./lib/"$filename" - else - CLASSPATH=./lib/"$filename" - fi - done - DEFINES="-Dorg.apache.manifoldcf.configfile=$MCF_HOME/properties.xml" - "$JAVA_HOME"/bin/java -cp "$CLASSPATH" $DEFINES org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner + # Build the global options + OPTIONS=$(cat "$OPTIONSFILE") + + "$JAVA_HOME/bin/java" $OPTIONS org.apache.manifoldcf.jettyrunner.ManifoldCFJettyRunner exit $? else Modified: manifoldcf/trunk/framework/scripts/executecommand.bat URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/scripts/executecommand.bat?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/scripts/executecommand.bat (original) +++ manifoldcf/trunk/framework/scripts/executecommand.bat Sun Jan 19 15:10:12 2014 @@ -16,23 +16,15 @@ rem limitations under the License. rem check that JAVA_HOME and MCF_HOME are set if not exist "%JAVA_HOME%\bin\java.exe" goto nojavahome -if not exist "%MCF_HOME%\properties.xml" goto nolcfhome -rem save existing path here -set OLDDIR=%CD% -cd "%MCF_HOME%\processes" -set CLASSPATH=. -for %%f in (lib/*) do call setclasspath.bat %%f -for /f "delims=" %%a in ('type %MCF_HOME%\processes\options.env') do set JAVAOPTIONS=%%a -set JAVADEFINES= -for %%g in (define/*) do call setdefine.bat %%g -rem restore old path here -cd "%OLDDIR%" -"%JAVA_HOME%\bin\java" "-Dorg.apache.manifoldcf.configfile=%MCF_HOME%\properties.xml" %JAVAOPTIONS% %JAVADEFINES% -classpath "%CLASSPATH%" %* +if not exist ".\properties.xml" goto nolcfhome +set JAVAOPTIONS= +for /f "delims=" %%a in ('type options.env.win') do call setjavaoption.bat "%%a" +"%JAVA_HOME%\bin\java" %JAVAOPTIONS% %* goto done :nojavahome echo Environment variable JAVA_HOME is not set properly. goto done :nolcfhome -echo Environment variable MCF_HOME is not set properly. +echo Working directory is not set properly. goto done :done Modified: manifoldcf/trunk/framework/scripts/executecommand.sh URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/scripts/executecommand.sh?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/framework/scripts/executecommand.sh (original) +++ manifoldcf/trunk/framework/scripts/executecommand.sh Sun Jan 19 15:10:12 2014 @@ -16,42 +16,23 @@ # limitations under the License. if [[ $OSTYPE == "cygwin" ]] ; then - PATHSEP=";" + OPTIONSFILE="options.env.win" else - PATHSEP=":" + OPTIONSFILE="options.env.unix" fi #Make sure environment variables are properly set if [ -e "$JAVA_HOME"/bin/java ] ; then - if [ -f "$MCF_HOME"/properties.xml ] ; then + if [ -f ./properties.xml ] ; then - # Build the classpath - CLASSPATH="" - for filename in $(ls -1 "$MCF_HOME"/processes/lib) ; do - if [ -n "$CLASSPATH" ] ; then - CLASSPATH="$CLASSPATH""$PATHSEP""$MCF_HOME"/processes/lib/"$filename" - else - CLASSPATH="$MCF_HOME"/processes/lib/"$filename" - fi - done - # Build the global options - OPTIONS=$(cat "$MCF_HOME"/processes/options.env) + OPTIONS=$(cat "$OPTIONSFILE") - # Build the defines - DEFINES="-Dorg.apache.manifoldcf.configfile=$MCF_HOME/properties.xml" - if [ -e "$MCF_HOME/processes/define" ] ; then - for filename in $(ls -1 "$MCF_HOME"/processes/define) ; do - DEFINEVAR=-D"$filename"=$(cat "$MCF_HOME"/processes/define/"$filename") - DEFINES="$DEFINES $DEFINEVAR" - done - fi - - "$JAVA_HOME/bin/java" $OPTIONS $DEFINES -cp "$CLASSPATH" $@ + "$JAVA_HOME/bin/java" $OPTIONS $@ exit $? else - echo "Environment variable MCF_HOME is not properly set." 1>&2 + echo "Working directory is not properly set." 1>&2 exit 1 fi Added: manifoldcf/trunk/framework/scripts/options.env.unix URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/scripts/options.env.unix?rev=1559502&view=auto ============================================================================== --- manifoldcf/trunk/framework/scripts/options.env.unix (added) +++ manifoldcf/trunk/framework/scripts/options.env.unix Sun Jan 19 15:10:12 2014 @@ -0,0 +1,5 @@ +-Xms256m +-Xmx256m +-Dorg.apache.manifoldcf.configfile=./properties.xml +-cp +.: Propchange: manifoldcf/trunk/framework/scripts/options.env.unix ------------------------------------------------------------------------------ svn:eol-style = LF Added: manifoldcf/trunk/framework/scripts/options.env.win URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/scripts/options.env.win?rev=1559502&view=auto ============================================================================== --- manifoldcf/trunk/framework/scripts/options.env.win (added) +++ manifoldcf/trunk/framework/scripts/options.env.win Sun Jan 19 15:10:12 2014 @@ -0,0 +1,5 @@ +-Xms256m +-Xmx256m +-Dorg.apache.manifoldcf.configfile=.\properties.xml +-cp +.; Propchange: manifoldcf/trunk/framework/scripts/options.env.win ------------------------------------------------------------------------------ svn:eol-style = CRLF 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=1559502&r1=1559501&r2=1559502&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 Sun Jan 19 15:10:12 2014 @@ -78,37 +78,43 @@ <p></p> <ul> <li>CMIS connector</li> - <li>Documentum connector, built against a Documentum API stub</li> + <li>EMC Documentum connector, built against a Documentum API stub</li> <li>DropBox connector</li> + <li>Email connector</li> <li>FileNet connector, built against a FileNet API stub</li> <li>WGET-compatible filesystem connector</li> <li>Generic XML repository connector</li> <li>Google Drive connector</li> <li>HDFS connector</li> <li>JDBC connector, with just the PostgreSQL jdbc driver</li> - <li>Jira connector</li> - <li>LiveLink connector, built against a LiveLink API stub</li> + <li>Atlassian Jira connector</li> + <li>OpenText LiveLink connector, built against a LiveLink API stub</li> <li>Meridio connector, built against modified Meridio API WSDLs and XSDs</li> <li>RSS connector</li> - <li>SharePoint connector, built against SharePoint API WSDLs</li> + <li>Microsoft SharePoint connector, built against SharePoint API WSDLs</li> <li>Webcrawler connector</li> <li>Wiki connector</li> </ul> <p></p> - <p>In addition, the following authority connectors will be built:</p> + <p>The following authority connectors will be built:</p> <p></p> <ul> <li>Active Directory authority</li> <li>CMIS authority</li> - <li>Documentum authority</li> - <li>LiveLink authority</li> - <li>Null authority</li> + <li>EMC Documentum authority</li> + <li>Atlassian Jira authority</li> <li>LDAP authority</li> + <li>OpenText LiveLink authority</li> + <li>Meridio authority, built against modified Meridio API WSDLs and XSDs</li> + <li>Null authority</li> + <li>Microsoft SharePoint/AD authority</li> + <li>Microsoft SharePoint/Native authority, built against SharePoint API WSDLs</li> </ul> <p></p> - <p>Finally, the following output connectors will be built:</p> + <p>The following output connectors will be built:</p> <p></p> <ul> + <li>WGET-compatible filesystem output connector</li> <li>MetaCarta GTS output connector</li> <li>Apache Solr output connector</li> <li>OpenSearchServer output connector</li> @@ -118,6 +124,12 @@ <li>Null output connector</li> </ul> <p></p> + <p>The following mapping connectors will be built:</p> + <p></p> + <ul> + <li>Regular-expression mapping connector</li> + </ul> + <p></p> <p>The dependencies and build limitations of each individual LGPL and proprietary connector is described in separate sections below.</p> <p></p> @@ -318,6 +330,8 @@ mvn clean package <tr><td><em>connectors.xml</em></td><td>an xml file describing the connectors that should be registered</td></tr> <tr><td><em>connector-lib</em></td><td>jars for all the connectors, referred to by properties.xml</td></tr> <tr><td><em>connector-lib-proprietary</em></td><td>proprietary jars for all the connectors, referred to by properties.xml; not included in binary release</td></tr> + <tr><td><em>lib</em></td><td>jars for all of the examples, referenced by the example scripts</td></tr> + <tr><td><em>lib-proprietary</em></td><td>proprietary jars for all of the examples, referenced by the proprietary example scripts</td></tr> <tr><td><em>xxx-process</em></td><td>scripts, classpath jars, and -D switch values needed for a required connector-specific process</td></tr> <tr><td><em>script-engine</em></td><td>jars and scripts for running the ManifoldCF script interpreter</td></tr> <tr><td><em>example</em></td><td>a jetty-based example that runs in a single process (except for any connector-specific processes), excluding all proprietary libraries</td></tr> Modified: manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml?rev=1559502&r1=1559501&r2=1559502&view=diff ============================================================================== --- manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml (original) +++ manifoldcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml Sun Jan 19 15:10:12 2014 @@ -78,37 +78,43 @@ <p></p> <ul> <li>CMIS connector</li> - <li>Documentum connector, built against a Documentum API stub</li> + <li>EMC Documentum connector, built against a Documentum API stub</li> <li>DropBox connector</li> + <li>Email connector</li> <li>FileNet connector, built against a FileNet API stub</li> <li>WGET-compatible filesystem connector</li> <li>Generic XML repository connector</li> <li>Google Drive connector</li> <li>HDFS connector</li> <li>JDBC connector, with just the PostgreSQL jdbc driver</li> - <li>Jira connector</li> - <li>LiveLink connector, built against a LiveLink API stub</li> + <li>Atlassian Jira connector</li> + <li>OpenText LiveLink connector, built against a LiveLink API stub</li> <li>Meridio connector, built against modified Meridio API WSDLs and XSDs</li> <li>RSS connector</li> - <li>SharePoint connector, built against SharePoint API WSDLs</li> + <li>Microsoft SharePoint connector, built against SharePoint API WSDLs</li> <li>Webcrawler connector</li> <li>Wiki connector</li> </ul> <p></p> - <p>In addition, the following authority connectors will be built:</p> + <p>The following authority connectors will be built:</p> <p></p> <ul> <li>Active Directory authority</li> <li>CMIS authority</li> - <li>Documentum authority</li> - <li>LiveLink authority</li> - <li>Null authority</li> + <li>EMC Documentum authority</li> + <li>Atlassian Jira authority</li> <li>LDAP authority</li> + <li>OpenText LiveLink authority</li> + <li>Meridio authority, built against modified Meridio API WSDLs and XSDs</li> + <li>Null authority</li> + <li>Microsoft SharePoint/AD authority</li> + <li>Microsoft SharePoint/Native authority, built against SharePoint API WSDLs</li> </ul> <p></p> - <p>Finally, the following output connectors will be built:</p> + <p>The following output connectors will be built:</p> <p></p> <ul> + <li>WGET-compatible filesystem output connector</li> <li>MetaCarta GTS output connector</li> <li>Apache Solr output connector</li> <li>OpenSearchServer output connector</li> @@ -118,6 +124,12 @@ <li>Null output connector</li> </ul> <p></p> + <p>The following mapping connectors will be built:</p> + <p></p> + <ul> + <li>Regular-expression mapping connector</li> + </ul> + <p></p> <p>The dependencies and build limitations of each individual LGPL and proprietary connector is described in separate sections below.</p> <p></p> @@ -318,6 +330,8 @@ mvn clean package <tr><td><em>connectors.xml</em></td><td>an xml file describing the connectors that should be registered</td></tr> <tr><td><em>connector-lib</em></td><td>jars for all the connectors, referred to by properties.xml</td></tr> <tr><td><em>connector-lib-proprietary</em></td><td>proprietary jars for all the connectors, referred to by properties.xml; not included in binary release</td></tr> + <tr><td><em>lib</em></td><td>jars for all of the examples, referenced by the example scripts</td></tr> + <tr><td><em>lib-proprietary</em></td><td>proprietary jars for all of the examples, referenced by the proprietary example scripts</td></tr> <tr><td><em>xxx-process</em></td><td>scripts, classpath jars, and -D switch values needed for a required connector-specific process</td></tr> <tr><td><em>script-engine</em></td><td>jars and scripts for running the ManifoldCF script interpreter</td></tr> <tr><td><em>example</em></td><td>a jetty-based example that runs in a single process (except for any connector-specific processes), excluding all proprietary libraries</td></tr>
