Commit b3785e7d authored by cdelbe's avatar cdelbe
Browse files

PICKED FROM TRUNK 15142

Split Scheduler and RM documentation into 2 separate outputs.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/proactive/scheduling/branches/Scheduling_2.0.x@15148 28e8926c-6b08-0410-baaa-805c5e19b8d6
parent e5ba9f7a
......@@ -11,6 +11,7 @@ function build() {
./build clean
./build -Dversion="${VERSION}" deploy.all
./build -Dversion="${VERSION}" doc.Scheduler.manualPdf
./build -Dversion="${VERSION}" doc.rm.manualPdf
generate_credential
}
......
......@@ -13,14 +13,6 @@
<!ENTITY Scheduler_admin_manual SYSTEM "scheduler/admin_manual.xml">
<!ENTITY Scheduler_plugin SYSTEM "scheduler_plugin/scheduler_plugin.xml">
<!ENTITY RM SYSTEM "resourcemanager/rm.xml">
<!ENTITY RM_deployment SYSTEM "resourcemanager/rm_deployment.xml">
<!ENTITY RM_admin SYSTEM "resourcemanager/rm_admin.xml">
<!ENTITY RM_API SYSTEM "resourcemanager/rm_api.xml">
<!ENTITY RM_EC2 SYSTEM "resourcemanager/rm_ec2.xml">
<!ENTITY RM_Virtualization SYSTEM "resourcemanager/rm_virtualization.xml">
<!ENTITY RM_plugin SYSTEM "resourcemanager_plugin/rm_plugin.xml">
<!ENTITY Matlab SYSTEM "matlab/matlab.xml">
<!ENTITY Scilab SYSTEM "scilab/scilab.xml">
<!ENTITY FilesSplitMerge SYSTEM "filessplitmerge/filessplitmerge.xml">
......@@ -28,8 +20,6 @@
<!ENTITY Modelica SYSTEM "modelica/modelica.xml">
<!ENTITY SchedulerTutorial SYSTEM "scheduler_tuto/scheduler_tutorial.xml">
<!ENTITY RM_WindowsAgent SYSTEM "resourcemanager/ProActiveWindowsAgent.xml">
]>
<book xmlns="http://docbook.org/ns/docbook" version="5.0">
......@@ -47,20 +37,6 @@
&Scheduler_plugin;
</part>
<part xml:id="ResourceManager">
<info>
<title>ProActive Resource Manager</title>
</info>
&RM;
&RM_deployment;
&RM_admin;
&RM_plugin;
&RM_EC2;
&RM_Virtualization;
&RM_API;
&RM_WindowsAgent;
</part>
<part xml:id="SchedulingWithMatlab">
<info>
<title>ProActive Scheduler's Matlab extension</title>
......@@ -91,8 +67,4 @@
&FilesSplitMerge;
</part>
</book>
......@@ -15,7 +15,7 @@
In order to launch jobs, the ProActive Scheduler has to obtain nodes (resources) from the Resources Manager.
As described hereafter, the user interacts only with the ProActive Scheduler entity and
the managed resources can be simple hosts or peer to peer resources. For full documentation about the Resource Manager,
please refer to <xref linkend="Resource_Manager"/>.
please refer to its own documentation.
</para>
<figure xml:id="Scheduler_2_entities"><info><title>The ProActive Scheduler Entities</title></info>
<mediaobject>
......@@ -506,7 +506,7 @@ PASchedulerProperties.updateProperties("your_property_file");
<section xml:id="Start_scheduler_java"><info><title>Start the Scheduler using the Java API</title></info>
<para>
You can start the ProActive Scheduler using the Java API. Supposing that a Resource Manager is already started on toto
(see Resource Manager documentation <xref linkend="Resource_Manager"/> to create a resource Manager),
(see Resource Manager documentation to create a resource Manager),
here's a complete example showing how to start both Scheduler and Resource Manager (assuming the JVM is totally clean ):
</para>
<programlisting language="java">
......
......@@ -14,7 +14,7 @@
also to manage issues related to distributed
environment, such as failing resources.
The ProActive Scheduler is connected to a Resource Manager providing therefore the resource
abstraction (see <xref linkend="Resource_Manager"/>).
abstraction.
</para>
<para>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment