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

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri Jul 13 15:07:21 EDT 2007


Author: pombredanne
Date: 2007-07-13 15:07:20 -0400 (Fri, 13 Jul 2007)
New Revision: 13458

Added:
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/CategoryExplorer.png
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/DRLRule.png
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/DSLRule.png
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/DecisionTable.png
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Function.png
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/GuidedComplex.png
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/GuidedDSL.png
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/GuidedEditor.png
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/GuidedLHSConstraints.png
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Snapshots.png
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/brmsdeployedrules.properties
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Approve.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Driver.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Policy.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Rejection.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/InsuranceBusiness.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/MainClass.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources/insuranceModel.jar
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources/org.acme.insurance.pkg
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources/repository_export.xml.gz
   labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre3/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.jar
   labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.pom
Removed:
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/files/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/lib/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/resources/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/brmsdeployedrules.properties
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/brmsdeployedrules.properties
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Approve.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Driver.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Policy.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Rejection.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/InsuranceBusiness.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/MainClass.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources/insuranceModel.jar
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources/org.acme.insurance.pkg
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources/repository_export.xml.gz
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/org/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre2/
   labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.jar
   labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.pom
Modified:
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/PackageExplorer.png
   labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-ExamplesAndTutorials.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/master.xml
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/.classpath
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/CLPFactory.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/CLPParser.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/Shell.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/valuehandlers/CLPLocalDeclarationVariable.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/valuehandlers/CLPPreviousDeclarationVariable.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/test/java/org/drools/clp/AddFunctionTest.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/test/java/org/drools/clp/CompiledFunctionsTest.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/test/java/org/drools/clp/LhsClpParserTest.java
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/.classpath
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/.classpath
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-decisiontables/.classpath
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/.classpath
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/cache/http%3A%2F%2Flocalhost%3A8080%2Fdrools-jbrms%2Forg.drools.brms.JBRMS%2Fpackage%2Forg.acme.insurance%2Ffmeyer
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/.classpath
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jsr94/.classpath
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jsr94/.project
   labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/.classpath
   labs/jbossrules/branches/mvel-tooling-2007-06-30/pom.xml
Log:
Ported r13457 from trunk to branch mvel-tooling-2007-06-30.

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/CategoryExplorer.png (from rev 13457, labs/jbossrules/trunk/documentation/manual/en/Chapter-BRMS/CategoryExplorer.png)
===================================================================
(Binary files differ)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/DRLRule.png (from rev 13457, labs/jbossrules/trunk/documentation/manual/en/Chapter-BRMS/DRLRule.png)
===================================================================
(Binary files differ)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/DSLRule.png (from rev 13457, labs/jbossrules/trunk/documentation/manual/en/Chapter-BRMS/DSLRule.png)
===================================================================
(Binary files differ)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/DecisionTable.png (from rev 13457, labs/jbossrules/trunk/documentation/manual/en/Chapter-BRMS/DecisionTable.png)
===================================================================
(Binary files differ)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Function.png (from rev 13457, labs/jbossrules/trunk/documentation/manual/en/Chapter-BRMS/Function.png)
===================================================================
(Binary files differ)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/GuidedComplex.png (from rev 13457, labs/jbossrules/trunk/documentation/manual/en/Chapter-BRMS/GuidedComplex.png)
===================================================================
(Binary files differ)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/GuidedDSL.png (from rev 13457, labs/jbossrules/trunk/documentation/manual/en/Chapter-BRMS/GuidedDSL.png)
===================================================================
(Binary files differ)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/GuidedEditor.png (from rev 13457, labs/jbossrules/trunk/documentation/manual/en/Chapter-BRMS/GuidedEditor.png)
===================================================================
(Binary files differ)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/GuidedLHSConstraints.png (from rev 13457, labs/jbossrules/trunk/documentation/manual/en/Chapter-BRMS/GuidedLHSConstraints.png)
===================================================================
(Binary files differ)

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

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-ExamplesAndTutorials.xml
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-ExamplesAndTutorials.xml	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-ExamplesAndTutorials.xml	2007-07-13 19:07:20 UTC (rev 13458)
@@ -5,25 +5,101 @@
   <title>Examples and tutorials</title>
 
   <section>
-    <title>Fernando's discount insurance brokers</title>
+    <title>Discount insurance brokers</title>
 
-    <para>This example takes you through the key steps in using the BRMS, and using rules in a very
-    very simple application.</para>
+    <section>
+      <title>Quick Start demo</title>
 
