[jboss-svn-commits] JBL Code SVN: r7689 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/client 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/gwtutil main/java/org/drools/brms/public/images 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
Fri Nov 17 12:47:48 EST 2006
Author: michael.neale at jboss.com
Date: 2006-11-17 12:47:29 -0500 (Fri, 17 Nov 2006)
New Revision: 7689
Added:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/home_icon.gif
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Info.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/RuleAsset.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/RuleViewer.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:
more changes for checking in.
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Info.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Info.java 2006-11-17 17:13:17 UTC (rev 7688)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/Info.java 2006-11-17 17:47:29 UTC (rev 7689)
@@ -39,13 +39,13 @@
public Info() {
- setWidget(new HTML(
+ initWidget(new HTML(
"<div class='infoProse'>"
+ "Welcome to the JBoss Rules Management System console."
- + "<p>Currently very much a WIP."
+ + "<p>"
+ "</div>"
+ "<div>"
- + "<img src='images/drools_logo.png'"
+ + "<img src='images/front_icon.gif'"
+ "</div>"
,
true));
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-11-17 17:13:17 UTC (rev 7688)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryService.java 2006-11-17 17:47:29 UTC (rev 7689)
@@ -50,4 +50,9 @@
public RuleAsset loadRuleAsset(String UUID) throws SerializableException;
+ /**
+ * This checks in a new version of an asset.
+ */
+ public void checkinVersion(RuleAsset asset) throws SerializableException;
+
}
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-11-17 17:13:17 UTC (rev 7688)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RepositoryServiceAsync.java 2006-11-17 17:47:29 UTC (rev 7689)
@@ -15,6 +15,7 @@
extends
RemoteService {
+ /** Generated by AsyncInterfaceGenerator hackery */
public void loadChildCategories(java.lang.String p0, AsyncCallback cb);
public void loadRuleListForCategories(java.lang.String p0, AsyncCallback cb);
public void loadTableConfig(java.lang.String p0, AsyncCallback cb);
@@ -22,4 +23,6 @@
public void createNewRule(java.lang.String p0, java.lang.String p1, java.lang.String p2, java.lang.String p3, 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/RuleAsset.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RuleAsset.java 2006-11-17 17:13:17 UTC (rev 7688)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/RuleAsset.java 2006-11-17 17:47:29 UTC (rev 7689)
@@ -16,5 +16,6 @@
public IsSerializable content;
public String dateEffective;
public String dateExpired;
+ public String uuid;
}
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-11-17 17:13:17 UTC (rev 7688)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/rpc/mock/MockRepositoryServiceAsync.java 2006-11-17 17:47:29 UTC (rev 7689)
@@ -163,6 +163,19 @@
}
+
+
+
+ public void checkinVersion(RuleAsset a,
+ AsyncCallback cb) {
+ if (a.metaData.coverage.equals( "fail" )) {
+ cb.onFailure( new SerializableException("This is an error") );
+ } else {
+ cb.onSuccess( null );
+ }
+
+
+ }
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 2006-11-17 17:13:17 UTC (rev 7688)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/ActionToolbar.java 2006-11-17 17:47:29 UTC (rev 7689)
@@ -1,6 +1,5 @@
package org.drools.brms.client.ruleeditor;
-import org.drools.brms.client.common.FormStyleLayout;
import org.drools.brms.client.common.FormStylePopup;
import org.drools.brms.client.rpc.MetaData;
@@ -8,18 +7,10 @@
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.HTML;
-import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Hyperlink;
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.MenuBar;
-import com.google.gwt.user.client.ui.MenuItem;
-import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.user.client.ui.TextArea;
-import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.Widget;
/**
@@ -93,6 +84,7 @@
protected void doCheckinConfirm() {
final FormStylePopup pop = new FormStylePopup("images/checkin.gif", "Check in a new version.");
TextArea comment = new TextArea();
+ comment.setWidth( "100%" );
Button save = new Button("Save");
pop.addAttribute( "Comment", comment );
pop.addAttribute( "", save);
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-11-17 17:13:17 UTC (rev 7688)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/client/ruleeditor/RuleViewer.java 2006-11-17 17:47:29 UTC (rev 7689)
@@ -6,6 +6,7 @@
import org.drools.brms.client.RulesFeature;
import org.drools.brms.client.breditor.BREditor;
import org.drools.brms.client.common.ErrorPopup;
+import org.drools.brms.client.common.WarningPopup;
import org.drools.brms.client.rpc.MetaData;
import org.drools.brms.client.rpc.RepositoryServiceFactory;
import org.drools.brms.client.rpc.RuleAsset;
@@ -32,98 +33,141 @@
* @author Michael Neale
*/
public class RuleViewer extends Composite {
-
- private final String resourceUUID;
- private final String name;
- private final String format;
- private Command closeCommand;
-
-
- final private SimplePanel panel = new SimplePanel();
- protected RuleAsset asset;
-
+
+ private final String resourceUUID;
+ private final String name;
+ private final String format;
+ private Command closeCommand;
+
+ final private SimplePanel panel = new SimplePanel();
+ protected RuleAsset asset;
+
/**
* @param UUID The resource to open.
* @param format The type of resource (may determine what editor is used).
* @param name The name to be displayed.
*/
- public RuleViewer(RulesFeature parent, String UUID, String format, String name) {
+ public RuleViewer(RulesFeature parent,
+ String UUID,
+ String format,
+ String name) {
this.resourceUUID = UUID;
this.name = name;
this.format = format;
-
+
//just pad it out a bit, so it gets the layout right - it will be loaded later.
FlexTable layout = new FlexTable();
- layout.setWidget( 0, 0, new Label("Loading ...") );
-
+ layout.setWidget( 0,
+ 0,
+ new Label( "Loading ..." ) );
+
//may use format here to determine which service to use in future
- RepositoryServiceFactory.getService().loadRuleAsset( this.resourceUUID, new AsyncCallback() {
- public void onFailure(Throwable e) {
- ErrorPopup.showMessage( e.getMessage() );
- }
- public void onSuccess(Object o) {
- asset = (RuleAsset) o;
- doWidgets();
- }
-
- });
-
+ RepositoryServiceFactory.getService().loadRuleAsset( this.resourceUUID,
+ new AsyncCallback() {
+ public void onFailure(Throwable e) {
+ ErrorPopup.showMessage( e.getMessage() );
+ }
+
+ public void onSuccess(Object o) {
+ asset = (RuleAsset) o;
+ doWidgets();
+ }
+
+ } );
+
panel.add( layout );
- initWidget(panel);
- }
-
-
+ initWidget( panel );
+ }
+
/**
* This will actually load up the data (this is called by the callback
* when we get the data back from the server,
* also determines what widgets to load up).
*/
private void doWidgets() {
- final MetaDataWidget metaWidget = new MetaDataWidget(this.name, false);
-
+ final MetaDataWidget metaWidget = new MetaDataWidget( this.name,
+ false );
+
final FlexTable layout = new FlexTable();
-
+
//now the main layout table
- FlexCellFormatter formatter = layout.getFlexCellFormatter();
- layout.setWidget( 0, 0, metaWidget );
- formatter.setRowSpan( 0, 0, 3 );
- formatter.setWidth( 0, 0, "40%" );
-
+ FlexCellFormatter formatter = layout.getFlexCellFormatter();
+ layout.setWidget( 0,
+ 0,
+ metaWidget );
+ formatter.setRowSpan( 0,
+ 0,
+ 3 );
+ formatter.setWidth( 0,
+ 0,
+ "40%" );
+
//and now the action widgets (checkin/close etc).
- ActionToolbar toolbar = new ActionToolbar(asset.metaData, null, null);
- toolbar.setCloseCommand(new Command() {
+ ActionToolbar toolbar = new ActionToolbar( asset.metaData,
+ new Command() {
+ public void execute() {
+ doCheckin();
+ }
+ },
+ null );
+ toolbar.setCloseCommand( new Command() {
public void execute() {
closeCommand.execute();
- }
- });
-
- layout.setWidget( 0, 1, toolbar );
- formatter.setAlignment( 0, 1, HasHorizontalAlignment.ALIGN_RIGHT, HasVerticalAlignment.ALIGN_MIDDLE );
-
+ }
+ } );
+
+ layout.setWidget( 0,
+ 1,
+ toolbar );
+ formatter.setAlignment( 0,
+ 1,
+ HasHorizontalAlignment.ALIGN_RIGHT,
+ HasVerticalAlignment.ALIGN_MIDDLE );
+
//REMEMBER: subsequent rows have only one column, doh that is confusing !
//GAAAAAAAAAAAAAAAAAAAAAAAAAAH
-
+
//depending on the format, load the appropriate editor
- if (asset.metaData.format.equals( "DSL" )) {
- BREditor ed = new BREditor(asset);
- layout.setWidget( 1, 0, ed );
+ if ( asset.metaData.format.equals( "DSL" ) ) {
+ BREditor ed = new BREditor( asset );
+ layout.setWidget( 1,
+ 0,
+ ed );
} else {
- DefaultRuleContentWidget ed = new DefaultRuleContentWidget(asset);
- layout.setWidget( 1, 0, ed );
+ DefaultRuleContentWidget ed = new DefaultRuleContentWidget( asset );
+ layout.setWidget( 1,
+ 0,
+ ed );
}
-
-
+
//the document widget
final RuleDocumentWidget doco = new RuleDocumentWidget();
- layout.setWidget( 2, 0, doco );
-
+ layout.setWidget( 2,
+ 0,
+ doco );
+
metaWidget.loadData( asset.metaData );
doco.loadData( asset.metaData );
-
-
+
panel.clear();
panel.setWidget( layout );
}
+
+ void doCheckin() {
+ RepositoryServiceFactory.getService().checkinVersion( this.asset, new AsyncCallback() {
+
+ public void onFailure(Throwable err) {
+ ErrorPopup.showMessage( err.getMessage() );
+ }
+
+ public void onSuccess(Object o) {
+ WarningPopup.showMessage( "Michael still needs to think about what to do after checking in re the UI !", 200, 200 );
+
+ }
+
+ });
+ }
+
/**
@@ -134,6 +178,4 @@
this.closeCommand = c;
}
-
-
}
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 2006-11-17 17:13:17 UTC (rev 7688)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/gwtutil/AsyncInterfaceGenerator.java 2006-11-17 17:47:29 UTC (rev 7689)
@@ -1,7 +1,6 @@
package org.drools.brms.gwtutil;
import java.lang.reflect.Method;
-import java.util.Iterator;
import org.drools.brms.client.rpc.RepositoryService;
@@ -37,7 +36,7 @@
line += ");\n";
}
}
-
+ System.out.println("/** Generated by AsyncInterfaceGenerator hackery */");
System.out.println(line);
}
Added: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/home_icon.gif
===================================================================
(Binary files differ)
Property changes on: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/images/home_icon.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 2006-11-17 17:13:17 UTC (rev 7688)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/JBRMSServiceServlet.java 2006-11-17 17:47:29 UTC (rev 7689)
@@ -211,7 +211,6 @@
//ok here is where we do DSLs...
throw new SerializableException("Can't load DSL rules just yet.");
- } else if (item.getFormat().equals( "DSL" )) {
} else if (item.getFormat().equals( "DT" )) {
//and here we do decision tables
throw new SerializableException("Still working on this...");
@@ -223,6 +222,7 @@
}
asset.metaData.packageName = item.getPackageName();
+ asset.uuid = uuid;
return asset;
}
@@ -272,7 +272,16 @@
return meta;
}
+ public void checkinVersion(RuleAsset asset) throws SerializableException {
+
+
+ RulesRepository repo = getRulesRepository();
+ RuleItem rule = repo.loadRuleByUUID( asset.uuid );
+ rule.checkout();
+ throw new UnsupportedOperationException("Not implemented yet !");
+ }
+
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-11-17 17:13:17 UTC (rev 7688)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/ServiceImplementationTest.java 2006-11-17 17:47:29 UTC (rev 7689)
@@ -149,6 +149,8 @@
RuleAsset asset = impl.loadRuleAsset( uuid );
assertNotNull(asset);
+ assertEquals(uuid, asset.uuid);
+
assertEquals("description", asset.metaData.description);
More information about the jboss-svn-commits
mailing list