[jboss-svn-commits] JBL Code SVN: r9665 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client/packages and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Feb 21 00:30:59 EST 2007
Author: michael.neale at jboss.com
Date: 2007-02-21 00:30:59 -0500 (Wed, 21 Feb 2007)
New Revision: 9665
Modified:
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/packages/PackageExplorerWidget.java
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/gwtutil/AsyncInterfaceGenerator.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:
JBRULES-691 can list multiple formats at once
Modified: 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 2007-02-21 05:30:16 UTC (rev 9664)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/AssetFormats.java 2007-02-21 05:30:59 UTC (rev 9665)
@@ -35,7 +35,10 @@
/** use a DSL, not sure about this one - can use text or constrained editor */
public static String DSL_TEMPLATE_RULE = "trule";
-
-
-
+
+ /**
+ * The following group the
+ */
+ public static String[] BUSINESS_RULE_FORMATS = new String[] {AssetFormats.BUSINESS_RULE, AssetFormats.DSL_TEMPLATE_RULE};
+ public static String[] TECHNICAL_RULE_FORMATS = new String[] {AssetFormats.DRL, AssetFormats.TECHNICAL_RULE};
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java 2007-02-21 05:30:16 UTC (rev 9664)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java 2007-02-21 05:30:59 UTC (rev 9665)
@@ -289,11 +289,11 @@
}
}));
- pkg.addItem( makeItem("Business rules", "images/rule_asset.gif", showListEvent(name, AssetFormats.BUSINESS_RULE)) );
- pkg.addItem( makeItem("Technical rules", "images/technical_rule_assets.gif", showListEvent(name, AssetFormats.TECHNICAL_RULE)) );
- pkg.addItem( makeItem("Functions", "images/function_assets.gif", showListEvent(name, AssetFormats.FUNCTION)) );
- pkg.addItem( makeItem("DSL", "images/dsl.gif", showListEvent(name, AssetFormats.DSL)) );
- pkg.addItem( makeItem("Model", "images/model_asset.gif", showListEvent(name, AssetFormats.MODEL) ) );
+ pkg.addItem( makeItem("Business rules", "images/rule_asset.gif", showListEvent(name, AssetFormats.BUSINESS_RULE_FORMATS)) );
+ pkg.addItem( makeItem("Technical rules", "images/technical_rule_assets.gif", showListEvent(name, AssetFormats.TECHNICAL_RULE_FORMATS)) );
+ pkg.addItem( makeItem("Functions", "images/function_assets.gif", showListEvent(name, new String[] {AssetFormats.FUNCTION})) );
+ pkg.addItem( makeItem("DSL", "images/dsl.gif", showListEvent(name, new String[] {AssetFormats.DSL})) );
+ pkg.addItem( makeItem("Model", "images/model_asset.gif", showListEvent(name, new String[] {AssetFormats.MODEL}) ) );
exTree.addItem( pkg );
}
@@ -308,7 +308,7 @@
/**
* This will create a "show list" event to be attached to the tree.
*/
- private PackageTreeItem showListEvent(final String name, final String format) {
+ private PackageTreeItem showListEvent(final String name, final String[] format) {
final GenericCallback cb = new GenericCallback() {
public void onSuccess(Object data) {
final TableDataResult table = (TableDataResult) data;
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 2007-02-21 05:30:16 UTC (rev 9664)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2007-02-21 05:30:59 UTC (rev 9665)
@@ -101,7 +101,7 @@
* @param numRows The number of rows to return. -1 means all.
* @param startRow The starting row number if paging - if numRows is -1 then this is ignored.
*/
- public TableDataResult listAssetsByFormat(String packageName, String format, int numRows, int startRow) throws SerializableException;
+ public TableDataResult listAssetsByFormat(String packageName, String formats[], int numRows, int startRow) throws SerializableException;
/**
* Returns a list of valid states.
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 2007-02-21 05:30:16 UTC (rev 9664)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java 2007-02-21 05:30:59 UTC (rev 9665)
@@ -29,8 +29,10 @@
public void createPackage(java.lang.String p0, java.lang.String p1, AsyncCallback cb);
public void loadPackage(java.lang.String p0, AsyncCallback cb);
public void savePackage(org.drools.brms.client.rpc.PackageConfigData p0, AsyncCallback cb);
- public void listAssetsByFormat(java.lang.String p0, java.lang.String p1, int p2, int p3, AsyncCallback cb);
+ public void listAssetsByFormat(java.lang.String p0, String[] p1, int p2, int p3, AsyncCallback cb);
public void listStates(AsyncCallback cb);
public void createState(java.lang.String p0, AsyncCallback cb);
public void changeState(java.lang.String p0, java.lang.String p1, boolean p2, 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 2007-02-21 05:30:16 UTC (rev 9664)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java 2007-02-21 05:30:59 UTC (rev 9665)
@@ -405,6 +405,17 @@
cb.onSuccess( null );
}
+
+
+
+ public void listAssetsByFormat(String p0,
+ String[] p1,
+ int p2,
+ int p3,
+ AsyncCallback cb) {
+ cb.onSuccess( null );
+
+ }
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/gwtutil/AsyncInterfaceGenerator.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/gwtutil/AsyncInterfaceGenerator.java 2007-02-21 05:30:16 UTC (rev 9664)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/gwtutil/AsyncInterfaceGenerator.java 2007-02-21 05:30:59 UTC (rev 9665)
@@ -22,7 +22,11 @@
line += "public void " + meth.getName() + "(";
Class params[] = meth.getParameterTypes();
for ( int j = 0; j < params.length; j++ ) {
- line += params[j].getName();
+ String type = params[j].getName();
+ if (type.equals( "[Ljava.lang.String;" )) {
+ type = "String[]";
+ }
+ line += type;
line += " p" + j;
if (j < params.length -1) {
line += ", ";
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 2007-02-21 05:30:16 UTC (rev 9664)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2007-02-21 05:30:59 UTC (rev 9665)
@@ -368,11 +368,11 @@
}
public TableDataResult listAssetsByFormat(String packageName,
- String format,
+ String formats[],
int numRows,
int startRow) throws SerializableException {
PackageItem pkg = getRulesRepository().loadPackage( packageName );
- AssetItemIterator it = pkg.listAssetsByFormat( format );
+ AssetItemIterator it = pkg.listAssetsByFormat( formats );
if (numRows != -1) {
it.skip( startRow );
}
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-02-21 05:30:16 UTC (rev 9664)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-02-21 05:30:59 UTC (rev 9665)
@@ -349,25 +349,40 @@
String uuid3 = impl.createNewRule( "testListByFormat3", "x", cat, "testListByFormat", "testListByFormat" );
String uuid4 = impl.createNewRule( "testListByFormat4", "x", cat, "testListByFormat", "testListByFormat" );
- TableDataResult res = impl.listAssetsByFormat( "testListByFormat", "testListByFormat", -1, 0 );
+ TableDataResult res = impl.listAssetsByFormat( "testListByFormat", arr("testListByFormat"), -1, 0 );
assertEquals(4, res.data.length);
assertEquals(uuid, res.data[0].id);
assertEquals("testListByFormat", res.data[0].values[0]);
- res = impl.listAssetsByFormat( "testListByFormat", "testListByFormat", 4, 0 );
+ res = impl.listAssetsByFormat( "testListByFormat", arr("testListByFormat"), 4, 0 );
assertEquals(4, res.data.length);
- res = impl.listAssetsByFormat( "testListByFormat", "testListByFormat", 2, 0 );
+ res = impl.listAssetsByFormat( "testListByFormat", arr("testListByFormat"), 2, 0 );
assertEquals(2, res.data.length);
assertEquals(uuid, res.data[0].id);
- res = impl.listAssetsByFormat( "testListByFormat", "testListByFormat", 2, 2 );
+ res = impl.listAssetsByFormat( "testListByFormat", arr("testListByFormat"), 2, 2 );
assertEquals(2, res.data.length);
assertEquals(uuid3, res.data[0].id);
+
+ uuid = impl.createNewRule( "testListByFormat5", "x", cat, "testListByFormat", "otherFormat" );
+
+ res = impl.listAssetsByFormat( "testListByFormat", arr("otherFormat"), 40, 0 );
+ assertEquals(1, res.data.length);
+ assertEquals(uuid, res.data[0].id);
+
+ res = impl.listAssetsByFormat( "testListByFormat", new String[] {"otherFormat", "testListByFormat"}, 40, 0 );
+ assertEquals(5, res.data.length);
+
+
+
}
+ public String[] arr(String s) {
+ return new String[] {s};
+ }
public void testStatus() throws Exception {
MockJBRMSServiceServlet impl = new MockJBRMSServiceServlet();
More information about the jboss-svn-commits
mailing list