[jboss-svn-commits] JBL Code SVN: r9720 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client/admin and 14 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Feb 23 06:20:47 EST 2007
Author: michael.neale at jboss.com
Date: 2007-02-23 06:20:47 -0500 (Fri, 23 Feb 2007)
New Revision: 9720
Added:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/package_snapshot.gif
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/package_snapshot_item.gif
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureList.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RuleBases.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Search.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/CategoryManager.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/breditor/ChoiceList.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/categorynav/CategoryExplorerWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/FactTemplateWizard.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/ModelAttachmentFileWidget.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/MetaData.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/RepositoryServiceFactory.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/ActionToolbar.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/AssetCategoryEditor.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/CheckinPopup.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionBrowser.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionViewer.java
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/util/MetaDataMapper.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/ActionSetFieldTest.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/CompositeFactPatternTest.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/FactPatternTest.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/RuleModelTest.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/rulelist/TableDataRowTest.java
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/FileUploadServletTest.java
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/util/TableDisplayHandlerTest.java
Log:
JBRULES-644 and tidy up of imports
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureList.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureList.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureList.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -21,11 +21,8 @@
import org.drools.brms.client.JBRMSFeature.ComponentInfo;
import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Hyperlink;
import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
/**
* This is the list of features that make up the rule management console.
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RuleBases.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RuleBases.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RuleBases.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -17,7 +17,6 @@
import org.drools.brms.client.decisiontable.EditableDTGrid;
-import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.VerticalPanel;
/**
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/RulesFeature.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -14,8 +14,8 @@
import org.drools.brms.client.rpc.TableDataResult;
import org.drools.brms.client.ruleeditor.NewAssetWizard;
import org.drools.brms.client.ruleeditor.RuleViewer;
+import org.drools.brms.client.rulelist.AssetItemListViewer;
import org.drools.brms.client.rulelist.EditItemEvent;
-import org.drools.brms.client.rulelist.AssetItemListViewer;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.DeferredCommand;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Search.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Search.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Search.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -15,7 +15,6 @@
*/
package org.drools.brms.client;
-import com.google.gwt.user.client.ui.Image;
/**
* Demonstrates {@link com.google.gwt.user.client.ui.Table}.
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/CategoryManager.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/CategoryManager.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/admin/CategoryManager.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -8,7 +8,6 @@
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.VerticalPanel;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/breditor/ChoiceList.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/breditor/ChoiceList.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/breditor/ChoiceList.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -3,7 +3,6 @@
import java.util.List;
import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.ChangeListener;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.KeyboardListener;
import com.google.gwt.user.client.ui.ListBox;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/categorynav/CategoryExplorerWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/categorynav/CategoryExplorerWidget.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/categorynav/CategoryExplorerWidget.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -5,18 +5,11 @@
import org.drools.brms.client.rpc.RepositoryServiceFactory;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Composite;
-import com.google.gwt.user.client.ui.FlexTable;
-import com.google.gwt.user.client.ui.HasHorizontalAlignment;
-import com.google.gwt.user.client.ui.HasVerticalAlignment;
-import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Tree;
import com.google.gwt.user.client.ui.TreeItem;
import com.google.gwt.user.client.ui.TreeListener;
import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
/**
* This is a rule/resource navigator that uses the server side categories to
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/modeldriven/ui/FactPatternWidget.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -1,7 +1,7 @@
package org.drools.brms.client.modeldriven.ui;
+import org.drools.brms.client.common.FieldEditListener;
import org.drools.brms.client.common.FormStylePopup;
-import org.drools.brms.client.common.FieldEditListener;
import org.drools.brms.client.common.YesNoDialog;
import org.drools.brms.client.modeldriven.HumanReadable;
import org.drools.brms.client.modeldriven.SuggestionCompletionEngine;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/FactTemplateWizard.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/FactTemplateWizard.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/FactTemplateWizard.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -1,13 +1,10 @@
package org.drools.brms.client.packages;
-import java.util.HashMap;
-
import org.drools.brms.client.common.FormStylePopup;
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.ListBox;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/ModelAttachmentFileWidget.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/ModelAttachmentFileWidget.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/ModelAttachmentFileWidget.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -17,7 +17,6 @@
import com.google.gwt.user.client.ui.FormPanel;
import com.google.gwt.user.client.ui.FormSubmitCompleteEvent;
import com.google.gwt.user.client.ui.FormSubmitEvent;
-import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
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-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -22,7 +22,6 @@
import com.google.gwt.user.client.ui.HasVerticalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Tree;
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-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageSnapshotView.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -1,14 +1,26 @@
package org.drools.brms.client.packages;
+import java.util.ArrayList;
+
import org.drools.brms.client.common.GenericCallback;
+import org.drools.brms.client.common.LoadingPopup;
import org.drools.brms.client.rpc.RepositoryServiceAsync;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
+import org.drools.brms.client.rpc.TableDataResult;
+import org.drools.brms.client.rpc.TableDataRow;
+import org.drools.brms.client.table.SortableTable;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.DeferredCommand;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.Tree;
+import com.google.gwt.user.client.ui.TreeItem;
+import com.google.gwt.user.client.ui.TreeListener;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
@@ -39,37 +51,55 @@
}
private void refreshPackageList() {
+ LoadingPopup.showMessage( "Loading package list..." );
service.listRulePackages( new GenericCallback() {
public void onSuccess(Object data) {
String[] list = (String[]) data;
addPackages(list);
+ LoadingPopup.close();
}
});
}
private void addPackages(final String[] list) {
+
+ Tree snapTree = new Tree();
+
VerticalPanel packages = new VerticalPanel();
for ( int i = 0; i < list.length; i++ ) {
final String pkgName = list[i];
-
- HTML pkg = new HTML("<img src = 'images/package.gif'/> " + pkgName);
-
- pkg.addClickListener( new ClickListener() {
- public void onClick(Widget w) {
+ TreeItem item = makeItem( pkgName, "images/package_snapshot.gif", new Command() {
+ public void execute() {
showPackage(pkgName);
- }
- });
- packages.add( pkg );
+ }
+ } );
+
+
+ snapTree.addItem( item );
+
}
- Image refresh = new Image("images/refresh.gif");
+ packages.add( snapTree );
+
+ HTML refresh = new HTML("Refresh list: <img src='images/refresh.gif'/>");
+
+ //Image refresh = new Image("images/refresh.gif");
refresh.addClickListener( new ClickListener() {
public void onClick(Widget w) {
refreshPackageList();
}
});
+ snapTree.addTreeListener( new TreeListener() {
+ public void onTreeItemSelected(TreeItem item) {
+ DeferredCommand.add( (Command) item.getUserObject() );
+ }
+ public void onTreeItemStateChanged(TreeItem a) {}
+ });
+
+ packages.add( refresh );
+
layout.setWidget( 0, 0, packages );
}
@@ -77,11 +107,33 @@
* This will load up the list of snapshots for a package.
*/
private void showPackage(String pkgName) {
+ LoadingPopup.showMessage( "Loading snapshots..." );
service.listSnapshots( pkgName, new GenericCallback() {
public void onSuccess(Object data) {
String[] list = (String[]) data;
+ renderListOfSnapshots(list);
+ LoadingPopup.close();
}
});
}
+
+ /**
+ * This will render the snapshot list.
+ */
+ protected void renderListOfSnapshots(String[] list) {
+ FlexTable table = new FlexTable();
+ for ( int i = 0; i < list.length; i++ ) {
+ table.setWidget( i, 0, new Label( list[i] ) );
+
+ }
+ layout.setWidget( 0, 1, table );
+ }
+ private TreeItem makeItem(String name, String icon, Object command) {
+ TreeItem item = new TreeItem();
+ item.setHTML( "<img src=\""+ icon + "\">" + name + "</a>" );
+ item.setUserObject( command );
+ return item;
+ }
+
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/MetaData.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/MetaData.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/MetaData.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -2,8 +2,6 @@
import java.util.Date;
-import org.drools.brms.client.modeldriven.brxml.RuleAttribute;
-
import com.google.gwt.user.client.rpc.IsSerializable;
/**
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-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -144,4 +144,15 @@
* by taking a labelled copy of a package, at a point in time, for instance for deployment.
*/
public String[] listSnapshots(String packageName);
+
+
+ /**
+ * Create a package snapshot for deployment.
+ * @param packageName THe name of the package to copy.
+ * @param snapshotName The name of the snapshot. Has to be unique unless existing one is to be replaced.
+ * @param replaceExisting Replace the existing one (must be true to replace an existing snapshot of the same name).
+ * @param comment A comment to be added to the copied one.
+ */
+ public void createPackageSnapshot(String packageName, String snapshotName, boolean replaceExisting, String comment);
+
}
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-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -35,6 +35,7 @@
public void changeAssetPackage(java.lang.String p0, java.lang.String p1, java.lang.String p2, AsyncCallback cb);
public void copyAsset(java.lang.String p0, java.lang.String p1, java.lang.String p2, AsyncCallback cb);
public void listSnapshots(java.lang.String p0, AsyncCallback cb);
+ 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);
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceFactory.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceFactory.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -36,7 +36,8 @@
}
private static RepositoryServiceAsync getMockService() {
- return new MockRepositoryServiceAsync();
+ //return new MockRepositoryServiceAsync();
+ return null;
}
private static RepositoryServiceAsync getRealService() {
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-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -35,9 +35,10 @@
* This is a repository back end simulator.
*/
public class MockRepositoryServiceAsync
- implements
- RepositoryServiceAsync {
+// implements
+// RepositoryServiceAsync {
+{
public void loadChildCategories(String categoryPath,
AsyncCallback callback) {
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -5,7 +5,6 @@
import org.drools.brms.client.common.RulePackageSelector;
import org.drools.brms.client.common.StatusChangePopup;
import org.drools.brms.client.rpc.MetaData;
-import org.drools.brms.client.rpc.RepositoryService;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
import org.drools.brms.client.rpc.RuleAsset;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/AssetCategoryEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/AssetCategoryEditor.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/AssetCategoryEditor.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -9,7 +9,6 @@
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.Grid;
-import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/CheckinPopup.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/CheckinPopup.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/CheckinPopup.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -5,14 +5,8 @@
import com.google.gwt.user.client.Command;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.FlexTable;
-import com.google.gwt.user.client.ui.HasHorizontalAlignment;
-import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.user.client.ui.TextArea;
import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
/**
*
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionBrowser.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionBrowser.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionBrowser.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -17,7 +17,6 @@
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.user.client.ui.FlexTable.FlexCellFormatter;
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionViewer.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/VersionViewer.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -2,14 +2,11 @@
import org.drools.brms.client.common.GenericCallback;
import org.drools.brms.client.common.LoadingPopup;
-import org.drools.brms.client.common.WarningPopup;
-import org.drools.brms.client.common.YesNoDialog;
import org.drools.brms.client.rpc.MetaData;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
import org.drools.brms.client.rpc.RuleAsset;
import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.DialogBox;
Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/package_snapshot.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/package_snapshot.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/package_snapshot_item.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/package_snapshot_item.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
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-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -8,12 +8,7 @@
import java.util.Iterator;
import java.util.List;
-import javax.jcr.LoginException;
-import javax.jcr.Repository;
import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpSession;
import org.drools.brms.client.common.AssetFormats;
@@ -32,7 +27,6 @@
import org.drools.repository.AssetItemIterator;
import org.drools.repository.CategoryItem;
import org.drools.repository.PackageItem;
-import org.drools.repository.RepositoryConfigurator;
import org.drools.repository.RulesRepository;
import org.drools.repository.RulesRepositoryException;
import org.drools.repository.StateItem;
@@ -434,6 +428,23 @@
public String[] listSnapshots(String packageName) {
return getRulesRepository().listPackageSnapshots( packageName );
}
+
+ public void createPackageSnapshot(String packageName,
+ String snapshotName,
+ boolean replaceExisting,
+ String comment) {
+ RulesRepository repo = getRulesRepository();
+
+ if (replaceExisting) {
+ repo.removePackageSnapshot( packageName, snapshotName );
+ }
+
+ repo.createPackageSnapshot( packageName, snapshotName );
+ PackageItem item = repo.loadPackageSnapshot( packageName, snapshotName );
+ item.updateCheckinComment( comment );
+ repo.save();
+
+ }
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/MetaDataMapper.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/MetaDataMapper.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/util/MetaDataMapper.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -3,8 +3,6 @@
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.util.Calendar;
-import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/ActionSetFieldTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/ActionSetFieldTest.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/ActionSetFieldTest.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -1,10 +1,10 @@
package org.drools.brms.client.modeldriven;
+import junit.framework.TestCase;
+
import org.drools.brms.client.modeldriven.brxml.ActionFieldValue;
import org.drools.brms.client.modeldriven.brxml.ActionSetField;
-import junit.framework.TestCase;
-
public class ActionSetFieldTest extends TestCase {
public void testRemove() {
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/CompositeFactPatternTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/CompositeFactPatternTest.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/CompositeFactPatternTest.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -1,10 +1,10 @@
package org.drools.brms.client.modeldriven;
+import junit.framework.TestCase;
+
import org.drools.brms.client.modeldriven.brxml.CompositeFactPattern;
import org.drools.brms.client.modeldriven.brxml.FactPattern;
-import junit.framework.TestCase;
-
public class CompositeFactPatternTest extends TestCase {
public void testAddPattern() {
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/FactPatternTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/FactPatternTest.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/FactPatternTest.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -1,10 +1,10 @@
package org.drools.brms.client.modeldriven;
+import junit.framework.TestCase;
+
import org.drools.brms.client.modeldriven.brxml.Constraint;
import org.drools.brms.client.modeldriven.brxml.FactPattern;
-import junit.framework.TestCase;
-
public class FactPatternTest extends TestCase {
public void testAddConstraint() {
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/RuleModelTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/RuleModelTest.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/modeldriven/RuleModelTest.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -2,6 +2,8 @@
import java.util.List;
+import junit.framework.TestCase;
+
import org.drools.brms.client.modeldriven.brxml.ActionRetractFact;
import org.drools.brms.client.modeldriven.brxml.ActionSetField;
import org.drools.brms.client.modeldriven.brxml.FactPattern;
@@ -12,8 +14,6 @@
import com.thoughtworks.xstream.XStream;
-import junit.framework.TestCase;
-
public class RuleModelTest extends TestCase {
public void testBoundFactFinder() {
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/rulelist/TableDataRowTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/rulelist/TableDataRowTest.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/client/rulelist/TableDataRowTest.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -1,9 +1,9 @@
package org.drools.brms.client.rulelist;
+import junit.framework.TestCase;
+
import org.drools.brms.client.rpc.TableDataRow;
-import junit.framework.TestCase;
-
public class TableDataRowTest extends TestCase {
public void testRow() {
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/FileUploadServletTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/FileUploadServletTest.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/FileUploadServletTest.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -7,12 +7,12 @@
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import junit.framework.TestCase;
+
import org.apache.commons.fileupload.FileItem;
import org.drools.repository.AssetItem;
import org.drools.repository.RulesRepository;
-import junit.framework.TestCase;
-
public class FileUploadServletTest extends TestCase {
public void testUploadFile() throws Exception {
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-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -15,7 +15,6 @@
import org.drools.brms.client.rulelist.AssetItemListViewer;
import org.drools.brms.server.util.TableDisplayHandler;
import org.drools.repository.AssetItem;
-import org.drools.repository.AssetItemIterator;
import org.drools.repository.CategoryItem;
import org.drools.repository.PackageItem;
import org.drools.repository.StateItem;
@@ -484,6 +483,23 @@
assertEquals("testCopyAsset2", asset.metaData.name);
}
+ public void testSnapshot() throws Exception {
+ JBRMSServiceServlet impl = new MockJBRMSServiceServlet();
+ impl.createCategory( "/", "snapshotTesting", "y" );
+ impl.createPackage( "testSnapshot", "d" );
+ String uuid = impl.createNewRule( "testSnapshotRule", "", "snapshotTesting", "testSnapshot", "drl" );
+
+ impl.createPackageSnapshot( "testSnapshot", "X", false, "ya" );
+ String[] snaps = impl.listSnapshots( "testSnapshot" );
+ assertEquals(1, snaps.length);
+
+
+ impl.createPackageSnapshot( "testSnapshot", "Y", false, "we" );
+ assertEquals(2, impl.listSnapshots( "testSnapshot" ).length);
+ impl.createPackageSnapshot( "testSnapshot", "X", true, "we" );
+ assertEquals(2, impl.listSnapshots( "testSnapshot" ).length);
+
+ }
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/util/TableDisplayHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/util/TableDisplayHandlerTest.java 2007-02-23 09:56:14 UTC (rev 9719)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/util/TableDisplayHandlerTest.java 2007-02-23 11:20:47 UTC (rev 9720)
@@ -1,13 +1,11 @@
package org.drools.brms.server.util;
import java.lang.reflect.Method;
-import java.util.Calendar;
-import org.drools.brms.server.util.TableDisplayHandler.RowLoader;
-import org.drools.repository.AssetItem;
-
import junit.framework.TestCase;
+import org.drools.brms.server.util.TableDisplayHandler.RowLoader;
+
public class TableDisplayHandlerTest extends TestCase {
public void testRowLoaders() throws Exception {
More information about the jboss-svn-commits
mailing list