ChangeLogTag: Thu Feb 22 22:59:01 UTC 2007 Jaiganesh B <jai.dre.vanderbilt.edu>

2 files changed, 55 insertions, 8 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 0e126b20bf2..22c5acf4af0 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,7 +1,14 @@
+Thu Feb 22 22:59:01 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
+
+        * docs/schema/ServerResourceUsage.txt:
+        
+          Updated the text document with the new usage guidelines.
+
 Thu Feb 22 22:53:52 UTC 2007  Nilabja R  <nilabjar@dre.vanderbilt.edu>
 
         * DAnCE/TargetManager/CmpClient.cpp:
-				  Changed in order to remove a warning in the build
+	 
+          Changed in order to remove a warning in the build
 
 Thu Feb 22 22:22:13 UTC 2007  Jaiganesh B  <jai.dre.vanderbilt.edu>
 
diff --git a/CIAO/docs/schema/ServerResourceUsage.txt b/CIAO/docs/schema/ServerResourceUsage.txt
index 061e2cc4422..d8fc47ca7b3 100644
--- a/CIAO/docs/schema/ServerResourceUsage.txt
+++ b/CIAO/docs/schema/ServerResourceUsage.txt
@@ -1,7 +1,7 @@
                   How to use CIAOServerResources.xsd
 
 Assuming we store two CIAO:ServerResources documents in two XML files
-called "RTLinuxServerConfig.xml" and "RTwIN32ServerConfig.xml"
+called "RTLinuxServerConfig.csr" and "RTwIN32ServerConfig.csr"
 respectively.  Two things need to happen in order to use the
 PolicySet's defined in these files.  First, we need to tell the DnC
 tools what are all the CIAOServerResources files a DeploymentPlan
@@ -21,7 +21,7 @@ filenames.
           <kind>tk_string</kind>
         </type>
         <value>
-         <string>RTLinuxServerConfig.xml</string>
+         <string>RTLinuxServerConfig.csr</string>
         </value>
      </value>
 
@@ -31,14 +31,14 @@ filenames.
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>RTWin32ServerConfig.xml</string>
+          <string>RTWin32ServerConfig.csr</string>
         </value>
      </value>
    </infoProperty>
 
 Second, we can now use the policy sets defined in these files by
 associating a policy set with the entity the policy set will be
-applied.  Currently, only associations with component instances are
+applied on.  Currently, only associations with component instances are
 supported.  A component instance in deployment plan can specify the
 policy set it wishes to be instantiated with.  A PolicySet is
 referenced by its name and the CIAO:ServerResources name.
@@ -47,13 +47,16 @@ referenced by its name and the CIAO:ServerResources name.
      ....
      <instance ...>
 
-     
        <deployedResource>
          <resourceUsage>InstanceUsesResource</resourceUsage>
-         <requirementName>CIAO:ServerResources</requirementName>
+         <requirementName>CIAO:PolicySet</requirementName>
          <resourceName>here_we_insert_the_name_defined_in_CIAO:ServerResources</resourcename>
          <property>
-           <name>CIAO:PolicySetName</name>
+// 
+// name could be CIAO:InstancePolicy or CIAO:ReceptaclePolicy.
+// Here we show an example of an CIAO::InstancePolicy.
+//
+           <name>CIAO:InstancePolicy</name>
            <value>
              <type>tk_string</type>
              <value>
@@ -63,6 +66,43 @@ referenced by its name and the CIAO:ServerResources name.
          </property>
        </deployedResource>
 
+// Now we show an example of a CIAO:ReceptaclePolicy.
+//
+       <deployedResource>
+         <resourceUsage>InstanceUsesResource</resourceUsage>
+         <requirementName>CIAO:PolicySet</requirementName>
+         <resourceName>here_we_insert_the_name_defined_in_CIAO:ServerResources</resourcename>
+//
+// First we specify that we are going to define a receptacle policy.
+//
+         <property>
+//
+// Note the name of the policy.
+//
+           <name>CIAO:ReceptaclePolicy</name>
+           <value>
+             <type>tk_string</type>
+             <value>
+               <string>here_we_insert_the_PolicySet_name_defined_in_the_ServerResources</string>
+             </value>
+           </value>
+         </property>
+//
+// Now we specify the receptacle (using the receptacle name) that is going to
+// be associated with this policy.
+//
+         <property>
+           <name>receptacle name from the .ccd file</name>
+           <value>
+             <type>tk_string</type>
+             <value>
+               <string>here_we_insert_the_PolicySet_name_defined_in_the_ServerResources</string>
+             </value>
+           </value>
+         </property>
+       </deployedResource>
+
+     </instance>
      </instance>
    </deploymentplan>