manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1549600 - in /manifoldcf/trunk: ./ framework/example-multiprocess-common/ framework/scripts/ site/src/documentation/content/xdocs/en_US/
Date Mon, 09 Dec 2013 16:14:24 GMT
Author: kwright
Date: Mon Dec  9 16:14:24 2013
New Revision: 1549600

URL: http://svn.apache.org/r1549600
Log:
Fix for CONNECTORS-832.  Add second agents process to example.

Added:
    manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.bat
      - copied, changed from r1549500, manifoldcf/trunk/framework/example-multiprocess-common/start-agents.bat
    manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.sh
      - copied, changed from r1549500, manifoldcf/trunk/framework/example-multiprocess-common/start-agents.sh
Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/example-multiprocess-common/start-agents.bat
    manifoldcf/trunk/framework/example-multiprocess-common/start-agents.sh
    manifoldcf/trunk/framework/scripts/executecommand.sh
    manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1549600&r1=1549599&r2=1549600&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Dec  9 16:14:24 2013
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.5-dev =====================
 
+CONNECTORS-832: Add example second agents process to all
+multiprocess examples.
+(Karl Wright)
+
 CONNECTORS-831: Refactor ReprioritizationTracker so that it uses
 the interface/factory paradigm.
 (Karl Wright)

Copied: manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.bat (from r1549500,
manifoldcf/trunk/framework/example-multiprocess-common/start-agents.bat)
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.bat?p2=manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.bat&p1=manifoldcf/trunk/framework/example-multiprocess-common/start-agents.bat&r1=1549500&r2=1549600&rev=1549600&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-common/start-agents.bat (original)
+++ manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.bat Mon Dec  9 16:14:24
2013
@@ -20,7 +20,7 @@ if not exist ".\properties.xml" goto nol
 rem set MCF_HOME
 set MCF_HOME=%CD%
 rem invoke the AgentRun command
-cmd /c "processes\executecommand.bat org.apache.manifoldcf.agents.AgentRun"
+cmd /c "processes\executecommand.bat -Dorg.apache.manifoldcf.processid=B org.apache.manifoldcf.agents.AgentRun"
 goto done
 :nojavahome
 echo Environment variable JAVA_HOME is not set properly.

Copied: manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.sh (from r1549500,
manifoldcf/trunk/framework/example-multiprocess-common/start-agents.sh)
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.sh?p2=manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.sh&p1=manifoldcf/trunk/framework/example-multiprocess-common/start-agents.sh&r1=1549500&r2=1549600&rev=1549600&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-common/start-agents.sh (original)
+++ manifoldcf/trunk/framework/example-multiprocess-common/start-agents-2.sh Mon Dec  9 16:14:24
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.agents.AgentRun
+        processes/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=1549600&r1=1549599&r2=1549600&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-common/start-agents.bat (original)
+++ manifoldcf/trunk/framework/example-multiprocess-common/start-agents.bat Mon Dec  9 16:14:24
2013
@@ -20,7 +20,7 @@ if not exist ".\properties.xml" goto nol
 rem set MCF_HOME
 set MCF_HOME=%CD%
 rem invoke the AgentRun command
-cmd /c "processes\executecommand.bat org.apache.manifoldcf.agents.AgentRun"
+cmd /c "processes\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=1549600&r1=1549599&r2=1549600&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-common/start-agents.sh (original)
+++ manifoldcf/trunk/framework/example-multiprocess-common/start-agents.sh Mon Dec  9 16:14:24
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.agents.AgentRun
+        processes/executecommand.sh -Dorg.apache.manifoldcf.processid=A org.apache.manifoldcf.agents.AgentRun
         exit $?
         
     else

Modified: manifoldcf/trunk/framework/scripts/executecommand.sh
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/scripts/executecommand.sh?rev=1549600&r1=1549599&r2=1549600&view=diff
==============================================================================
--- manifoldcf/trunk/framework/scripts/executecommand.sh (original)
+++ manifoldcf/trunk/framework/scripts/executecommand.sh Mon Dec  9 16:14:24 2013
@@ -35,7 +35,7 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
             fi
         done
 
-        # Build the options
+        # Build the global options
 	OPTIONS=$(cat "$MCF_HOME"/processes/options.env)
         
         # Build the defines
@@ -47,7 +47,7 @@ if [ -e "$JAVA_HOME"/bin/java ] ; then
             done
         fi
 
-        "$JAVA_HOME/bin/java" $OPTIONS $DEFINES -cp "$CLASSPATH" "$@"
+        "$JAVA_HOME/bin/java" $OPTIONS $DEFINES -cp "$CLASSPATH" $@
         exit $?
         
     else

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=1549600&r1=1549599&r2=1549600&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
Mon Dec  9 16:14:24 2013
@@ -442,8 +442,9 @@ cd example
             <tr><td><em>start-database[.sh|.bat]</em></td><td>script
to start the HSQLDB database</td></tr>
             <tr><td><em>initialize[.sh|.bat]</em></td><td>script
to create the database instance, create all database tables, and register connectors</td></tr>
             <tr><td><em>start-webapps[.sh|.bat]</em></td><td>script
to start Jetty with the ManifoldCF web applications deployed</td></tr>
-            <tr><td><em>start-agents[.sh|.bat]</em></td><td>script
to start the agents process</td></tr>
-            <tr><td><em>stop-agents[.sh|.bat]</em></td><td>script
to stop a running agents process cleanly</td></tr>
+            <tr><td><em>start-agents[.sh|.bat]</em></td><td>script
to start the (first) agents process</td></tr>
+            <tr><td><em>start-agents-2[.sh|.bat]</em></td><td>script
to start a second agents process</td></tr>
+            <tr><td><em>stop-agents[.sh|.bat]</em></td><td>script
to stop all running agents processes cleanly</td></tr>
             <tr><td><em>lock-clean[.sh|.bat]</em></td><td>script
to clean up dirty locks (run only when all webapps and processes are stopped)</td></tr>
           </table>
           <p></p>
@@ -452,7 +453,7 @@ cd example
             <p></p>
             <p>If you run the file-based multiprocess model, after you first start
the database (using <em>start-database[.sh|.bat]</em>), you will need to initialize
the database before you start the agents process or use the crawler UI.  To do this, all you
need to do is
                 run the <em>initialize[.sh|.bat]</em> script.  Then, you will
need to start the web applications (using <em>start-webapps[.sh|.bat]</em>) and
the agents process (using
-                <em>start-agents[.sh|.bat]</em>).</p>
+                <em>start-agents[.sh|.bat]</em>), and optionally the second agents
process (using <em>start-agents-2[.sh|.bat]</em>).</p>
             <p></p>
           </section>
 
@@ -480,8 +481,9 @@ cd example
             <tr><td><em>start-database[.sh|.bat]</em></td><td>script
to start the HSQLDB database</td></tr>
             <tr><td><em>initialize[.sh|.bat]</em></td><td>script
to create the database instance, create all database tables, and register connectors</td></tr>
             <tr><td><em>start-webapps[.sh|.bat]</em></td><td>script
to start Jetty with the ManifoldCF web applications deployed</td></tr>
-            <tr><td><em>start-agents[.sh|.bat]</em></td><td>script
to start the agents process</td></tr>
-            <tr><td><em>stop-agents[.sh|.bat]</em></td><td>script
to stop a running agents process cleanly</td></tr>
+            <tr><td><em>start-agents[.sh|.bat]</em></td><td>script
to start (the first) agents process</td></tr>
+            <tr><td><em>start-agents-2[.sh|.bat]</em></td><td>script
to start a second agents process</td></tr>
+            <tr><td><em>stop-agents[.sh|.bat]</em></td><td>script
to stop all running agents processes cleanly</td></tr>
           </table>
           <p></p>
           <section>
@@ -494,8 +496,8 @@ cd example
               <li>Initialize the ManifoldCF shared configuration data (using <em>setglobalproperties[.sh|.bat]</em>)</li>
               <li>Start the database (using <em>start-database[.sh|.bat]</em>)</li>
               <li>Initialize the database (using <em>initialize[.sh|.bat]</em>)</li>
-              <li>Start the agents process (using <em>start-agents[.sh|.bat]</em></li>
-              <li>Start the web applications (using <em>start-webapps[.sh|.bat]</em></li>
+              <li>Start the agents process (using <em>start-agents[.sh|.bat]</em>,
and optionally <em>start-agents-2[.sh|.bat]</em>)</li>
+              <li>Start the web applications (using <em>start-webapps[.sh|.bat]</em>)</li>
             </ol>
             <p></p>
           </section>



Mime
View raw message