[jboss-svn-commits] JBL Code SVN: r12939 - in labs/jbossrules/trunk: drools-compiler/src/test/java/org/drools/brms/server/util and 16 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Jun 28 17:46:54 EDT 2007


Author: fmeyer
Date: 2007-06-28 17:46:54 -0400 (Thu, 28 Jun 2007)
New Revision: 12939

Added:
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/editors/BrlPage.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrlFileWizard.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrlFileWizardPage.java
Removed:
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/editors/BrxmlPage.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrxmlFileWizard.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrxmlFileWizardPage.java
Modified:
   labs/jbossrules/trunk/drools-compiler/.classpath
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java
   labs/jbossrules/trunk/drools-core/.classpath
   labs/jbossrules/trunk/drools-decisiontables/.classpath
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/.classpath
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/plugin.xml
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/menu/RuleHelperActionDelegate.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/editors/RuleEditor.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionInsertFactWidget.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionRetractFactWidget.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionSetFieldDialog.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionSetFieldWidget.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddCompositeConstraintOptionDialog.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewActionDialog.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewConditionDialog.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewFactConstraintDialog.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewFieldConstraintDialog.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewInsertedFactFieldDialog.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AssignFieldVariableDialog.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/CompositeFactPatternWidget.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/DSLSentenceWidget.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/LHSDSLSentenceWidget.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RHSDSLSentenceWidget.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleAttributeWidget.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleAttributesDialog.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleModeller.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ValueEditorTypeSelectionDialog.java
   labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/.classpath
   labs/jbossrules/trunk/drools-jbrms/build.properties
   labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/brl/package.html
   labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/org.drools.brms.JBRMS.nocache.html
   labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
   labs/jbossrules/trunk/drools-jsr94/.classpath
   labs/jbossrules/trunk/drools-repository/.classpath
   labs/jbossrules/trunk/experimental/drools-testing/.classpath
   labs/jbossrules/trunk/lib/utility-scripts/copyright-headers/copy_wrong.rb
Log:
JBRULES-956 - Rename ALL occurences of BRXML to BRL



Modified: labs/jbossrules/trunk/drools-compiler/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-compiler/.classpath	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-compiler/.classpath	2007-06-28 21:46:54 UTC (rev 12939)
@@ -5,14 +5,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/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/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/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0-sources.jar"/>
   <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="src" path="/drools-core"/>
