[jboss-svn-commits] JBL Code SVN: r8413 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client/common main/java/org/drools/brms/client/rpc main/java/org/drools/brms/client/rpc/mock main/java/org/drools/brms/client/ruleeditor main/java/org/drools/brms/server test/java/org/drools/brms/server
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Dec 19 12:08:36 EST 2006
Author: michael.neale at jboss.com
Date: 2006-12-19 12:08:21 -0500 (Tue, 19 Dec 2006)
New Revision: 8413
Added:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/AssetFormats.java
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/EditorLauncher.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewRuleWizard.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
modifications to do with format types. Format choose on new rule wizard.
Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/AssetFormats.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/AssetFormats.java 2006-12-19 17:08:20 UTC (rev 8412)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/AssetFormats.java 2006-12-19 17:08:21 UTC (rev 8413)
@@ -0,0 +1,25 @@
+package org.drools.brms.client.common;
+
+/**
+ * Keeps track of the different rule formats we support.
+ * Each format type corresponds to the dublin core "format" attribute.
+ * @author Michael Neale
+ *
+ */
+public class AssetFormats {
+
+ /** Vanilla DRL "file" */
+ public static String DRL = "drl";
+
+ /** Use the rule modeller */
+ public static String BUSINESS_RULE = "brl";
+
+ /** use vanilla text */
+ public static String TECHNICAL_RULE = "rule";
+
+ /** use a DSL, not sure about this one - can use text or constrained editor */
+ public static String DSL_TEMPLATE_RULE = "trule";
+
+
+
+}
Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/AssetFormats.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2006-12-19 17:08:20 UTC (rev 8412)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2006-12-19 17:08:21 UTC (rev 8413)
@@ -36,7 +36,7 @@
/**
* Creates a brand new rule with the initial category.
*/
- public Boolean createNewRule(String ruleName, String description, String initialCategory, String initialPackage) throws SerializableException;
+ public Boolean createNewRule(String ruleName, String description, String initialCategory, String initialPackage, String format) throws SerializableException;
/**
* This returns a list of packages where rules may be added.
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java 2006-12-19 17:08:20 UTC (rev 8412)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java 2006-12-19 17:08:21 UTC (rev 8413)
@@ -20,7 +20,7 @@
public void loadRuleListForCategories(java.lang.String p0, AsyncCallback cb);
public void loadTableConfig(java.lang.String p0, AsyncCallback cb);
public void createCategory(java.lang.String p0, java.lang.String p1, java.lang.String p2, AsyncCallback cb);
- public void createNewRule(java.lang.String p0, java.lang.String p1, java.lang.String p2, java.lang.String p3, AsyncCallback cb);
+ public void createNewRule(java.lang.String p0, java.lang.String p1, java.lang.String p2, java.lang.String p3, java.lang.String p4, AsyncCallback cb);
public void listRulePackages(AsyncCallback cb);
public void loadRuleAsset(java.lang.String p0, AsyncCallback cb);
public void checkinVersion(org.drools.brms.client.rpc.RuleAsset p0, AsyncCallback cb);
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java 2006-12-19 17:08:20 UTC (rev 8412)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java 2006-12-19 17:08:21 UTC (rev 8413)
@@ -109,12 +109,13 @@
public void createNewRule(String name,
String description,
- String initialCategory, String initialPackage, AsyncCallback callback) {
+ String initialCategory, String initialPackage, String format, AsyncCallback callback) {
System.out.println("creating rule:" + name);
System.out.println("creating rule description:" + description);
System.out.println("creating rule initialCategory:" + initialCategory);
System.out.println("creating rule initialPackage:" + initialPackage);
+ System.out.println("creating rule format:" + format);
if (name.equals( "foo" )) {
callback.onFailure( new SerializableException("thats naughty") );
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/EditorLauncher.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/EditorLauncher.java 2006-12-19 17:08:20 UTC (rev 8412)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/EditorLauncher.java 2006-12-19 17:08:21 UTC (rev 8413)
@@ -25,7 +25,10 @@
*/
public class EditorLauncher {
- public static Widget getWidget(RuleAsset asset) {
+ /**
+ * This will return the appropriate viewer for the asset.
+ */
+ public static Widget getEditorViewer(RuleAsset asset) {
//depending on the format, load the appropriate editor
if ( asset.metaData.format.equals( "DSL" ) ) {
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java 2006-12-19 17:08:20 UTC (rev 8412)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java 2006-12-19 17:08:21 UTC (rev 8413)
@@ -5,7 +5,6 @@
import org.drools.brms.client.common.FormStyleLayout;
import org.drools.brms.client.rpc.MetaData;
-import com.google.gwt.user.client.rpc.IsSerializable;
import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.TextBox;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewRuleWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewRuleWizard.java 2006-12-19 17:08:20 UTC (rev 8412)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/NewRuleWizard.java 2006-12-19 17:08:21 UTC (rev 8413)
@@ -2,6 +2,7 @@
import org.drools.brms.client.categorynav.CategoryExplorerWidget;
import org.drools.brms.client.categorynav.CategorySelectHandler;
+import org.drools.brms.client.common.AssetFormats;
import org.drools.brms.client.common.ErrorPopup;
import org.drools.brms.client.common.RulePackageSelector;
import org.drools.brms.client.common.WarningPopup;
@@ -13,6 +14,7 @@
import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.TextBox;
@@ -33,6 +35,8 @@
initialCategory = selectedPath;
}
}, false );
+ private ListBox formatChooser = getFormatChooser();
+
private RulePackageSelector packageSelector = new RulePackageSelector();
/** This is used when creating a new rule. */
@@ -60,15 +64,18 @@
table.setWidget( 2, 0, new Label("Initial category") );
table.setWidget( 2, 1, catChooser );
- table.setWidget( 3, 0, new Label("Package") );
- table.setWidget( 3, 1, packageSelector );
+ table.setWidget( 3, 0, new Label("Type (format) of rule" ));
+ table.setWidget( 3, 1, this.formatChooser );
+
+ table.setWidget( 4, 0, new Label("Package") );
+ table.setWidget( 4, 1, packageSelector );
description.setVisibleLines( 4 );
description.setWidth( "100%" );
- table.setWidget( 4,
+ table.setWidget( 5,
0,
new Label( "Initial Description" ) );
- table.setWidget( 4,
+ table.setWidget( 5,
1,
description );
@@ -80,7 +87,7 @@
} );
- table.setWidget( 5,
+ table.setWidget( 6,
0,
ok );
@@ -92,7 +99,7 @@
} );
- table.setWidget( 5,
+ table.setWidget( 6,
1,
cancel );
@@ -100,6 +107,19 @@
setStyleName( "ks-popups-Popup" );
}
+ private ListBox getFormatChooser() {
+
+ ListBox box = new ListBox();
+
+ box.addItem( "Business rule", AssetFormats.BUSINESS_RULE );
+ box.addItem( "DRL file", AssetFormats.DRL );
+ box.addItem( "Technical rule", AssetFormats.TECHNICAL_RULE );
+
+ box.setSelectedIndex( 0 );
+
+ return box;
+ }
+
/**
* When OK is pressed, it will update the repository with the new rule.
*/
@@ -135,6 +155,7 @@
description.getText(),
initialCategory,
packageSelector.getSelectedPackage(),
+ formatChooser.getValue( formatChooser.getSelectedIndex() ),
cb );
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java 2006-12-19 17:08:20 UTC (rev 8412)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java 2006-12-19 17:08:21 UTC (rev 8413)
@@ -120,7 +120,7 @@
//REMEMBER: subsequent rows have only one column, doh that is confusing !
//GAAAAAAAAAAAAAAAAAAAAAAAAAAH
- layout.setWidget( 1, 0, EditorLauncher.getWidget(asset));
+ layout.setWidget( 1, 0, EditorLauncher.getEditorViewer(asset));
//the document widget
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2006-12-19 17:08:20 UTC (rev 8412)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2006-12-19 17:08:21 UTC (rev 8413)
@@ -84,10 +84,11 @@
public Boolean createNewRule(String ruleName,
String description,
String initialCategory,
- String initialPackage) throws SerializableException {
+ String initialPackage,
+ String format) throws SerializableException {
try {
PackageItem pkg = getRulesRepository().loadPackage( initialPackage );
- pkg.addAsset( ruleName, description, initialCategory );
+ pkg.addAsset( ruleName, description, initialCategory, format );
getRulesRepository().save();
} catch (RulesRepositoryException e) {
throw new SerializableException(e.getMessage());
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 2006-12-19 17:08:20 UTC (rev 8412)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2006-12-19 17:08:21 UTC (rev 8413)
@@ -60,7 +60,7 @@
cat.addCategory( "testAddRule", "yeah" );
- Boolean result = impl.createNewRule( "testAddRule", "a description", "testAddRule", "another" );
+ Boolean result = impl.createNewRule( "testAddRule", "a description", "testAddRule", "another", "txt" );
assertTrue(result.booleanValue());
String[] packages = impl.listRulePackages();
@@ -83,10 +83,10 @@
impl.repo.createPackage("dupes", "yeah");
- impl.createNewRule( "testAttemptDupeRule", "ya", "testAttemptDupeRule", "dupes" );
+ impl.createNewRule( "testAttemptDupeRule", "ya", "testAttemptDupeRule", "dupes", "rule" );
try {
- impl.createNewRule( "testAttemptDupeRule", "ya", "testAttemptDupeRule", "dupes" );
+ impl.createNewRule( "testAttemptDupeRule", "ya", "testAttemptDupeRule", "dupes", "rule" );
fail("should not allow duplicates.");
} catch (SerializableException e) {
assertNotNull(e.getMessage());
@@ -103,8 +103,8 @@
cat.addCategory( "testRuleTableLoad", "yeah" );
impl.repo.createPackage("testRuleTableLoad", "yeah");
- impl.createNewRule( "testRuleTableLoad", "ya", "testRuleTableLoad", "testRuleTableLoad" );
- impl.createNewRule( "testRuleTableLoad2", "ya", "testRuleTableLoad", "testRuleTableLoad" );
+ impl.createNewRule( "testRuleTableLoad", "ya", "testRuleTableLoad", "testRuleTableLoad", "rule" );
+ impl.createNewRule( "testRuleTableLoad2", "ya", "testRuleTableLoad", "testRuleTableLoad", "rule" );
TableDataResult result = impl.loadRuleListForCategories( "testRuleTableLoad" );
assertEquals(2, result.numberOfRows);
@@ -113,7 +113,7 @@
String key = result.data[0].id;
assertFalse(key.startsWith( "testRule" ));
- assertEquals(result.data[0].format, "DRL");
+ assertEquals(result.data[0].format, "rule");
assertTrue(result.data[0].values[0].startsWith( "testRule" ));
@@ -135,7 +135,7 @@
impl.createCategory( "", "testLoadRuleAsset", "this is a cat" );
- impl.createNewRule( "testLoadRuleAsset", "description", "testLoadRuleAsset", "testLoadRuleAsset" );
+ impl.createNewRule( "testLoadRuleAsset", "description", "testLoadRuleAsset", "testLoadRuleAsset", "rule" );
TableDataResult res = impl.loadRuleListForCategories( "testLoadRuleAsset" );
assertEquals(1, res.data.length);
More information about the jboss-svn-commits
mailing list