[jboss-svn-commits] JBL Code SVN: r9696 - 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
Thu Feb 22 07:16:16 EST 2007
Author: michael.neale at jboss.com
Date: 2007-02-22 07:16:16 -0500 (Thu, 22 Feb 2007)
New Revision: 9696
Added:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/DeploymentManagementFeature.java
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageSnapshotView.java
Removed:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Deployment.java
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureConfigurator.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/client/ruleeditor/MetaDataWidget.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-644
Deleted: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Deployment.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Deployment.java 2007-02-22 11:11:27 UTC (rev 9695)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Deployment.java 2007-02-22 12:16:16 UTC (rev 9696)
@@ -1,45 +0,0 @@
-/*
- * Copyright 2006 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.drools.brms.client;
-
-import com.google.gwt.user.client.ui.Image;
-
-/**
- * Demonstrates {@link com.google.gwt.user.client.ui.MenuBar} and
- * {@link com.google.gwt.user.client.ui.MenuItem}.
- */
-public class Deployment extends JBRMSFeature {
-
- public static ComponentInfo init() {
- return new ComponentInfo("Deployment",
- "Deploy rulebases to runtime systems.") {
- public JBRMSFeature createInstance() {
- return new Deployment();
- }
-
- };
- }
-
-
- public Deployment() {
-
- }
-
-
-
- public void onShow() {
- }
-}
Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/DeploymentManagementFeature.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/DeploymentManagementFeature.java (rev 0)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/DeploymentManagementFeature.java 2007-02-22 12:16:16 UTC (rev 9696)
@@ -0,0 +1,33 @@
+package org.drools.brms.client;
+
+import org.drools.brms.client.packages.PackageSnapshotView;
+
+/**
+ * This is the package management feature.
+ * For managing packages (namespaces, imports etc) for rule assets.
+ *
+ * This is also an alternative way of viewing packages.
+ */
+public class DeploymentManagementFeature extends JBRMSFeature {
+
+
+ public static ComponentInfo init() {
+ return new ComponentInfo( "Deployment",
+ "Configure and view frozen snapshots of packages." ) {
+ public JBRMSFeature createInstance() {
+ return new DeploymentManagementFeature();
+ }
+ };
+ }
+
+
+ public DeploymentManagementFeature() {
+ initWidget( new PackageSnapshotView() );
+ }
+
+
+
+
+ public void onShow() {
+ }
+}
Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/DeploymentManagementFeature.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureConfigurator.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureConfigurator.java 2007-02-22 11:11:27 UTC (rev 9695)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/JBRMSFeatureConfigurator.java 2007-02-22 12:16:16 UTC (rev 9696)
@@ -20,9 +20,9 @@
list.addSink(RulesFeature.init());
list.addSink(PackageManagementFeature.init());
list.addSink(RuleBases.init());
- //list.addSink(Deployment.init());
+ list.addSink(DeploymentManagementFeature.init());
list.addSink(AdminFeature.init());
- //list.addSink(Search.init());
+
}
}
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-22 11:11:27 UTC (rev 9695)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageExplorerWidget.java 2007-02-22 12:16:16 UTC (rev 9696)
@@ -89,8 +89,11 @@
layout.getFlexCellFormatter().setAlignment( 0, 1, HasHorizontalAlignment.ALIGN_CENTER, HasVerticalAlignment.ALIGN_TOP );
+
refreshTreeView( );
+ TreeItem item = exTree.getItem( 0 );
+ if (item != null) exTree.setSelectedItem( item );
layout.setWidget( 0, 1, new HTML("<i>Please choose a package to edit, explore, or create a new package.</i>") );
Added: 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 (rev 0)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageSnapshotView.java 2007-02-22 12:16:16 UTC (rev 9696)
@@ -0,0 +1,87 @@
+package org.drools.brms.client.packages;
+
+import org.drools.brms.client.common.GenericCallback;
+import org.drools.brms.client.rpc.RepositoryServiceAsync;
+import org.drools.brms.client.rpc.RepositoryServiceFactory;
+
+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.VerticalPanel;
+import com.google.gwt.user.client.ui.Widget;
+
+/**
+ * This contains a list of packages and their deployment snapshots.
+ *
+ * @author Michael Neale
+ */
+public class PackageSnapshotView extends Composite {
+
+ private RepositoryServiceAsync service;
+ private FlexTable layout;
+
+ public PackageSnapshotView() {
+
+ layout = new FlexTable();
+ layout.getCellFormatter().setWidth( 0, 0, "40%" );
+
+
+ service = RepositoryServiceFactory.getService();
+
+ refreshPackageList();
+
+
+ initWidget( layout );
+
+
+ }
+
+ private void refreshPackageList() {
+ service.listRulePackages( new GenericCallback() {
+ public void onSuccess(Object data) {
+ String[] list = (String[]) data;
+ addPackages(list);
+ }
+ });
+ }
+
+ private void addPackages(final String[] list) {
+ 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) {
+ showPackage(pkgName);
+ }
+ });
+ packages.add( pkg );
+ }
+
+ Image refresh = new Image("images/refresh.gif");
+ refresh.addClickListener( new ClickListener() {
+ public void onClick(Widget w) {
+ refreshPackageList();
+ }
+ });
+
+ layout.setWidget( 0, 0, packages );
+ }
+
+ /**
+ * This will load up the list of snapshots for a package.
+ */
+ private void showPackage(String pkgName) {
+ service.listSnapshots( pkgName, new GenericCallback() {
+ public void onSuccess(Object data) {
+ String[] list = (String[]) data;
+ }
+ });
+ }
+
+}
Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/packages/PackageSnapshotView.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 2007-02-22 11:11:27 UTC (rev 9695)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2007-02-22 12:16:16 UTC (rev 9696)
@@ -128,4 +128,20 @@
* This moves an asset to the given target package.
*/
public void changeAssetPackage(String uuid, String newPackage, String comment);
+
+ /**
+ * Copies an asset into a new destination package.
+ * @param assetUUID The source assetID.
+ * @param newPackage The destination package (may be the same as the current source package, but
+ * in that case the asset has to have a different name).
+ * @param newName The new name of the asset.
+ */
+ public String copyAsset(String assetUUID, String newPackage, String newName);
+
+
+ /**
+ * 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);
}
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-22 11:11:27 UTC (rev 9695)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java 2007-02-22 12:16:16 UTC (rev 9696)
@@ -33,6 +33,9 @@
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);
+ 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 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-22 11:11:27 UTC (rev 9695)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java 2007-02-22 12:16:16 UTC (rev 9696)
@@ -426,6 +426,24 @@
cb.onSuccess( null );
}
+
+
+
+ public void copyAsset(String p0,
+ String p1,
+ String p2,
+ AsyncCallback cb) {
+ cb.onSuccess( "lalalalal" );
+
+ }
+
+
+
+ public void listSnapshots(String p0,
+ AsyncCallback cb) {
+ cb.onSuccess( null );
+
+ }
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 2007-02-22 11:11:27 UTC (rev 9695)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/MetaDataWidget.java 2007-02-22 12:16:16 UTC (rev 9696)
@@ -140,7 +140,7 @@
private void showEditPackage(final String pkg, Widget source) {
- final FormStylePopup pop = new FormStylePopup("images/package_large.png", "Change package");
+ final FormStylePopup pop = new FormStylePopup("images/package_large.png", "Move this item to another package");
pop.addAttribute( "Current package:", new Label(pkg) );
final RulePackageSelector sel = new RulePackageSelector();
pop.addAttribute( "New package:", sel );
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-22 11:11:27 UTC (rev 9695)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2007-02-22 12:16:16 UTC (rev 9696)
@@ -424,6 +424,16 @@
getRulesRepository().moveRuleItemPackage( newPackage, uuid, comment );
}
+
+ public String copyAsset(String assetUUID,
+ String newPackage,
+ String newName) {
+ return getRulesRepository().copyAsset( assetUUID, newPackage, newName );
+ }
+
+ public String[] listSnapshots(String packageName) {
+ return getRulesRepository().listPackageSnapshots( 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-22 11:11:27 UTC (rev 9695)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2007-02-22 12:16:16 UTC (rev 9696)
@@ -471,6 +471,19 @@
}
+ public void testCopyAsset() throws Exception {
+ JBRMSServiceServlet impl = new MockJBRMSServiceServlet();
+ impl.createCategory( "/", "templates", "ya" );
+ String uuid = impl.createNewRule( "testCopyAsset", "", "templates", "default", "drl" );
+ String uuid2 = impl.copyAsset( uuid, "default", "testCopyAsset2" );
+ assertNotSame( uuid, uuid2 );
+
+ RuleAsset asset = impl.loadRuleAsset( uuid2 );
+ assertNotNull(asset);
+ assertEquals("default", asset.metaData.packageName);
+ assertEquals("testCopyAsset2", asset.metaData.name);
+ }
+
}
More information about the jboss-svn-commits
mailing list