-	<!-- this shows how to embed a PNG picture/screen shot 
-	
-		<figure>
-          <title>Package building</title>
+      <para>Fernando runs a dodgy fly by night insurance operation in Sao
+      Paulo, Brasil. These are his rules - would you buy insurance from him ?
+      (I wouldn't).</para>
 
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="PackageBuild.png"
-                         format="PNG" scalefit="1" />
-            </imageobject>
-          </mediaobject>
-        </figure>	
-	
-	-->
+      <para>This example takes you through the key steps in using the BRMS
+      with an example respository, and using rules in a very very simple
+      application (which you can use as a basis for your applications).</para>
 
+      <itemizedlist>
+        <listitem>
+          <para>Download the latest version of BRMS from
+          http://cruisecontrol.jboss.com/cc/artifacts/jboss-rules</para>
+
+          <para>Deploy BRMS WAR file into JBoss4.2 AS or JBossWeb, other
+          containers can be used as well (possibly with some tweaking of
+          dependencies).</para>
+
+          <para>Check you can access and run the BRMS.</para>
+        </listitem>
+
+        <listitem>
+          <para>Check out the demo project from the Drools subversion
+          repository (this will be included in future distributions):</para>
+
+          <para>http://anonsvn.labs.jboss.com/labs/jbossrules/trunk/drools-examples/drools-examples-brms/</para>
+        </listitem>
+
+        <listitem>
+          <para>Import the demo business rules insurance repository file into
+          BRMS, the compressed can be found at "files" folder in the demo
+          project.</para>
+
+          <para>To do this, open the "files" directory, unzip the file there
+          locally, and then go to the "Admin" section and "Manage backups" of
+          the BRMS, select the file, and press "Import" - follow
+          instructions.</para>
+        </listitem>
+
+        <listitem>
+          <para>Navigate through the BRMS web application to see how things
+          are placed and organized and try to create some rules.</para>
+
+          <para>Go to the "Packages" feature and build the package (you should
+          see no errors).</para>
+        </listitem>
+
+        <listitem>
+          <para>Now go to the "Deployment" feature, when you click on the
+          package, it will show you one snapshot (which was part of the
+          import, you can create more if you like from the previous
+          step).</para>
+
+          <para>Open a snapshot.</para>
+
+          <para>Copy the snapshot url that is displayed.</para>
+
+          <para>Locate the file brmsdeployedrules.properties</para>
+
+          <para>Place the copied URL in the brmsdeployedrules.properties
+          file.</para>
+        </listitem>
+
+        <listitem>
+          <para>OPTIONAL: To use a file or directory deployment in the rule
+          agent just update brmsdeployedrules.properties according the
+          documentation.</para>
+        </listitem>
+
+        <listitem>
+          <para>Import the example project into eclipse and execute the
+          MainClass. The program will show the following trace (and away you
+          go !).</para>
+
+          <programlisting>
+RuleAgent(insuranceconfig) INFO (Thu Jul 12 20:06:02 BRT 2007): Configuring with newInstance=true, secondsToRefresh=30
+RuleAgent(insuranceconfig) INFO (Thu Jul 12 20:06:02 BRT 2007): Configuring package provider : URLScanner monitoring URLs: http://localhost:8080/drools-jbrms/org.drools.brms.JBRMS/package/org.acme.insurance/fmeyer With local cache dir of /Users/fernandomeyer/projects/jbossrules/drools-examples/drools-examples-brms/cache
+RuleAgent(insuranceconfig) INFO (Thu Jul 12 20:06:02 BRT 2007): Applying changes to the rulebase.
+RuleAgent(insuranceconfig) INFO (Thu Jul 12 20:06:02 BRT 2007): Creating a new rulebase as per settings.
+RuleAgent(insuranceconfig) INFO (Thu Jul 12 20:06:02 BRT 2007): Adding package called org.acme.insurance
+APPROVED: due to no objections.
+APPROVED: Driver is safe and mature.
+APPROVED: due to no objections.
+REJECTED: Too many accidents
+</programlisting>
+
+          <para>The Rule Agent will pick up any changes that happen
+          automatically - as soon as you create a new snapshot of the rules
+          you want to deploy.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
   </section>
 </section>
\ No newline at end of file

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-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Section-UserGuide.xml	2007-07-13 19:07:20 UTC (rev 13458)
@@ -409,35 +409,295 @@
       Here the key ones are described. Some of these are covered in other
       parts of the manual, and the detail will not be repeated here.</para>
 
-      <para>Guided editor style "Business rules": (also known as "BRL
-      format"). These rules use the guided GUI which controls and propts user
-      input based on knowledge of the object model. This can also be augmented
-      with DSL sentences.</para>
+      <section>
+        <title>Business rules with the guided editor</title>
 
-      <para>DSL rules:</para>
+        <para>Guided editor style "Business rules": (also known as "BRL
+        format"). These rules use the guided GUI which controls and propts
+        user input based on knowledge of the object model. This can also be
+        augmented with DSL sentences.</para>
 
-      <para>Spreadsheet decision tables:</para>
+        <para>IMPORTANT: to use the BRL guided editor, someone will need to
+        have you package configured before hand.</para>
 
-      <para>Technical (drl) rules: Rules stored as drl text can be managed in
-      the BRMS, as well as more "traditional" drl files. A DRL can either be a
-      whole chunk of rules, or an individual rule. if its an individual rule,
-      no package statement or imports are required (in fact, you can skip the
-      "rule" statement altogether, just use "when" and "then" to mark the
-      condition and action sections respectively). Normally you would use the
-      IDE to edit raw DRL files, since it has all the advanced tooling and
-      content assistance and debugging, however there are times when a rule
-      may have to deal with something fairly technical.</para>
+        <para>Also note that there is a guided editor in the Eclipse plug in,
+        most of the details in this section can also apply to it.</para>
 
-      <para>Rule flows: Rule flows allow you to visually describe the steps
-      taken - so not all rules are evaluated at once, but there is a flow of
-      logic. Rule flows are not covered in this chapter on the BRMS, but you
-      can use the IDE to graphically draw ruleflows, and upload the .rf file
-      to the BRMS.</para>
+        <figure>
+          <title>The guided BRL editor</title>
 
-      <para>Suggestion: As you may have many similar rules, you can create
-      rule templates, which are simply rules which are kept in an inactive
-      package - you can then categories templates accordingly, and copy them
-      as needed (choosing a live package as the target package).</para>
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center" fileref="GuidedEditor.png"
+                         format="PNG" scalefit="1" />
+            </imageobject>
+          </mediaobject>
+        </figure>
+
+        <para>The above diagram shows the editor in action. The following
+        description apply to the letter boxes in the diagram above:</para>
+
+        <para>A: The different parts of a rule. The "WHEN" part is the
+        condition, "THEN" action, and "(options)" are optional attributes that
+        may effect the operation of the rule.</para>
+
+        <para>B: This shows a pattern which is declaring that the rule is
+        looking for a "Driver" fact (the fields are listed below, in this case
+        just "age"). Note the green triangle, it will popup a list of options
+        to add to the fact declaration: you can add more fields (eg their
+        "location"), or you can assign a variable name to the fact (which you
+        can use later on if needs be). As well as adding more fields to this
+        pattern - you can add "multiple field" constraints - ie constraints
+        that span across fields (eg age &gt; 42 or risk &gt; 2). The popup
+        dialog shows the options.</para>
+
+        <para>C: The small "-" icons indicate you can remove something - in
+        this case it would remove the whole Driver fact declaration. If its
+        the one below, it would remove just the age constraint.</para>
+
+        <para>D: The "+" symbols allow you to add more patterns to the
+        condition or the action part of the rule, or more attributes. In all
+        cases, a popup option box is provided. For the "WHEN" part of the
+        rule, you can choose to add a constraint on a fact (it will give you a
+        list of facts), or you can use another conditional element, the
+        choices which are : "There is no" - which means the fact+constraints
+        must not exist, "There exists" - which means that there exists at
+        least one match (but there only needs to be one - it will not trigger
+        for each match), and "Any of" - which means that any of the patterns
+        can match (you then add patterns to these higher level patterns). If
+        you just put a fact (like is shown above) then all the patterns are
+        combined together so they are all true ("and").</para>
+
+        <para>E: This shows the constraint for the "age" field. (Looking from
+        left to right) the green triangle allows you to "assign" a variable
+        name to the "age" field, which you may use later on in the rule. Next
+        is the list of constraint operations - this list changes depending on
+        the data type. After that is the value field - the value field will be
+        one of: a) a literal value (eg number, text), b) a "formula" - in
+        which case it is an expression which is calculated (this is for
+        advanced users) or b) a variable (in which case a list will be
+        provided to choose values from). After this there is a horizontal
+        arrow icon, this is for "connective constraints" : these are
+        constraints which allow you to have alternative values to check a
+        field against, for example: "age is less than 42 or age is not equal
+        to 39" is possibly this way.</para>
+
+        <para>F: This shows an "action" of the rule, a rule consists of a list
+        of actions. In this case, we are asserting/inserting a new fact, which
+        is a rejection (with the "reason" field set to an explanation). There
+        are quite a few other types of actions you can use: you can modify an
+        existing fact (which tells the engine the fact has changed) - or you
+        can simply set a field on a fact (in which case the engine doesn't
+        know about the change - normally because you are setting a result).
+        You can also retract a fact. In most cases the green arrow will give
+        you a list of fields you can add so you can change the value. The
+        values you enter are "literal" - in the sense that what you type is
+        what the value is. If it needs to be a calculation, then add an "=" at
+        the start of the value - this will be interpreted as a "formula" (for
+        advanced users only) ! and the calculation will be performed (not
+        unlike a spreadsheet).</para>
+
+        <para>G: This is where the rule options live. In this case, only
+        salience is used which is a numeric value representing the rules
+        "priority". This would probably be the most common option to
+        use.</para>
+
+        <para>Augmenting with DSL sentences: If the package the rule is part
+        of has a dsl configuration, when when you add conditions or actions,
+        then it will provide a list of "DSL Sentences" which you can choose
+        from - when you choose one, it will add a row to the rule - where the
+        DSL specifies values come from a user, then a edit box (text) will be
+        shown (so it ends up looking a bit like a form). This is optional, and
+        there is another DSL editor. Please note that the DSL capabilities in
+        this editor are slightly less then the full set of DSL features
+        (basically you can do [when] and [then] sections of the DSL only -
+        which is no different to drools 3 in effect).</para>
+
+        <para>The following diagram shows the DSL sentences in action in the
+        guided editor:</para>
+
+        <figure>
+          <title>DSL in guided editor</title>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center" fileref="GuidedDSL.png" format="PNG"
+                         scalefit="1" />
+            </imageobject>
+          </mediaobject>
+        </figure>
+
+        <para>A more complex example:</para>
+
+        <figure>
+          <title>A more complex BRL example</title>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center" fileref="GuidedComplex.png"
+                         format="PNG" scalefit="1" />
+            </imageobject>
+          </mediaobject>
+        </figure>
+
+        <para>In the above example, you can see it is using a mixture of
+        literal values, and formulas. The second constraint on the "Person"
+        fact, is a formula (in this case it is doing a silly calculation on
+        the persons age, and checking something against their name - both
+        "age" and "name" are fields of the Person fact in this case. In the
+        3rd line (which says "age is less than .." - it is also using a
+        formula, although, in this case the formula does a calculation and
+        returns a value (which is used in the comparison) - in the former
+        case, it had to return True or False (in this case, its a value).
+        Obvious formulas are basically pieces of code - so this is for
+        experienced users only.</para>
+
+        <para>Looking at the "Board" pattern (the second pattern with the
+        horizontal grey bar): this uses a top level conditional element
+        ("There is no") - this means that the pattern is actually looking for
+        the "non existence" of a fact that matches the pattern. Note the "Any
+        of:" - this means that EITHER the "type" field constraint is matched,
+        or the "name" field is matched (to "myname" in the case above). This
+        is what is termed a Multiple field constraint (you can nest these, and
+        have it as complex as you like, depending on how much you want the
+        next person to hate you: Some paraphrased advice: Write your rules in
+        such as way as the person who has to read/maintain them is a
+        psychopath, has a gun, and knows where you live).</para>
+
+        <figure>
+          <title>Adding constraints</title>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center" fileref="GuidedLHSConstraints.png"
+                         format="PNG" scalefit="1" />
+            </imageobject>
+          </mediaobject>
+        </figure>
+
+        <para>The above dialog is what you will get when you want to add
+        constraints to the Person fact. In the top half are the simple
+        options: you can either add a field straight away (a list of fields of
+        the Person fact will be shown), or you can add a "Multiple field
+        constraint" - of a given type (which is described above). The Advanced
+        options: you can add a formula (which resolves to True or False - this
+        is like in the example above: "age &lt; (age * 2) ...."). You can also
+        assign a Variable name to the Person fact (which means you can then
+        access that variable on the action part of the rule, to set a value
+        etc).</para>
+      </section>
+
+      <section>
+        <title>DSL rules</title>
+
+        <para>DSL rules are textual rules, that use a language configuration
+        asset to control how they appear.</para>
+
+        <figure>
+          <title>DSL rule</title>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center" fileref="DSLRule.png" format="PNG"
+                         scalefit="1" />
+            </imageobject>
+          </mediaobject>
+        </figure>
+
+        <para>A dsl rule is a single rule. Refering to the picture above, you
+        can a text editor. You can use the icons to the right to provide lists
+        of conditions and actions to choose from (or else press Control +
+        Space at the same time to pop up a list).</para>
+      </section>
+
+      <section>
+        <title>Spreadsheet decision tables</title>
+
+        <para>Multiple rules can be stored in a spreadsheet (each row is a
+        rule). The details of the spreadsheet are not covered in this chapter
+        (as there is a separate chapter for them).</para>
+
+        <figure>
+          <title>Spreadsheet decision table</title>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center" fileref="DecisionTable.png"
+                         format="PNG" scalefit="1" />
+            </imageobject>
+          </mediaobject>
+        </figure>
+
+        <para>To use a spreadsheet, you upload an xls (and can download the
+        current version, as per the picture above). To create a new decision
+        table, when you launch the rule wizard, you will get an option to
+        create one (after that point, you can upload the xls file).</para>
+      </section>
+
+      <section>
+        <title>Rule flows</title>
+
+        <para>Rule flows: Rule flows allow you to visually describe the steps
+        taken - so not all rules are evaluated at once, but there is a flow of
+        logic. Rule flows are not covered in this chapter on the BRMS, but you
+        can use the IDE to graphically draw ruleflows, and upload the .rf file
+        to the BRMS.</para>
+
+        <para>Similar to spreadsheets, you upload/download ruleflow files (the
+        eclipse IDE has a graphical editor for them). The details of Rule
+        Flows are not discussed here.</para>
+      </section>
+
+      <section>
+        <title>Technical rules (drl)</title>
+
+        <para>Technical (drl) rules are stored as text - they can be managed
+        in the BRMS. A DRL can either be a whole chunk of rules, or an
+        individual rule. if its an individual rule, no package statement or
+        imports are required (in fact, you can skip the "rule" statement
+        altogether, just use "when" and "then" to mark the condition and
+        action sections respectively). Normally you would use the IDE to edit
+        raw DRL files, since it has all the advanced tooling and content
+        assistance and debugging, however there are times when a rule may have
+        to deal with something fairly technical. In any typical package of
+        rules, you generally have a been for some "technical rules" - you can
+        mix and match all the rule types together of course.</para>
+
+        <figure>
+          <title>DRL technical rule</title>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center" fileref="DRLRule.png" format="PNG"
+                         scalefit="1" />
+            </imageobject>
+          </mediaobject>
+        </figure>
+      </section>
+
+      <section>
+        <title>Functions</title>
+
+        <para>Functions are another asset type. They are NOT rules, and should
+        only be used when necessary. The function editor is a textual editor.
+        Functions</para>
+
+        <figure>
+          <title>Function</title>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center" fileref="Function.png" format="PNG"
+                         scalefit="1" />
+            </imageobject>
+          </mediaobject>
+        </figure>
+      </section>
+
+      <para>Tip: As you may have many similar rules, you can create rule
+      templates, which are simply rules which are kept in an inactive package
+      - you can then categories templates accordingly, and copy them as needed
+      (choosing a live package as the target package).</para>
     </section>
 
     <section>
@@ -661,6 +921,23 @@
       <para>Refer to the section on the Rule Agent for details on how you can
       use these URLs (and binary downloads) in your application, and how rules
       can be updated on the fly.</para>
+
+      <figure>
+        <title>Deployment snapshots</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="Snapshots.png" format="PNG"
+                       scalefit="1" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+
+      <para>The above shows deployment snapshots view. On the left there is a
+      list of packages. Clilcking on a specific package will show you a list
+      of snapshots for that package (if any). From there you can copy, remove
+      or view an asset snapshot. Each snapshot is available for download or
+      access via a URL for deployment.</para>
     </section>
 
     <section>
@@ -673,13 +950,40 @@
       <para>The category view provides a way to navigate your rules in a way
       that makes sense to your organisation.</para>
 
+      <figure>
+        <title>Category view</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="CategoryExplorer.png"
+                       format="PNG" scalefit="1" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+
+      <para>The above diagram shows categories in action. Generally under each
+      category you should have no more then a few dozen rules, if
+      possible.</para>
+
       <para>The alternative and more technical view is to use the package
       explorer. This shows the rules (assets) closer to how they are actually
       stored in the database, and also separates rules into packages (name
       spaces) and their type (format, as rules can be in many different
       formats).</para>
 
-      <para>[picture of rules explorer list, and package explorer]</para>
+      <figure>
+        <title>Package view</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="PackageExplorer.png"
+                       format="PNG" scalefit="1" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+
+      <para>The above shows the alternate way of exploring - using
+      packages.</para>
     </section>
   </section>
 

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/Chapter-BRMS/Snapshots.png (from rev 13457, labs/jbossrules/trunk/documentation/manual/en/Chapter-BRMS/Snapshots.png)
===================================================================
(Binary files differ)

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-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/documentation/manual/en/master.xml	2007-07-13 19:07:20 UTC (rev 13458)
@@ -39,7 +39,6 @@
 
     <author>
       <firstname>Fernando</firstname>
-
       <surname>Meyer</surname>
     </author>
   </bookinfo>
@@ -149,6 +148,8 @@
       <xi:include href="Chapter-BRMS/Section-Architecture.xml" />
 
       <xi:include href="Chapter-BRMS/Section-UserGuide.xml" />
+
+      <xi:include href="Chapter-BRMS/Section-ExamplesAndTutorials.xml" />
     </chapter>
 
     <chapter>

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/.classpath
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/.classpath	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/.classpath	2007-07-13 19:07:20 UTC (rev 13458)
@@ -5,17 +5,15 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2beta23/mvel14-1.2beta23.jar"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0/antlr-3.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.0/stringtemplate-3.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/4.0.0.SNAPSHOT/drools-compiler-4.0.0.SNAPSHOT.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.1.v_677_R32x/core-3.2.1.v_677_R32x.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar" sourcepath="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/drools/drools-core/4.0.0.SNAPSHOT/drools-core-4.0.0.SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/4.0.0.SNAPSHOT/drools-compiler-4.0.0.SNAPSHOT.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar" sourcepath="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre2/mvel14-1.2pre2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0-sources.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/CLPFactory.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/CLPFactory.java	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/CLPFactory.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -9,6 +9,7 @@
 import org.drools.clp.valuehandlers.CLPGlobalVariable;
 import org.drools.clp.valuehandlers.CLPLocalDeclarationVariable;
 import org.drools.clp.valuehandlers.CLPPreviousDeclarationVariable;
+import org.drools.common.InternalWorkingMemory;
 import org.drools.rule.Declaration;
 import org.drools.spi.Tuple;
 import org.mvel.integration.VariableResolver;
@@ -22,7 +23,7 @@
 
     private Map           resolvers;
     //private
-    private WorkingMemory workingMemory;
+    private InternalWorkingMemory workingMemory;
 
     public CLPFactory() {
         this.resolvers = Collections.EMPTY_MAP;
@@ -52,7 +53,7 @@
 
     public void setContext(Tuple tuple,
                            Object object,
-                           WorkingMemory workingMemory) {
+                           InternalWorkingMemory workingMemory) {
         this.tuple = tuple;
         this.object = object;
         this.workingMemory = workingMemory;
@@ -88,9 +89,9 @@
         }
 
         if ( this.previousDeclarations != null && this.previousDeclarations.containsKey( name ) ) {
-            resolver = new CLPPreviousDeclarationVariable( (Declaration) this.previousDeclarations.get( name ) );
+            resolver = new CLPPreviousDeclarationVariable( (Declaration) this.previousDeclarations.get( name ), workingMemory);
         } else if ( this.localDeclarations != null && this.localDeclarations.containsKey( name ) ) {
-            resolver = new CLPLocalDeclarationVariable( (Declaration) this.localDeclarations.get( name ) );
+            resolver = new CLPLocalDeclarationVariable( (Declaration) this.localDeclarations.get( name ), workingMemory );
         } else {
             Class clazz = (Class) this.globals.get( name );
             resolver = new CLPGlobalVariable( name,

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/CLPParser.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/CLPParser.java	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/CLPParser.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -2,21 +2,47 @@
 
 	package org.drools.clp;
 	
-	import org.drools.clp.valuehandlers.*;
-	import java.util.List;
 	import java.util.ArrayList;
-	import java.util.Iterator;
-	import java.util.HashMap;	
-	import java.util.StringTokenizer;
-	import org.drools.lang.descr.*;
-	import org.drools.compiler.SwitchingCommonTokenStream;
+import java.util.Iterator;
+import java.util.List;
 
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.CommonToken;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.FailedPredicateException;
+import org.antlr.runtime.MismatchedNotSetException;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.MismatchedTokenException;
+import org.antlr.runtime.MismatchedTreeNodeException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.Parser;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenStream;
+import org.drools.clp.valuehandlers.BooleanValueHandler;
+import org.drools.clp.valuehandlers.DoubleValueHandler;
+import org.drools.clp.valuehandlers.FunctionCaller;
+import org.drools.clp.valuehandlers.LongValueHandler;
+import org.drools.clp.valuehandlers.ObjectValueHandler;
+import org.drools.lang.descr.AndDescr;
+import org.drools.lang.descr.AttributeDescr;
+import org.drools.lang.descr.ConditionalElementDescr;
+import org.drools.lang.descr.DescrFactory;
+import org.drools.lang.descr.EvalDescr;
+import org.drools.lang.descr.ExistsDescr;
+import org.drools.lang.descr.FieldBindingDescr;
+import org.drools.lang.descr.FieldConstraintDescr;
+import org.drools.lang.descr.LiteralRestrictionDescr;
+import org.drools.lang.descr.NotDescr;
+import org.drools.lang.descr.OrDescr;
+import org.drools.lang.descr.PackageDescr;
+import org.drools.lang.descr.PatternDescr;
+import org.drools.lang.descr.PredicateDescr;
+import org.drools.lang.descr.RestrictionConnectiveDescr;
+import org.drools.lang.descr.ReturnValueRestrictionDescr;
+import org.drools.lang.descr.RuleDescr;
+import org.drools.lang.descr.VariableRestrictionDescr;
 
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-
 public class CLPParser extends Parser {
     public static final String[] tokenNames = new String[] {
         "<invalid>", "<EOR>", "<DOWN>", "<UP>", "LEFT_PAREN", "DEFFUNCTION", "NAME", "VAR", "RIGHT_PAREN", "DEFRULE", "STRING", "SALIENCE", "INT", "AND", "OR", "NOT", "EXISTS", "TEST", "ASSIGN_OP", "AMPERSAND", "PIPE", "TILDE", "COLON", "EQUALS", "FLOAT", "BOOL", "NULL", "EOL", "WS", "DECLARE", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SYMBOL", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "LEFT_SQUARE", "RIGHT_SQUARE", "LEFT_CURLY", "RIGHT_CURLY", "MULTI_LINE_COMMENT", "'=>'"

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/Shell.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/Shell.java	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/Shell.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -10,16 +10,15 @@
 import org.antlr.runtime.ANTLRReaderStream;
 import org.antlr.runtime.ANTLRStringStream;
 import org.antlr.runtime.CharStream;
+import org.antlr.runtime.CommonTokenStream;
 import org.antlr.runtime.Lexer;
 import org.antlr.runtime.TokenStream;
 import org.drools.RuleBase;
 import org.drools.RuleBaseFactory;
 import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
 import org.drools.clp.valuehandlers.FunctionCaller;
 import org.drools.clp.valuehandlers.NamedShellVariableValue;
 import org.drools.compiler.PackageBuilder;
-import org.drools.compiler.SwitchingCommonTokenStream;
 import org.drools.lang.DRLLexer;
 import org.drools.lang.descr.AttributeDescr;
 import org.drools.lang.descr.PackageDescr;
@@ -27,7 +26,8 @@
 import org.drools.spi.GlobalResolver;
 
 public class  Shell implements ParserHandler, GlobalResolver, BuildContext {
-    private FunctionRegistry registry;
+	private static final long serialVersionUID = 1L;
+	private FunctionRegistry registry;
     private Map variables;
     private Map              properties = Collections.EMPTY_MAP;
     
@@ -43,7 +43,7 @@
     
     public void evalReader(Reader reader)  {
         try {
-            CLPParser parser = new CLPParser( new SwitchingCommonTokenStream( new DRLLexer( new ANTLRReaderStream( reader ) ) ) );
+            CLPParser parser = new CLPParser( new CommonTokenStream( new DRLLexer( new ANTLRReaderStream( reader ) ) ) );
             evalParser( parser );    
         } catch (Exception e) {
             throw new RuntimeException( "Unable to parser Reader", e);
@@ -112,7 +112,7 @@
     }
 
     private TokenStream newTokenStream(final Lexer lexer) {
-        return new SwitchingCommonTokenStream( lexer );
+        return new CommonTokenStream( lexer );
     }
 
     public Object resolve(String name) {
@@ -165,4 +165,14 @@
         this.variables.put( var.getIdentifier(), var );
     }
 
+	public Object resolveGlobal(String identifier) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	public void setGlobal(String identifier, Object value) {
+		// TODO Auto-generated method stub
+		
+	}
+
 }

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/valuehandlers/CLPLocalDeclarationVariable.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/valuehandlers/CLPLocalDeclarationVariable.java	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/valuehandlers/CLPLocalDeclarationVariable.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -6,13 +6,16 @@
 import org.drools.clp.ExecutionContext;
 import org.drools.clp.ValueHandler;
 import org.drools.clp.VariableValueHandler;
+import org.drools.common.InternalWorkingMemory;
 import org.drools.rule.Declaration;
 
 public class CLPLocalDeclarationVariable implements VariableValueHandler {
     
     private Declaration declaration;
+	private InternalWorkingMemory workingmemory;
        
-    public CLPLocalDeclarationVariable(Declaration declaration) {
+    public CLPLocalDeclarationVariable(Declaration declaration, InternalWorkingMemory workingMemory) {
+    	this.workingmemory = workingMemory;
         this.declaration = declaration;
     }  
     
@@ -38,11 +41,11 @@
     }
     
     public Object getObject(ExecutionContext context) {
-        return declaration.getValue( context.getObject() );
+        return declaration.getValue(workingmemory, context.getObject());
     }
     
     public BigDecimal getBigDecimalValue(ExecutionContext context) throws NumberFormatException {
-        Object object = declaration.getValue( context.getObject() );
+        Object object = declaration.getValue(workingmemory, context.getObject() );
         if ( object instanceof BigDecimal ) {
             return (BigDecimal) object;
         } else {
@@ -51,7 +54,7 @@
     }
 
     public BigInteger getBigIntegerValue(ExecutionContext context) throws NumberFormatException {
-        Object object = declaration.getValue( context.getObject() );
+        Object object = declaration.getValue(workingmemory, context.getObject() );
         if ( object instanceof BigInteger ) {
             return (BigInteger) object;
         } else {
@@ -60,31 +63,31 @@
     }    
 
     public boolean getBooleanValue(ExecutionContext context) throws ClassCastException {
-        return declaration.getBooleanValue( context.getObject() );
+        return declaration.getBooleanValue(workingmemory, context.getObject() );
     }
 
     public double getDoubleValue(ExecutionContext context) throws NumberFormatException {
-        return declaration.getDoubleValue( context.getObject() );
+        return declaration.getDoubleValue(workingmemory, context.getObject() );
     }
 
     public float getFloatValue(ExecutionContext context) throws NumberFormatException {
-        return declaration.getFloatValue( context.getObject() );
+        return declaration.getFloatValue( workingmemory,context.getObject() );
     }
 
     public int getIntValue(ExecutionContext context) throws NumberFormatException {
-        return declaration.getIntValue( context.getObject() );
+        return declaration.getIntValue( workingmemory, context.getObject() );
     }
 
     public long getLongValue(ExecutionContext context) throws NumberFormatException {
-        return declaration.getLongValue( context.getObject() );
+        return declaration.getLongValue(workingmemory, context.getObject() );
     }
 
     public short getShortValue(ExecutionContext context) throws NumberFormatException {
-        return declaration.getShortValue( context.getObject() );
+        return declaration.getShortValue(workingmemory, context.getObject() );
     }
 
     public String getStringValue(ExecutionContext context) {
-        return (String) declaration.getValue( context.getObject() );
+        return (String) declaration.getValue(workingmemory, context.getObject() );
     }
     
     public String toString() {

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/valuehandlers/CLPPreviousDeclarationVariable.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/valuehandlers/CLPPreviousDeclarationVariable.java	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/main/java/org/drools/clp/valuehandlers/CLPPreviousDeclarationVariable.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -7,14 +7,17 @@
 import org.drools.clp.ValueHandler;
 import org.drools.clp.VariableValueHandler;
 import org.drools.common.InternalFactHandle;
+import org.drools.common.InternalWorkingMemory;
 import org.drools.rule.Declaration;
 
 public class CLPPreviousDeclarationVariable implements VariableValueHandler {
 
     private Declaration declaration;
+	private InternalWorkingMemory workingmemory;
     
-    public CLPPreviousDeclarationVariable(Declaration declaration) {
+    public CLPPreviousDeclarationVariable(Declaration declaration, InternalWorkingMemory workingmemory) {
         this.declaration = declaration;
+        this.workingmemory = workingmemory;
     }
     
     public ValueHandler getValue(ExecutionContext context) {
@@ -40,12 +43,12 @@
     
     public Object getObject(ExecutionContext context) {
         InternalFactHandle handle = context.getTuple().get( this.declaration );
-        return declaration.getValue( handle.getObject() );
+        return declaration.getValue( workingmemory, handle.getObject() );
     }
     
     public BigDecimal getBigDecimalValue(ExecutionContext context) throws NumberFormatException {
         InternalFactHandle handle = context.getTuple().get( this.declaration );
-        Object object = declaration.getValue(  handle.getObject() );
+        Object object = declaration.getValue(workingmemory,  handle.getObject() );
         if ( object instanceof BigDecimal ) {
             return (BigDecimal) object;
         } else {
@@ -55,7 +58,7 @@
 
     public BigInteger getBigIntegerValue(ExecutionContext context) throws NumberFormatException {
         InternalFactHandle handle = context.getTuple().get( this.declaration );
-        Object object = declaration.getValue(  handle.getObject() );
+        Object object = declaration.getValue(workingmemory,  handle.getObject() );
         if ( object instanceof BigInteger ) {
             return (BigInteger) object;
         } else {
@@ -65,37 +68,37 @@
 
     public boolean getBooleanValue(ExecutionContext context) throws ClassCastException {
         InternalFactHandle handle = context.getTuple().get( this.declaration );
-        return declaration.getBooleanValue( handle.getObject() );
+        return declaration.getBooleanValue(workingmemory, handle.getObject() );
     }
 
     public double getDoubleValue(ExecutionContext context) throws NumberFormatException {
         InternalFactHandle handle = context.getTuple().get( this.declaration );
-        return declaration.getDoubleValue( handle.getObject() );
+        return declaration.getDoubleValue(workingmemory, handle.getObject() );
     }
 
     public float getFloatValue(ExecutionContext context) throws NumberFormatException {
         InternalFactHandle handle = context.getTuple().get( this.declaration );
-        return declaration.getFloatValue( handle.getObject() );
+        return declaration.getFloatValue(workingmemory, handle.getObject() );
     }
 
     public int getIntValue(ExecutionContext context) throws NumberFormatException {
         InternalFactHandle handle = context.getTuple().get( this.declaration );
-        return declaration.getIntValue( handle.getObject() );
+        return declaration.getIntValue(workingmemory, handle.getObject() );
     }
 
     public long getLongValue(ExecutionContext context) throws NumberFormatException {
         InternalFactHandle handle = context.getTuple().get( this.declaration );
-        return declaration.getLongValue( handle.getObject() );
+        return declaration.getLongValue(workingmemory, handle.getObject() );
     }
 
     public short getShortValue(ExecutionContext context) throws NumberFormatException {
         InternalFactHandle handle = context.getTuple().get( this.declaration );
-        return declaration.getShortValue( handle.getObject() );
+        return declaration.getShortValue(workingmemory, handle.getObject() );
     }
 
     public String getStringValue(ExecutionContext context) {
         InternalFactHandle handle = context.getTuple().get( this.declaration );
-        return (String) declaration.getValue( handle.getObject() );
+        return (String) declaration.getValue(workingmemory, handle.getObject() );
     }
     
     public String toString() {

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/test/java/org/drools/clp/AddFunctionTest.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/test/java/org/drools/clp/AddFunctionTest.java	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/test/java/org/drools/clp/AddFunctionTest.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -59,7 +59,7 @@
         RuleBase ruleBase = RuleBaseFactory.newRuleBase();
         InternalWorkingMemory workingMemory = (InternalWorkingMemory) ruleBase.newStatefulSession();
 
-        InternalFactHandle factHandle = (InternalFactHandle) workingMemory.assertObject( new BigDecimal( 10 ) );
+        InternalFactHandle factHandle = (InternalFactHandle) workingMemory.insert( new BigDecimal( 10 ) );
         ReteTuple tuple = new ReteTuple( factHandle );
 
         ObjectType objectType = new ClassObjectType( BigDecimal.class );
@@ -69,23 +69,16 @@
                                         objectType );
         PatternExtractor extractor = new PatternExtractor( objectType );
 
-        //        VariableValueHandler pd = new CLPPreviousDeclarationVariable( new Declaration( "pd",
-        //                                                                                       extractor,
-        //                                                                                       column0 ) );
-        //
-        //        VariableValueHandler ld = new CLPLocalDeclarationVariable( new Declaration( "ld",
-        //                                                                                    extractor,
-        //                                                                                    column1 ) );
-
         Map variables = new HashMap();
         variables.put( "pd",
                        new CLPPreviousDeclarationVariable( new Declaration( "pd",
                                                                             extractor,
-                                                                            pattern0 ) ) );
+                                                                            pattern0 ), workingMemory ) );
         variables.put( "ld",
                        new CLPLocalDeclarationVariable( new Declaration( "ld",
                                                                          extractor,
-                                                                         pattern1 ) ) );
+                                                                         pattern1
+                                                                         ), workingMemory ) );
 
         ValueHandler val1 = new TempTokenVariable( "pd" );
         ValueHandler val2 = new IndexedLocalVariableValue( "lv",

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/test/java/org/drools/clp/CompiledFunctionsTest.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/test/java/org/drools/clp/CompiledFunctionsTest.java	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/test/java/org/drools/clp/CompiledFunctionsTest.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -6,24 +6,22 @@
 import java.io.PrintStream;
 import java.io.Reader;
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
+import junit.framework.TestCase;
+
 import org.antlr.runtime.ANTLRStringStream;
 import org.antlr.runtime.CharStream;
+import org.antlr.runtime.CommonTokenStream;
 import org.antlr.runtime.Lexer;
 import org.antlr.runtime.TokenStream;
 import org.drools.Person;
-import org.drools.clp.valuehandlers.ListValueHandler;
 import org.drools.clp.valuehandlers.IndexedLocalVariableValue;
+import org.drools.clp.valuehandlers.ListValueHandler;
 import org.drools.clp.valuehandlers.LongValueHandler;
 import org.drools.clp.valuehandlers.ObjectValueHandler;
-import org.drools.compiler.SwitchingCommonTokenStream;
 
-import junit.framework.TestCase;
-
 public class CompiledFunctionsTest extends TestCase {
     private CLPParser parser;
 
@@ -323,7 +321,7 @@
     }
 
     private TokenStream newTokenStream(final Lexer lexer) {
-        return new SwitchingCommonTokenStream( lexer );
+        return new CommonTokenStream( lexer );
     }
 
     private CLPParser newParser(final TokenStream tokenStream) {

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/test/java/org/drools/clp/LhsClpParserTest.java
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/test/java/org/drools/clp/LhsClpParserTest.java	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-clips/src/test/java/org/drools/clp/LhsClpParserTest.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -9,21 +9,21 @@
 
 import org.antlr.runtime.ANTLRStringStream;
 import org.antlr.runtime.CharStream;
+import org.antlr.runtime.CommonTokenStream;
 import org.antlr.runtime.Lexer;
 import org.antlr.runtime.TokenStream;
 import org.drools.clp.valuehandlers.DoubleValueHandler;
 import org.drools.clp.valuehandlers.FunctionCaller;
 import org.drools.clp.valuehandlers.LongValueHandler;
-import org.drools.compiler.SwitchingCommonTokenStream;
 import org.drools.lang.descr.AndDescr;
 import org.drools.lang.descr.AttributeDescr;
-import org.drools.lang.descr.PatternDescr;
 import org.drools.lang.descr.EvalDescr;
 import org.drools.lang.descr.ExistsDescr;
 import org.drools.lang.descr.FieldConstraintDescr;
 import org.drools.lang.descr.LiteralRestrictionDescr;
 import org.drools.lang.descr.NotDescr;
 import org.drools.lang.descr.OrDescr;
+import org.drools.lang.descr.PatternDescr;
 import org.drools.lang.descr.PredicateDescr;
 import org.drools.lang.descr.RestrictionConnectiveDescr;
 import org.drools.lang.descr.ReturnValueRestrictionDescr;
@@ -386,7 +386,7 @@
     }
 
     private TokenStream newTokenStream(final Lexer lexer) {
-        return new SwitchingCommonTokenStream( lexer );
+        return new CommonTokenStream( lexer );
     }
 
     private CLPParser newParser(final TokenStream tokenStream) {

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/.classpath
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/.classpath	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-compiler/.classpath	2007-07-13 19:07:20 UTC (rev 13458)
@@ -6,14 +6,14 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
   <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
   <classpathentry kind="src" path="/drools-core"/>
-  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre2/mvel14-1.2pre2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
 </classpath>

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/.classpath
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/.classpath	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-core/.classpath	2007-07-13 19:07:20 UTC (rev 13458)
@@ -6,8 +6,8 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre2/mvel14-1.2pre2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
 </classpath>

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-decisiontables/.classpath
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-decisiontables/.classpath	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-decisiontables/.classpath	2007-07-13 19:07:20 UTC (rev 13458)
@@ -5,16 +5,16 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
   <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+  <classpathentry kind="src" path="/drools-core"/>
   <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
-  <classpathentry kind="src" path="/drools-core"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
   <classpathentry kind="src" path="/drools-compiler"/>
   <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre2/mvel14-1.2pre2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/.classpath
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/.classpath	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/.classpath	2007-07-13 19:07:20 UTC (rev 13458)
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry excluding="resources/" kind="src" path="src/main"/>
+	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/insuranceModel.jar"/>
-	<classpathentry kind="lib" path="lib/drools-core-4.0.0.SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="lib/mvel14-1.2pre2.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/drools-core"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/cache/http%3A%2F%2Flocalhost%3A8080%2Fdrools-jbrms%2Forg.drools.brms.JBRMS%2Fpackage%2Forg.acme.insurance%2Ffmeyer
===================================================================
(Binary files differ)

Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/brmsdeployedrules.properties
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/brmsdeployedrules.properties	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/brmsdeployedrules.properties	2007-07-13 19:07:20 UTC (rev 13458)
@@ -1,6 +0,0 @@
-newInstance=true
-url=http://localhost:8080/drools-jbrms/org.drools.brms.JBRMS/package/org.acme.insurance/fmeyer
-localCacheDir=/Users/fernandomeyer/projects/jbossrules/experimental/drools-brms-examples/cache
-#file=/Users/fernandomeyer/projects/jbossrules/experimental/drools-brms-examples/resources/org.acme.insurance.pkg
-poll=30
-name=insuranceconfig

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main)

Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/brmsdeployedrules.properties
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/brmsdeployedrules.properties	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/brmsdeployedrules.properties	2007-07-13 19:07:20 UTC (rev 13458)
@@ -1,5 +0,0 @@
-newInstance=true
-url=http://localhost:8080/drools-jbrms/org.drools.brms.JBRMS/package/org.acme.insurance/fmeyer
-localCacheDir=/Users/fernandomeyer/projects/jbossrules/drools-examples/drools-examples-brms/cache
-poll=30
-name=insuranceconfig

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/brmsdeployedrules.properties (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/brmsdeployedrules.properties)
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/brmsdeployedrules.properties	                        (rev 0)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/brmsdeployedrules.properties	2007-07-13 19:07:20 UTC (rev 13458)
@@ -0,0 +1,5 @@
+newInstance=true
+url=http://localhost:8080/drools-jbrms/org.drools.brms.JBRMS/package/org.acme.insurance/fmeyer
+localCacheDir=/Users/fernandomeyer/projects/jbossrules/drools-examples/drools-examples-brms/cache
+poll=30
+name=insuranceconfig

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme/insurance)

Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Approve.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Approve.java	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Approve.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -1,24 +0,0 @@
-package org.acme.insurance;
-
-/**
- * This is a simple fact class to mark something as approved.
- * @author Michael Neale
- *
- */
-public class Approve {
-	
-	private String reason;
-
-	public Approve(String reason) {
-		this.reason = reason;
-	}
-
-	public String getReason() {
-		return reason;
-	}
-
-	public void setReason(String reason) {
-		this.reason = reason;
-	}
-
-}

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Approve.java (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Approve.java)
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Approve.java	                        (rev 0)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Approve.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -0,0 +1,24 @@
+package org.acme.insurance;
+
+/**
+ * This is a simple fact class to mark something as approved.
+ * @author Michael Neale
+ *
+ */
+public class Approve {
+	
+	private String reason;
+
+	public Approve(String reason) {
+		this.reason = reason;
+	}
+
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+
+}

Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Driver.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Driver.java	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Driver.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -1,41 +0,0 @@
-package org.acme.insurance;
-
-/**
- * This represents obviously a driver who is applying for an insurance Policy.
- * @author Michael Neale
- *
- */
-public class Driver {
-
-	private String name = "Mr Joe Blogs";
-	private Integer age = new Integer(30);
-	private Integer priorClaims = new Integer(0);	
-	private String  locationRiskProfile = "LOW";
-	
-	public Integer getAge() {
-		return age;
-	}
-	public void setAge(Integer age) {
-		this.age = age;
-	}
-	public String getLocationRiskProfile() {
-		return locationRiskProfile;
-	}
-	public void setLocationRiskProfile(String locationRiskProfile) {
-		this.locationRiskProfile = locationRiskProfile;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public Integer getPriorClaims() {
-		return priorClaims;
-	}
-	public void setPriorClaims(Integer priorClaims) {
-		this.priorClaims = priorClaims;
-	}
-	
-	
-}

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Driver.java (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Driver.java)
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Driver.java	                        (rev 0)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Driver.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -0,0 +1,41 @@
+package org.acme.insurance;
+
+/**
+ * This represents obviously a driver who is applying for an insurance Policy.
+ * @author Michael Neale
+ *
+ */
+public class Driver {
+
+	private String name = "Mr Joe Blogs";
+	private Integer age = new Integer(30);
+	private Integer priorClaims = new Integer(0);	
+	private String  locationRiskProfile = "LOW";
+	
+	public Integer getAge() {
+		return age;
+	}
+	public void setAge(Integer age) {
+		this.age = age;
+	}
+	public String getLocationRiskProfile() {
+		return locationRiskProfile;
+	}
+	public void setLocationRiskProfile(String locationRiskProfile) {
+		this.locationRiskProfile = locationRiskProfile;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public Integer getPriorClaims() {
+		return priorClaims;
+	}
+	public void setPriorClaims(Integer priorClaims) {
+		this.priorClaims = priorClaims;
+	}
+	
+	
+}

Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Policy.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Policy.java	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Policy.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -1,49 +0,0 @@
-package org.acme.insurance;
-
-/**
- * This represents a policy that a driver is applying for. 
- * 
- * Obviously in the real world, there are actuaries to mess things up, but lets just pretend there is
- * some simple base price and discount that we can calculate with relatively simple rules !
- * 
- * @author Michael Neale
- */
-public class Policy {
-
-	private String type = "COMPREHENSIVE";
-	private boolean approved = false;
-	private int discountPercent = 0;
-	private int basePrice;
-	
-	public boolean isApproved() {
-		return approved;
-	}
-	public void setApproved(boolean approved) {
-		this.approved = approved;
-	}
-	public int getDiscountPercent() {
-		return discountPercent;
-	}
-	public void setDiscountPercent(int discountPercent) {
-		this.discountPercent = discountPercent;
-	}
-	
-	public String getType() {
-		return type;
-	}
-	
-	public void setType(String type) {
-		this.type = type;
-	}
-	
-	public void applyDiscount(int discount) {
-		discountPercent += discount;
-	}
-	public int getBasePrice() {
-		return basePrice;
-	}
-	public void setBasePrice(int basePrice) {
-		this.basePrice = basePrice;
-	}
-	
-}

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Policy.java (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Policy.java)
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Policy.java	                        (rev 0)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Policy.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -0,0 +1,49 @@
+package org.acme.insurance;
+
+/**
+ * This represents a policy that a driver is applying for. 
+ * 
+ * Obviously in the real world, there are actuaries to mess things up, but lets just pretend there is
+ * some simple base price and discount that we can calculate with relatively simple rules !
+ * 
+ * @author Michael Neale
+ */
+public class Policy {
+
+	private String type = "COMPREHENSIVE";
+	private boolean approved = false;
+	private int discountPercent = 0;
+	private int basePrice;
+	
+	public boolean isApproved() {
+		return approved;
+	}
+	public void setApproved(boolean approved) {
+		this.approved = approved;
+	}
+	public int getDiscountPercent() {
+		return discountPercent;
+	}
+	public void setDiscountPercent(int discountPercent) {
+		this.discountPercent = discountPercent;
+	}
+	
+	public String getType() {
+		return type;
+	}
+	
+	public void setType(String type) {
+		this.type = type;
+	}
+	
+	public void applyDiscount(int discount) {
+		discountPercent += discount;
+	}
+	public int getBasePrice() {
+		return basePrice;
+	}
+	public void setBasePrice(int basePrice) {
+		this.basePrice = basePrice;
+	}
+	
+}

Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Rejection.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Rejection.java	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Rejection.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -1,23 +0,0 @@
-package org.acme.insurance;
-
-/**
- * 
- * @author Michael Neale
- */
-public class Rejection {
-
-	private String reason;
-
-	public Rejection(String reason) {
-		this.reason = reason;
-	}
-
-	public String getReason() {
-		return reason;
-	}
-
-	public void setReason(String reason) {
-		this.reason = reason;
-	}
-	
-}

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Rejection.java (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Rejection.java)
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Rejection.java	                        (rev 0)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/Rejection.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -0,0 +1,23 @@
+package org.acme.insurance;
+
+/**
+ * 
+ * @author Michael Neale
+ */
+public class Rejection {
+
+	private String reason;
+
+	public Rejection(String reason) {
+		this.reason = reason;
+	}
+
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+	
+}

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher)

Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/InsuranceBusiness.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/InsuranceBusiness.java	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/InsuranceBusiness.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -1,79 +0,0 @@
-package org.acme.insurance.launcher;
-
-import java.io.IOException;
-
-import org.acme.insurance.Driver;
-import org.acme.insurance.Policy;
-import org.drools.RuleBase;
-import org.drools.StatefulSession;
-import org.drools.agent.RuleAgent;
-
-public class InsuranceBusiness {
-	
-	public void executeExample() throws Exception {
-		RuleBase ruleBase = loadRuleBase();
-
-		testUnsafeDriver(ruleBase);
-		testSafeMature(ruleBase);
-		testUnsafeAreaAndPriors(ruleBase);
-	}
-
-	/**
-	 * This shows how rules are loaded up from a deployed package.
-	 */
-	private RuleBase loadRuleBase() throws IOException, Exception {
-
-		RuleAgent agent = RuleAgent.newRuleAgent("/brmsdeployedrules.properties");
-		RuleBase rb = agent.getRuleBase(); 
-
-		return rb;
-	}
-
-	private void testUnsafeDriver(RuleBase ruleBase) {
-		StatefulSession session = ruleBase.newStatefulSession();
-		
-		Driver driver = new Driver();
-		driver.setPriorClaims(new Integer(1));
-		Policy policy = new Policy();
-		policy.setType("COMPREHENSIVE");
-		policy.setApproved(false);
-		
-		session.insert(driver);
-		session.insert(policy);
-		session.fireAllRules();
-	}		
-
-	private void testSafeMature(RuleBase ruleBase) {
-		StatefulSession session = ruleBase.newStatefulSession();
-		
-		Driver driver = new Driver();
-		driver.setPriorClaims(new Integer(0));
-		driver.setAge(new Integer(45));
-		
-		Policy policy = new Policy();
-		policy.setType("COMPREHENSIVE");
-		policy.setApproved(false);
-		
-		session.insert(driver);
-		session.insert(policy);
-		session.fireAllRules();
-	}		
-	
-	private void testUnsafeAreaAndPriors(RuleBase ruleBase) {
-		StatefulSession session = ruleBase.newStatefulSession();
-		
-		Driver driver = new Driver();
-		driver.setPriorClaims(new Integer(20));
-		driver.setAge(new Integer(55));
-		driver.setLocationRiskProfile("LOW");
-		
-		Policy policy = new Policy();
-		policy.setType("COMPREHENSIVE");
-		policy.setApproved(false);
-		
-		session.insert(driver);
-		session.insert(policy);
-		session.fireAllRules();
-	}
-	
-}

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/InsuranceBusiness.java (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/InsuranceBusiness.java)
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/InsuranceBusiness.java	                        (rev 0)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/InsuranceBusiness.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -0,0 +1,79 @@
+package org.acme.insurance.launcher;
+
+import java.io.IOException;
+
+import org.acme.insurance.Driver;
+import org.acme.insurance.Policy;
+import org.drools.RuleBase;
+import org.drools.StatefulSession;
+import org.drools.agent.RuleAgent;
+
+public class InsuranceBusiness {
+	
+	public void executeExample() throws Exception {
+		RuleBase ruleBase = loadRuleBase();
+
+		testUnsafeDriver(ruleBase);
+		testSafeMature(ruleBase);
+		testUnsafeAreaAndPriors(ruleBase);
+	}
+
+	/**
+	 * This shows how rules are loaded up from a deployed package.
+	 */
+	private RuleBase loadRuleBase() throws IOException, Exception {
+
+		RuleAgent agent = RuleAgent.newRuleAgent("/brmsdeployedrules.properties");
+		RuleBase rb = agent.getRuleBase(); 
+
+		return rb;
+	}
+
+	private void testUnsafeDriver(RuleBase ruleBase) {
+		StatefulSession session = ruleBase.newStatefulSession();
+		
+		Driver driver = new Driver();
+		driver.setPriorClaims(new Integer(1));
+		Policy policy = new Policy();
+		policy.setType("COMPREHENSIVE");
+		policy.setApproved(false);
+		
+		session.insert(driver);
+		session.insert(policy);
+		session.fireAllRules();
+	}		
+
+	private void testSafeMature(RuleBase ruleBase) {
+		StatefulSession session = ruleBase.newStatefulSession();
+		
+		Driver driver = new Driver();
+		driver.setPriorClaims(new Integer(0));
+		driver.setAge(new Integer(45));
+		
+		Policy policy = new Policy();
+		policy.setType("COMPREHENSIVE");
+		policy.setApproved(false);
+		
+		session.insert(driver);
+		session.insert(policy);
+		session.fireAllRules();
+	}		
+	
+	private void testUnsafeAreaAndPriors(RuleBase ruleBase) {
+		StatefulSession session = ruleBase.newStatefulSession();
+		
+		Driver driver = new Driver();
+		driver.setPriorClaims(new Integer(20));
+		driver.setAge(new Integer(55));
+		driver.setLocationRiskProfile("LOW");
+		
+		Policy policy = new Policy();
+		policy.setType("COMPREHENSIVE");
+		policy.setApproved(false);
+		
+		session.insert(driver);
+		session.insert(policy);
+		session.fireAllRules();
+	}
+	
+}

Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/MainClass.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/MainClass.java	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/MainClass.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -1,20 +0,0 @@
-package org.acme.insurance.launcher;
-
-/**
- * @author fernandomeyer
- */
-
-public class MainClass {
-	
-	public static void main(String[] args) {
-
-		InsuranceBusiness launcher = new InsuranceBusiness();
-		try {
-			launcher.executeExample();
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		System.exit(0);
-	}
-}

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/MainClass.java (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/MainClass.java)
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/MainClass.java	                        (rev 0)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/org/acme/insurance/launcher/MainClass.java	2007-07-13 19:07:20 UTC (rev 13458)
@@ -0,0 +1,20 @@
+package org.acme.insurance.launcher;
+
+/**
+ * @author fernandomeyer
+ */
+
+public class MainClass {
+	
+	public static void main(String[] args) {
+
+		InsuranceBusiness launcher = new InsuranceBusiness();
+		try {
+			launcher.executeExample();
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		System.exit(0);
+	}
+}

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/resources)

Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources/insuranceModel.jar
===================================================================
(Binary files differ)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources/insuranceModel.jar (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/resources/insuranceModel.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources/org.acme.insurance.pkg
===================================================================
(Binary files differ)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources/org.acme.insurance.pkg (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/resources/org.acme.insurance.pkg)
===================================================================
(Binary files differ)

Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources/repository_export.xml.gz
===================================================================
(Binary files differ)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-examples/drools-examples-brms/src/main/resources/repository_export.xml.gz (from rev 13457, labs/jbossrules/trunk/drools-examples/drools-examples-brms/src/main/resources/repository_export.xml.gz)
===================================================================
(Binary files differ)

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/.classpath
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/.classpath	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jbrms/.classpath	2007-07-13 19:07:20 UTC (rev 13458)
@@ -53,5 +53,5 @@
   <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
   <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre2/mvel14-1.2pre2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jsr94/.classpath
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jsr94/.classpath	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jsr94/.classpath	2007-07-13 19:07:20 UTC (rev 13458)
@@ -5,20 +5,20 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
+  <classpathentry kind="src" path="/drools-decisiontables"/>
+  <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-tck/1.0.3/jsr94-tck-1.0.3.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
+  <classpathentry kind="src" path="/drools-core"/>
+  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.jar"/>
   <classpathentry kind="var" path="M2_REPO/xstream/xstream/1.1.3/xstream-1.1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
   <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-tck/1.0.3/jsr94-tck-1.0.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.jar"/>
   <classpathentry kind="src" path="/drools-compiler"/>
-  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2pre2/mvel14-1.2pre2.jar"/>
-  <classpathentry kind="src" path="/drools-core"/>
-  <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-1.1.jar"/>
-  <classpathentry kind="src" path="/drools-decisiontables"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jsr94/.project
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jsr94/.project	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-jsr94/.project	2007-07-13 19:07:20 UTC (rev 13458)
@@ -2,9 +2,9 @@
   <name>drools-jsr94</name>
   <comment>A rule production system</comment>
   <projects>
+    <project>drools-decisiontables</project>
+    <project>drools-core</project>
     <project>drools-compiler</project>
-    <project>drools-core</project>
-    <project>drools-decisiontables</project>
   </projects>
   <buildSpec>
     <buildCommand>

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/.classpath
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/.classpath	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/drools-repository/.classpath	2007-07-13 19:07:20 UTC (rev 13458)
@@ -5,20 +5,20 @@
   <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
   <classpathentry kind="output" path="target/classes"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.3/jackrabbit-jcr-commons-1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.3/jackrabbit-text-extractors-1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.3/jackrabbit-core-1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.3/jackrabbit-api-1.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
+  <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
   <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.3.0/slf4j-api-1.3.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.0.0/lucene-core-2.0.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.3/jackrabbit-jcr-commons-1.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.3/jackrabbit-core-1.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.3/jackrabbit-text-extractors-1.3.jar"/>
 </classpath>
\ No newline at end of file

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre3 (from rev 13457, labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2pre3)

Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.jar
===================================================================
(Binary files differ)

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.jar (from rev 13457, labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.jar)
===================================================================
(Binary files differ)

Deleted: labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.pom
===================================================================
--- labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.pom	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.pom	2007-07-13 19:07:20 UTC (rev 13458)
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <modelVersion>4.0.0</modelVersion>
-  
-  <groupId>org.mvel</groupId>
-  
-  <artifactId>mvel14</artifactId>
-  
-  <name>mvel</name>
-  
-  <version>1.2pre3</version>
-  
-  <description></description>
-  
-  <inceptionYear>2005</inceptionYear>
-  
-  <url>http://wiki.mvflex.org/index.php?title=MVFLEX_Expression_Language</url>
-  
-  <issueManagement>
-    <url>http://jira.codehaus.org/browse/MVEL</url>
-  </issueManagement>
-  
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>  
-  
-  <mailingLists/>
-  
-  <scm>
-    <connection>scm:svn:http://svn.codehaus.org/mvel/</connection>
-    <developerConnection>scm:svn:https://svn.codehaus.org/mvel/</developerConnection>
-    <url>http://svn.mvel.codehaus.org/</url>
-  </scm>
-  
-  <organization>
-    <name>Codehaus</name>
-    <url>http://codehaus.org</url>
-  </organization>
-  
-  <build>
-    <sourceDirectory></sourceDirectory>
-    <testSourceDirectory></testSourceDirectory>
-  </build>
-</project>
\ No newline at end of file

Copied: labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.pom (from rev 13457, labs/jbossrules/trunk/m2_repo/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.pom)
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.pom	                        (rev 0)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/m2_repo/org/mvel/mvel14/1.2pre3/mvel14-1.2pre3.pom	2007-07-13 19:07:20 UTC (rev 13458)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+  <modelVersion>4.0.0</modelVersion>
+  
+  <groupId>org.mvel</groupId>
+  
+  <artifactId>mvel14</artifactId>
+  
+  <name>mvel</name>
+  
+  <version>1.2pre3</version>
+  
+  <description></description>
+  
+  <inceptionYear>2005</inceptionYear>
+  
+  <url>http://wiki.mvflex.org/index.php?title=MVFLEX_Expression_Language</url>
+  
+  <issueManagement>
+    <url>http://jira.codehaus.org/browse/MVEL</url>
+  </issueManagement>
+  
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>  
+  
+  <mailingLists/>
+  
+  <scm>
+    <connection>scm:svn:http://svn.codehaus.org/mvel/</connection>
+    <developerConnection>scm:svn:https://svn.codehaus.org/mvel/</developerConnection>
+    <url>http://svn.mvel.codehaus.org/</url>
+  </scm>
+  
+  <organization>
+    <name>Codehaus</name>
+    <url>http://codehaus.org</url>
+  </organization>
+  
+  <build>
+    <sourceDirectory></sourceDirectory>
+    <testSourceDirectory></testSourceDirectory>
+  </build>
+</project>
\ No newline at end of file

Modified: labs/jbossrules/branches/mvel-tooling-2007-06-30/pom.xml
===================================================================
--- labs/jbossrules/branches/mvel-tooling-2007-06-30/pom.xml	2007-07-13 18:18:44 UTC (rev 13457)
+++ labs/jbossrules/branches/mvel-tooling-2007-06-30/pom.xml	2007-07-13 19:07:20 UTC (rev 13458)
@@ -651,7 +651,7 @@
 	    <dependency>
 			  <groupId>org.mvel</groupId>
 			  <artifactId>mvel14</artifactId>
-			  <version>1.2pre2</version>
+			  <version>1.2pre3</version>
       </dependency>
 
       <!-- drools-compiler -->




More information about the jboss-svn-commits mailing list