[jboss-svn-commits] JBL Code SVN: r31482 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor: client/rpc and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Feb 8 02:09:32 EST 2010
Author: jervisliu
Date: 2010-02-08 02:09:32 -0500 (Mon, 08 Feb 2010)
New Revision: 31482
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RepositoryStartupService.java
Log:
https://jira.jboss.org/jira/browse/GUVNOR-480: Be able to promote an asset from a package to Global Area
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2010-02-07 21:22:37 UTC (rev 31481)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2010-02-08 07:09:32 UTC (rev 31482)
@@ -2045,4 +2045,9 @@
String Asset0IsAlreadyOpenPleaseCloseItBeforeOpeningMultiview();
+ String PromptToGlobal();
+
+ String PromptAreYouSure();
+
+ String Prompted();
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2010-02-07 21:22:37 UTC (rev 31481)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2010-02-08 07:09:32 UTC (rev 31482)
@@ -975,4 +975,7 @@
SaveAndCloseAll=Save and close all
DescriptionAndDiscussion=Description and discussion
Show=Show
-Asset0IsAlreadyOpenPleaseCloseItBeforeOpeningMultiview=Asset {0} is already open, please close it before opening multiview.
\ No newline at end of file
+Asset0IsAlreadyOpenPleaseCloseItBeforeOpeningMultiview=Asset {0} is already open, please close it before opening multiview.
+PromptToGlobal=Prompt to Global
+PromptAreYouSure=Are you sure you want to prompt this item to Global area?
+Prompted=The item has been moved to Global area.
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java 2010-02-07 21:22:37 UTC (rev 31481)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java 2010-02-08 07:09:32 UTC (rev 31482)
@@ -221,6 +221,12 @@
public void changeAssetPackage(String uuid, String newPackage, String comment);
/**
+ * Prompt an asset into Global area.
+ * @param assetUUID The source assetID.
+ */
+ public void promptAssetToGlobalArea(String assetUUID);
+
+ /**
* 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
@@ -229,7 +235,6 @@
*/
public String copyAsset(String assetUUID, String newPackage, String newName);
-
/**
* Copy the package (everything).
* @param sourcePackageName
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java 2010-02-07 21:22:37 UTC (rev 31481)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java 2010-02-08 07:09:32 UTC (rev 31482)
@@ -67,6 +67,7 @@
public void removeState(java.lang.String p0, AsyncCallback cb);
public void changeState(java.lang.String p0, java.lang.String p1, boolean p2, AsyncCallback cb);
public void changeAssetPackage(java.lang.String p0, java.lang.String p1, java.lang.String p2, AsyncCallback cb);
+ public void promptAssetToGlobalArea(java.lang.String p0, AsyncCallback cb);
public void copyAsset(java.lang.String p0, java.lang.String p1, java.lang.String p2, AsyncCallback<java.lang.String> cb);
public void copyPackage(java.lang.String p0, java.lang.String p1, AsyncCallback cb);
public void listSnapshots(java.lang.String p0, AsyncCallback<org.drools.guvnor.client.rpc.SnapshotInfo[]> cb);
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2010-02-07 21:22:37 UTC (rev 31481)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/ActionToolbar.java 2010-02-08 07:09:32 UTC (rev 31482)
@@ -61,15 +61,17 @@
private Widget editor;
private Command closeCommand;
private Command copyCommand;
+ private Command promptCommand;
public ActionToolbar(final RuleAsset asset,
+ boolean readOnly,
+ Widget editor,
final CheckinAction checkin,
final CheckinAction archiv,
- final Command delete,
- boolean readOnly,
- Widget editor,
+ final Command delete,
Command closeCommand,
- Command copyCommand) {
+ Command copyCommand,
+ Command promptCommand) {
this.checkinAction = checkin;
this.archiveAction = archiv;
@@ -78,6 +80,7 @@
this.editor = editor;
this.closeCommand = closeCommand;
this.copyCommand = copyCommand;
+ this.promptCommand = promptCommand;
this.state = new ToolbarTextItem(constants.Status() + " ");
@@ -158,6 +161,12 @@
copyCommand.execute();
}
}));
+ moreMenu.addItem(new Item(constants.PromptToGlobal(), new BaseItemListenerAdapter() {
+ @Override
+ public void onClick(BaseItem baseItem, EventObject eventObject) {
+ promptCommand.execute();
+ }
+ }));
moreMenu.addItem(new Item(constants.Archive(), new BaseItemListenerAdapter() {
@Override
public void onClick(BaseItem baseItem, EventObject eventObject) {
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java 2010-02-07 21:22:37 UTC (rev 31481)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/RuleViewer.java 2010-02-08 07:09:32 UTC (rev 31482)
@@ -131,21 +131,19 @@
//the action widgets (checkin/close etc).
toolbar = new ActionToolbar( asset,
+ readOnly,
+ editor,
checkInCommand,
new ActionToolbar.CheckinAction() {
public void doCheckin(String comment) {
doArchive( comment );
}
-
},
-
new Command() {
public void execute() {
doDelete();
}
},
- readOnly,
- editor,
new Command() {
public void execute() {
close();
@@ -155,7 +153,12 @@
public void execute() {
doCopy();
}
- } );
+ },
+ new Command() {
+ public void execute() {
+ doPromptToGlobal();
+ }
+ });
//layout.add(toolbar, DockPanel.NORTH);
layout.add( toolbar );
@@ -460,4 +463,22 @@
editEvent.open( newAssetUUID );
}
}
+
+ private void doPromptToGlobal() {
+ if (Window.confirm(constants.PromptAreYouSure()) ) {
+ RepositoryServiceFactory.getService().promptAssetToGlobalArea(asset.uuid,
+ new GenericCallback<String>() {
+ public void onSuccess(String data) {
+ Window.alert(constants.Prompted());
+ }
+
+ @Override
+ public void onFailure(Throwable t) {
+ super.onFailure( t );
+ }
+ } );
+
+} ;
+
+ }
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2010-02-07 21:22:37 UTC (rev 31481)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java 2010-02-08 07:09:32 UTC (rev 31482)
@@ -183,6 +183,9 @@
public void changeAssetPackage(java.lang.String p0, java.lang.String p1, java.lang.String p2) {
getService().changeAssetPackage( p0, p1, p2);
}
+ public void promptAssetToGlobalArea(java.lang.String p0) {
+ getService().promptAssetToGlobalArea( p0);
+ }
public java.lang.String copyAsset(java.lang.String p0, java.lang.String p1, java.lang.String p2) {
return getService().copyAsset( p0, p1, p2);
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-02-07 21:22:37 UTC (rev 31481)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java 2010-02-08 07:09:32 UTC (rev 31482)
@@ -1257,9 +1257,22 @@
repository.moveRuleItemPackage( newPackage,
uuid,
comment );
+ }
+
+ @WebRemote
+ @Restrict("#{identity.loggedIn}")
+ public void promptAssetToGlobalArea(String uuid) {
+ if ( Contexts.isSessionContextActive() ) {
+ Identity.instance().checkPermission( new PackageNameType(RulesRepository.RULE_GLOBAL_AREA),
+ RoleTypes.PACKAGE_DEVELOPER );
+ }
+ log.info( "USER:" + getCurrentUserName() + " CHANGING PACKAGE OF asset: [" + uuid + "] to [ globalArea ]" );
+ repository.moveRuleItemPackage(RulesRepository.RULE_GLOBAL_AREA,
+ uuid,
+ "prompt asset to globalArea");
}
-
+
@WebRemote
@Restrict("#{identity.loggedIn}")
public String copyAsset(String assetUUID,
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RepositoryStartupService.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RepositoryStartupService.java 2010-02-07 21:22:37 UTC (rev 31481)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/repository/RepositoryStartupService.java 2010-02-08 07:09:32 UTC (rev 31482)
@@ -32,8 +32,8 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Startup;
-import org.apache.derby.iapi.services.i18n.MessageService;
+
/**
* This startup class manages the JCR repository, sets it up if necessary.
* @author Michael Neale
More information about the jboss-svn-commits
mailing list