[jboss-svn-commits] JBL Code SVN: r9733 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client/packages and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Feb 24 04:35:16 EST 2007
Author: michael.neale at jboss.com
Date: 2007-02-24 04:35:16 -0500 (Sat, 24 Feb 2007)
New Revision: 9733
Added:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/SnapshotInfo.java
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/RulePackageSelector.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.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/packages/PackageSnapshotView.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/server/JBRMSServiceServlet.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java
Log:
refactoring to consistently use UUIDs where appropriate
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/RulePackageSelector.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/RulePackageSelector.java 2007-02-24 09:34:21 UTC (rev 9732)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/common/RulePackageSelector.java 2007-02-24 09:35:16 UTC (rev 9733)
@@ -1,5 +1,6 @@
package org.drools.brms.client.common;
+import org.drools.brms.client.rpc.PackageConfigData;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -17,16 +18,17 @@
public RulePackageSelector() {
packageList = new ListBox();
- RepositoryServiceFactory.getService().listRulePackages( new AsyncCallback() {
+ RepositoryServiceFactory.getService().listPackages( new AsyncCallback() {
public void onFailure(Throwable arg0) {
ErrorPopup.showMessage( "Unable to load list of packages." );
}
public void onSuccess(Object o) {
- String[] list = (String[]) o;
+ PackageConfigData[] list = (PackageConfigData[]) o;
+
for ( int i = 0; i < list.length; i++ ) {
- packageList.addItem( list[i] );
+ packageList.addItem( list[i].name );
}
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java 2007-02-24 09:34:21 UTC (rev 9732)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageEditor.java 2007-02-24 09:35:16 UTC (rev 9733)
@@ -130,7 +130,7 @@
*/
private void reload() {
LoadingPopup.showMessage( "Refreshing package data..." );
- RepositoryServiceFactory.getService().loadPackage( this.conf.name, new GenericCallback() {
+ RepositoryServiceFactory.getService().loadPackageConfig( this.conf.uuid, new GenericCallback() {
public void onSuccess(Object data) {
LoadingPopup.close();
conf = (PackageConfigData) data;
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-24 09:34:21 UTC (rev 9732)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java 2007-02-24 09:35:16 UTC (rev 9733)
@@ -41,7 +41,6 @@
private final Tree exTree;
private final FlexTable layout;
private final TreeListener treeListener;
- private String currentPackage;
private AssetItemListViewer listView;
private EditItemEvent editEvent;
@@ -56,7 +55,7 @@
public void onTreeItemSelected(TreeItem selected) {
PackageTreeItem event = (PackageTreeItem) selected.getUserObject();
- currentPackage = event.name;
+
Command selectEvent = event.command;
LoadingPopup.showMessage( "Please wait..." );
DeferredCommand.add( selectEvent );
@@ -215,11 +214,12 @@
LoadingPopup.showMessage( "Loading list of packages ..." );
- RepositoryServiceFactory.getService().listRulePackages( new GenericCallback() {
+ RepositoryServiceFactory.getService().listPackages( new GenericCallback() {
public void onSuccess(Object data) {
- String[] packages = (String[]) data;
+ PackageConfigData[] packages = (PackageConfigData[]) data;
+
exTree.clear();
for ( int i = 0; i < packages.length; i++ ) {
addPackage( packages[i] );
@@ -284,19 +284,19 @@
* Add a package to the tree.
* @param name
*/
- private void addPackage(final String name) {
+ private void addPackage(final PackageConfigData conf) {
- TreeItem pkg = makeItem(name, "images/package.gif", new PackageTreeItem(name,new Command() {
+ TreeItem pkg = makeItem(conf.name, "images/package.gif", new PackageTreeItem(new Command() {
public void execute() {
- loadPackageConfig(name);
+ loadPackageConfig(conf.uuid);
}
}));
- 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}) ) );
+ pkg.addItem( makeItem("Business rules", "images/rule_asset.gif", showListEvent(conf.uuid, AssetFormats.BUSINESS_RULE_FORMATS)) );
+ pkg.addItem( makeItem("Technical rules", "images/technical_rule_assets.gif", showListEvent(conf.uuid, AssetFormats.TECHNICAL_RULE_FORMATS)) );
+ pkg.addItem( makeItem("Functions", "images/function_assets.gif", showListEvent(conf.uuid, new String[] {AssetFormats.FUNCTION})) );
+ pkg.addItem( makeItem("DSL", "images/dsl.gif", showListEvent(conf.uuid, new String[] {AssetFormats.DSL})) );
+ pkg.addItem( makeItem("Model", "images/model_asset.gif", showListEvent(conf.uuid, new String[] {AssetFormats.MODEL}) ) );
exTree.addItem( pkg );
}
@@ -311,7 +311,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 uuid, final String[] format) {
final GenericCallback cb = new GenericCallback() {
public void onSuccess(Object data) {
@@ -325,9 +325,9 @@
}
};
- return new PackageTreeItem(name, new Command() {
+ return new PackageTreeItem(new Command() {
public void execute() {
- RepositoryServiceFactory.getService().listAssetsByFormat( currentPackage, format,
+ RepositoryServiceFactory.getService().listAssets( uuid, format,
-1, -1, cb);
}
});
@@ -339,10 +339,10 @@
/**
* Load up the package config data and display it.
*/
- private void loadPackageConfig(String name) {
- this.currentPackage = name;
- RepositoryServiceFactory.getService().loadPackage( name, new GenericCallback() {
+ private void loadPackageConfig(String uuid) {
+ RepositoryServiceFactory.getService().loadPackageConfig( uuid, new GenericCallback() {
+
public void onSuccess(Object data) {
PackageConfigData conf = (PackageConfigData) data;
PackageEditor ed = new PackageEditor(conf);
@@ -366,10 +366,10 @@
static class PackageTreeItem {
Command command;
- String name;
- public PackageTreeItem(String name, Command com) {
+
+ public PackageTreeItem(Command com) {
this.command = com;
- this.name = name;
+
}
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageSnapshotView.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageSnapshotView.java 2007-02-24 09:34:21 UTC (rev 9732)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageSnapshotView.java 2007-02-24 09:35:16 UTC (rev 9733)
@@ -4,8 +4,10 @@
import org.drools.brms.client.common.GenericCallback;
import org.drools.brms.client.common.LoadingPopup;
+import org.drools.brms.client.rpc.PackageConfigData;
import org.drools.brms.client.rpc.RepositoryServiceAsync;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.brms.client.rpc.SnapshotInfo;
import org.drools.brms.client.rpc.TableDataResult;
import org.drools.brms.client.rpc.TableDataRow;
import org.drools.brms.client.table.SortableTable;
@@ -52,23 +54,23 @@
private void refreshPackageList() {
LoadingPopup.showMessage( "Loading package list..." );
- service.listRulePackages( new GenericCallback() {
+ service.listPackages( new GenericCallback() {
public void onSuccess(Object data) {
- String[] list = (String[]) data;
+ PackageConfigData[] list = (PackageConfigData[]) data;
addPackages(list);
LoadingPopup.close();
}
});
}
- private void addPackages(final String[] list) {
+ private void addPackages(final PackageConfigData[] list) {
Tree snapTree = new Tree();
VerticalPanel packages = new VerticalPanel();
for ( int i = 0; i < list.length; i++ ) {
- final String pkgName = list[i];
-
+ final String pkgName = list[i].name;
+ final String uuid = list[i].uuid;
TreeItem item = makeItem( pkgName, "images/package_snapshot.gif", new Command() {
public void execute() {
showPackage(pkgName);
@@ -110,7 +112,8 @@
LoadingPopup.showMessage( "Loading snapshots..." );
service.listSnapshots( pkgName, new GenericCallback() {
public void onSuccess(Object data) {
- String[] list = (String[]) data;
+ SnapshotInfo[] list = (SnapshotInfo[]) data;
+
renderListOfSnapshots(list);
LoadingPopup.close();
}
@@ -120,10 +123,10 @@
/**
* This will render the snapshot list.
*/
- protected void renderListOfSnapshots(String[] list) {
+ protected void renderListOfSnapshots(SnapshotInfo[] list) {
FlexTable table = new FlexTable();
for ( int i = 0; i < list.length; i++ ) {
- table.setWidget( i, 0, new Label( list[i] ) );
+ table.setWidget( i, 0, new Label( list[i].name ) );
}
layout.setWidget( 0, 1, table );
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-24 09:34:21 UTC (rev 9732)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2007-02-24 09:35:16 UTC (rev 9733)
@@ -42,8 +42,9 @@
/**
* This returns a list of packages where rules may be added.
+ * Only the UUID and the name need to be populated.
*/
- public String[] listRulePackages();
+ public PackageConfigData[] listPackages();
/**
* This loads up all the stuff for a
@@ -79,11 +80,10 @@
public String createPackage(String name, String description) throws SerializableException;
/**
- * Loads a package by its name (NOT UUID !).
- * @param name The name of the package (NOT THE UUID !).
+ * Loads a package by its uuid.
* @return Well, its pretty obvious if you think about it for a minute. Really.
*/
- public PackageConfigData loadPackage(String name);
+ public PackageConfigData loadPackageConfig(String uuid);
/**
* Saves the package config data in place (does not create a new version of anything).
@@ -96,12 +96,12 @@
* Given a format, this will return assets that match.
* It can also be used for "pagination" by passing in start and
* finish row numbers.
- * @param packageName The package name to search inside.
+ * @param packageUUID The package uuid to search inside.
* @param format The format to filter on.
* @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 formats[], int numRows, int startRow) throws SerializableException;
+ public TableDataResult listAssets(String packageUUID, String formats[], int numRows, int startRow) throws SerializableException;
/**
* Returns a list of valid states.
@@ -143,7 +143,7 @@
* This will load a list of snapshots for the given package. Snapshots are created
* by taking a labelled copy of a package, at a point in time, for instance for deployment.
*/
- public String[] listSnapshots(String packageName);
+ public SnapshotInfo[] listSnapshots(String packageName);
/**
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-24 09:34:21 UTC (rev 9732)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java 2007-02-24 09:35:16 UTC (rev 9733)
@@ -21,15 +21,15 @@
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, java.lang.String p4, AsyncCallback cb);
- public void listRulePackages(AsyncCallback cb);
+ public void listPackages(AsyncCallback cb);
public void loadRuleAsset(java.lang.String p0, AsyncCallback cb);
public void loadAssetHistory(java.lang.String p0, AsyncCallback cb);
public void checkinVersion(org.drools.brms.client.rpc.RuleAsset p0, AsyncCallback cb);
public void restoreVersion(java.lang.String p0, java.lang.String p1, java.lang.String p2, AsyncCallback cb);
public void createPackage(java.lang.String p0, java.lang.String p1, AsyncCallback cb);
- public void loadPackage(java.lang.String p0, AsyncCallback cb);
+ public void loadPackageConfig(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, String[] p1, int p2, int p3, AsyncCallback cb);
+ public void listAssets(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 changeAssetPackage(java.lang.String p0, java.lang.String p1, java.lang.String p2, AsyncCallback cb);
@@ -38,5 +38,4 @@
public void createPackageSnapshot(java.lang.String p0, java.lang.String p1, boolean p2, java.lang.String p3, AsyncCallback cb);
public void changeState(java.lang.String p0, java.lang.String p1, boolean p2, AsyncCallback cb);
-
}
Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/SnapshotInfo.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/SnapshotInfo.java (rev 0)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/SnapshotInfo.java 2007-02-24 09:35:16 UTC (rev 9733)
@@ -0,0 +1,17 @@
+package org.drools.brms.client.rpc;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+
+/**
+ * Simple DTO for snapshot info.
+ * @author Michael Neale
+ */
+public class SnapshotInfo
+ implements
+ IsSerializable {
+
+ public String name;
+ public String comment;
+ public String uuid;
+
+}
Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/SnapshotInfo.java
___________________________________________________________________
Name: svn:eol-style
+ native
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-24 09:34:21 UTC (rev 9732)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2007-02-24 09:35:16 UTC (rev 9733)
@@ -2,8 +2,9 @@
import java.text.DateFormat;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -16,6 +17,7 @@
import org.drools.brms.client.rpc.PackageConfigData;
import org.drools.brms.client.rpc.RepositoryService;
import org.drools.brms.client.rpc.RuleAsset;
+import org.drools.brms.client.rpc.SnapshotInfo;
import org.drools.brms.client.rpc.TableConfig;
import org.drools.brms.client.rpc.TableDataResult;
import org.drools.brms.client.rpc.TableDataRow;
@@ -48,10 +50,8 @@
private static final long serialVersionUID = 3150768417428383474L;
private static final DateFormat dateFormatter = DateFormat.getInstance();
-
-
private MetaDataMapper metaDataMapper;
@@ -110,15 +110,30 @@
}
- public String[] listRulePackages() {
+ public PackageConfigData[] listPackages() {
Iterator pkgs = getRulesRepository().listPackages();
List result = new ArrayList();
while(pkgs.hasNext()) {
PackageItem pkg = (PackageItem) pkgs.next();
- result.add( pkg.getName() );
+
+ PackageConfigData data = new PackageConfigData();
+ data.uuid = pkg.getUUID();
+ data.name = pkg.getName();
+
+ result.add( data );
}
- String[] resultArr = (String[]) result.toArray( new String[result.size()] );
- Arrays.sort( resultArr );
+ Collections.sort( result, new Comparator() {
+
+ public int compare(Object o1,
+ Object o2) {
+ PackageConfigData d1 = (PackageConfigData) o1;
+ PackageConfigData d2 = (PackageConfigData) o2;
+ return d1.name.compareTo( d2.name );
+ }
+
+ });
+ PackageConfigData[] resultArr = (PackageConfigData[]) result.toArray( new PackageConfigData[result.size()] );
+
return resultArr;
}
@@ -335,8 +350,8 @@
return item.getUUID();
}
- public PackageConfigData loadPackage(String name) {
- PackageItem item = getRulesRepository().loadPackage( name );
+ public PackageConfigData loadPackageConfig(String uuid) {
+ PackageItem item = getRulesRepository().loadPackageByUUID( uuid );
PackageConfigData data = new PackageConfigData();
data.uuid = item.getUUID();
@@ -364,12 +379,12 @@
return item.getUUID();
}
- public TableDataResult listAssetsByFormat(String packageName,
+ public TableDataResult listAssets(String uuid,
String formats[],
int numRows,
int startRow) throws SerializableException {
long start = System.currentTimeMillis();
- PackageItem pkg = getRulesRepository().loadPackage( packageName );
+ PackageItem pkg = getRulesRepository().loadPackageByUUID( uuid );
AssetItemIterator it = pkg.listAssetsByFormat( formats );
if (numRows != -1) {
it.skip( startRow );
@@ -425,8 +440,20 @@
return getRulesRepository().copyAsset( assetUUID, newPackage, newName );
}
- public String[] listSnapshots(String packageName) {
- return getRulesRepository().listPackageSnapshots( packageName );
+ public SnapshotInfo[] listSnapshots(String packageName) {
+ RulesRepository repo = getRulesRepository();
+
+ String[] snaps = repo.listPackageSnapshots( packageName );
+ SnapshotInfo[] res = new SnapshotInfo[snaps.length];
+ for ( int i = 0; i < snaps.length; i++ ) {
+ PackageItem snap = repo.loadPackageSnapshot( packageName, snaps[i] );
+ SnapshotInfo info = new SnapshotInfo();
+ res[i] = info;
+ info.comment = snap.getCheckinComment();
+ info.name = snaps[i];
+ info.uuid = snap.getUUID();
+ }
+ return res;
}
public void createPackageSnapshot(String packageName,
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-24 09:34:21 UTC (rev 9732)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-02-24 09:35:16 UTC (rev 9733)
@@ -9,6 +9,7 @@
import org.drools.brms.client.rpc.RepositoryService;
import org.drools.brms.client.rpc.RuleAsset;
import org.drools.brms.client.rpc.RuleContentText;
+import org.drools.brms.client.rpc.SnapshotInfo;
import org.drools.brms.client.rpc.TableConfig;
import org.drools.brms.client.rpc.TableDataResult;
import org.drools.brms.client.rpc.TableDataRow;
@@ -69,17 +70,21 @@
assertNotNull(result);
assertFalse("".equals( result ));
- String[] packages = impl.listRulePackages();
+ PackageConfigData[] packages = impl.listPackages();
assertTrue(packages.length > 0);
boolean found = false;
for ( int i = 0; i < packages.length; i++ ) {
- if (packages[i].equals( "another" )) {
+ if (packages[i].name.equals( "another" )) {
found = true;
}
}
+
assertTrue(found);
+ assertFalse(packages[0].uuid == null);
+ assertFalse(packages[0].uuid.equals( "" ));
+
//just for performance testing with scaling up numbers of rules
// for (int i=1; i <= 1000; i++) {
// impl.createNewRule( "somerule_" + i, "description",
@@ -229,7 +234,7 @@
public void testCheckin() throws Exception {
MockJBRMSServiceServlet serv = new MockJBRMSServiceServlet();
- serv.listRulePackages();
+ serv.listPackages();
serv.createCategory( "/", "testCheckinCategory", "this is a description" );
serv.createCategory( "/", "testCheckinCategory2", "this is a description" );
@@ -287,7 +292,7 @@
public void testCreatePackage() throws Exception {
MockJBRMSServiceServlet impl = new MockJBRMSServiceServlet();
- String[] pkgs = impl.listRulePackages();
+ PackageConfigData[] pkgs = impl.listPackages();
String uuid = impl.createPackage( "testCreatePackage", "this is a new package" );
assertNotNull( uuid );
@@ -297,9 +302,9 @@
- assertEquals(pkgs.length + 1, impl.listRulePackages().length);
+ assertEquals(pkgs.length + 1, impl.listPackages().length);
- PackageConfigData conf = impl.loadPackage( "testCreatePackage" );
+ PackageConfigData conf = impl.loadPackageConfig( uuid );
assertEquals("this is a new package", conf.description);
assertNotNull(conf.lastModified);
}
@@ -307,12 +312,13 @@
public void testLoadPackageConfig() throws Exception {
MockJBRMSServiceServlet impl = new MockJBRMSServiceServlet();
PackageItem it = impl.repo.loadDefaultPackage();
+ String uuid = it.getUUID();
it.updateCoverage( "xyz" );
it.updateExternalURI( "ext" );
it.updateHeader( "header" );
impl.repo.save();
- PackageConfigData data = impl.loadPackage( "default" );
+ PackageConfigData data = impl.loadPackageConfig( uuid );
assertNotNull(data);
assertEquals("default", data.name);
@@ -326,7 +332,7 @@
public void testPackageConfSave() throws Exception {
MockJBRMSServiceServlet impl = new MockJBRMSServiceServlet();
String uuid = impl.createPackage( "testPackageConfSave", "a desc" );
- PackageConfigData data = impl.loadPackage( "testPackageConfSave" );
+ PackageConfigData data = impl.loadPackageConfig( uuid );
data.description = "new desc";
data.header = "wa";
@@ -337,7 +343,7 @@
assertNotNull(uuid);
assertEquals(uuid, uuid2);
- data = impl.loadPackage( "testPackageConfSave" );
+ data = impl.loadPackageConfig( uuid );
assertEquals("new desc", data.description);
assertEquals("wa", data.header);
assertEquals("new URI", data.externalURI);
@@ -347,38 +353,38 @@
MockJBRMSServiceServlet impl = new MockJBRMSServiceServlet();
String cat = "testListByFormat";
impl.createCategory( "/", cat, "ya" );
- impl.createPackage( "testListByFormat", "used for listing by format." );
+ String pkgUUID = impl.createPackage( "testListByFormat", "used for listing by format." );
String uuid = impl.createNewRule( "testListByFormat", "x", cat, "testListByFormat", "testListByFormat" );
String uuid2 = impl.createNewRule( "testListByFormat2", "x", cat, "testListByFormat", "testListByFormat" );
String uuid3 = impl.createNewRule( "testListByFormat3", "x", cat, "testListByFormat", "testListByFormat" );
String uuid4 = impl.createNewRule( "testListByFormat4", "x", cat, "testListByFormat", "testListByFormat" );
- TableDataResult res = impl.listAssetsByFormat( "testListByFormat", arr("testListByFormat"), -1, 0 );
+ TableDataResult res = impl.listAssets( pkgUUID, 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", arr("testListByFormat"), 4, 0 );
+ res = impl.listAssets( pkgUUID , arr("testListByFormat"), 4, 0 );
assertEquals(4, res.data.length);
- res = impl.listAssetsByFormat( "testListByFormat", arr("testListByFormat"), 2, 0 );
+ res = impl.listAssets( pkgUUID, arr("testListByFormat"), 2, 0 );
assertEquals(2, res.data.length);
assertEquals(uuid, res.data[0].id);
- res = impl.listAssetsByFormat( "testListByFormat", arr("testListByFormat"), 2, 2 );
+ res = impl.listAssets( pkgUUID, 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 );
+ res = impl.listAssets( pkgUUID, 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 );
+ res = impl.listAssets( pkgUUID, new String[] {"otherFormat", "testListByFormat"}, 40, 0 );
assertEquals(5, res.data.length);
@@ -431,7 +437,7 @@
impl.createState( "testState2" );
impl.changeState( packagUUID, "testState2", true );
- PackageConfigData pkg = impl.loadPackage( "testStatus" );
+ PackageConfigData pkg = impl.loadPackageConfig( packagUUID );
assertEquals("testState2", pkg.state);
asset = impl.loadRuleAsset( ruleUUID2 );
@@ -449,25 +455,29 @@
if (cats.length == 0) {
impl.createCategory( "/", "la", "d" );
}
- impl.createPackage( "sourcePackage", "description" );
- impl.createPackage( "targetPackage", "description" );
+ String sourcePkgId = impl.createPackage( "sourcePackage", "description" );
+ String destPkgId = impl.createPackage( "targetPackage", "description" );
String cat = impl.loadChildCategories( "/" )[0];
String uuid = impl.createNewRule( "testMovePackage", "desc", cat, "sourcePackage", "drl" );
- TableDataResult res = impl.listAssetsByFormat( "targetPackage", new String[] {"drl"}, 2, 0 );
+ TableDataResult res = impl.listAssets( destPkgId, new String[] {"drl"}, 2, 0 );
assertEquals(0, res.data.length);
impl.changeAssetPackage( uuid, "targetPackage", "yeah" );
- res = impl.listAssetsByFormat( "targetPackage", new String[] {"drl"}, 2, 0 );
+ res = impl.listAssets( destPkgId, new String[] {"drl"}, 2, 0 );
assertEquals(1, res.data.length);
+ res = impl.listAssets( sourcePkgId, new String[] {"drl"}, 2, 0 );
+ assertEquals(0, res.data.length);
+
+
}
public void testCopyAsset() throws Exception {
@@ -490,8 +500,11 @@
String uuid = impl.createNewRule( "testSnapshotRule", "", "snapshotTesting", "testSnapshot", "drl" );
impl.createPackageSnapshot( "testSnapshot", "X", false, "ya" );
- String[] snaps = impl.listSnapshots( "testSnapshot" );
+ SnapshotInfo[] snaps = impl.listSnapshots( "testSnapshot" );
assertEquals(1, snaps.length);
+ assertEquals("X", snaps[0].name);
+ assertEquals("ya", snaps[0].comment);
+ assertNotNull(snaps[0].uuid);
impl.createPackageSnapshot( "testSnapshot", "Y", false, "we" );
More information about the jboss-svn-commits
mailing list