modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 49 ++-------- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AbstractServerNodeDatasource.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java | 6 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java | 5 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java | 9 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java | 6 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java | 7 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ListServersUIBean.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java | 3 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java | 2 modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java | 5 - modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java | 5 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java | 13 +- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java | 8 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/ShutdownListener.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java | 3 21 files changed, 55 insertions(+), 94 deletions(-)
New commits: commit 764fb31756c961b5f5a31df71a8b04def6fce249 Author: Jirka Kremser jkremser@redhat.com Date: Wed Dec 19 23:47:56 2012 +0100
AuthZ for CloudManagerBean (adding Subject param to methods)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java index 3659082..addd59d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java @@ -64,9 +64,8 @@ public class ServerWithAgentCountDatasource extends ListGridField agentCountField = FIELD_AGENT_COUNT.getListGridField("75"); agentCountField.setHoverCustomizer(new HoverCustomizer() { public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { - return MSG.view_adminTopology_message_agentsCount(FIELD_AGENT_COUNT.propertyName()); - // "There are " + record.getAttributeAsInt(FIELD_AGENT_COUNT.propertyName()) - // + " agents registered to this server."; + return MSG.view_adminTopology_message_agentsCount(record.getAttributeAsString(FIELD_AGENT_COUNT + .propertyName())); } }); agentCountField.setShowHover(true); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java index dd63fa0..ab46527 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java @@ -77,7 +77,7 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud @Override public void deleteServers(int[] serverIds) throws RuntimeException { try { - cloudManager.deleteServers(ArrayUtils.toObject(serverIds)); + cloudManager.deleteServers(getSessionSubject(), ArrayUtils.toObject(serverIds)); } catch (Throwable t) { throw getExceptionToThrowToClient(t); } @@ -86,7 +86,7 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud @Override public void updateServerMode(int[] serverIds, OperationMode mode) throws RuntimeException { try { - cloudManager.updateServerMode(ArrayUtils.toObject(serverIds), mode); + cloudManager.updateServerMode(getSessionSubject(), ArrayUtils.toObject(serverIds), mode); } catch (Throwable t) { throw getExceptionToThrowToClient(t); } @@ -96,7 +96,8 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud public List<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc) throws RuntimeException { try { - return SerialUtility.prepare(cloudManager.getFailoverListDetailsByAgentId(agentId, pc), + return SerialUtility.prepare( + cloudManager.getFailoverListDetailsByAgentId(getSessionSubject(), agentId, pc), "CloudGWTServiceImpl.getFailoverListDetailsByAgentId"); } catch (Throwable t) { throw getExceptionToThrowToClient(t); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ListServersUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ListServersUIBean.java index 49dee0d..ef4b65a 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ListServersUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ListServersUIBean.java @@ -49,7 +49,7 @@ public class ListServersUIBean extends PagedDataTableUIBean {
if (ids.length > 0) { try { - cloudManager.deleteServers(ids); + cloudManager.deleteServers(subject, ids);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Removed [" + ids.length + "] servers from the cloud."); @@ -70,7 +70,7 @@ public class ListServersUIBean extends PagedDataTableUIBean {
if (ids.length > 0) { try { - cloudManager.updateServerMode(ids, mode); + cloudManager.updateServerMode(EnterpriseFacesContextUtility.getSubject(), ids, mode);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Set [" + ids.length + "] servers to mode " + mode); diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java index 90d7042..4ccba78 100644 --- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java +++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java @@ -81,7 +81,8 @@ public class ViewAgentUIBean extends PagedDataTableUIBean { @Override public PageList<FailoverListDetails> fetchPage(PageControl pc) { int agentId = getAgent().getId(); - PageList<FailoverListDetails> pageList = cloudManager.getFailoverListDetailsByAgentId(agentId, pc); + PageList<FailoverListDetails> pageList = cloudManager.getFailoverListDetailsByAgentId( + EnterpriseFacesContextUtility.getSubject(), agentId, pc);
return pageList; } diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java index a74550d..a33d77c 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java @@ -683,7 +683,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase { private void deleteServerIdentity() throws Exception { if (server != null) { cleanupAgent(); // can't remove the server before we purge the agent - LookupUtil.getCloudManager().deleteServer(server.getId()); + LookupUtil.getCloudManager().deleteServer(LookupUtil.getSubjectManager().getOverlord(), server.getId()); server = null; } } diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java index 26a6254..2494ece 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java @@ -95,8 +95,9 @@ public class FailoverListManagerBeanTest extends AbstractEJB3Test { try { for (Server server : servers) { // must set to down to allow for a delete - cloudManager.updateServerMode(new Integer[] { server.getId() }, Server.OperationMode.DOWN); - cloudManager.deleteServer(server.getId()); + cloudManager.updateServerMode(LookupUtil.getSubjectManager().getOverlord(), + new Integer[] { server.getId() }, Server.OperationMode.DOWN); + cloudManager.deleteServer(LookupUtil.getSubjectManager().getOverlord(), server.getId()); }
for (Agent agent : agents) { diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java index 0e25ee4..3857afc 100644 --- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java +++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java @@ -178,8 +178,9 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test { protected void afterMethod() throws Exception {
// cleanup our test server - LookupUtil.getCloudManager().updateServerMode(new Integer[] { server.getId() }, OperationMode.DOWN); - LookupUtil.getCloudManager().deleteServer(server.getId()); + LookupUtil.getCloudManager().updateServerMode(LookupUtil.getSubjectManager().getOverlord(), + new Integer[] { server.getId() }, OperationMode.DOWN); + LookupUtil.getCloudManager().deleteServer(LookupUtil.getSubjectManager().getOverlord(), server.getId());
// shutdown our mock mbean server unprepareCustomServerService(CoreServerMBean.OBJECT_NAME); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java index 455e375..37029b4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java @@ -87,9 +87,5 @@ public interface AffinityGroupManagerLocal { */ PageList<Agent> getAgentNonMembers(Subject subject, int affinityGroupId, PageControl pageControl);
- /** - * @deprecated portal war was using it (use finders <code>AgentManagerBean.findAgentsByCriteria()</code> and - * <code>CloudManagerBean.findServersByCriteria()</code> instead) - */ PageList<AffinityGroupCountComposite> getComposites(Subject subject, PageControl pageControl); } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java index d1ffb1b..2c775d4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java @@ -163,19 +163,19 @@ public class CloudManagerBean implements CloudManagerLocal {
@RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS), @RequiredPermission(Permission.MANAGE_INVENTORY) }) - public void deleteServers(Integer[] serverIds) throws CloudManagerException { + public void deleteServers(Subject subject, Integer[] serverIds) throws CloudManagerException { if (serverIds == null) { return; }
for (Integer nextServerId : serverIds) { - cloudManager.deleteServer(nextServerId); + cloudManager.deleteServer(subject, nextServerId); } }
@RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS), @RequiredPermission(Permission.MANAGE_INVENTORY) }) - public void deleteServer(Integer serverId) throws CloudManagerException { + public void deleteServer(Subject subject, Integer serverId) throws CloudManagerException { try { Server server = entityManager.find(Server.class, serverId);
@@ -214,7 +214,7 @@ public class CloudManagerBean implements CloudManagerLocal {
@RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS), @RequiredPermission(Permission.MANAGE_INVENTORY) }) - public void updateServerMode(Integer[] serverIds, Server.OperationMode mode) { + public void updateServerMode(Subject subject, Integer[] serverIds, Server.OperationMode mode) { if (serverIds == null) { return; } @@ -249,14 +249,15 @@ public class CloudManagerBean implements CloudManagerLocal { } }
- @RequiredPermission(Permission.MANAGE_INVENTORY) + @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS), + @RequiredPermission(Permission.MANAGE_INVENTORY) }) public Server updateServer(Subject subject, Server server) { return entityManager.merge(server); }
@RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS), @RequiredPermission(Permission.MANAGE_INVENTORY) }) - public PageList<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc) { + public PageList<FailoverListDetails> getFailoverListDetailsByAgentId(Subject subject, int agentId, PageControl pc) { pc.initDefaultOrderingField("fld.ordinal");
Query query = PersistenceUtility.createQueryWithOrderBy(entityManager, diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java index 595ca8f..8ba595a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java @@ -37,9 +37,9 @@ import org.rhq.core.domain.util.PageList; @Local public interface CloudManagerLocal {
- void deleteServers(Integer[] serverIds) throws CloudManagerException; + void deleteServers(Subject subject, Integer[] serverIds) throws CloudManagerException;
- void deleteServer(Integer serverId) throws CloudManagerException; + void deleteServer(Subject subject, Integer serverId) throws CloudManagerException;
List<Agent> getAgentsByServerName(String serverName);
@@ -83,11 +83,11 @@ public interface CloudManagerLocal { */ int getNormalServerCount();
- void updateServerMode(Integer[] serverIds, Server.OperationMode mode); + void updateServerMode(Subject subject, Integer[] serverIds, Server.OperationMode mode);
Server updateServer(Subject subject, Server server);
- PageList<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc); + PageList<FailoverListDetails> getFailoverListDetailsByAgentId(Subject subject, int agentId, PageControl pc);
void markStaleServersDown(Subject subject);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/ShutdownListener.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/ShutdownListener.java index 3490df6..0749543 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/ShutdownListener.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/ShutdownListener.java @@ -169,7 +169,7 @@ public class ShutdownListener { // Set the server operation mode to DOWN unless in MM Server server = serverManager.getServer(); if (Server.OperationMode.MAINTENANCE != server.getOperationMode()) { - cloudManager.updateServerMode(new Integer[] { server.getId() }, OperationMode.DOWN); + cloudManager.updateServerMode(LookupUtil.getSubjectManager().getOverlord(), new Integer[] { server.getId() }, OperationMode.DOWN); } } catch (Throwable t) { // only show ugly stack traces if the user runs the server in debug mode diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java index f7e0606..3240c1e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java @@ -258,7 +258,8 @@ public class StartupBean { log.info("Server is configured to start up in MAINTENANCE mode."); Server server = serverManager.getServer(); Integer[] serverId = new Integer[] { server.getId() }; - cloudManager.updateServerMode(serverId, OperationMode.MAINTENANCE); + cloudManager.updateServerMode(LookupUtil.getSubjectManager().getOverlord(), serverId, + OperationMode.MAINTENANCE); }
// Establish the current server mode for the server. This will move the server to NORMAL
commit 5a78346ff88d4b2694a68b6c519c01d52da12df6 Author: Jirka Kremser jkremser@redhat.com Date: Wed Dec 19 22:46:03 2012 +0100
Old JSF views are not accessible from UI anymore, instead the new GWT views are on their place (without the "GWT" suffix)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java index 6afe5e4..652299d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java @@ -144,69 +144,40 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView { ProductInfo productInfo = CoreGUI.get().getProductInfo(); boolean isRHQ = (productInfo != null) && "RHQ".equals(productInfo.getShortName());
- NavigationItem serversItem = new NavigationItem(PAGE_SERVERS_VIEW_ID, new ViewFactory() { - public Canvas createView() { - return new FullHTMLPane(extendLocatorId(PAGE_SERVERS_VIEW_ID.getName()), - "/rhq/ha/listServers-plain.xhtml?nomenu=true"); - } - }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY)); - - NavigationItem agentsItem = new NavigationItem(PAGE_AGENTS_VIEW_ID, new ViewFactory() { - public Canvas createView() { - return new FullHTMLPane(extendLocatorId(PAGE_AGENTS_VIEW_ID.getName()), - "/rhq/ha/listAgents-plain.xhtml?nomenu=true"); - } - }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY)); - - NavigationItem affinityGroupsItem = new NavigationItem(PAGE_AFFINITY_GROUPS_VIEW_ID, new ViewFactory() { - public Canvas createView() { - return new FullHTMLPane(extendLocatorId(PAGE_AFFINITY_GROUPS_VIEW_ID.getName()), - "/rhq/ha/listAffinityGroups-plain.xhtml?nomenu=true"); - } - }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY)); - - NavigationItem partitionEventsItem = new NavigationItem(PAGE_PARTITION_EVENTS_VIEW_ID, new ViewFactory() { - public Canvas createView() { - return new FullHTMLPane(extendLocatorId(PAGE_PARTITION_EVENTS_VIEW_ID.getName()), - "/rhq/ha/listPartitionEvents-plain.xhtml?nomenu=true"); - } - }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY)); - NavigationItem remoteAgentInstallItem = new NavigationItem(RemoteAgentInstallView.VIEW_ID, new ViewFactory() { public Canvas createView() { return new RemoteAgentInstallView(extendLocatorId("RemoteAgentInstall")); } - }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY)); + }, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
- NavigationItem serversItemGwt = new NavigationItem(ServerTableView.VIEW_ID, new ViewFactory() { + NavigationItem serversItem = new NavigationItem(ServerTableView.VIEW_ID, new ViewFactory() { public Canvas createView() { return new ServerTableView(extendLocatorId(ServerTableView.VIEW_ID.getName()), null, false); } - }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY)); + }, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
- NavigationItem agentsItemGwt = new NavigationItem(AgentTableView.VIEW_ID, new ViewFactory() { + NavigationItem agentsItem = new NavigationItem(AgentTableView.VIEW_ID, new ViewFactory() { public Canvas createView() { return new AgentTableView(extendLocatorId(AgentTableView.VIEW_ID.getName()), null, false); } - }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY)); + }, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
- NavigationItem affinityGroupsItemGwt = new NavigationItem(AffinityGroupTableView.VIEW_ID, new ViewFactory() { + NavigationItem affinityGroupsItem = new NavigationItem(AffinityGroupTableView.VIEW_ID, new ViewFactory() { public Canvas createView() { return new AffinityGroupTableView(extendLocatorId(AffinityGroupTableView.VIEW_ID.getName())); } - }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY)); + }, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
- NavigationItem partitionEventsGwt = new NavigationItem(PartitionEventTableView.VIEW_ID, new ViewFactory() { + NavigationItem partitionEventsItem = new NavigationItem(PartitionEventTableView.VIEW_ID, new ViewFactory() { public Canvas createView() { return new PartitionEventTableView(extendLocatorId(PartitionEventTableView.VIEW_ID.getName()), PartitionEventTableView.VIEW_ID.getTitle()); } - }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY)); + }, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
// Arrays.asList returns a list with a fixed size, therefore there is the wrapping ArrayList List<NavigationItem> navigationItems = new ArrayList<NavigationItem>(Arrays.asList(serversItem, agentsItem, - affinityGroupsItem, partitionEventsItem, serversItemGwt, agentsItemGwt, affinityGroupsItemGwt, - partitionEventsGwt)); + affinityGroupsItem, partitionEventsItem)); if (isRHQ) { navigationItems.add(remoteAgentInstallItem); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AbstractServerNodeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AbstractServerNodeDatasource.java index 528ab8e..ac4c736 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AbstractServerNodeDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AbstractServerNodeDatasource.java @@ -22,10 +22,14 @@ import java.util.List;
import com.smartgwt.client.widgets.grid.ListGridField;
+import org.rhq.core.domain.cloud.FailoverListDetails; +import org.rhq.core.domain.cloud.composite.ServerWithAgentCountComposite; import org.rhq.core.domain.criteria.BaseCriteria; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
/** + * Base class for all Server derivatives like {@link ServerWithAgentCountComposite} and {@link FailoverListDetails} + * * @author Jirka Kremser */ public abstract class AbstractServerNodeDatasource<T, C extends BaseCriteria> extends RPCDataSource<T, C> { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java index 6786a89..65efb7c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java @@ -60,9 +60,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton; public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCriteria> {
private final Integer affinityGroupId; - private static RPCDataSource<Agent, AgentCriteria> datasource = null; - private static final int MAX_AVAIL_AGENTS = 3000; private static Window modalWindow; private static boolean shouldBeClosed; @@ -104,7 +102,6 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr selector.reset(); }
- @Override public void onFailure(Throwable t) { CoreGUI.getErrorHandler().handleError( MSG.view_adminTopology_message_fetchAgentsFail(String.valueOf(affinityGroupId)), t); @@ -187,7 +184,6 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr shouldBeClosed = false; GWTServiceLookup.getCloudService().removeAgentsFromGroup( originallySelected.toArray(new Integer[originallySelected.size()]), new AsyncCallback<Void>() { - public void onSuccess(Void result) { closeAndRefresh(parrent, true); } @@ -203,7 +199,6 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr shouldBeClosed = false; GWTServiceLookup.getCloudService().addAgentsToGroup(selector.getAffinityGroupId(), actuallySelected.toArray(new Integer[actuallySelected.size()]), new AsyncCallback<Void>() { - public void onSuccess(Void result) { closeAndRefresh(parrent, true); } @@ -258,5 +253,4 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr public Integer getAffinityGroupId() { return affinityGroupId; } - } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java index fbd832e..8a8d81b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java @@ -199,7 +199,7 @@ public class AffinityGroupDetailView extends LocatableVLayout implements Bookmar footer.addMember(saveButton); form.setItems(nameItem); SectionStackSection section = new SectionStackSection(MSG.common_title_details()); - section.setExpanded(true); + section.setExpanded(false); section.setItems(form, footer);
detailsSection = section; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java index b21b2a6..fe4db20 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java @@ -63,9 +63,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton; public class AffinityGroupServersSelector extends AbstractSelector<Server, ServerCriteria> {
private final Integer affinityGroupId; - private static RPCDataSource<Server, ServerCriteria> datasource = null; - private static Window modalWindow; private static boolean shouldBeClosed; private static VLayout layout; @@ -93,7 +91,6 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve MSG.view_adminTopology_serverDetail_operationMode()); operationModeSelect.setValueMap(buildOperationModeOptions()); operationModeSelect.setValue("ALL"); - availableFilterForm.setItems(search, operationModeSelect); } return availableFilterForm; @@ -122,7 +119,6 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve selector.reset(); }
- @Override public void onFailure(Throwable t) { CoreGUI.getErrorHandler().handleError( MSG.view_adminTopology_message_fetchServersFail(String.valueOf(affinityGroupId)), t); @@ -279,5 +275,4 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve public Integer getAffinityGroupId() { return affinityGroupId; } - } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java index dbe8d0f..87afd6d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java @@ -65,8 +65,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton; */ public class AffinityGroupTableView extends TableSection<AffinityGroupWithCountsDatasource> implements HasViewName {
- public static final ViewName VIEW_ID = new ViewName("AffinityGroups(GWT)", MSG.view_adminTopology_affinityGroups() - + "(GWT)", IconEnum.ALL_GROUPS); + public static final ViewName VIEW_ID = new ViewName("AffinityGroups", MSG.view_adminTopology_affinityGroups(), + IconEnum.ALL_GROUPS);
public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/" + AdministrationView.SECTION_TOPOLOGY_VIEW_ID + "/" + VIEW_ID; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java index 8c47813..8f2a658 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java @@ -48,14 +48,12 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; */ public class AgentTableView extends TableSection<AgentDatasource> implements HasViewName {
- public static final ViewName VIEW_ID = new ViewName("Agents(GWT)", MSG.view_adminTopology_agents() + "(GWT)", - IconEnum.AGENT); + public static final ViewName VIEW_ID = new ViewName("Agents", MSG.view_adminTopology_agents(), IconEnum.AGENT);
public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/" + AdministrationView.SECTION_TOPOLOGY_VIEW_ID + "/" + VIEW_ID;
private final boolean isAffinityGroupId; - private final Integer id;
public AgentTableView(String locatorId, Integer id, boolean isAffinityGroupId) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java index 7fa9a7c..599b2c2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java @@ -58,8 +58,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; */ public class PartitionEventTableView extends TableSection<PartitionEventDatasource> implements HasViewName {
- public static final ViewName VIEW_ID = new ViewName("PartitionEvents(GWT)", - MSG.view_adminTopology_partitionEvents() + "(GWT)", IconEnum.EVENTS); + public static final ViewName VIEW_ID = new ViewName("PartitionEvents", MSG.view_adminTopology_partitionEvents(), + IconEnum.EVENTS);
public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/" + AdministrationView.SECTION_TOPOLOGY_VIEW_ID + "/" + VIEW_ID; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java index d38d95d..2374685 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java @@ -18,8 +18,8 @@ */ package org.rhq.enterprise.gui.coregui.client.admin.topology;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AFFINITY_GROUP; -import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AFFINITY_GROUP_ID; +import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_AFFINITY_GROUP; +import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_AFFINITY_GROUP_ID; import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_ORDINAL;
import java.io.Serializable; @@ -59,16 +59,13 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; public class ServerTableView extends TableSection<AbstractServerNodeDatasource<? extends Serializable, ? extends BaseCriteria>> implements HasViewName {
- public static final ViewName VIEW_ID = new ViewName("Servers(GWT)", MSG.view_adminTopology_servers() + "(GWT)", - IconEnum.SERVERS); + public static final ViewName VIEW_ID = new ViewName("Servers", MSG.view_adminTopology_servers(), IconEnum.SERVERS);
public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/" + AdministrationView.SECTION_TOPOLOGY_VIEW_ID + "/" + VIEW_ID;
private final boolean showActions; - private final boolean isAffinityGroupId; - private final Integer id;
public ServerTableView(String locatorId, Integer id, boolean isAffinityGroupId) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java index 1b6609b..3659082 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java @@ -44,6 +44,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; public class ServerWithAgentCountDatasource extends AbstractServerNodeDatasource<ServerWithAgentCountComposite, Criteria> {
+ // server datasource delegate private final ServerDatasource serverDatasource;
public ServerWithAgentCountDatasource() {
rhq-commits@lists.fedorahosted.org