[jboss-svn-commits] JBL Code SVN: r13286 - in labs/jbossrules/branches/mvel-tooling-2007-06-30: documentation/manual/en/Chapter-BRMS and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Jul 9 20:21:56 EDT 2007


Author: pombredanne
Date: 2007-07-09 20:21:55 -0400 (Mon, 09 Jul 2007)
New Revision: 13286

Added:
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/pattern.vsd
Removed:
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/column.vsd
Modified:
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-AdminGuide.xml
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-Architecture.xml
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-UserGuide.xml
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-IDE/Section-QuickStart.xml
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/Section-XML.xml
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/rule.vsd
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/rule_attributes.png
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/rule_attributes.svg
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/master.xml
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/editors/keywords.properties
Log:
Ported r13280 from trunk to branch mvel-tooling-2007-06-30

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-AdminGuide.xml
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-AdminGuide.xml	2007-07-10 00:19:16 UTC (rev 13285)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-AdminGuide.xml	2007-07-10 00:21:55 UTC (rev 13286)
@@ -108,7 +108,7 @@
       components.xml file in the WEB-INF directory. This is a JBoss Seam
       configuration file (Seam is the framework used) which allows various
       parts of the system to be customised. When you have located the
-      components.xml file, you should see something like the following:
+      components.xml file, you should see something like the following:</para>
       <programlisting>&lt;component name="repositoryConfiguration"&gt;
  &lt;!--
   *** This is for configuring the "home" directory for the repo storage. the directory must exist. ***
@@ -117,7 +117,7 @@
 
    ...
 &lt;/component&gt;
-</programlisting></para>
+</programlisting>
 
       <para>Find the component with a name of "repositoryConfiguration" and
       the property with the name of "homeDirectory".</para>
@@ -326,7 +326,7 @@
       of them forgetting are too terrible con contemplate).</para>
 
       <para>To achieve, this, you can "explode" the deployment war file, and
-      locate the JBRMS.html file. <programlisting>
+      locate the JBRMS.html file.</para> <programlisting>
 &lt;html&gt;
 &lt;head&gt;
   &lt;meta name='gwt:module' content='org.drools.brms.JBRMS'&gt;
@@ -341,7 +341,7 @@
   &lt;script language='javascript' src='gwt.js'&gt;&lt;/script&gt;
   &lt;iframe id='__gwt_historyFrame' style='width:0;height:0;border:0'&gt;&lt;/iframe&gt;
 &lt;/body&gt;