+  <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/org/mvel/mvel14/1.2beta27/mvel14-1.2beta27.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/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar"/>
-  <classpathentry kind="src" path="/drools-core"/>
+  <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"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/brms/server/util/BRLPersitenceTest.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -175,7 +175,7 @@
     }
 
     /**
-     * This will verify that we can load an old BRXML change. If this fails,
+     * This will verify that we can load an old BRL change. If this fails,
      * then backwards compatability is broken.
      */
     public void testBackwardsCompat() throws Exception {

Modified: labs/jbossrules/trunk/drools-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-core/.classpath	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-core/.classpath	2007-06-28 21:46:54 UTC (rev 12939)
@@ -5,8 +5,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/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/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/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/org/mvel/mvel14/1.2beta27/mvel14-1.2beta27.jar"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.3.4.O/xpp3-1.1.3.4.O.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-decisiontables/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/.classpath	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-decisiontables/.classpath	2007-06-28 21:46:54 UTC (rev 12939)
@@ -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/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="src" path="/drools-core"/>
+  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2beta27/mvel14-1.2beta27.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/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2beta26/mvel14-1.2beta26.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="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/jexcelapi/jxl/2.4.2/jxl-2.4.2.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"/>
+  <classpathentry kind="src" path="/drools-core"/>
   <classpathentry kind="src" path="/drools-compiler"/>
-  <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/junit/junit/3.8.1/junit-3.8.1.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/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/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/.classpath	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/.classpath	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,21 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry exported="true" kind="lib" path="lib/drools-compiler.jar" sourcepath="/drools-compiler"/>
-	<classpathentry exported="true" kind="lib" path="lib/drools-core.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/drools-decisiontables.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/drools-jsr94.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jsr94.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jxl.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/mvel14.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xpp3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xstream.jar"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/antlr-runtime.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry exported="true" kind="lib" path="lib/drools-compiler.jar" sourcepath="/drools-compiler"/>
+	<classpathentry exported="true" kind="lib" path="lib/drools-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/drools-decisiontables.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/drools-jsr94.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jsr94.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jxl.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/mvel14.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xml-apis.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xpp3.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xstream.jar"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/antlr-runtime.jar"/>
+	<classpathentry kind="src" path="/drools-compiler"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/plugin.xml
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/plugin.xml	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/plugin.xml	2007-06-28 21:46:54 UTC (rev 12939)
@@ -380,9 +380,9 @@
          point="org.eclipse.ui.editors">
       <editor
             class="org.drools.eclipse.rulebuilder.editors.RuleEditor"
-            extensions="brxml"
+            extensions="brl"
             icon="icons/drools.gif"
-            id="org.drools.eclipse.ide.rulebuilder.brxml.editors.RuleEditor"
+            id="org.drools.eclipse.ide.rulebuilder.brl.editors.RuleEditor"
             name="RuleBuilder Editor"/>
    </extension>
 
@@ -391,9 +391,9 @@
 
       <wizard
             category="org.drools.eclipse.new"
-            class="org.drools.eclipse.rulebuilder.wizards.NewBrxmlFileWizard"
+            class="org.drools.eclipse.rulebuilder.wizards.NewBrlFileWizard"
             icon="icons/drools.gif"
-            id="org.drools.eclipse.rulebuilder.wizards.NewBrxmlFileWizard"
+            id="org.drools.eclipse.rulebuilder.wizards.NewBrlFileWizard"
             name="Guided DRL Editor"/>
    </extension>
    

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/menu/RuleHelperActionDelegate.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/menu/RuleHelperActionDelegate.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/menu/RuleHelperActionDelegate.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -4,7 +4,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.drools.eclipse.rulebuilder.wizards.NewBrxmlFileWizard;
+import org.drools.eclipse.rulebuilder.wizards.NewBrlFileWizard;
 import org.drools.eclipse.wizard.decisiontable.NewDTFileWizard;
 import org.drools.eclipse.wizard.dsl.NewDSLFileWizard;
 import org.drools.eclipse.wizard.project.NewDroolsProjectWizard;
@@ -140,7 +140,7 @@
         dsl.addSelectionListener( new SelectionListener() {
 
             public void widgetSelected(SelectionEvent e) {
-                NewBrxmlFileWizard wizard = new NewBrxmlFileWizard();
+                NewBrlFileWizard wizard = new NewBrlFileWizard();
                 launchWizard( shell,
                               wizard );
             }

Copied: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/editors/BrlPage.java (from rev 12903, labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/editors/BrxmlPage.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/editors/BrlPage.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/editors/BrlPage.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -0,0 +1,69 @@
+package org.drools.eclipse.rulebuilder.editors;
+
+import org.drools.brms.client.modeldriven.brl.RuleModel;
+import org.drools.brms.server.util.BRXMLPersistence;
+import org.drools.eclipse.rulebuilder.ui.RuleModeller;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormPage;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.eclipse.ui.forms.widgets.ScrolledForm;
+
+/**
+ * Rule Builder main page used as a tab in {@link RuleEditor} multipage.
+ * 
+ * @author Ahti Kitsik
+ *
+ */
+public class BrlPage extends FormPage {
+
+    private static final String PAGE_NAME = "Rule Builder";
+    private static final String PAGE_ID   = BrlPage.class.getName();
+
+    private RuleModeller        modeller;
+    private RuleModel           model;
+    private RuleEditor          editor;
+
+    public BrlPage(RuleEditor editor) {
+        super( editor,
+               PAGE_ID,
+               PAGE_NAME );
+        this.editor = editor;
+    }
+
+    protected void createFormContent(IManagedForm managedForm) {
+        ScrolledForm form = managedForm.getForm();
+        FormToolkit toolkit = managedForm.getToolkit();
+
+        modeller = new RuleModeller( form,
+                                     toolkit,
+                                     model,
+                                     editor );
+    }
+
+    public void setModelXML(String xml) {
+        model = BRXMLPersistence.getInstance().unmarshal( xml );
+        modeller.setModel( model );
+        modeller.reloadWidgets();
+    }
+
+    public RuleModel getRuleModel() {
+        return model;
+    }
+
+    public RuleModeller getModeller() {
+        return modeller;
+    }
+
+    public boolean isDirty() {
+        return modeller.isDirty();
+    }
+
+    public void fireDirtyPropertyChanged() {
+        editor.dirtyPropertyChanged();
+    }
+
+    public void refresh() {
+        modeller.refresh();
+    }
+
+}

Deleted: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/editors/BrxmlPage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/editors/BrxmlPage.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/editors/BrxmlPage.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,69 +0,0 @@
-package org.drools.eclipse.rulebuilder.editors;
-
-import org.drools.brms.client.modeldriven.brxml.RuleModel;
-import org.drools.brms.server.util.BRXMLPersistence;
-import org.drools.eclipse.rulebuilder.ui.RuleModeller;
-import org.eclipse.ui.forms.IManagedForm;
-import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.ScrolledForm;
-
-/**
- * Rule Builder main page used as a tab in {@link RuleEditor} multipage.
- * 
- * @author Ahti Kitsik
- *
- */
-public class BrxmlPage extends FormPage {
-
-    private static final String PAGE_NAME = "Rule Builder";
-    private static final String PAGE_ID   = BrxmlPage.class.getName();
-
-    private RuleModeller        modeller;
-    private RuleModel           model;
-    private RuleEditor          editor;
-
-    public BrxmlPage(RuleEditor editor) {
-        super( editor,
-               PAGE_ID,
-               PAGE_NAME );
-        this.editor = editor;
-    }
-
-    protected void createFormContent(IManagedForm managedForm) {
-        ScrolledForm form = managedForm.getForm();
-        FormToolkit toolkit = managedForm.getToolkit();
-
-        modeller = new RuleModeller( form,
-                                     toolkit,
-                                     model,
-                                     editor );
-    }
-
-    public void setModelXML(String xml) {
-        model = BRXMLPersistence.getInstance().unmarshal( xml );
-        modeller.setModel( model );
-        modeller.reloadWidgets();
-    }
-
-    public RuleModel getRuleModel() {
-        return model;
-    }
-
-    public RuleModeller getModeller() {
-        return modeller;
-    }
-
-    public boolean isDirty() {
-        return modeller.isDirty();
-    }
-
-    public void fireDirtyPropertyChanged() {
-        editor.dirtyPropertyChanged();
-    }
-
-    public void refresh() {
-        modeller.refresh();
-    }
-
-}

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/editors/RuleEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/editors/RuleEditor.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/editors/RuleEditor.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -48,7 +48,7 @@
     implements
     IResourceChangeListener {
 
-    private BrxmlPage                  guidedEditor;
+    private BrlPage                  guidedEditor;
 
     private TextEditor                 xmlEditor          = new TextEditor();
 
@@ -89,7 +89,7 @@
     }
 
     protected void addPages() {
-        guidedEditor = new BrxmlPage( this );
+        guidedEditor = new BrlPage( this );
         try {
             addPage( guidedEditor );
             addPage( xmlEditor,
@@ -126,7 +126,7 @@
             reloadCompletionEngine();
 
             setPageText( 1,
-                         "BRXML Source" );
+                         "BRL Source" );
 
             setPageText( 2,
                          "Generated DRL (read-only)" );
@@ -142,9 +142,9 @@
         String name = xmlEditor.getTitle();
         setPartName( name );
         
-        //TODO Add support for other than .brxml extensions
+        //TODO Add support for other than .brl extensions
         if (guidedEditor.getModeller()!=null && guidedEditor.getModeller().getModel()!=null && (guidedEditor.getModeller().getModel().name==null || forced)) {
-            String shortName = name.substring( 0, name.length()-".brxml".length() );
+            String shortName = name.substring( 0, name.length()-".brl".length() );
             guidedEditor.getModeller().getModel().name=shortName;            
         }
         

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionInsertFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionInsertFactWidget.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionInsertFactWidget.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,9 +1,9 @@
 package org.drools.eclipse.rulebuilder.ui;
 
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brxml.ActionInsertLogicalFact;
+import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
+import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
+import org.drools.brms.client.modeldriven.brl.ActionInsertLogicalFact;
 import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionRetractFactWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionRetractFactWidget.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionRetractFactWidget.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,6 +1,6 @@
 package org.drools.eclipse.rulebuilder.ui;
 
-import org.drools.brms.client.modeldriven.brxml.ActionRetractFact;
+import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
 import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionSetFieldDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionSetFieldDialog.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionSetFieldDialog.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,7 +1,7 @@
 package org.drools.eclipse.rulebuilder.ui;
 
-import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brxml.ActionSetField;
+import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
+import org.drools.brms.client.modeldriven.brl.ActionSetField;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionSetFieldWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionSetFieldWidget.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ActionSetFieldWidget.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,11 +1,11 @@
 package org.drools.eclipse.rulebuilder.ui;
 
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
-import org.drools.brms.client.modeldriven.brxml.ActionSetField;
-import org.drools.brms.client.modeldriven.brxml.ActionUpdateField;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
-import org.drools.brms.client.modeldriven.brxml.RuleModel;
+import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
+import org.drools.brms.client.modeldriven.brl.ActionSetField;
+import org.drools.brms.client.modeldriven.brl.ActionUpdateField;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
+import org.drools.brms.client.modeldriven.brl.RuleModel;
 import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddCompositeConstraintOptionDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddCompositeConstraintOptionDialog.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddCompositeConstraintOptionDialog.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,8 +1,8 @@
 package org.drools.eclipse.rulebuilder.ui;
 
-import org.drools.brms.client.modeldriven.brxml.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
-import org.drools.brms.client.modeldriven.brxml.SingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
+import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewActionDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewActionDialog.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewActionDialog.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -3,11 +3,11 @@
 import java.util.List;
 
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brxml.ActionInsertLogicalFact;
-import org.drools.brms.client.modeldriven.brxml.ActionSetField;
-import org.drools.brms.client.modeldriven.brxml.ActionUpdateField;
-import org.drools.brms.client.modeldriven.brxml.DSLSentence;
+import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
+import org.drools.brms.client.modeldriven.brl.ActionInsertLogicalFact;
+import org.drools.brms.client.modeldriven.brl.ActionSetField;
+import org.drools.brms.client.modeldriven.brl.ActionUpdateField;
+import org.drools.brms.client.modeldriven.brl.DSLSentence;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewConditionDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewConditionDialog.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewConditionDialog.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,10 +1,10 @@
 package org.drools.eclipse.rulebuilder.ui;
 
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brxml.DSLSentence;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
-import org.drools.brms.client.modeldriven.brxml.IPattern;
+import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.brms.client.modeldriven.brl.DSLSentence;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
+import org.drools.brms.client.modeldriven.brl.IPattern;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewFactConstraintDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewFactConstraintDialog.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewFactConstraintDialog.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,8 +1,8 @@
 package org.drools.eclipse.rulebuilder.ui;
 
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
+import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewFieldConstraintDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewFieldConstraintDialog.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewFieldConstraintDialog.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,10 +1,10 @@
 package org.drools.eclipse.rulebuilder.ui;
 
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
-import org.drools.brms.client.modeldriven.brxml.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.SingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
+import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewInsertedFactFieldDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewInsertedFactFieldDialog.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AddNewInsertedFactFieldDialog.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,8 +1,8 @@
 package org.drools.eclipse.rulebuilder.ui;
 
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
+import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
+import org.drools.brms.client.modeldriven.brl.ActionFieldValue;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AssignFieldVariableDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AssignFieldVariableDialog.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/AssignFieldVariableDialog.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,6 +1,6 @@
 package org.drools.eclipse.rulebuilder.ui;
 
-import org.drools.brms.client.modeldriven.brxml.SingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/CompositeFactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/CompositeFactPatternWidget.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/CompositeFactPatternWidget.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,7 +1,7 @@
 package org.drools.eclipse.rulebuilder.ui;
 
-import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
+import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
 import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/DSLSentenceWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/DSLSentenceWidget.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/DSLSentenceWidget.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -4,7 +4,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.drools.brms.client.modeldriven.brxml.DSLSentence;
+import org.drools.brms.client.modeldriven.brl.DSLSentence;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/FactPatternWidget.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -4,13 +4,13 @@
 import java.util.List;
 
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brxml.CompositeFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.ConnectiveConstraint;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
-import org.drools.brms.client.modeldriven.brxml.FieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.ISingleFieldConstraint;
-import org.drools.brms.client.modeldriven.brxml.SingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.brms.client.modeldriven.brl.CompositeFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.ConnectiveConstraint;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
+import org.drools.brms.client.modeldriven.brl.FieldConstraint;
+import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.SingleFieldConstraint;
 import org.drools.eclipse.rulebuilder.modeldriven.HumanReadable;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/LHSDSLSentenceWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/LHSDSLSentenceWidget.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/LHSDSLSentenceWidget.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,6 +1,6 @@
 package org.drools.eclipse.rulebuilder.ui;
 
-import org.drools.brms.client.modeldriven.brxml.DSLSentence;
+import org.drools.brms.client.modeldriven.brl.DSLSentence;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RHSDSLSentenceWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RHSDSLSentenceWidget.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RHSDSLSentenceWidget.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,6 +1,6 @@
 package org.drools.eclipse.rulebuilder.ui;
 
-import org.drools.brms.client.modeldriven.brxml.DSLSentence;
+import org.drools.brms.client.modeldriven.brl.DSLSentence;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleAttributeWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleAttributeWidget.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleAttributeWidget.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.drools.brms.client.modeldriven.brxml.RuleAttribute;
+import org.drools.brms.client.modeldriven.brl.RuleAttribute;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleAttributesDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleAttributesDialog.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleAttributesDialog.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -3,7 +3,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.drools.brms.client.modeldriven.brxml.RuleAttribute;
+import org.drools.brms.client.modeldriven.brl.RuleAttribute;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleModeller.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleModeller.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/RuleModeller.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,15 +1,15 @@
 package org.drools.eclipse.rulebuilder.ui;
 
 import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.brms.client.modeldriven.brxml.ActionInsertFact;
-import org.drools.brms.client.modeldriven.brxml.ActionRetractFact;
-import org.drools.brms.client.modeldriven.brxml.ActionSetField;
-import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
-import org.drools.brms.client.modeldriven.brxml.DSLSentence;
-import org.drools.brms.client.modeldriven.brxml.FactPattern;
-import org.drools.brms.client.modeldriven.brxml.IAction;
-import org.drools.brms.client.modeldriven.brxml.IPattern;
-import org.drools.brms.client.modeldriven.brxml.RuleModel;
+import org.drools.brms.client.modeldriven.brl.ActionInsertFact;
+import org.drools.brms.client.modeldriven.brl.ActionRetractFact;
+import org.drools.brms.client.modeldriven.brl.ActionSetField;
+import org.drools.brms.client.modeldriven.brl.CompositeFactPattern;
+import org.drools.brms.client.modeldriven.brl.DSLSentence;
+import org.drools.brms.client.modeldriven.brl.FactPattern;
+import org.drools.brms.client.modeldriven.brl.IAction;
+import org.drools.brms.client.modeldriven.brl.IPattern;
+import org.drools.brms.client.modeldriven.brl.RuleModel;
 import org.drools.eclipse.rulebuilder.editors.RuleEditor;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.window.Window;

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ValueEditorTypeSelectionDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ValueEditorTypeSelectionDialog.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/ui/ValueEditorTypeSelectionDialog.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,6 +1,6 @@
 package org.drools.eclipse.rulebuilder.ui;
 
-import org.drools.brms.client.modeldriven.brxml.ISingleFieldConstraint;
+import org.drools.brms.client.modeldriven.brl.ISingleFieldConstraint;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;

Copied: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrlFileWizard.java (from rev 12931, labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrxmlFileWizard.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrlFileWizard.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrlFileWizard.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -0,0 +1,168 @@
+package org.drools.eclipse.rulebuilder.wizards;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.core.runtime.*;
+import org.eclipse.jface.operation.*;
+import java.lang.reflect.InvocationTargetException;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.CoreException;
+import java.io.*;
+import org.eclipse.ui.*;
+import org.eclipse.ui.ide.IDE;
+
+/**
+ * This is a sample new wizard. Its role is to create a new file 
+ * resource in the provided container. If the container resource
+ * (a folder or a project) is selected in the workspace 
+ * when the wizard is opened, it will accept it as the target
+ * container. The wizard creates one file with the extension
+ * "brl". If a sample multi-page editor (also available
+ * as a template) is registered for the same extension, it will
+ * be able to open it.
+ */
+
+public class NewBrlFileWizard extends Wizard
+    implements
+    INewWizard {
+    private NewBrlFileWizardPage page;
+    private ISelection             selection;
+
+    /**
+     * Constructor for NewBrlFileWizard.
+     */
+    public NewBrlFileWizard() {
+        super();
+        setNeedsProgressMonitor( true );
+    }
+
+    /**
+     * Adding the page to the wizard.
+     */
+
+    public void addPages() {
+        page = new NewBrlFileWizardPage( selection );
+        addPage( page );
+    }
+
+    /**
+     * This method is called when 'Finish' button is pressed in
+     * the wizard. We will create an operation and run it
+     * using wizard as execution context.
+     */
+    public boolean performFinish() {
+        final String containerName = page.getContainerName();
+        final String fileName = page.getFileName();
+        IRunnableWithProgress op = new IRunnableWithProgress() {
+            public void run(IProgressMonitor monitor) throws InvocationTargetException {
+                try {
+                    doFinish( containerName,
+                              fileName,
+                              monitor );
+                } catch ( CoreException e ) {
+                    throw new InvocationTargetException( e );
+                } finally {
+                    monitor.done();
+                }
+            }
+        };
+        try {
+            getContainer().run( true,
+                                false,
+                                op );
+        } catch ( InterruptedException e ) {
+            return false;
+        } catch ( InvocationTargetException e ) {
+            Throwable realException = e.getTargetException();
+            MessageDialog.openError( getShell(),
+                                     "Error",
+                                     realException.getMessage() );
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * The worker method. It will find the container, create the
+     * file if missing or just replace its contents, and open
+     * the editor on the newly created file.
+     */
+
+    private void doFinish(String containerName,
+                          String fileName,
+                          IProgressMonitor monitor) throws CoreException {
+        // create a sample file
+        monitor.beginTask( "Creating " + fileName,
+                           2 );
+        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
+        IResource resource = root.findMember( new Path( containerName ) );
+        if ( !resource.exists() || !(resource instanceof IContainer) ) {
+            throwCoreException( "Container \"" + containerName + "\" does not exist." );
+        }
+        IContainer container = (IContainer) resource;
+        final IFile file = container.getFile( new Path( fileName ) );
+        try {
+            InputStream stream = openContentStream();
+            if ( file.exists() ) {
+                file.setContents( stream,
+                                  true,
+                                  true,
+                                  monitor );
+            } else {
+                file.create( stream,
+                             true,
+                             monitor );
+            }
+            stream.close();
+        } catch ( IOException e ) {
+        }
+        monitor.worked( 1 );
+        monitor.setTaskName( "Opening file for editing..." );
+        getShell().getDisplay().asyncExec( new Runnable() {
+            public void run() {
+                IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+                try {
+                    IDE.openEditor( page,
+                                    file,
+                                    true );
+                } catch ( PartInitException e ) {
+                }
+            }
+        } );
+        monitor.worked( 1 );
+    }
+
+    /**
+     * We will initialize file contents with a sample text.
+     */
+
+    private InputStream openContentStream() {
+        //String contents =
+        //	"This is the initial file contents for *.brl file that should be word-sorted in the Preview page of the multi-page editor";
+        String contents = "";
+        return new ByteArrayInputStream( contents.getBytes() );
+    }
+
+    private void throwCoreException(String message) throws CoreException {
+        IStatus status = new Status( IStatus.ERROR,
+                                     "org.drools.eclipse.rulebuilder",
+                                     IStatus.OK,
+                                     message,
+                                     null );
+        throw new CoreException( status );
+    }
+
+    /**
+     * We will accept the selection in the workbench to see if
+     * we can initialize from it.
+     * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
+     */
+    public void init(IWorkbench workbench,
+                     IStructuredSelection selection) {
+        this.selection = selection;
+    }
+}
\ No newline at end of file

Copied: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrlFileWizardPage.java (from rev 12931, labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrxmlFileWizardPage.java)
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrlFileWizardPage.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrlFileWizardPage.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -0,0 +1,189 @@
+package org.drools.eclipse.rulebuilder.wizards;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.WizardPage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.dialogs.ContainerSelectionDialog;
+
+/**
+ * The "New" wizard page allows setting the container for the new file as well
+ * as the file name. The page will only accept file name without the extension
+ * OR with the extension that matches the expected one (brl).
+ */
+
+public class NewBrlFileWizardPage extends WizardPage {
+    private Text       containerText;
+
+    private Text       fileText;
+
+    private ISelection selection;
+
+    /**
+     * Constructor for SampleNewWizardPage.
+     * 
+     * @param pageName
+     */
+    public NewBrlFileWizardPage(ISelection selection) {
+        super( "wizardPage" );
+        setTitle( "RuleBuilder Editor File" );
+        setDescription( "This wizard creates a new file with *.brl extension that can be opened by a multi-page editor." );
+        this.selection = selection;
+    }
+
+    /**
+     * @see IDialogPage#createControl(Composite)
+     */
+    public void createControl(Composite parent) {
+        Composite container = new Composite( parent,
+                                             SWT.NULL );
+        GridLayout layout = new GridLayout();
+        container.setLayout( layout );
+        layout.numColumns = 3;
+        layout.verticalSpacing = 9;
+        Label label = new Label( container,
+                                 SWT.NULL );
+        label.setText( "&Container:" );
+
+        containerText = new Text( container,
+                                  SWT.BORDER | SWT.SINGLE );
+        GridData gd = new GridData( GridData.FILL_HORIZONTAL );
+        containerText.setLayoutData( gd );
+        containerText.addModifyListener( new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                dialogChanged();
+            }
+        } );
+
+        Button button = new Button( container,
+                                    SWT.PUSH );
+        button.setText( "Browse..." );
+        button.addSelectionListener( new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent e) {
+                handleBrowse();
+            }
+        } );
+        label = new Label( container,
+                           SWT.NULL );
+        label.setText( "&File name:" );
+
+        fileText = new Text( container,
+                             SWT.BORDER | SWT.SINGLE );
+        gd = new GridData( GridData.FILL_HORIZONTAL );
+        fileText.setLayoutData( gd );
+        fileText.addModifyListener( new ModifyListener() {
+            public void modifyText(ModifyEvent e) {
+                dialogChanged();
+            }
+        } );
+        initialize();
+        dialogChanged();
+        setControl( container );
+    }
+
+    /**
+     * Tests if the current workbench selection is a suitable container to use.
+     */
+
+    private void initialize() {
+        if ( selection != null && selection.isEmpty() == false && selection instanceof IStructuredSelection ) {
+            IStructuredSelection ssel = (IStructuredSelection) selection;
+            if ( ssel.size() > 1 ) return;
+            Object obj = ssel.getFirstElement();
+            if ( obj instanceof IResource ) {
+                IContainer container;
+                if ( obj instanceof IContainer ) container = (IContainer) obj;
+                else container = ((IResource) obj).getParent();
+                containerText.setText( container.getFullPath().toString() );
+            }
+        }
+        fileText.setText( "rules.brl" );
+    }
+
+    /**
+     * Uses the standard container selection dialog to choose the new value for
+     * the container field.
+     */
+
+    private void handleBrowse() {
+        ContainerSelectionDialog dialog = new ContainerSelectionDialog( getShell(),
+                                                                        ResourcesPlugin.getWorkspace().getRoot(),
+                                                                        false,
+                                                                        "Select new file container" );
+        if ( dialog.open() == Window.OK ) {
+            Object[] result = dialog.getResult();
+            if ( result.length == 1 ) {
+                containerText.setText( ((Path) result[0]).toString() );
+            }
+        }
+    }
+
+    /**
+     * Ensures that both text fields are set.
+     */
+
+    private void dialogChanged() {
+        IResource container = ResourcesPlugin.getWorkspace().getRoot().findMember( new Path( getContainerName() ) );
+        String fileName = getFileName();
+
+        if ( getContainerName().length() == 0 ) {
+            updateStatus( "File container must be specified" );
+            return;
+        }
+        if ( container == null || (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0 ) {
+            updateStatus( "File container must exist" );
+            return;
+        }
+        if ( !container.isAccessible() ) {
+            updateStatus( "Project must be writable" );
+            return;
+        }
+        if ( fileName.length() == 0 ) {
+            updateStatus( "File name must be specified" );
+            return;
+        }
+        if ( fileName.replace( '\\',
+                               '/' ).indexOf( '/',
+                                              1 ) > 0 ) {
+            updateStatus( "File name must be valid" );
+            return;
+        }
+        int dotLoc = fileName.lastIndexOf( '.' );
+        if ( dotLoc != -1 ) {
+            String ext = fileName.substring( dotLoc + 1 );
+            if ( ext.equalsIgnoreCase( "brl" ) == false ) {
+                updateStatus( "File extension must be \"brl\"" );
+                return;
+            }
+        }
+        updateStatus( null );
+    }
+
+    private void updateStatus(String message) {
+        setErrorMessage( message );
+        setPageComplete( message == null );
+    }
+
+    public String getContainerName() {
+        return containerText.getText();
+    }
+
+    public String getFileName() {
+        return fileText.getText();
+    }
+}
\ No newline at end of file

Deleted: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrxmlFileWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrxmlFileWizard.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrxmlFileWizard.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,168 +0,0 @@
-package org.drools.eclipse.rulebuilder.wizards;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.operation.*;
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.CoreException;
-import java.io.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.ide.IDE;
-
-/**
- * This is a sample new wizard. Its role is to create a new file 
- * resource in the provided container. If the container resource
- * (a folder or a project) is selected in the workspace 
- * when the wizard is opened, it will accept it as the target
- * container. The wizard creates one file with the extension
- * "brxml". If a sample multi-page editor (also available
- * as a template) is registered for the same extension, it will
- * be able to open it.
- */
-
-public class NewBrxmlFileWizard extends Wizard
-    implements
-    INewWizard {
-    private NewBrxmlFileWizardPage page;
-    private ISelection             selection;
-
-    /**
-     * Constructor for NewBrxmlFileWizard.
-     */
-    public NewBrxmlFileWizard() {
-        super();
-        setNeedsProgressMonitor( true );
-    }
-
-    /**
-     * Adding the page to the wizard.
-     */
-
-    public void addPages() {
-        page = new NewBrxmlFileWizardPage( selection );
-        addPage( page );
-    }
-
-    /**
-     * This method is called when 'Finish' button is pressed in
-     * the wizard. We will create an operation and run it
-     * using wizard as execution context.
-     */
-    public boolean performFinish() {
-        final String containerName = page.getContainerName();
-        final String fileName = page.getFileName();
-        IRunnableWithProgress op = new IRunnableWithProgress() {
-            public void run(IProgressMonitor monitor) throws InvocationTargetException {
-                try {
-                    doFinish( containerName,
-                              fileName,
-                              monitor );
-                } catch ( CoreException e ) {
-                    throw new InvocationTargetException( e );
-                } finally {
-                    monitor.done();
-                }
-            }
-        };
-        try {
-            getContainer().run( true,
-                                false,
-                                op );
-        } catch ( InterruptedException e ) {
-            return false;
-        } catch ( InvocationTargetException e ) {
-            Throwable realException = e.getTargetException();
-            MessageDialog.openError( getShell(),
-                                     "Error",
-                                     realException.getMessage() );
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * The worker method. It will find the container, create the
-     * file if missing or just replace its contents, and open
-     * the editor on the newly created file.
-     */
-
-    private void doFinish(String containerName,
-                          String fileName,
-                          IProgressMonitor monitor) throws CoreException {
-        // create a sample file
-        monitor.beginTask( "Creating " + fileName,
-                           2 );
-        IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-        IResource resource = root.findMember( new Path( containerName ) );
-        if ( !resource.exists() || !(resource instanceof IContainer) ) {
-            throwCoreException( "Container \"" + containerName + "\" does not exist." );
-        }
-        IContainer container = (IContainer) resource;
-        final IFile file = container.getFile( new Path( fileName ) );
-        try {
-            InputStream stream = openContentStream();
-            if ( file.exists() ) {
-                file.setContents( stream,
-                                  true,
-                                  true,
-                                  monitor );
-            } else {
-                file.create( stream,
-                             true,
-                             monitor );
-            }
-            stream.close();
-        } catch ( IOException e ) {
-        }
-        monitor.worked( 1 );
-        monitor.setTaskName( "Opening file for editing..." );
-        getShell().getDisplay().asyncExec( new Runnable() {
-            public void run() {
-                IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-                try {
-                    IDE.openEditor( page,
-                                    file,
-                                    true );
-                } catch ( PartInitException e ) {
-                }
-            }
-        } );
-        monitor.worked( 1 );
-    }
-
-    /**
-     * We will initialize file contents with a sample text.
-     */
-
-    private InputStream openContentStream() {
-        //String contents =
-        //	"This is the initial file contents for *.brxml file that should be word-sorted in the Preview page of the multi-page editor";
-        String contents = "";
-        return new ByteArrayInputStream( contents.getBytes() );
-    }
-
-    private void throwCoreException(String message) throws CoreException {
-        IStatus status = new Status( IStatus.ERROR,
-                                     "org.drools.eclipse.rulebuilder",
-                                     IStatus.OK,
-                                     message,
-                                     null );
-        throw new CoreException( status );
-    }
-
-    /**
-     * We will accept the selection in the workbench to see if
-     * we can initialize from it.
-     * @see IWorkbenchWizard#init(IWorkbench, IStructuredSelection)
-     */
-    public void init(IWorkbench workbench,
-                     IStructuredSelection selection) {
-        this.selection = selection;
-    }
-}
\ No newline at end of file

Deleted: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrxmlFileWizardPage.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrxmlFileWizardPage.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/rulebuilder/wizards/NewBrxmlFileWizardPage.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,189 +0,0 @@
-package org.drools.eclipse.rulebuilder.wizards;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-
-/**
- * The "New" wizard page allows setting the container for the new file as well
- * as the file name. The page will only accept file name without the extension
- * OR with the extension that matches the expected one (brxml).
- */
-
-public class NewBrxmlFileWizardPage extends WizardPage {
-    private Text       containerText;
-
-    private Text       fileText;
-
-    private ISelection selection;
-
-    /**
-     * Constructor for SampleNewWizardPage.
-     * 
-     * @param pageName
-     */
-    public NewBrxmlFileWizardPage(ISelection selection) {
-        super( "wizardPage" );
-        setTitle( "RuleBuilder Editor File" );
-        setDescription( "This wizard creates a new file with *.brxml extension that can be opened by a multi-page editor." );
-        this.selection = selection;
-    }
-
-    /**
-     * @see IDialogPage#createControl(Composite)
-     */
-    public void createControl(Composite parent) {
-        Composite container = new Composite( parent,
-                                             SWT.NULL );
-        GridLayout layout = new GridLayout();
-        container.setLayout( layout );
-        layout.numColumns = 3;
-        layout.verticalSpacing = 9;
-        Label label = new Label( container,
-                                 SWT.NULL );
-        label.setText( "&Container:" );
-
-        containerText = new Text( container,
-                                  SWT.BORDER | SWT.SINGLE );
-        GridData gd = new GridData( GridData.FILL_HORIZONTAL );
-        containerText.setLayoutData( gd );
-        containerText.addModifyListener( new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-                dialogChanged();
-            }
-        } );
-
-        Button button = new Button( container,
-                                    SWT.PUSH );
-        button.setText( "Browse..." );
-        button.addSelectionListener( new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent e) {
-                handleBrowse();
-            }
-        } );
-        label = new Label( container,
-                           SWT.NULL );
-        label.setText( "&File name:" );
-
-        fileText = new Text( container,
-                             SWT.BORDER | SWT.SINGLE );
-        gd = new GridData( GridData.FILL_HORIZONTAL );
-        fileText.setLayoutData( gd );
-        fileText.addModifyListener( new ModifyListener() {
-            public void modifyText(ModifyEvent e) {
-                dialogChanged();
-            }
-        } );
-        initialize();
-        dialogChanged();
-        setControl( container );
-    }
-
-    /**
-     * Tests if the current workbench selection is a suitable container to use.
-     */
-
-    private void initialize() {
-        if ( selection != null && selection.isEmpty() == false && selection instanceof IStructuredSelection ) {
-            IStructuredSelection ssel = (IStructuredSelection) selection;
-            if ( ssel.size() > 1 ) return;
-            Object obj = ssel.getFirstElement();
-            if ( obj instanceof IResource ) {
-                IContainer container;
-                if ( obj instanceof IContainer ) container = (IContainer) obj;
-                else container = ((IResource) obj).getParent();
-                containerText.setText( container.getFullPath().toString() );
-            }
-        }
-        fileText.setText( "rules.brxml" );
-    }
-
-    /**
-     * Uses the standard container selection dialog to choose the new value for
-     * the container field.
-     */
-
-    private void handleBrowse() {
-        ContainerSelectionDialog dialog = new ContainerSelectionDialog( getShell(),
-                                                                        ResourcesPlugin.getWorkspace().getRoot(),
-                                                                        false,
-                                                                        "Select new file container" );
-        if ( dialog.open() == Window.OK ) {
-            Object[] result = dialog.getResult();
-            if ( result.length == 1 ) {
-                containerText.setText( ((Path) result[0]).toString() );
-            }
-        }
-    }
-
-    /**
-     * Ensures that both text fields are set.
-     */
-
-    private void dialogChanged() {
-        IResource container = ResourcesPlugin.getWorkspace().getRoot().findMember( new Path( getContainerName() ) );
-        String fileName = getFileName();
-
-        if ( getContainerName().length() == 0 ) {
-            updateStatus( "File container must be specified" );
-            return;
-        }
-        if ( container == null || (container.getType() & (IResource.PROJECT | IResource.FOLDER)) == 0 ) {
-            updateStatus( "File container must exist" );
-            return;
-        }
-        if ( !container.isAccessible() ) {
-            updateStatus( "Project must be writable" );
-            return;
-        }
-        if ( fileName.length() == 0 ) {
-            updateStatus( "File name must be specified" );
-            return;
-        }
-        if ( fileName.replace( '\\',
-                               '/' ).indexOf( '/',
-                                              1 ) > 0 ) {
-            updateStatus( "File name must be valid" );
-            return;
-        }
-        int dotLoc = fileName.lastIndexOf( '.' );
-        if ( dotLoc != -1 ) {
-            String ext = fileName.substring( dotLoc + 1 );
-            if ( ext.equalsIgnoreCase( "brxml" ) == false ) {
-                updateStatus( "File extension must be \"brxml\"" );
-                return;
-            }
-        }
-        updateStatus( null );
-    }
-
-    private void updateStatus(String message) {
-        setErrorMessage( message );
-        setPageComplete( message == null );
-    }
-
-    public String getContainerName() {
-        return containerText.getText();
-    }
-
-    public String getFileName() {
-        return fileText.getText();
-    }
-}
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/.classpath	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/.classpath	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/drools-compiler"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/drools-core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/drools-decisiontables"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Modified: labs/jbossrules/trunk/drools-jbrms/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/build.properties	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-jbrms/build.properties	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,2 +1,2 @@
 #this is needed to point to your version of GWT
-gwt.home=/home/michael/apps/gwt-linux-1.3.3
\ No newline at end of file
+gwt.home=/usr/local/share/java/gwt/
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/brl/package.html
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/brl/package.html	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/brl/package.html	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,6 +1,6 @@
 <body>
 	This package holds classes that are used as RPC classes for the rule modeller, 
-	as well as the DOM for the BRXML rule format that the rule modeller uses.
+	as well as the DOM for the BRL rule format that the rule modeller uses.
 	
 	IMPORTANT:
 	Do not change these unless you are adding fields or removing fields, not refactoring

Modified: labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/org.drools.brms.JBRMS.nocache.html
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/org.drools.brms.JBRMS.nocache.html	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/webapp/org.drools.brms.JBRMS/org.drools.brms.JBRMS.nocache.html	2007-06-28 21:46:54 UTC (rev 12939)
@@ -69,11 +69,11 @@
     var F;
     var I = ["true", (F=window["prop$user.agent"],F(1))];
 
-    O(["true","safari"],"00D12C31CF80D9B8ADF29E388874C6FB");
-    O(["true","opera"],"182CA3F1A731A60E06764F9C5271541B");
-    O(["true","gecko"],"5EAE488B2F49561F7F6D9559BE76D319");
-    O(["true","ie6"],"6C2505619F0CF0F9412A47719A3508CA");
-    O(["true","gecko1_8"],"C533DAEE77123C6C67B35E59CAE40FC0");
+    O(["true","opera"],"04299236B8E00702ED6F06DEEADC7C3D");
+    O(["true","gecko"],"6FEED380D9FBAB86CECA1079823C3A7D");
+    O(["true","safari"],"7497A12C5A9D7D33A63116629C8303B8");
+    O(["true","ie6"],"8EC91AE0CB8436FB3AF71D968833956F");
+    O(["true","gecko1_8"],"A7C8E22BAC02A2F49CB55C431A09CFF4");
 
     var strongName = O.answers[I[0]][I[1]];
     var query = location.search;

Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1288,9 +1288,9 @@
         model.checkin( "" );
         
         pkg.updateHeader( "import com.billasurf.Person" );
-        impl.createCategory( "/", "brxml", "" );
+        impl.createCategory( "/", "brl", "" );
 
-        String uuid = impl.createNewRule( "testBRL", "", "brxml", "testBuildAssetBRL", AssetFormats.BUSINESS_RULE );
+        String uuid = impl.createNewRule( "testBRL", "", "brl", "testBuildAssetBRL", AssetFormats.BUSINESS_RULE );
         
         
         RuleAsset rule = impl.loadRuleAsset( uuid );

Modified: labs/jbossrules/trunk/drools-jsr94/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/.classpath	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-jsr94/.classpath	2007-06-28 21:46:54 UTC (rev 12939)
@@ -5,18 +5,18 @@
   <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/mvel/mvel14/1.2beta27/mvel14-1.2beta27.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/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" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.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" sourcepath="M2_REPO/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0-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/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/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-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/jsr94/jsr94/1.1/jsr94-1.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.2beta26/mvel14-1.2beta26.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/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="src" path="/drools-compiler"/>
+  <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/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="src" path="/drools-core"/>
-  <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
 </classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-repository/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-repository/.classpath	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/drools-repository/.classpath	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,25 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_10"/>
-	<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/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.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/org/apache/jackrabbit/jackrabbit-text-extractors/1.3/jackrabbit-text-extractors-1.3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.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/jackrabbit/jackrabbit-core/1.3/jackrabbit-core-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/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/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.3.0/slf4j-log4j12-1.3.0.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<classpath>
+  <classpathentry kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+  <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+  <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/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1-sources.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/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/org/apache/jackrabbit/jackrabbit-text-extractors/1.3/jackrabbit-text-extractors-1.3.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/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.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/org/apache/jackrabbit/jackrabbit-jcr-commons/1.3/jackrabbit-jcr-commons-1.3.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/javax/jcr/jcr/1.0/jcr-1.0.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"/>
+  <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.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/org/apache/jackrabbit/jackrabbit-core/1.3/jackrabbit-core-1.3.jar"/>
+  <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar" sourcepath="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4-sources.jar"/>
+</classpath>
\ No newline at end of file

Modified: labs/jbossrules/trunk/experimental/drools-testing/.classpath
===================================================================
--- labs/jbossrules/trunk/experimental/drools-testing/.classpath	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/experimental/drools-testing/.classpath	2007-06-28 21:46:54 UTC (rev 12939)
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="generated-source"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="generated-source"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/drools-compiler"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/drools-core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/drools-decisiontables"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Modified: labs/jbossrules/trunk/lib/utility-scripts/copyright-headers/copy_wrong.rb
===================================================================
--- labs/jbossrules/trunk/lib/utility-scripts/copyright-headers/copy_wrong.rb	2007-06-28 21:20:34 UTC (rev 12938)
+++ labs/jbossrules/trunk/lib/utility-scripts/copyright-headers/copy_wrong.rb	2007-06-28 21:46:54 UTC (rev 12939)
@@ -61,5 +61,5 @@
       target.close
 end
 
-do_dir("c:/temp/tryagain", IO.read ("c:/temp/copyright.txt")) 
+do_dir("/Users/fernandomeyer/projects/jbossrules/drools-jbrms", IO.read ("/Users/fernandomeyer/projects/jbossrules/lib/utility-scripts/copyright-headers/copyright.txt")) 
 




More information about the jboss-svn-commits mailing list