-&lt;/html&gt;</programlisting> The above is the contents of the JBRMS.html
+&lt;/html&gt;</programlisting><para> The above is the contents of the JBRMS.html
       file - it is faily empty (as most of the work is done by the GWT - the
       GUI is built dynamically in the browser). The parts you can customise
       are the style sheet - you can either edit the JBRMS.css (or better yet,

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-Architecture.xml
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-Architecture.xml	2007-07-10 00:19:16 UTC (rev 13285)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-Architecture.xml	2007-07-10 00:21:55 UTC (rev 13286)
@@ -12,7 +12,7 @@
   <para>You may want to build from source if you want to re-use components, or
   embed the application in your own.</para>
 
-  <para><figure>
+  <figure>
       <title>Architectural diagram</title>
 
       <mediaobject>
@@ -21,7 +21,7 @@
                      scalefit="1" />
         </imageobject>
       </mediaobject>
-    </figure></para>
+    </figure>
 
   <para>The above diagram shows the major components of the system and how
   they integrate and are deployed. The Admin guide has more details on the

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-UserGuide.xml
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-UserGuide.xml	2007-07-10 00:19:16 UTC (rev 13285)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-UserGuide.xml	2007-07-10 00:21:55 UTC (rev 13286)
@@ -2,6 +2,8 @@
 <!DOCTYPE section PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN"
 "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd">
 <section>
+
+    <title>Quick start guide</title>
   <section>
     <title>Quick start guide</title>
 
@@ -23,7 +25,7 @@
       </mediaobject>
     </figure>
 
-    <para>The above picture shows the main feature areas of the BRMS.
+    <para>The above picture shows the main feature areas of the BRMS.</para>
     <itemizedlist>
         <listitem>
           <para>Info: This is the initial screen, with links to
@@ -49,7 +51,7 @@
           <para>Admin: Administrative functions (categories, statuses, import
           and export)</para>
         </listitem>
-      </itemizedlist></para>
+      </itemizedlist>
 
     <para>You can also consult the wiki:
     http://wiki.jboss.org/wiki/Wiki.jsp?page=RulesRepository for some
@@ -279,7 +281,7 @@
       item in the version history. Changing the categories of a rule has no
       effect on its execution.</para>
 
-      <para><figure>
+      <figure>
           <title>Creating categories</title>
 
           <mediaobject>
@@ -288,7 +290,7 @@
                          scalefit="1" />
             </imageobject>
           </mediaobject>
-        </figure> The above view shows the administration screen for setting
+        </figure> <para> The above view shows the administration screen for setting
       up categories (there) are no categories in the system by default. As the
       categories can be hierachical you chose the "parent" category that you
       want to create a sub-category for. From here categories can also be
@@ -306,7 +308,7 @@
     <section>
       <title>The asset editor</title>
 
-      <para><figure>
+      <figure>
           <title>The Asset editor view</title>
 
           <mediaobject>
@@ -315,9 +317,9 @@
                          scalefit="1" />
             </imageobject>
           </mediaobject>
-        </figure> The above diagram shows the "asset editor" with some
+        </figure> <para> The above diagram shows the "asset editor" with some
       annotated areas. The asset editor is where all rule changes are made.
-      Below is a list which describes the different parts of the editor.
+      Below is a list which describes the different parts of the editor.</para>
       <itemizedlist>
           <listitem>
             <para>A</para>
@@ -394,7 +396,7 @@
             <para>This will show the version history list when
             requested.</para>
           </listitem>
-        </itemizedlist></para>
+        </itemizedlist>
     </section>
 
     <section>
@@ -427,7 +429,7 @@
       the lifecycle of assets (which you can alternatively do with categories
       if you like).</para>
 
-      <para><figure>
+      <figure>
           <title>Asset status</title>
 
           <mediaobject>
@@ -436,11 +438,11 @@
                          format="PNG" scalefit="1" />
             </imageobject>
           </mediaobject>
-        </figure> You can change the status of an individual asset (like in
+        </figure><para> You can change the status of an individual asset (like in
       the diagram above). Its change takes effect immediately, no seperate
       save is needed.</para>
 
-      <para><figure>
+      <figure>
           <title>Asset status</title>
 
           <mediaobject>
@@ -449,7 +451,7 @@
                          format="PNG" scalefit="1" />
             </imageobject>
           </mediaobject>
-        </figure> You can change the status of a whole package - this sets the
+        </figure><para> You can change the status of a whole package - this sets the
       status flag on the package itself, but it ALSO changes the statuses on
       ALL the assets that belong to this package in one hit (to be the same as
       what you set the package to).</para>
@@ -471,7 +473,7 @@
       snapshot (typically which is used for deployment). The next section
       talks about deployment management and snapshots.</para>
 
-      <para><figure>
+      <figure>
           <title>Asset versions</title>
 
           <mediaobject>
@@ -480,7 +482,7 @@
                          format="PNG" scalefit="1" />
             </imageobject>
           </mediaobject>
-        </figure> Each time you make a change to an asset, it creates a new
+        </figure> <para> Each time you make a change to an asset, it creates a new
       item in the version history. This is a bit like having an unlimited
       undo. You can look back through the history of an individual asset like
       the list above, and view it (and restore it) from that point in
@@ -586,7 +588,7 @@
       your classpath. You can also pass in a Properties object with the
       parameters set up (the parameters are discussed next).</para>
 
-      <para>The following shows the content of MyRules.properties:
+      <para>The following shows the content of MyRules.properties: </para>
       <programlisting>##
 ## RuleAgent configuration file example
 ##
@@ -599,13 +601,13 @@
 poll=30
 
 
-name=MyConfig</programlisting></para>
+name=MyConfig</programlisting>
 
       <para>You can only have one type of key in each configuration (eg only
       one "file", "dir" etc - even though you can specify multiple items by
       space separating them).</para>
 
-      <para>Referring to the above example, the "keys" in the properties are:
+      <para>Referring to the above example, the "keys" in the properties are:</para>
       <itemizedlist>
           <listitem>
             <para>newInstance</para>
@@ -668,10 +670,11 @@
             when logging events (as typically you would have multiple agents
             in a system).</para>
           </listitem>
-        </itemizedlist></para>
+        </itemizedlist>
 
       <para>Following shows the deployment screen of the BRMS, which provides
-      URLs and downloads of packages. <figure>
+      URLs and downloads of packages. </para>
+        <figure>
           <title>Snapshot deployment</title>
 
           <mediaobject>
@@ -680,7 +683,7 @@
                          format="PNG" scalefit="1" />
             </imageobject>
           </mediaobject>
-        </figure></para>
+        </figure>
 
       <para>You can see the "Package URI" - this is the URL that you would
       copy and paste into the agent .properties file to specify that you want

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-IDE/Section-QuickStart.xml
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-IDE/Section-QuickStart.xml	2007-07-10 00:19:16 UTC (rev 13285)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-IDE/Section-QuickStart.xml	2007-07-10 00:21:55 UTC (rev 13286)
@@ -161,7 +161,7 @@
           <imagedata align="center" fileref="wizards.jpg" format="JPG" />
         </imageobject>
       </mediaobject>
-    </figure>
+	    </figure>
 
     <para>The wizard will ask for some basic options for generating a rule
     resource. These are just hints, you can change your mind later !. In terms
@@ -576,99 +576,104 @@
     with each change, which may provide performance improvements if your IDE
     becomes sluggish with very large numbers of rules.</para>
   </section>
-  
-  <section>
-    <title>Debugging rules</title>
 
-    <para>You can debug rules during the execution of your Drools application.
-    You can add breakpoints in the consequences of your rules, and whenever
-    such a breakpoint is encounted during the execution of the rules, the execution
-    is halted.  You can then inspect the variables known at that point and use any
-    of the default debugging actions to decide what should happen next (step over,
-    continue, etc.).  You can also use the debug views to inspect the content of the
-    working memory and agenda.</para>
 
-   <title>Creating breakpoints</title>
-   <para>You can add/remove rule breakpoints in drl files in two ways, similar to adding
-   breakpoints to Java files:</para>
-    <itemizedlist>
-      <listitem>
-        <para>Double-click the ruler of the DRL editor at the line where you want to
-        add a breakpoint.  Note that rule breakpoints can only be created in the
-        consequence of a rule.  Double-clicking on a line where no breakpoint is allowed
-        will do nothing.  A breakpoint can be removed by double-clicking the ruler once more.
-        </para>
-      </listitem>
-      <listitem>
-        <para>If you right-click the ruler, a popup menu will show up, containing the 
-        "Toggle breakpoint" action.  Note that rule breakpoints can only be created in the
-        consequence of a rule.  The action is automatically disabled if no rule
-        breakpoint is allowed at that line.  Clicking the action will add a breakpoint at the
-        selected line, or remove it if there was one already.</para>
-      </listitem>
-   </itemizedlist>
-   <para>The Debug Perspective contains a Breakpoints view which can be used to see
-   all defined breakpoints, get their properties, enable/disable or remove them, etc.</para>
-    
-   <title>Debugging rules</title>
-   <para>Drools breakpoints are only enabled if you debug your application as
-    a Drools Application.  You can do this like this:</para>
-    <itemizedlist>
-      <listitem>
-        <para>Select the main class of your application. Right click it and select the
-        "Debug As >" sub-menu.  There, select the "Debug ..." menu item to open a
-        new dialog for creating, managing and running debug configurations (see
-        screenshot below)</para>
-      </listitem>
-      <listitem>
-        <para>Select the "JBoss Rules Application" item in the left tree and click the "New
-        launch configuration" button (leftmost icon in the toolbar above the tree).  This
-        will create a new configuration and already fill in some of the properties
-        (like the project and main class) based on main class you selected in the beginning.
-        All properties shown here are the same as any standard Java program.</para>
-      </listitem>
-      <listitem>
-        <para>Change the name of your debug configuration to something meaningful.
-        You can just accept the defaults for all other properties.  For more information
-        about these properties, please check the eclipse jdt documentation.</para>
-      </listitem>
-      <listitem>
-        <para>Click the "Debug" button on the botton to start debugging your application.
-        </para>
-      </listitem>
-   </itemizedlist>
-   
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="debug_rules_configuration.JPG" />
-      </imageobject>
-    </mediaobject>
+    <section>
 
-   <para>You only have to define your debug configuration once.  The next time you try to run your
-   JBoss Rules application, you don't have to create a new one but select the one you defined
-   previously by selecting it in the tree on the left, as a sub-element of the "JBoss Rules Application"
-   tree node, and then click the Debug button.  The eclipse toolbar also contains shortcut
-   buttons to quickly re-execute the one of your previous configurations (at least when the
-   Java, Java Debug, or JBoss Rules perspective has been selected).
-   </para>
+      <title>Debugging rules</title>
 
-   <para>After clicking the "Debug" button, the application starts executing and will halt if any
-   breakpoint is encountered.  This can be a Drools rule breakpoint, or any other standard
-   Java breakpoint.  Whenever a Drools rule breakpoint is encountered, the corresponding drl
-   file is opened and the active line is highlighted.  The Variables view also contains all rule
-   parameters and their value.You can then use the default Java debug actions
-   to decide what to do next (resume, terminate, step over, etc.).  The debug views can also
-   be used to determine the contents of the working memory and agenda at that time as well
-   (you don't have to select a working memory now, the current executing working memory
-   is automatically shown).
-   </para>
+      <para>You can debug rules during the execution of your Drools application.
+      You can add breakpoints in the consequences of your rules, and whenever
+      such a breakpoint is encounted during the execution of the rules, the execution
+      is halted.  You can then inspect the variables known at that point and use any
+      of the default debugging actions to decide what should happen next (step over,
+      continue, etc.).  You can also use the debug views to inspect the content of the
+      working memory and agenda.</para>
 
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="debug_rules_configuration.JPG" />
-      </imageobject>
-    </mediaobject>
+<section>
+     <title>Creating breakpoints</title>
+     <para>You can add/remove rule breakpoints in drl files in two ways, similar to adding
+     breakpoints to Java files:</para>
+      <itemizedlist>
+        <listitem>
+          <para>Double-click the ruler of the DRL editor at the line where you want to
+          add a breakpoint.  Note that rule breakpoints can only be created in the
+          consequence of a rule.  Double-clicking on a line where no breakpoint is allowed
+          will do nothing.  A breakpoint can be removed by double-clicking the ruler once more.
+          </para>
+        </listitem>
+        <listitem>
+          <para>If you right-click the ruler, a popup menu will show up, containing the
+          "Toggle breakpoint" action.  Note that rule breakpoints can only be created in the
+          consequence of a rule.  The action is automatically disabled if no rule
+          breakpoint is allowed at that line.  Clicking the action will add a breakpoint at the
+          selected line, or remove it if there was one already.</para>
+        </listitem>
+     </itemizedlist>
+     <para>The Debug Perspective contains a Breakpoints view which can be used to see
+     all defined breakpoints, get their properties, enable/disable or remove them, etc.</para>
+</section>
+<section>
+     <title>Debugging rules</title>
+     <para>Drools breakpoints are only enabled if you debug your application as
+      a Drools Application.  You can do this like this:</para>
+      <itemizedlist>
+        <listitem>
+          <para>Select the main class of your application. Right click it and select the
+          "Debug As >" sub-menu.  There, select the "Debug ..." menu item to open a
+          new dialog for creating, managing and running debug configurations (see
+          screenshot below)</para>
+        </listitem>
+        <listitem>
+          <para>Select the "JBoss Rules Application" item in the left tree and click the "New
+          launch configuration" button (leftmost icon in the toolbar above the tree).  This
+          will create a new configuration and already fill in some of the properties
+          (like the project and main class) based on main class you selected in the beginning.
+          All properties shown here are the same as any standard Java program.</para>
+        </listitem>
+        <listitem>
+          <para>Change the name of your debug configuration to something meaningful.
+          You can just accept the defaults for all other properties.  For more information
+          about these properties, please check the eclipse jdt documentation.</para>
+        </listitem>
+        <listitem>
+          <para>Click the "Debug" button on the botton to start debugging your application.
+          </para>
+        </listitem>
+     </itemizedlist>
 
-  </section>
-    
-</section>
\ No newline at end of file
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="debug_rules_configuration.JPG" />
+        </imageobject>
+      </mediaobject>
+
+     <para>You only have to define your debug configuration once.  The next time you try to run your
+     JBoss Rules application, you don't have to create a new one but select the one you defined
+     previously by selecting it in the tree on the left, as a sub-element of the "JBoss Rules Application"
+     tree node, and then click the Debug button.  The eclipse toolbar also contains shortcut
+     buttons to quickly re-execute the one of your previous configurations (at least when the
+     Java, Java Debug, or JBoss Rules perspective has been selected).
+     </para>
+
+     <para>After clicking the "Debug" button, the application starts executing and will halt if any
+     breakpoint is encountered.  This can be a Drools rule breakpoint, or any other standard
+     Java breakpoint.  Whenever a Drools rule breakpoint is encountered, the corresponding drl
+     file is opened and the active line is highlighted.  The Variables view also contains all rule
+     parameters and their value.You can then use the default Java debug actions
+     to decide what to do next (resume, terminate, step over, etc.).  The debug views can also
+     be used to determine the contents of the working memory and agenda at that time as well
+     (you don't have to select a working memory now, the current executing working memory
+     is automatically shown).
+     </para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="debug_rules_configuration.JPG" />
+        </imageobject>
+      </mediaobject>
+    </section>
+    </section>
+
+
+</section>

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/Section-XML.xml
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/Section-XML.xml	2007-07-10 00:19:16 UTC (rev 13285)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/Section-XML.xml	2007-07-10 00:21:55 UTC (rev 13286)
@@ -20,11 +20,11 @@
     rules.</para>
 
     <para>If you do want to edit XML by hand, use a good schema aware editor
-    that provides nice heirarchical views of the XML, ideally visually
+    that provides nice hierarchical views of the XML, ideally visually
     (commercial tools like XMLSpy, Oxygen etc are good, but cost money, but
     then so do headache tablets).</para>
 
-    <para>Other scenarious where you may want to use the XML format are if you
+    <para>Other scenarios where you may want to use the XML format are if you
     have a tool that generates rules from some input (programmatically
     generated rules), or perhaps interchange from another rule language, or
     from another tool that emits XML (using XSLT you can easily transform
@@ -51,11 +51,12 @@
         </indexterm></title>
 
       <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+
 &lt;package name="com.sample"
-         xmlns="http://drools.org/drools-3.0"
+         xmlns="http://drools.org/drools-4.0"
          xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
-         xs:schemaLocation="http://drools.org/drools-3.0 drools-3.0.xsd"&gt;
-         
+         xs:schemaLocation="http://drools.org/drools-4.0 drools-4.0.xsd"&gt;
+
 &lt;import name="java.util.HashMap" /&gt;
 &lt;import name="org.drools.*" /&gt;
 
@@ -65,32 +66,144 @@
 &lt;function return-type="void" name="myFunc"&gt;
     &lt;parameter identifier="foo" type="Bar" /&gt;
     &lt;parameter identifier="bada" type="Bing" /&gt;
-        
+
     &lt;body&gt;
-        System.out.println("hello world");
+     System.out.println("hello world");
     &lt;/body&gt;
 &lt;/function&gt;
 
-&lt;rule name="my rule"&gt;
-  &lt;rule-attribute name="salience" value="10" /&gt;
+&lt;rule name="simple_rule"&gt;
+&lt;rule-attribute name="salience" value="10" /&gt;
+&lt;rule-attribute name="no-loop" value="true" /&gt;
+&lt;rule-attribute name="agenda-group" value="agenda-group" /&gt;
+&lt;rule-attribute name="activation-group" value="activation-group" /&gt;
 
-  &lt;lhs&gt;
-       &lt;column object-type="Foo" /&gt;
+&lt;lhs&gt;
+		&lt;pattern identifier="foo2" object-type="Bar" &gt;
+            &lt;or-constraint-connective&gt;
+                &lt;and-constraint-connective&gt;
+                    &lt;field-constraint field-name="a"&gt;
+                        &lt;or-restriction-connective&gt;
+                            &lt;and-restriction-connective&gt;
+                                &lt;literal-restriction evaluator="&gt;" value="60" /&gt;
+                                &lt;literal-restriction evaluator="&lt;" value="70" /&gt;
+                            &lt;/and-restriction-connective&gt;
+                            &lt;and-restriction-connective&gt;
+                                &lt;literal-restriction evaluator="&lt;" value="50" /&gt;
+                                &lt;literal-restriction evaluator="&gt;" value="55" /&gt;
+                            &lt;/and-restriction-connective&gt;
+                        &lt;/or-restriction-connective&gt;
+                    &lt;/field-constraint&gt;
+
+                    &lt;field-constraint field-name="a3"&gt;
+                        &lt;literal-restriction evaluator="==" value="black" /&gt;
+                    &lt;/field-constraint&gt;
+                &lt;/and-constraint-connective&gt;
+
+                &lt;and-constraint-connective&gt;
+                    &lt;field-constraint field-name="a"&gt;
+                        &lt;literal-restriction evaluator="==" value="40" /&gt;
+                    &lt;/field-constraint&gt;
+
+                    &lt;field-constraint field-name="a3"&gt;
+                        &lt;literal-restriction evaluator="==" value="pink" /&gt;
+                    &lt;/field-constraint&gt;
+                &lt;/and-constraint-connective&gt;
+
+                &lt;and-constraint-connective&gt;
+                    &lt;field-constraint field-name="a"&gt;
+                        &lt;literal-restriction evaluator="==" value="12"/&gt;
+                    &lt;/field-constraint&gt;
+
+                    &lt;field-constraint field-name="a3"&gt;
+                        &lt;or-restriction-connective&gt;
+                            &lt;literal-restriction evaluator="==" value="yellow"/&gt;
+                            &lt;literal-restriction evaluator="==" value="blue" /&gt;
+                        &lt;/or-restriction-connective&gt;
+                    &lt;/field-constraint&gt;
+                &lt;/and-constraint-connective&gt;
+            &lt;/or-constraint-connective&gt;
+        &lt;/pattern&gt;
+
+        &lt;not&gt;
+            &lt;pattern object-type="Person"&gt;
+                &lt;field-constraint field-name="likes"&gt;
+                    &lt;variable-restriction evaluator="==" identifier="type"/&gt;
+                &lt;/field-constraint&gt;
+            &lt;/pattern&gt;
+
+            &lt;exists&gt;
+                &lt;pattern object-type="Person"&gt;
+                    &lt;field-constraint field-name="likes"&gt;
+                        &lt;variable-restriction evaluator="==" identifier="type"/&gt;
+                    &lt;/field-constraint&gt;
+                &lt;/pattern&gt;                
+            &lt;/exists&gt;
+        &lt;/not&gt;
+
+        &lt;or-conditional-element&gt;
+            &lt;pattern identifier="foo3" object-type="Bar" &gt;
+                &lt;field-constraint field-name="a"&gt;
+                    &lt;or-restriction-connective&gt;
+                        &lt;literal-restriction evaluator="==" value="3" /&gt;
+                        &lt;literal-restriction evaluator="==" value="4" /&gt;
+                    &lt;/or-restriction-connective&gt;
+                &lt;/field-constraint&gt;
+                &lt;field-constraint field-name="a3"&gt;
+                    &lt;literal-restriction evaluator="==" value="hello" /&gt;
+                &lt;/field-constraint&gt;
+                &lt;field-constraint field-name="a4"&gt;
+                    &lt;literal-restriction evaluator="==" value="null" /&gt;
+                &lt;/field-constraint&gt;
+            &lt;/pattern&gt;
+
+            &lt;pattern identifier="foo4" object-type="Bar" &gt;
+                &lt;field-binding field-name="a" identifier="a4" /&gt;
+                &lt;field-constraint field-name="a"&gt;
+                    &lt;literal-restriction evaluator="!=" value="4" /&gt;
+                    &lt;literal-restriction evaluator="!=" value="5" /&gt;
+                &lt;/field-constraint&gt;
+            &lt;/pattern&gt;
+        &lt;/or-conditional-element&gt;
+
+        &lt;pattern identifier="foo5" object-type="Bar" &gt;
+            &lt;field-constraint field-name="b"&gt;
+                &lt;or-restriction-connective&gt;
+                    &lt;return-value-restriction evaluator="==" &gt;a4 + 1&lt;/return-value-restriction&gt;
+                    &lt;variable-restriction evaluator="&gt;" identifier="a4" /&gt;
+                    &lt;qualified-identifier-restriction evaluator="=="&gt;
+                        org.drools.Bar.BAR_ENUM_VALUE
+                    &lt;/qualified-identifier-restriction&gt;
+                &lt;/or-restriction-connective&gt;
+            &lt;/field-constraint&gt;            
+        &lt;/pattern&gt;
+
+        &lt;pattern identifier="foo6" object-type="Bar" &gt;
+            &lt;field-binding field-name="a" identifier="a4" /&gt;
+            &lt;field-constraint field-name="b"&gt;
+                &lt;literal-restriction evaluator="==" value="6" /&gt;
+            &lt;/field-constraint&gt;
+        &lt;/pattern&gt;
   &lt;/lhs&gt;
+ &lt;rhs&gt;
+    if ( a == b ) {
+      assert( foo3 );
+    } else {
+      retract( foo4 );
+    }
+    System.out.println( a4 );
+   &lt;/rhs&gt;
+&lt;/rule&gt;
 
-  &lt;rhs&gt;
-    System.out.println( "hello" );    
-&lt;/rhs&gt;
-&lt;/rule&gt;
 &lt;/package&gt;
+	
 </programlisting>
     </example>
 
     <para>Referring to the above example: Notice the key parts, the
-    declaration for the Drools 3, schema, imports, globals (application-data
-    in drools 2), functions, and the rules. Most of the elements are self
-    explanatory if you have some understanding of the Drools 3
-    features.</para>
+    declaration for the Drools 4, schema, imports, globals, functions, and the
+    rules. Most of the elements are self explanatory if you have some
+    understanding of the Drools 4 features.</para>
 
     <para>Imports: import the types you wish to use in the rule.</para>
 
@@ -106,52 +219,44 @@
     <example>
       <title>Detail of rule element</title>
 
-      <programlisting>&lt;rule name="my rule"&gt;
- &lt;lhs&gt;
+      <programlisting>&lt;rule name="simple_rule"&gt;
+&lt;rule-attribute name="salience" value="10" /&gt;
+&lt;rule-attribute name="no-loop" value="true" /&gt;
+&lt;rule-attribute name="agenda-group" value="agenda-group" /&gt;
+&lt;rule-attribute name="activation-group" value="activation-group" /&gt;
 
-  &lt;column object-type="Foo" /&gt;
-  &lt;column identifier="bar" object-type="Bar" /&gt;
+&lt;lhs&gt;
+    &lt;pattern identifier="cheese" object-type="Cheese"&gt;
+        &lt;from&gt;
+            &lt;accumulate&gt;
+                &lt;pattern object-type="Person"&gt;&lt;/pattern&gt;
+                &lt;init&gt;
+                    int total = 0;
+                &lt;/init&gt;
+                &lt;action&gt;
+                    total += $cheese.getPrice();
+                &lt;/action&gt;
+                &lt;result&gt;
+                    new Integer( total ) );
+                &lt;/result&gt;
+            &lt;/accumulate&gt;
+        &lt;/from&gt;
+    &lt;/pattern&gt;
 
-  &lt;column object-type="Foo"&gt;
-    &lt;literal field-name="field1" evaluator="==" value="value1" /&gt;
-    &lt;predicate field-name="field1" identifier="var1" expression="1==1" /&gt;
-    &lt;return-value field-name="field1" evaluator="==" expression="1==1" /&gt;
-    &lt;field-binding field-name="field1" identifier="var1" /&gt;
-    &lt;bound-variable field-name="field1" evaluator="==" identifier="var1" /&gt;
-  &lt;/column&gt;
-
-  &lt;not&gt;
-    &lt;column object-type="Bar" /&gt;
-  &lt;/not&gt;
-
-  &lt;exists&gt;
-    &lt;column object-type="Bar" /&gt;
-  &lt;/exists&gt;
-
-  &lt;and&gt;
-    &lt;or&gt;
-      &lt;column object-type="Bar" /&gt;
-    &lt;/or&gt;
-    &lt;column object-type="Yada" /&gt;
-  &lt;/and&gt;
-
-  &lt;or&gt;
-    &lt;and&gt;
-      &lt;column object-type="Foo" /&gt;
-    &lt;/and&gt;
-    &lt;column object-type="Zaa" /&gt;
-  &lt;/or&gt;
-
-  &lt;eval&gt;
-    1==1
-  &lt;/eval&gt;
- &lt;/lhs&gt;
-
- &lt;rhs&gt;
-   /* semantic actions here */
- &lt;/rhs&gt;
+    &lt;pattern identifier="max" object-type="Number"&gt;
+        &lt;from&gt;
+            &lt;accumulate&gt;
+                &lt;pattern identifier="cheese" object-type="Cheese"&gt;&lt;/pattern&gt;
+                &lt;external-function evaluator="max" expression="$price"/&gt;
+            &lt;/accumulate&gt;
+        &lt;/from&gt;
+    &lt;/pattern&gt;
+&lt;/lhs&gt;
+&lt;rhs&gt;
+    list1.add( $cheese );
+&lt;/rhs&gt;
 &lt;/rule&gt;
-</programlisting>
+	</programlisting>
     </example>
 
     <para>Referring to the above rule detail:</para>
@@ -159,19 +264,30 @@
     <para>The rule has a LHS and RHS (conditions and consequence) sections.
     The RHS is simple, it is just a block of semantic code that will be
     executed when the rule is activated. The LHS is slightly more complicated,
-    certainly more so then Drools 2.x.</para>
+    certainly more so then past versions.</para>
 
-    <para>A key element of the LHS is the Column element. This allows you to
+
+<!--
+	TODO: explain about 
+	
+	conditional-element 
+	constraint-connective
+	restriction-connective
+	
+	accumulate and external functions
+-->
+
+    <para>A key element of the LHS is the Pattern element. This allows you to
     specify a type (class) and perhaps bind a variable to an instance of that
-    class. Nested under the column object are constraints that have to be met.
-    The Predicate and Return Value constraints allow java expressions to be
-    embedded.</para>
+    class. Nested under the pattern object are constraints and conditional
+	elements that have to be met. The Predicate and Return Value constraints 
+	allow java expressions to be embedded.</para>
 
     <para>That leaves the conditional elements, not, exists, and, or etc. They
     work like their DRL counterparts. Elements that are nested under and an
     "and" element are logically "anded" together. Likewise with "or" (and you
-    can nest things further). "Exists" and "Not" work around Columns, to check
-    for the existence or non existance of a fact meeting its
+    can nest things further). "Exists" and "Not" work around Patterns, to check
+    for the existence or non existence of a fact meeting its
     constraints.</para>
 
     <para>The Eval element allows the execution of a valid snippet of java
@@ -184,61 +300,7 @@
 
   <section>
     <title>Legacy Drools 2.x XML rule format</title>
-
-    <para>The Drools 2.x legacy XML format is somewhat different to the Drools
-    3 format that you can see above.</para>
-
-    <para>However, there are some similarities. Basically the imports, globals
-    (which replace application-data in drools 2.x) work the same. Functions
-    are also similar, except that they are specified one at a time (in Drools
-    2 they where specified in a single block).</para>
-
-    <para />
-
-    <example>
-      <title>Drools 2.x xml</title>
-
-      <programlisting>  &lt;rule name="Goodbye Cruel World"&gt;
-    &lt;parameter identifier="goodbye"&gt;
-      &lt;class&gt;String&lt;/class&gt;
-    &lt;/parameter&gt;
-
-    &lt;java:condition&gt;goodbye.equals("Goodbye")&lt;/java:condition&gt;
-
-    &lt;java:consequence&gt;
-      goodbyeWorld( goodbye );
-    &lt;/java:consequence&gt;
-  &lt;/rule&gt;</programlisting>
-    </example>
-
-    <section>
-      <title>Migrating to Drools 3</title>
-
-      <para>It is possible generally to migrate from drools 2 to drools 3 XML
-      format, if you have existing rulebases you want to port to drools 3.
-      This may be done with a stylesheet, possibly. Note that Drools 2.x DSLs
-      will not be trivial to port to drools 3 XML. You would be best to look
-      at the new DSL features in Drools 3 DRL.</para>
-
-      <para>Note that while "eval" allows you to more or less directly migrate
-      your conditions from Drools 2.x to 3, it is far more powerful, and
-      performant, to use constraints on columns where possible, as it utilises
-      the full power of the engine.</para>
-
-      <example>
-        <title>Drools 3 XML equivalent</title>
-
-        <programlisting>&lt;rule name="Goodbye Cruel World"&gt;
- &lt;lhs&gt;
-   &lt;column identifier='goodbye' object-type='String' &gt;
-   &lt;eval&gt;goodbye.equals("Goodbye")&lt;/eval&gt;
- &lt;/lhs&gt;
- &lt;rhs&gt;
-   goodbyeWorld( goodbye );
- &lt;/rhs&gt;
-&lt;/rule&gt;</programlisting>
-      </example>
-    </section>
+    <para>The Drools 2.x legacy XML format is no longer supported by Drools XML parser</para>
   </section>
 
   <section>

Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/column.vsd
===================================================================
(Binary files differ)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/pattern.vsd (from rev 13279, labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Language/pattern.vsd)
===================================================================
(Binary files differ)

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/rule.vsd
===================================================================
(Binary files differ)

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/rule_attributes.png
===================================================================
(Binary files differ)

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/rule_attributes.svg
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/rule_attributes.svg	2007-07-10 00:19:16 UTC (rev 13285)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-Rule_Language/rule_attributes.svg	2007-07-10 00:21:55 UTC (rev 13286)
@@ -1,34 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated by Microsoft Visio 11.0, SVG Export, v1.0 rule_attributes.svg Page-1 --><svg xmlns="http://www.w3.org/2000/svg" xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" xmlns:xlink="http://www.w3.org/1999/xlink" width="3.71024in" height="1.85852in" viewBox="0 0 267.137 133.813" xml:space="preserve" color-interpolation-filters="sRGB" class="st6" preserveAspectRatio="xMidYMid meet" zoomAndPan="magnify" version="1.0" contentScriptType="text/ecmascript" contentStyleType="text/css">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Generated by Microsoft Visio 11.0, SVG Export, v1.0 rule_attributes.svg Page-1 -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" width="3.90316in"
+		height="4.06922in" viewBox="0 0 281.027 292.984" xml:space="preserve" color-interpolation-filters="sRGB" class="st7">
 	<v:documentProperties v:langID="1033" v:metric="true" v:viewMarkup="false"/>
 
-	<style type="text/css" xml:space="preserve">
-	
+	<style type="text/css">
+	<![CDATA[
 		.st1 {fill:#e8eef7;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.24}
 		.st2 {fill:#000000;font-family:Arial;font-size:0.666664em}
-		.st3 {marker-end:url(#mrkr2-12);stroke:#4677bf;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.24}
-		.st4 {fill:#4677bf;fill-opacity:1;stroke:#4677bf;stroke-opacity:1;stroke-width:0.086956386131125}
-		.st5 {fill:#000000;font-family:Arial;font-size:0.666664em;font-style:italic}
-		.st6 {fill:none;fill-rule:evenodd;font-size:12;overflow:visible;stroke-linecap:square;stroke-miterlimit:3}
-	
+		.st3 {font-size:1em}
+		.st4 {marker-end:url(#mrkr2-16);stroke:#4677bf;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.24}
+		.st5 {fill:#4677bf;fill-opacity:1;stroke:#4677bf;stroke-opacity:1;stroke-width:0.08695652173913}
+		.st6 {fill:#000000;font-family:Arial;font-size:0.666664em;font-style:italic}
+		.st7 {fill:none;fill-rule:evenodd;font-size:12;overflow:visible;stroke-linecap:square;stroke-miterlimit:3}
+	]]>
 	</style>
 
 	<defs id="Markers">
 		<g id="lend2">
 			<path d="M 1 1 L 0 0 L 1 -1 L 1 1 " style="stroke:none"/>
 		</g>
-		<marker xmlns="http://www.w3.org/TR/xhtml1/transitional" overflow="visible" id="mrkr2-12" class="st4" v:arrowType="2" v:arrowSize="2" v:setback="0" refX="-0" orient="auto" markerUnits="strokeWidth" preserveAspectRatio="xMidYMid meet">
-			<use xmlns="http://www.w3.org/2000/svg" xlink:href="#lend2" transform="scale(-11.500017934187,-11.500017934187) " xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
+		<marker id="mrkr2-16" class="st5" v:arrowType="2" v:arrowSize="2" v:setback="11.5" refX="-11.5" orient="auto"
+				markerUnits="strokeWidth">
+			<use xlink:href="#lend2" transform="scale(-11.5,-11.5) "/>
 		</marker>
 	</defs>
 	<g v:mID="0" v:index="1" v:groupContext="foregroundPage">
-		<title content="structured text">Page-1</title>
-		<v:pageProperties v:drawingScale="0.0393701" v:pageScale="0.0393701" v:drawingUnits="24" v:shadowOffsetX="8.50394" v:shadowOffsetY="-8.50394"/>
+		<title>Page-1</title>
+		<v:pageProperties v:drawingScale="0.0393701" v:pageScale="0.0393701" v:drawingUnits="24" v:shadowOffsetX="8.50394"
+				v:shadowOffsetY="-8.50394"/>
 		<v:layer v:name="Flowchart" v:index="0"/>
 		<v:layer v:name="Connector" v:index="1"/>
-		<g id="shape1-1" v:mID="1" v:groupContext="shape" v:layerMember="0" transform="translate(64.9003,-104.673)">
-			<title content="structured text">Process.89</title>
-			<desc content="structured text">‘no-loop’</desc>
+		<g id="shape5-1" v:mID="5" v:groupContext="shape" v:layerMember="0" transform="translate(64.9004,-263.849)">
+			<title>Process.89</title>
+			<desc>‘no-loop’</desc>
 			<v:custProps>
 				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
 				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
@@ -37,13 +43,14 @@
 			<v:userDefs>
 				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
 			</v:userDefs>
-			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5196"/>
-			<v:textRect cx="23.2135" cy="127.103" width="46.44" height="13.4147"/>
-			<path d="M-0 130.97 A2.83472 2.83472 -180 0 0 2.83 133.81 L43.59 133.81 A2.83472 2.83472 -180 0 0 46.43 130.97 L46.43        123.23 A2.83472 2.83472 -180 0 0 43.59 120.39 L2.83 120.39 A2.83472 2.83472 -180 0 0 -0 123.23 L0 130.97        Z" class="st1"/>
-			<text x="8.1" y="129.5" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>‘no-loop’</text>		</g>
-		<g id="shape2-4" v:mID="2" v:groupContext="shape" v:layerMember="0" transform="translate(65.1966,-85.6582)">
-			<title content="structured text">Process.90</title>
-			<desc content="structured text">‘salience’</desc>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="23.2137" cy="286.277" width="46.43" height="13.4147"/>
+			<rect x="0" y="279.569" width="46.4273" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="8.1" y="288.68" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>‘n<tspan class="st3"
+						v:langID="2057">o</tspan><tspan class="st3" v:langID="2057">-</tspan>l<tspan class="st3" v:langID="2057">oop</tspan>’</text>		</g>
+		<g id="shape8-7" v:mID="8" v:groupContext="shape" v:layerMember="0" transform="translate(64.9004,-216.257)">
+			<title>Process.90</title>
+			<desc>‘salience’</desc>
 			<v:custProps>
 				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
 				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
@@ -52,21 +59,23 @@
 			<v:userDefs>
 				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
 			</v:userDefs>
-			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5196"/>
-			<v:textRect cx="23.2135" cy="127.103" width="46.44" height="13.4147"/>
-			<path d="M-0 130.97 A2.83472 2.83472 -180 0 0 2.83 133.81 L43.59 133.81 A2.83472 2.83472 -180 0 0 46.43 130.97 L46.43        123.23 A2.83472 2.83472 -180 0 0 43.59 120.39 L2.83 120.39 A2.83472 2.83472 -180 0 0 -0 123.23 L0 130.97        Z" class="st1"/>
-			<text x="6.77" y="129.5" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>‘salience’</text>		</g>
-		<g id="shape3-7" v:mID="3" v:groupContext="shape" v:layerMember="1" transform="translate(11.9778,-111.381)">
-			<title content="structured text">Dynamic connector.91</title>
-			<path d="M0 133.81 L50.16 133.81 L52.92 133.81" class="st3"/>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="23.2137" cy="286.277" width="46.43" height="13.4147"/>
+			<rect x="0" y="279.569" width="46.4273" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="6.77" y="288.68" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>‘<tspan class="st3"
+						v:langID="2057">salience</tspan>’</text>		</g>
+		<g id="shape10-11" v:mID="10" v:groupContext="shape" v:layerMember="1" transform="translate(11.9778,-263.469)">
+			<title>Dynamic connector.91</title>
+			<path d="M0 285.9 L50.16 285.9" class="st4"/>
 		</g>
-		<g id="shape4-13" v:mID="4" v:groupContext="shape" v:layerMember="1" transform="translate(18.3206,-91.9863)">
-			<title content="structured text">Dynamic connector.92</title>
-			<path d="M0 114.42 L11.71 114.42 A5.70531 4.01384 180 0 1 17.42 118.43 L17.42 129.79 A5.70531 4.01384 -0 0 0 23.13 133.81        L44.1 133.81 L44.12 133.81 L46.88 133.81" class="st3"/>
+		<g id="shape27-17" v:mID="27" v:groupContext="shape" v:layerMember="1" transform="translate(18.3206,-270.556)">
+			<title>Dynamic connector.92</title>
+			<path d="M0 292.98 L11.64 292.98 A5.66929 5.66929 0 0 1 17.31 298.65 L17.31 334.91 A5.66929 5.66929 -180 0 0 22.98 340.58
+						 L43.82 340.58" class="st4"/>
 		</g>
-		<g id="shape5-18" v:mID="5" v:groupContext="shape" v:layerMember="0" transform="translate(51.0233,-68.6503)">
-			<title content="structured text">Process.93</title>
-			<desc content="structured text">‘agenda-group’</desc>
+		<g id="shape35-22" v:mID="35" v:groupContext="shape" v:layerMember="0" transform="translate(51.2499,-192.461)">
+			<title>Process.93</title>
+			<desc>‘agenda-group’</desc>
 			<v:custProps>
 				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
 				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
@@ -75,13 +84,15 @@
 			<v:userDefs>
 				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
 			</v:userDefs>
-			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5196"/>
-			<v:textRect cx="36.8638" cy="127.103" width="73.74" height="13.4147"/>
-			<path d="M-0 130.97 A2.83472 2.83472 -180 0 0 2.83 133.81 L70.89 133.81 A2.83472 2.83472 -180 0 0 73.73 130.97 L73.73        123.23 A2.83472 2.83472 -180 0 0 70.89 120.39 L2.83 120.39 A2.83472 2.83472 -180 0 0 0 123.23 L0 130.97        Z" class="st1"/>
-			<text x="10.18" y="129.5" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>‘agenda-group’</text>		</g>
-		<g id="shape6-21" v:mID="6" v:groupContext="shape" v:layerMember="0" transform="translate(58.5291,-0.618942)">
-			<title content="structured text">Process.94</title>
-			<desc content="structured text">‘duration’</desc>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="36.8641" cy="286.277" width="73.73" height="13.4147"/>
+			<rect x="0" y="279.569" width="73.7282" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="10.19" y="288.68" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>‘a<tspan class="st3"
+						v:langID="2057">genda</tspan><tspan class="st3" v:langID="2057">-</tspan>g<tspan class="st3"
+						v:langID="2057">roup</tspan>’</text>		</g>
+		<g id="shape41-28" v:mID="41" v:groupContext="shape" v:layerMember="0" transform="translate(58.7694,-2.09267)">
+			<title>Process.94</title>
+			<desc>‘duration’</desc>
 			<v:custProps>
 				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
 				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
@@ -90,37 +101,43 @@
 			<v:userDefs>
 				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
 			</v:userDefs>
-			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5196"/>
-			<v:textRect cx="29.3443" cy="127.103" width="58.7" height="13.4147"/>
-			<path d="M0 130.97 A2.83472 2.83472 -180 0 0 2.83 133.81 L55.85 133.81 A2.83472 2.83472 -180 0 0 58.69 130.97 L58.69        123.23 A2.83472 2.83472 -180 0 0 55.85 120.39 L2.83 120.39 A2.83472 2.83472 -180 0 0 0 123.23 L0 130.97        Z" class="st1"/>
-			<text x="13.11" y="129.5" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>‘duration’</text>		</g>
-		<g id="shape7-24" v:mID="7" v:groupContext="shape" v:layerMember="1" transform="translate(18.3206,-76.3957)">
-			<title content="structured text">Dynamic connector.95</title>
-			<path d="M0 98.83 L11.64 98.83 A5.66928 3.62107 180 0 1 17.31 102.45 L17.31 130.19 A5.66928 3.62107 -0 0 0 22.98 133.81        L30.17 133.81 L32.93 133.81" class="st3"/>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="29.3446" cy="286.277" width="58.69" height="13.4147"/>
+			<rect x="0" y="279.569" width="58.6892" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="13.12" y="288.68" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>‘<tspan class="st3"
+						v:langID="2057">duration</tspan>’</text>		</g>
+		<g id="shape42-32" v:mID="42" v:groupContext="shape" v:layerMember="1" transform="translate(18.3206,-270.556)">
+			<title>Dynamic connector.95</title>
+			<path d="M0 292.98 L11.64 292.98 A5.66929 5.66929 0 0 1 17.31 298.65 L17.31 358.7 A5.66929 5.66929 -180 0 0 22.98 364.37
+						 L30.17 364.37" class="st4"/>
 		</g>
-		<g id="shape8-29" v:mID="8" v:groupContext="shape" v:layerMember="1" transform="translate(18.3206,-6.94841)">
-			<title content="structured text">Dynamic connector.96</title>
-			<path d="M0 29.38 L11.64 29.38 A5.66928 5.66928 0 0 1 17.31 35.05 L17.31 128.14 A5.66928 5.66928 -180 0 0 22.98 133.81        L37.69 133.81 L40.45 133.81" class="st3"/>
+		<g id="shape43-37" v:mID="43" v:groupContext="shape" v:layerMember="1" transform="translate(18.3206,-270.556)">
+			<title>Dynamic connector.96</title>
+			<path d="M0 292.98 L11.64 292.98 A5.66929 5.66929 0 0 1 17.31 298.65 L17.31 549.07 A5.66929 5.66929 -180 0 0 22.98 554.74
+						 L37.69 554.74" class="st4"/>
 		</g>
-		<g id="shape9-34" v:mID="9" v:groupContext="shape" v:layerMember="1" transform="translate(111.328,-111.385)">
-			<title content="structured text">Dynamic connector.98</title>
-			<path d="M0 133.81 L32.06 133.81 L34.82 133.81" class="st3"/>
+		<g id="shape44-42" v:mID="44" v:groupContext="shape" v:layerMember="1" transform="translate(111.328,-277.643)">
+			<title>Dynamic connector.98</title>
+			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
+			<path d="M0 300.07 L32.06 300.07" class="st4"/>
 		</g>
-		<g id="shape10-39" v:mID="10" v:groupContext="shape" v:layerMember="1" transform="translate(117.459,-6.94841)">
-			<title content="structured text">Dynamic connector.99</title>
-			<path d="M0 133.81 L25.13 133.81 L27.89 133.81" class="st3"/>
+		<g id="shape45-47" v:mID="45" v:groupContext="shape" v:layerMember="1" transform="translate(117.459,-1.71339)">
+			<title>Dynamic connector.99</title>
+			<path d="M0 285.9 L25.13 285.9" class="st4"/>
 		</g>
-		<g id="shape11-44" v:mID="11" v:groupContext="shape" v:layerMember="1" transform="translate(111.328,-93.4036)">
-			<title content="structured text">Dynamic connector.100</title>
-			<path d="M0 133.81 L9.6 133.81 A5.66928 3.72081 -0 0 0 15.27 130.09 L15.27 119.55 A5.66928 3.72081 180 0 1 20.94 115.83        L58.66 115.83 L61.42 115.83" class="st3"/>
+		<g id="shape46-52" v:mID="46" v:groupContext="shape" v:layerMember="1" transform="translate(111.328,-222.964)">
+			<title>Dynamic connector.100</title>
+			<path d="M0 292.98 L22.5 292.98 A5.66929 5.66929 -180 0 0 28.17 287.31 L28.17 248.72 A3.32794 3.32794 0 0 1 31.5 245.39
+						 L32.06 245.39" class="st4"/>
 		</g>
-		<g id="shape12-49" v:mID="12" v:groupContext="shape" v:layerMember="1" transform="translate(124.978,-76.3957)">
-			<title content="structured text">Dynamic connector.101</title>
-			<path d="M0 133.81 L5.31 133.81 A5.31495 3.39446 -0 0 0 10.63 130.41 L10.63 102.19 A5.27186 3.36694 180 0 1 15.9 98.82        L18.41 98.82 L21.17 98.82" class="st3"/>
+		<g id="shape47-57" v:mID="47" v:groupContext="shape" v:layerMember="1" transform="translate(124.978,-199.168)">
+			<title>Dynamic connector.101</title>
+			<path d="M0 292.98 L8.71 292.98 A5.66929 5.66929 -180 0 0 14.38 287.31 L14.38 224.99 A3.39596 3.39596 0 0 1 17.78 221.6
+						 L18.41 221.6" class="st4"/>
 		</g>
-		<g id="shape13-54" v:mID="13" v:groupContext="shape" v:layerMember="0" transform="translate(146.152,-104.673)">
-			<title content="structured text">Process.156</title>
-			<desc content="structured text">value</desc>
+		<g id="shape48-62" v:mID="48" v:groupContext="shape" v:layerMember="0" transform="translate(146.152,-263.849)">
+			<title>Process.156</title>
+			<desc>value</desc>
 			<v:custProps>
 				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
 				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
@@ -129,20 +146,21 @@
 			<v:userDefs>
 				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
 			</v:userDefs>
-			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5196"/>
-			<v:textRect cx="18.4974" cy="127.103" width="37.01" height="13.4147"/>
-			<path d="M0 130.97 A2.83472 2.83472 -180 0 0 2.83 133.81 L34.16 133.81 A2.83472 2.83472 -180 0 0 37 130.97 L37 123.23        A2.83472 2.83472 -180 0 0 34.16 120.39 L2.83 120.39 A2.83472 2.83472 -180 0 0 0 123.23 L0 130.97 Z" class="st1"/>
-			<text x="8.93" y="129.5" class="st5" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>value</text>		</g>
-		<g id="shape14-57" v:mID="14" v:groupContext="shape" v:layerMember="1;0" transform="translate(255.157,-105.509)">
-			<title content="structured text">On-page reference.157</title>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="18.4976" cy="286.277" width="37" height="13.4147"/>
+			<rect x="0" y="279.569" width="36.9953" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="8.94" y="288.68" class="st6" v:langID="2057"><v:paragraph v:horizAlign="1"/><v:tabList/>value</text>		</g>
+		<g id="shape49-65" v:mID="49" v:groupContext="shape" v:layerMember="1;0" transform="translate(255.158,-264.687)">
+			<title>On-page reference.157</title>
 			<v:userDefs>
 				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
 			</v:userDefs>
-			<path d="M0 127.94 A5.86999 5.86999 0 0 1 11.74 127.94 A5.86999 5.86999 0 0 1 0 127.94 Z" class="st1"/>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<path d="M0 287.12 A5.86892 5.86892 0 0 1 11.74 287.12 A5.86892 5.86892 0 0 1 0 287.12 Z" class="st1"/>
 		</g>
-		<g id="shape15-59" v:mID="15" v:groupContext="shape" v:layerMember="0" transform="translate(206.889,-120.153)">
-			<title content="structured text">Process.160</title>
-			<desc content="structured text">;</desc>
+		<g id="shape50-67" v:mID="50" v:groupContext="shape" v:layerMember="0" transform="translate(206.89,-279.329)">
+			<title>Process.160</title>
+			<desc>;</desc>
 			<v:custProps>
 				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
 				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
@@ -151,32 +169,35 @@
 			<v:userDefs>
 				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
 			</v:userDefs>
-			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5196"/>
-			<v:textRect cx="10.0608" cy="127.103" width="20.14" height="13.4147"/>
-			<path d="M0 130.97 A2.83472 2.83472 -180 0 0 2.83 133.81 L17.29 133.81 A2.83472 2.83472 -180 0 0 20.12 130.97 L20.12        123.23 A2.83472 2.83472 -180 0 0 17.29 120.39 L2.83 120.39 A2.83472 2.83472 -180 0 0 -0 123.23 L0 130.97        Z" class="st1"/>
-			<text x="8.95" y="129.5" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>;</text>		</g>
-		<g id="shape16-62" v:mID="16" v:groupContext="shape" v:layerMember="1" transform="translate(183.147,-111.378)">
-			<title content="structured text">Dynamic connector.161</title>
-			<path d="M0 133.81 L5.31 133.81 A5.31495 5.31495 -180 0 0 10.63 128.49 L10.63 124 A5.66928 5.66928 0 0 1 16.3 118.33        L20.98 118.33 L23.74 118.33" class="st3"/>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="10.061" cy="286.277" width="20.13" height="13.4147"/>
+			<rect x="0" y="279.569" width="20.122" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="8.94" y="288.68" class="st2" v:langID="2057"><v:paragraph v:horizAlign="1"/><v:tabList/>;</text>		</g>
+		<g id="shape51-70" v:mID="51" v:groupContext="shape" v:layerMember="1" transform="translate(183.147,-270.556)">
+			<title>Dynamic connector.161</title>
+			<path d="M0 292.98 L5.31 292.98 A5.31496 5.31496 -180 0 0 10.63 287.67 L10.63 283.17 A5.66929 5.66929 0 0 1 16.3 277.5
+						 L20.98 277.5" class="st4"/>
 		</g>
-		<g id="shape17-67" v:mID="17" v:groupContext="shape" v:layerMember="1" transform="translate(227.011,-111.378)">
-			<title content="structured text">Dynamic connector.162</title>
-			<path d="M0 118.33 L5.31 118.33 A5.31495 5.31495 0 0 1 10.63 123.64 L10.63 128.14 A5.66928 5.66928 -180 0 0 16.3 133.81        L25.39 133.81 L28.15 133.81" class="st3"/>
+		<g id="shape52-75" v:mID="52" v:groupContext="shape" v:layerMember="1" transform="translate(227.012,-286.037)">
+			<title>Dynamic connector.162</title>
+			<path d="M0 292.98 L5.31 292.98 A5.31496 5.31496 0 0 1 10.63 298.3 L10.63 302.8 A5.66929 5.66929 -180 0 0 16.3 308.46
+						 L25.39 308.46" class="st4"/>
 		</g>
-		<g id="shape18-72" v:mID="18" v:groupContext="shape" v:layerMember="1" transform="translate(183.147,-111.381)">
-			<title content="structured text">Dynamic connector.163</title>
-			<path d="M0 133.81 L69.25 133.81 L72.01 133.81" class="st3"/>
+		<g id="shape53-80" v:mID="53" v:groupContext="shape" v:layerMember="1" transform="translate(183.147,-263.469)">
+			<title>Dynamic connector.163</title>
+			<path d="M0 285.9 L69.25 285.9" class="st4"/>
 		</g>
-		<g id="shape19-77" v:mID="19" v:groupContext="shape" v:layerMember="1;0" transform="translate(0.24,-105.509)">
-			<title content="structured text">On-page reference.164</title>
+		<g id="shape54-85" v:mID="54" v:groupContext="shape" v:layerMember="1;0" transform="translate(0.24,-264.687)">
+			<title>On-page reference.164</title>
 			<v:userDefs>
 				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
 			</v:userDefs>
-			<path d="M0 127.94 A5.86999 5.86999 0 0 1 11.74 127.94 A5.86999 5.86999 0 0 1 0 127.94 Z" class="st1"/>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<path d="M0 287.12 A5.86892 5.86892 0 0 1 11.74 287.12 A5.86892 5.86892 0 0 1 0 287.12 Z" class="st1"/>
 		</g>
-		<g id="shape20-79" v:mID="20" v:groupContext="shape" v:layerMember="0" transform="translate(145.346,-0.240005)">
-			<title content="structured text">Process.201</title>
-			<desc content="structured text">duration-value (ms)</desc>
+		<g id="shape58-87" v:mID="58" v:groupContext="shape" v:layerMember="0" transform="translate(145.346,-2.09267)">
+			<title>Process.201</title>
+			<desc>duration-value (ms)</desc>
 			<v:custProps>
 				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
 				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
@@ -185,17 +206,17 @@
 			<v:userDefs>
 				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
 			</v:userDefs>
-			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5196"/>
-			<v:textRect cx="48.628" cy="127.103" width="97.27" height="13.4147"/>
-			<path d="M-0 130.97 A2.83472 2.83472 -180 0 0 2.83 133.81 L94.42 133.81 A2.83472 2.83472 -180 0 0 97.26 130.97 L97.26        123.23 A2.83472 2.83472 -180 0 0 94.42 120.39 L2.83 120.39 A2.83472 2.83472 -180 0 0 0 123.23 L0 130.97        Z" class="st1"/>
-			<text x="14.16" y="129.5" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>duration-value (ms)</text>		</g>
-		<g id="shape21-82" v:mID="21" v:groupContext="shape" v:layerMember="1" transform="translate(242.601,-6.94502)">
-			<title content="structured text">Dynamic connector.202</title>
-			<path d="M0 133.81 L12.76 133.81 A5.66928 5.66928 -180 0 0 18.43 128.14 L18.43 38 L18.43 35.24" class="st3"/>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="48.6282" cy="286.277" width="97.26" height="13.4147"/>
+			<rect x="0" y="279.569" width="97.2563" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="14.17" y="288.68" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>duration-value (ms)</text>		</g>
+		<g id="shape59-90" v:mID="59" v:groupContext="shape" v:layerMember="1" transform="translate(242.602,-8.8)">
+			<title>Dynamic connector.202</title>
+			<path d="M0 292.98 L12.76 292.98 A5.66929 5.66929 -180 0 0 18.43 287.31 L18.43 39.86" class="st4"/>
 		</g>
-		<g id="shape22-87" v:mID="22" v:groupContext="shape" v:layerMember="0" transform="translate(51.0233,-51.6424)">
-			<title content="structured text">Process.60</title>
-			<desc content="structured text">‘auto-focus’</desc>
+		<g id="shape60-95" v:mID="60" v:groupContext="shape" v:layerMember="0" transform="translate(51.4584,-168.665)">
+			<title>Process.60</title>
+			<desc>‘auto-focus’</desc>
 			<v:custProps>
 				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
 				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
@@ -204,21 +225,24 @@
 			<v:userDefs>
 				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
 			</v:userDefs>
-			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5196"/>
-			<v:textRect cx="36.8638" cy="127.103" width="73.74" height="13.4147"/>
-			<path d="M-0 130.97 A2.83472 2.83472 -180 0 0 2.83 133.81 L70.89 133.81 A2.83472 2.83472 -180 0 0 73.73 130.97 L73.73        123.23 A2.83472 2.83472 -180 0 0 70.89 120.39 L2.83 120.39 A2.83472 2.83472 -180 0 0 -0 123.23 L0 130.97        Z" class="st1"/>
-			<text x="16.41" y="129.5" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>‘auto-focus’</text>		</g>
-		<g id="shape23-90" v:mID="23" v:groupContext="shape" v:layerMember="1" transform="translate(11.9778,-59.3879)">
-			<title content="structured text">Dynamic connector.61</title>
-			<path d="M0 81.82 L18.19 81.82 A5.66928 3.71688 180 0 1 23.86 85.53 L23.86 130.09 A5.66928 3.71688 -0 0 0 29.53 133.81        L36.72 133.81 L39.48 133.81" class="st3"/>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="36.8641" cy="286.277" width="73.73" height="13.4147"/>
+			<rect x="0" y="279.569" width="73.7282" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="16.42" y="288.68" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>‘<tspan class="st3"
+						v:langID="2057">auto</tspan><tspan class="st3" v:langID="2057">-</tspan><tspan class="st3" v:langID="2057">focus</tspan>’</text>		</g>
+		<g id="shape61-101" v:mID="61" v:groupContext="shape" v:layerMember="1" transform="translate(11.9778,-270.556)">
+			<title>Dynamic connector.61</title>
+			<path d="M0 292.98 L18.19 292.98 A5.66929 5.66929 0 0 1 23.86 298.65 L23.86 382.5 A5.66929 5.66929 -180 0 0 29.53 388.17
+						 L36.72 388.17" class="st4"/>
 		</g>
-		<g id="shape24-95" v:mID="24" v:groupContext="shape" v:layerMember="1" transform="translate(125.187,-56.5532)">
-			<title content="structured text">Dynamic connector.62</title>
-			<path d="M0 133.81 L5.31 133.81 A5.31495 3.6745 -0 0 0 10.63 130.13 L10.63 82.55 A5.16761 3.57264 180 0 1 15.8 78.98        L18.21 78.98 L20.97 78.98" class="st3"/>
+		<g id="shape62-106" v:mID="62" v:groupContext="shape" v:layerMember="1" transform="translate(125.187,-175.372)">
+			<title>Dynamic connector.62</title>
+			<path d="M0 292.98 L8.5 292.98 A5.66929 5.66929 -180 0 0 14.17 287.31 L14.17 201.2 A3.39596 3.39596 0 0 1 17.57 197.8
+						 L18.21 197.8" class="st4"/>
 		</g>
-		<g id="shape25-100" v:mID="25" v:groupContext="shape" v:layerMember="0" transform="translate(52.4406,-31.0415)">
-			<title content="structured text">Process.25</title>
-			<desc content="structured text">‘auto-focus’</desc>
+		<g id="shape63-111" v:mID="63" v:groupContext="shape" v:layerMember="0" transform="translate(56.9329,-240.053)">
+			<title>Process.63</title>
+			<desc>‘lock-on-active’</desc>
 			<v:custProps>
 				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
 				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
@@ -227,17 +251,173 @@
 			<v:userDefs>
 				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
 			</v:userDefs>
-			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5196"/>
-			<v:textRect cx="36.8638" cy="127.103" width="73.74" height="13.4147"/>
-			<path d="M0 130.97 A2.83472 2.83472 -180 0 0 2.83 133.81 L70.89 133.81 A2.83472 2.83472 -180 0 0 73.73 130.97 L73.73        123.23 A2.83472 2.83472 -180 0 0 70.89 120.39 L2.83 120.39 A2.83472 2.83472 -180 0 0 -0 123.23 L0 130.97        Z" class="st1"/>
-			<text x="6.63" y="129.5" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>‘activation-group’</text>		</g>
-		<g id="shape26-103" v:mID="26" v:groupContext="shape" v:layerMember="1" transform="translate(11.7796,-36.7108)">
-			<title content="structured text">Dynamic connector.26</title>
-			<path d="M0 59.14 L18.19 59.14 A5.66928 5.33811 180 0 1 23.86 64.48 L23.86 128.47 A5.66928 5.33811 -0 0 0 29.53 133.81        L36.72 133.81 L39.48 133.81" class="st3"/>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="30.4724" cy="286.277" width="60.95" height="13.4147"/>
+			<rect x="0" y="279.569" width="60.9449" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="4.02" y="288.68" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>‘<tspan class="st3"
+						v:langID="2057">lock</tspan><tspan class="st3" v:langID="2057">-</tspan><tspan class="st3" v:langID="2057">on</tspan><tspan
+						class="st3" v:langID="2057">-</tspan><tspan class="st3" v:langID="2057">active</tspan>’</text>		</g>
+		<g id="shape64-119" v:mID="64" v:groupContext="shape" v:layerMember="1" transform="translate(11.9778,-270.556)">
+			<title>Dynamic connector.64</title>
+			<path d="M0 292.98 L18.19 292.98 A5.66929 5.66929 0 0 1 23.86 298.65 L23.86 311.11 A5.66929 5.66929 -180 0 0 29.53 316.78
+						 L42.2 316.78" class="st4"/>
 		</g>
-		<g id="shape27-108" v:mID="27" v:groupContext="shape" v:layerMember="1" transform="translate(125.197,-40.9628)">
-			<title content="structured text">Dynamic connector.27</title>
-			<path d="M0 133.81 L5.31 133.81 A5.31495 4.74968 -0 0 0 10.63 129.05 L10.63 67.55 A5.16761 4.61801 180 0 1 15.8 62.94        L18.21 62.94 L20.97 62.94" class="st3"/>
+		<g id="shape65-124" v:mID="65" v:groupContext="shape" v:layerMember="1" transform="translate(117.878,-246.76)">
+			<title>Dynamic connector.65</title>
+			<path d="M0 292.98 L15.81 292.98 A5.66929 5.66929 -180 0 0 21.48 287.31 L21.48 272.58 A3.39596 3.39596 0 0 1 24.88 269.19
+						 L25.51 269.19" class="st4"/>
 		</g>
+		<g id="shape66-129" v:mID="66" v:groupContext="shape" v:layerMember="0" transform="translate(51.5944,-144.869)">
+			<title>Process.66</title>
+			<desc>‘ruleflow-group’</desc>
+			<v:custProps>
+				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
+				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
+				<v:cp v:nameU="Resources" v:lbl="Resources" v:langID="1033"/>
+			</v:custProps>
+			<v:userDefs>
+				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
+			</v:userDefs>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="36.8641" cy="286.277" width="73.73" height="13.4147"/>
+			<rect x="0" y="279.569" width="73.7282" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="9.75" y="288.68" class="st2" v:langID="2057"><v:paragraph v:horizAlign="1"/><v:tabList/>‘ruleflow-<tspan
+						class="st3" v:langID="1033">g</tspan>roup<tspan class="st3" v:langID="1033">’</tspan></text>		</g>
+		<g id="shape67-134" v:mID="67" v:groupContext="shape" v:layerMember="1" transform="translate(11.9778,-270.556)">
+			<title>Dynamic connector.67</title>
+			<path d="M0 292.98 L18.19 292.98 A5.66929 5.66929 0 0 1 23.86 298.65 L23.86 406.29 A5.66929 5.66929 -180 0 0 29.53 411.96
+						 L36.86 411.96" class="st4"/>
+		</g>
+		<g id="shape68-139" v:mID="68" v:groupContext="shape" v:layerMember="1" transform="translate(125.323,-151.576)">
+			<title>Dynamic connector.68</title>
+			<path d="M0 292.98 L8.5 292.98 A5.66929 5.66929 -180 0 0 14.17 287.31 L14.17 177.33 A3.32794 3.32794 0 0 1 17.5 174 L18.07
+						 174" class="st4"/>
+		</g>
+		<g id="shape69-144" v:mID="69" v:groupContext="shape" v:layerMember="0" transform="translate(50.7224,-121.073)">
+			<title>Process.69</title>
+			<desc>‘activation-group’</desc>
+			<v:custProps>
+				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
+				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
+				<v:cp v:nameU="Resources" v:lbl="Resources" v:langID="1033"/>
+			</v:custProps>
+			<v:userDefs>
+				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
+			</v:userDefs>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="36.8641" cy="286.277" width="73.73" height="13.4147"/>
+			<rect x="0" y="279.569" width="73.7282" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="6.64" y="288.68" class="st2" v:langID="2057"><v:paragraph v:horizAlign="1"/><v:tabList/>‘activation-<tspan
+						class="st3" v:langID="1033">g</tspan>roup<tspan class="st3" v:langID="1033">’</tspan></text>		</g>
+		<g id="shape70-149" v:mID="70" v:groupContext="shape" v:layerMember="1" transform="translate(11.9778,-270.556)">
+			<title>Dynamic connector.70</title>
+			<path d="M0 292.98 L18.19 292.98 A5.66929 5.66929 0 0 1 23.86 298.65 L23.86 430.09 A5.66929 5.66929 -180 0 0 29.53 435.76
+						 L35.98 435.76" class="st4"/>
+		</g>
+		<g id="shape71-154" v:mID="71" v:groupContext="shape" v:layerMember="1" transform="translate(124.451,-127.78)">
+			<title>Dynamic connector.71</title>
+			<path d="M0 292.98 L9.24 292.98 A5.66929 5.66929 -180 0 0 14.91 287.31 L14.91 153.6 A3.39596 3.39596 0 0 1 18.31 150.21
+						 L18.94 150.21" class="st4"/>
+		</g>
+		<g id="shape72-159" v:mID="72" v:groupContext="shape" v:layerMember="0" transform="translate(53.1578,-97.2767)">
+			<title>Process.72</title>
+			<desc>‘dialect’</desc>
+			<v:custProps>
+				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
+				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
+				<v:cp v:nameU="Resources" v:lbl="Resources" v:langID="1033"/>
+			</v:custProps>
+			<v:userDefs>
+				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
+			</v:userDefs>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="36.8641" cy="286.277" width="73.73" height="13.4147"/>
+			<rect x="0" y="279.569" width="73.7282" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="23.54" y="288.68" class="st2" v:langID="2057"><v:paragraph v:horizAlign="1"/><v:tabList/>‘dialect’</text>		</g>
+		<g id="shape73-162" v:mID="73" v:groupContext="shape" v:layerMember="1" transform="translate(11.9778,-270.556)">
+			<title>Dynamic connector.73</title>
+			<path d="M0 292.98 L18.19 292.98 A5.66929 5.66929 0 0 1 23.86 298.65 L23.86 453.89 A5.66929 5.66929 -180 0 0 29.53 459.56
+						 L38.42 459.56" class="st4"/>
+		</g>
+		<g id="shape74-167" v:mID="74" v:groupContext="shape" v:layerMember="1" transform="translate(126.886,-103.984)">
+			<title>Dynamic connector.74</title>
+			<path d="M0 292.98 L6.8 292.98 A5.66929 5.66929 -180 0 0 12.47 287.31 L12.47 129.81 A3.39596 3.39596 0 0 1 15.87 126.41
+						 L16.51 126.41" class="st4"/>
+		</g>
+		<g id="shape75-172" v:mID="75" v:groupContext="shape" v:layerMember="0" transform="translate(52.2857,-73.4807)">
+			<title>Process.75</title>
+			<desc>‘date-effective’</desc>
+			<v:custProps>
+				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
+				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
+				<v:cp v:nameU="Resources" v:lbl="Resources" v:langID="1033"/>
+			</v:custProps>
+			<v:userDefs>
+				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
+			</v:userDefs>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="36.8641" cy="286.277" width="73.73" height="13.4147"/>
+			<rect x="0" y="279.569" width="73.7282" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="11.08" y="288.68" class="st2" v:langID="2057"><v:paragraph v:horizAlign="1"/><v:tabList/>‘date-effective’</text>		</g>
+		<g id="shape76-175" v:mID="76" v:groupContext="shape" v:layerMember="1" transform="translate(11.9778,-270.556)">
+			<title>Dynamic connector.76</title>
+			<path d="M0 292.98 L17.99 292.98 A5.66929 5.66929 0 0 1 23.66 298.65 L23.66 477.68 A5.66929 5.66929 -180 0 0 29.32 483.35
+						 L37.55 483.35" class="st4"/>
+		</g>
+		<g id="shape77-180" v:mID="77" v:groupContext="shape" v:layerMember="1" transform="translate(126.014,-80.188)">
+			<title>Dynamic connector.77</title>
+			<path d="M0 292.98 L7.81 292.98 A5.66929 5.66929 -180 0 0 13.48 287.31 L13.48 105.94 A3.32794 3.32794 0 0 1 16.81 102.62
+						 L17.38 102.62" class="st4"/>
+		</g>
+		<g id="shape78-185" v:mID="78" v:groupContext="shape" v:layerMember="0" transform="translate(55.1928,-49.6847)">
+			<title>Process.78</title>
+			<desc>‘date-expires’</desc>
+			<v:custProps>
+				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
+				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
+				<v:cp v:nameU="Resources" v:lbl="Resources" v:langID="1033"/>
+			</v:custProps>
+			<v:userDefs>
+				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
+			</v:userDefs>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="36.8641" cy="286.277" width="73.73" height="13.4147"/>
+			<rect x="0" y="279.569" width="73.7282" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="13.09" y="288.68" class="st2" v:langID="2057"><v:paragraph v:horizAlign="1"/><v:tabList/>‘date-expires’</text>		</g>
+		<g id="shape79-188" v:mID="79" v:groupContext="shape" v:layerMember="1" transform="translate(11.9778,-270.556)">
+			<title>Dynamic connector.79</title>
+			<path d="M0 292.98 L18.19 292.98 A5.66929 5.66929 0 0 1 23.86 298.65 L23.86 501.48 A5.66929 5.66929 -180 0 0 29.53 507.15
+						 L40.45 507.15" class="st4"/>
+		</g>
+		<g id="shape80-193" v:mID="80" v:groupContext="shape" v:layerMember="1" transform="translate(128.921,-56.392)">
+			<title>Dynamic connector.80</title>
+			<path d="M0 292.98 L5.22 292.98 A5.2194 5.2194 -180 0 0 10.44 287.76 L10.44 82.22 A3.39596 3.39596 0 0 1 13.83 78.82
+						 L14.47 78.82" class="st4"/>
+		</g>
+		<g id="shape81-198" v:mID="81" v:groupContext="shape" v:layerMember="0" transform="translate(54.3208,-25.8887)">
+			<title>Process.81</title>
+			<desc>‘enabled’</desc>
+			<v:custProps>
+				<v:cp v:nameU="Cost" v:lbl="Cost" v:type="7" v:format="@" v:langID="1033"/>
+				<v:cp v:nameU="Duration" v:lbl="Duration" v:type="2" v:langID="1033"/>
+				<v:cp v:nameU="Resources" v:lbl="Resources" v:langID="1033"/>
+			</v:custProps>
+			<v:userDefs>
+				<v:ud v:nameU="visVersion" v:val="VT0(11):26"/>
+			</v:userDefs>
+			<v:textBlock v:margins="rect(2,2,2,2)" v:tabSpace="42.5197"/>
+			<v:textRect cx="36.8641" cy="286.277" width="73.73" height="13.4147"/>
+			<rect x="0" y="279.569" width="73.7282" height="13.4147" rx="2.83465" ry="2.83465" class="st1"/>
+			<text x="20.86" y="288.68" class="st2" v:langID="2057"><v:paragraph v:horizAlign="1"/><v:tabList/>‘enabled’</text>		</g>
+		<g id="shape82-201" v:mID="82" v:groupContext="shape" v:layerMember="1" transform="translate(11.9778,-270.556)">
+			<title>Dynamic connector.82</title>
+			<path d="M0 292.98 L17.99 292.98 A5.66929 5.66929 0 0 1 23.66 298.65 L23.66 525.27 A5.66929 5.66929 -180 0 0 29.32 530.94
+						 L39.58 530.94" class="st4"/>
+		</g>
+		<g id="shape83-206" v:mID="83" v:groupContext="shape" v:layerMember="1" transform="translate(128.049,-32.596)">
+			<title>Dynamic connector.83</title>
+			<path d="M0 292.98 L5.78 292.98 A5.66929 5.66929 -180 0 0 11.45 287.31 L11.45 58.35 A3.32794 3.32794 0 0 1 14.77 55.02
+						 L15.34 55.02" class="st4"/>
+		</g>
 	</g>
-</svg>
\ No newline at end of file
+</svg>

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/master.xml
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/master.xml	2007-07-10 00:19:16 UTC (rev 13285)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/master.xml	2007-07-10 00:21:55 UTC (rev 13286)
@@ -145,6 +145,10 @@
       <xi:include href="Chapter-BRMS/Section-Introduction.xml" />
 
       <xi:include href="Chapter-BRMS/Section-AdminGuide.xml" />
+
+      <xi:include href="Chapter-BRMS/Section-Architecture.xml" />
+
+      <xi:include href="Chapter-BRMS/Section-UserGuide.xml" />
     </chapter>
 
     <chapter>

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java	2007-07-10 00:19:16 UTC (rev 13285)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java	2007-07-10 00:21:55 UTC (rev 13286)
@@ -34,16 +34,16 @@
 import org.eclipse.swt.graphics.Image;
 
 /**
- * For handling within rules. 
- * 
+ * For handling within rules.
+ *
  * @author Michael Neale, Kris Verlanen
  */
 public class RuleCompletionProcessor extends DefaultCompletionProcessor {
 
-	private static final Image DROOLS_ICON = 
+	private static final Image DROOLS_ICON =
 		DroolsPluginImages.getImage(DroolsPluginImages.DROOLS);
 
-	private static final Image CLASS_ICON = 
+	private static final Image CLASS_ICON =
 		DroolsPluginImages.getImage(DroolsPluginImages.CLASS);
 
 	public RuleCompletionProcessor(AbstractRuleEditor editor) {
@@ -80,7 +80,7 @@
 		}
 		return null;
 	}
-	
+
 	protected void addRHSCompletionProposals(List list, String prefix, String backText,
 			String conditions, String consequence) {
 		// only add functions and keywords if at the beginning of a
@@ -289,7 +289,7 @@
 			String operator = (String) location
 					.getProperty(Location.LOCATION_PROPERTY_OPERATOR);
 			type = getPropertyClass(className, property);
-			
+
 			if ("in".equals(operator)) {
 				list.add(new RuleCompletionProposal(prefix.length(), "()",
 					"(  )", 2, DROOLS_ICON));
@@ -488,12 +488,12 @@
 					String simplePropertyName = nestedProperties[i];
 					currentClass = getSimplePropertyClass(currentClass, simplePropertyName);
 				}
-				return currentClass; 
+				return currentClass;
 			}
 		}
 		return null;
 	}
-	
+
 	private String getSimplePropertyClass(String className, String propertyName) {
 		if ("this".equals(propertyName)) {
 			return className;
@@ -546,7 +546,7 @@
 		}
 		return result;
 	}
-	
+
 	private boolean isComparable(String type) {
 		if (type == null) {
 			return false;
@@ -586,7 +586,7 @@
 	/**
 	 * Returns true if the first class is the same or a subtype of the second
 	 * class.
-	 * 
+	 *
 	 * @param class1
 	 * @param class2
 	 * @return
@@ -672,7 +672,7 @@
 		list.add(prop);
 	}
 
-	private void addRHSJavaCompletionProposals(List list, String prefix, String backText, 
+	private void addRHSJavaCompletionProposals(List list, String prefix, String backText,
 			String conditions, String consequence) {
 		list.addAll(getJavaCompletionProposals(consequence, prefix,
 				getRuleParameters(backText)));
@@ -754,7 +754,11 @@
 		list.add(new RuleCompletionProposal(prefix.length(), "ruleflow-group",
 				"ruleflow-group \"\"", 16, DROOLS_ICON));
         list.add(new RuleCompletionProposal(prefix.length(), "lock-on-active",
-                "lock-on-active ", DROOLS_ICON));        
+                "lock-on-active ", DROOLS_ICON));
+        list.add(new RuleCompletionProposal(prefix.length(), "dialect \"java\"",
+        		"dialect \"java\"", DROOLS_ICON));
+        list.add(new RuleCompletionProposal(prefix.length(), "dialect \"mvel\"",
+        		"dialect \"mvel\"", DROOLS_ICON));
 	}
 
 	private boolean addFactTemplatePropertyProposals(String prefix,

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/editors/keywords.properties
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/editors/keywords.properties	2007-07-10 00:19:16 UTC (rev 13285)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-eclipse/drools-eclipse-plugin/src/main/resources/org/drools/eclipse/editors/keywords.properties	2007-07-10 00:21:55 UTC (rev 13286)
@@ -35,4 +35,5 @@
 date-effective
 date-expires
 enabled
-forall
\ No newline at end of file
+forall
+dialect
\ No newline at end of file




More information about the jboss-svn-commits mailing list