[rhq] 6 commits - modules/enterprise

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 21 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java | 16 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertGWTService.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertTemplateGWTService.java | 9 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AuthorizationGWTService.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AvailabilityGWTService.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java | 49 ++++---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ClusterGWTService.java | 11 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java | 47 +++++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ContentGWTService.java | 8 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/DashboardGWTService.java | 11 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/EventGWTService.java | 15 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GroupAlertDefinitionGWTService.java | 11 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/LdapGWTService.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java | 52 +++++---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/OperationGWTService.java | 22 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RemoteInstallGWTService.java | 14 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RepoGWTService.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceBossGWTService.java | 7 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java | 37 +++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java | 33 +++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java | 10 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RoleGWTService.java | 14 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SearchGWTService.java | 13 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SubjectGWTService.java | 25 +--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/TagGWTService.java | 22 +-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 6 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 6 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/inventory/TestSearchBarView.java | 19 --- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java | 56 ++++------ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertGWTServiceImpl.java | 10 - modules/enterprise/gui/coregui/src/main/webapp/images/info/icn_info_blank.png |binary 38 files changed, 309 insertions(+), 279 deletions(-) New commits: commit 77e1b14f5f782fbd44e5a738d4581a26ec64513b Author: Joseph Marques <joseph(a)redhat.com&gt; Date: Thu Dec 23 12:59:58 2010 -0500 test out suppression of table header for those with search bars diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java index fcc5909..78fb5db 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java @@ -432,6 +432,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements } public void setFilterFormItems(FormItem... formItems) { + setShowHeader(false); this.filterForm.setItems(formItems); } commit 264e845a22ba36bdaa62f4d21f0237b15219dcaa Author: Joseph Marques <joseph(a)redhat.com&gt; Date: Thu Dec 23 12:52:26 2010 -0500 declare services to throw exceptions so they are properly gwt-serialized diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java index 05b813f..f79fa9d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java @@ -30,20 +30,20 @@ public interface AlertDefinitionGWTService extends RemoteService { PageList<AlertDefinition> findAlertDefinitionsByCriteria(AlertDefinitionCriteria criteria); - int createAlertDefinition(AlertDefinition alertDefinition, Integer resourceId) throws Exception; + int createAlertDefinition(AlertDefinition alertDefinition, Integer resourceId) throws RuntimeException; AlertDefinition updateAlertDefinition(int alertDefinitionId, AlertDefinition alertDefinition, - boolean updateInternals) throws Exception; + boolean updateInternals) throws RuntimeException; - int enableAlertDefinitions(int[] alertDefinitionIds) throws Exception; + int enableAlertDefinitions(int[] alertDefinitionIds) throws RuntimeException; - int disableAlertDefinitions(int[] alertDefinitionIds) throws Exception; + int disableAlertDefinitions(int[] alertDefinitionIds) throws RuntimeException; - int removeAlertDefinitions(int[] alertDefinitionIds) throws Exception; + int removeAlertDefinitions(int[] alertDefinitionIds) throws RuntimeException; - String[] getAlertNotificationConfigurationPreview(AlertNotification[] notifs) throws Exception; + String[] getAlertNotificationConfigurationPreview(AlertNotification[] notifs) throws RuntimeException; - String[] getAllAlertSenders() throws Exception; + String[] getAllAlertSenders() throws RuntimeException; - ConfigurationDefinition getConfigurationDefinitionForSender(String sender) throws Exception; + ConfigurationDefinition getConfigurationDefinitionForSender(String sender) throws RuntimeException; } \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertGWTService.java index a8fd51a..8cbd431 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertGWTService.java @@ -37,7 +37,7 @@ public interface AlertGWTService extends RemoteService { * * @return all alerts that match the specified criteria */ - PageList<Alert> findAlertsByCriteria(AlertCriteria criteria); + PageList<Alert> findAlertsByCriteria(AlertCriteria criteria) throws RuntimeException; /** * Delete the alerts with the specified ids if the current user has permission to do so (i.e. either @@ -50,7 +50,7 @@ public interface AlertGWTService extends RemoteService { * @param alertIds the ids of the alerts to be deleted * @return the number of alerts deleted */ - int deleteAlerts(int[] alertIds); + int deleteAlerts(int[] alertIds) throws RuntimeException; /** * Deletes all alerts for the given context if the current user has permission to do so (i.e., either @@ -62,7 +62,7 @@ public interface AlertGWTService extends RemoteService { * the user * @return the number of alerts deleted */ - int deleteAlertsByContext(EntityContext context); + int deleteAlertsByContext(EntityContext context) throws RuntimeException; /** * Acknowledges the alerts with the specified ids if the current user has permission to do so (i.e., either @@ -75,7 +75,7 @@ public interface AlertGWTService extends RemoteService { * @param alertIds the ids of the alerts to be acknowledged * @return the number of alerts acknowledged */ - int acknowledgeAlerts(int[] alertIds); + int acknowledgeAlerts(int[] alertIds) throws RuntimeException; /** * Acknowledges all alerts for the given context if the current user has permission to do so (i.e., either @@ -87,5 +87,5 @@ public interface AlertGWTService extends RemoteService { * the user * @return the number of alerts acknowledged */ - int acknowledgeAlertsByContext(EntityContext context); + int acknowledgeAlertsByContext(EntityContext context) throws RuntimeException; } \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertTemplateGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertTemplateGWTService.java index da8bf55..9f079cb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertTemplateGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertTemplateGWTService.java @@ -34,11 +34,12 @@ public interface AlertTemplateGWTService extends RemoteService { * @return the updated definition * @throws Exception */ - AlertDefinition updateAlertTemplate(AlertDefinition alertDefinition, boolean purgeInternals) throws Exception; + AlertDefinition updateAlertTemplate(AlertDefinition alertDefinition, boolean purgeInternals) + throws RuntimeException; - void enableAlertTemplates(Integer[] alertDefinitionIds) throws Exception; + void enableAlertTemplates(Integer[] alertDefinitionIds) throws RuntimeException; - void disableAlertTemplates(Integer[] alertDefinitionIds) throws Exception; + void disableAlertTemplates(Integer[] alertDefinitionIds) throws RuntimeException; - void removeAlertTemplates(Integer[] alertDefinitionIds) throws Exception; + void removeAlertTemplates(Integer[] alertDefinitionIds) throws RuntimeException; } \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AuthorizationGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AuthorizationGWTService.java index 13b5572..249a655 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AuthorizationGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AuthorizationGWTService.java @@ -36,7 +36,7 @@ public interface AuthorizationGWTService extends RemoteService { * * @return the set of permissions that the current user possesses for the specified {@link org.rhq.core.domain.resource.Resource} - never null */ - Set<Permission> getExplicitResourcePermissions(int resourceId); + Set<Permission> getExplicitResourcePermissions(int resourceId) throws RuntimeException; /** * Gets the set of permissions that the current user implicitly possesses for the specified {@link org.rhq.core.domain.resource.Resource}. @@ -45,7 +45,7 @@ public interface AuthorizationGWTService extends RemoteService { * * @return the set of permissions that the current user implicitly possesses for the specified {@link org.rhq.core.domain.resource.Resource} - never null */ - Set<Permission> getImplicitResourcePermissions(int resourceId); + Set<Permission> getImplicitResourcePermissions(int resourceId) throws RuntimeException; /** * Gets the set of permissions that the current user explicitly possesses for the specified {@link org.rhq.core.domain.resource.group.Group}. @@ -54,7 +54,7 @@ public interface AuthorizationGWTService extends RemoteService { * * @return the set of permissions that the current user explicitly possesses for the specified {@link org.rhq.core.domain.resource.group.Group} - never null */ - Set<Permission> getExplicitGroupPermissions(int groupId); + Set<Permission> getExplicitGroupPermissions(int groupId) throws RuntimeException; /** * Gets the set of permissions that the current user implicitly possesses for the specified {@link org.rhq.core.domain.resource.group.Group}. @@ -63,13 +63,13 @@ public interface AuthorizationGWTService extends RemoteService { * * @return the set of permissions that the current user implicitly possesses for the specified {@link org.rhq.core.domain.resource.group.Group} */ - Set<Permission> getImplicitGroupPermissions(int groupId); + Set<Permission> getImplicitGroupPermissions(int groupId) throws RuntimeException; /** * Gets the set of global permissions that the current user explicitly possesses. * * @return the set of global permissions that the current user possesses - never null */ - Set<Permission> getExplicitGlobalPermissions(); + Set<Permission> getExplicitGlobalPermissions() throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AvailabilityGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AvailabilityGWTService.java index fcb5a29..f657b9d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AvailabilityGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AvailabilityGWTService.java @@ -20,7 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.gwt; import com.google.gwt.user.client.rpc.RemoteService; -import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.measurement.Availability; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; @@ -30,7 +29,6 @@ import org.rhq.core.domain.util.PageList; */ public interface AvailabilityGWTService extends RemoteService { - - PageList<Availability> findAvailabilityForResource(int resourceId, PageControl pc); + PageList<Availability> findAvailabilityForResource(int resourceId, PageControl pc) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java index 0f58c44..4c7b209 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/BundleGWTService.java @@ -42,53 +42,58 @@ import org.rhq.core.domain.util.PageList; public interface BundleGWTService extends RemoteService { - BundleVersion createBundleVersion(int bundleId, String name, String version, String recipe) throws Exception; + BundleVersion createBundleVersion(int bundleId, String name, String version, String recipe) throws RuntimeException; - BundleVersion createBundleVersionViaURL(String url) throws Exception; + BundleVersion createBundleVersionViaURL(String url) throws RuntimeException; - BundleVersion createBundleVersionViaRecipe(String recipe) throws Exception; + BundleVersion createBundleVersionViaRecipe(String recipe) throws RuntimeException; BundleDeployment createBundleDeployment(int bundleVersionId, int bundleDestinationId, String description, Configuration configuration, boolean enforcePolicy, int enforcementInterval, boolean pinToBundle) - throws Exception; + throws RuntimeException; BundleDestination createBundleDestination(int bundleId, String name, String description, String deployDir, - int groupId) throws Exception; + int groupId) throws RuntimeException; - void deleteBundles(int[] bundleIds) throws Exception; + void deleteBundles(int[] bundleIds) throws RuntimeException; - void deleteBundle(int bundleId) throws Exception; + void deleteBundle(int bundleId) throws RuntimeException; - void deleteBundleDeployment(int bundleDeploymentId) throws Exception; + void deleteBundleDeployment(int bundleDeploymentId) throws RuntimeException; - void deleteBundleDestination(int bundleDestinationId) throws Exception; + void deleteBundleDestination(int bundleDestinationId) throws RuntimeException; - void deleteBundleVersion(int bundleVersionId, boolean deleteBundleIfEmpty) throws Exception; + void deleteBundleVersion(int bundleVersionId, boolean deleteBundleIfEmpty) throws RuntimeException; - PageList<Bundle> findBundlesByCriteria(BundleCriteria criteria) throws Exception; + PageList<Bundle> findBundlesByCriteria(BundleCriteria criteria) throws RuntimeException; - PageList<BundleDeployment> findBundleDeploymentsByCriteria(BundleDeploymentCriteria criteria); + PageList<BundleDeployment> findBundleDeploymentsByCriteria(BundleDeploymentCriteria criteria) + throws RuntimeException; - PageList<BundleDestination> findBundleDestinationsByCriteria(BundleDestinationCriteria criteria); + PageList<BundleDestination> findBundleDestinationsByCriteria(BundleDestinationCriteria criteria) + throws RuntimeException; - PageList<BundleFile> findBundleFilesByCriteria(BundleFileCriteria criteria); + PageList<BundleFile> findBundleFilesByCriteria(BundleFileCriteria criteria) throws RuntimeException; - PageList<BundleResourceDeployment> findBundleResourceDeploymentsByCriteria(BundleResourceDeploymentCriteria criteria); + PageList<BundleResourceDeployment> findBundleResourceDeploymentsByCriteria(BundleResourceDeploymentCriteria criteria) + throws RuntimeException; - PageList<BundleVersion> findBundleVersionsByCriteria(BundleVersionCriteria criteria) throws Exception; + PageList<BundleVersion> findBundleVersionsByCriteria(BundleVersionCriteria criteria) throws RuntimeException; PageList<BundleWithLatestVersionComposite> findBundlesWithLatestVersionCompositesByCriteria(BundleCriteria criteria) - throws Exception; + throws RuntimeException; - HashMap<String, Boolean> getAllBundleVersionFilenames(int bundleVersionId) throws Exception; + HashMap<String, Boolean> getAllBundleVersionFilenames(int bundleVersionId) throws RuntimeException; - ArrayList<BundleType> getAllBundleTypes() throws Exception; + ArrayList<BundleType> getAllBundleTypes() throws RuntimeException; - String getBundleDeploymentName(int bundleDestinationId, int bundleVersionId, int prevDeploymentId); + String getBundleDeploymentName(int bundleDestinationId, int bundleVersionId, int prevDeploymentId) + throws RuntimeException; - BundleDeployment scheduleBundleDeployment(int bundleDeploymentId, boolean isCleanDeployment) throws Exception; + BundleDeployment scheduleBundleDeployment(int bundleDeploymentId, boolean isCleanDeployment) + throws RuntimeException; BundleDeployment scheduleRevertBundleDeployment(int bundleDestinationId, String deploymentDescription, - boolean isCleanDeployment) throws Exception; + boolean isCleanDeployment) throws RuntimeException; } \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ClusterGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ClusterGWTService.java index 20d32d5..de16309 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ClusterGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ClusterGWTService.java @@ -36,7 +36,6 @@ import org.rhq.core.domain.resource.group.composite.ClusterFlyweight; */ public interface ClusterGWTService extends RemoteService { - /** * Given a cluster key create a backing group. * @param clusterKey @@ -44,7 +43,7 @@ public interface ClusterGWTService extends RemoteService { * Otherwise no resources will be assigned to the new group. * @throws IllegalArgumentException if a backing group exists for this clusterKey */ - ResourceGroup createAutoClusterBackingGroup(ClusterKey clusterKey, boolean addResources); + ResourceGroup createAutoClusterBackingGroup(ClusterKey clusterKey, boolean addResources) throws RuntimeException; /** * Return the backing group for the supplied cluster key. Resource membership will represent the resources @@ -52,17 +51,15 @@ public interface ClusterGWTService extends RemoteService { * @param clusterKey * @return The backing group, or null if the key does not have a backing group. */ - ResourceGroup getAutoClusterBackingGroup(ClusterKey clusterKey); + ResourceGroup getAutoClusterBackingGroup(ClusterKey clusterKey) throws RuntimeException; /** * Given a cluster key get the auto cluster resource membership. The membership is always determined * at call time, regardless of whether a backing group exists. To get the backing group, if it exists, * for a cluster key then call {@link #getAutoClusterBackingGroup(String)}. */ - List<Resource> getAutoClusterResources(ClusterKey clusterKey); - - - ClusterFlyweight getClusterTree(int groupId); + List<Resource> getAutoClusterResources(ClusterKey clusterKey) throws RuntimeException; + ClusterFlyweight getClusterTree(int groupId) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java index 5b8c09f..b0ca09b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java @@ -25,46 +25,55 @@ import org.rhq.core.domain.util.PageList; */ @RemoteServiceRelativePath("ConfigurationGWTService") public interface ConfigurationGWTService extends RemoteService { - Configuration getPluginConfiguration(int resourceId); + Configuration getPluginConfiguration(int resourceId) throws RuntimeException; - ConfigurationDefinition getPluginConfigurationDefinition(int resourceTypeId); + ConfigurationDefinition getPluginConfigurationDefinition(int resourceTypeId) throws RuntimeException; - Configuration getResourceConfiguration(int resourceId); + Configuration getResourceConfiguration(int resourceId) throws RuntimeException; - ConfigurationDefinition getResourceConfigurationDefinition(int resourceTypeId); + ConfigurationDefinition getResourceConfigurationDefinition(int resourceTypeId) throws RuntimeException; PageList<ResourceConfigurationUpdate> findResourceConfigurationUpdates(Integer resourceId, Long beginDate, - Long endDate, boolean suppressOldest, PageControl pc); + Long endDate, boolean suppressOldest, PageControl pc) throws RuntimeException; - ResourceConfigurationUpdate updateResourceConfiguration(int resourceId, Configuration configuration); + ResourceConfigurationUpdate updateResourceConfiguration(int resourceId, Configuration configuration) + throws RuntimeException; - PluginConfigurationUpdate updatePluginConfiguration(int resourceId, Configuration configuration); + PluginConfigurationUpdate updatePluginConfiguration(int resourceId, Configuration configuration) + throws RuntimeException; PageList<ResourceConfigurationUpdate> findResourceConfigurationUpdatesByCriteria( - ResourceConfigurationUpdateCriteria criteria); + ResourceConfigurationUpdateCriteria criteria) throws RuntimeException; PageList<PluginConfigurationUpdate> findPluginConfigurationUpdatesByCriteria( - PluginConfigurationUpdateCriteria criteria); + PluginConfigurationUpdateCriteria criteria) throws RuntimeException; PageList<GroupResourceConfigurationUpdate> findGroupResourceConfigurationUpdatesByCriteria( - GroupResourceConfigurationUpdateCriteria criteria); + GroupResourceConfigurationUpdateCriteria criteria) throws RuntimeException; PageList<GroupPluginConfigurationUpdate> findGroupPluginConfigurationUpdatesByCriteria( - GroupPluginConfigurationUpdateCriteria criteria); + GroupPluginConfigurationUpdateCriteria criteria) throws RuntimeException; - List<DisambiguationReport<ResourceConfigurationComposite>> findResourceConfigurationsForGroup(int groupId); + List<DisambiguationReport<ResourceConfigurationComposite>> findResourceConfigurationsForGroup(int groupId) + throws RuntimeException; - List<DisambiguationReport<ResourceConfigurationComposite>> findPluginConfigurationsForGroup(int groupId); + List<DisambiguationReport<ResourceConfigurationComposite>> findPluginConfigurationsForGroup(int groupId) + throws RuntimeException; - List<DisambiguationReport<ResourceConfigurationComposite>> findPluginConfigurationsForGroupUpdate(int groupUpdateId); + List<DisambiguationReport<ResourceConfigurationComposite>> findPluginConfigurationsForGroupUpdate(int groupUpdateId) + throws RuntimeException; - void updateResourceConfigurationsForGroup(int groupId, List<ResourceConfigurationComposite> resourceConfigurations); + void updateResourceConfigurationsForGroup(int groupId, List<ResourceConfigurationComposite> resourceConfigurations) + throws RuntimeException; - void updatePluginConfigurationsForGroup(int groupId, List<ResourceConfigurationComposite> pluginConfigurations); + void updatePluginConfigurationsForGroup(int groupId, List<ResourceConfigurationComposite> pluginConfigurations) + throws RuntimeException; - void deleteGroupPluginConfigurationUpdate(Integer groupId, Integer[] groupPluginConfigUpdateIds); + void deleteGroupPluginConfigurationUpdate(Integer groupId, Integer[] groupPluginConfigUpdateIds) + throws RuntimeException; - void deleteGroupResourceConfigurationUpdate(Integer groupId, Integer[] groupResourceConfigUpdateIds); + void deleteGroupResourceConfigurationUpdate(Integer groupId, Integer[] groupResourceConfigUpdateIds) + throws RuntimeException; - //RawConfiguration dummy(RawConfiguration config); + //RawConfiguration dummy(RawConfiguration config) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ContentGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ContentGWTService.java index 9ca5c51..a8da933 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ContentGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ContentGWTService.java @@ -37,11 +37,11 @@ import org.rhq.core.domain.util.PageList; */ public interface ContentGWTService extends RemoteService { - void deletePackageVersion(int packageVersionId); + void deletePackageVersion(int packageVersionId) throws RuntimeException; - PageList<PackageVersion> findPackageVersionsByCriteria(PackageVersionCriteria criteria); + PageList<PackageVersion> findPackageVersionsByCriteria(PackageVersionCriteria criteria) throws RuntimeException; - List<Architecture> getArchitectures(); + List<Architecture> getArchitectures() throws RuntimeException; - PackageType getResourceCreationPackageType(int resourceTypeId); + PackageType getResourceCreationPackageType(int resourceTypeId) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/DashboardGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/DashboardGWTService.java index da86756..f56b97a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/DashboardGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/DashboardGWTService.java @@ -26,7 +26,6 @@ import java.util.List; import com.google.gwt.user.client.rpc.RemoteService; -import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.dashboard.Dashboard; /** @@ -34,14 +33,12 @@ import org.rhq.core.domain.dashboard.Dashboard; */ public interface DashboardGWTService extends RemoteService { + List<Dashboard> findDashboardsForSubject() throws RuntimeException; - List<Dashboard> findDashboardsForSubject(); + List<Dashboard> findSharedDashboards() throws RuntimeException; - List<Dashboard> findSharedDashboards(); - - Dashboard storeDashboard(Dashboard dashboard); - - void removeDashboard(int dashboardId); + Dashboard storeDashboard(Dashboard dashboard) throws RuntimeException; + void removeDashboard(int dashboardId) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/EventGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/EventGWTService.java index 5846d8d..ebe1326 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/EventGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/EventGWTService.java @@ -39,18 +39,19 @@ import org.rhq.core.domain.util.PageList; */ public interface EventGWTService extends RemoteService { - EventSeverity[] getSeverityBuckets(int resourceId, long begin, long end, int numBuckets); + EventSeverity[] getSeverityBuckets(int resourceId, long begin, long end, int numBuckets) throws RuntimeException; EventSeverity[] getSeverityBucketsForAutoGroup(int parentResourceId, int resourceTypeId, long begin, long end, - int numBuckets); + int numBuckets) throws RuntimeException; - EventSeverity[] getSeverityBucketsForCompGroup(int resourceGroupId, long begin, long end, int numBuckets); + EventSeverity[] getSeverityBucketsForCompGroup(int resourceGroupId, long begin, long end, int numBuckets) + throws RuntimeException; - PageList<Event> findEventsByCriteria(EventCriteria criteria); + PageList<Event> findEventsByCriteria(EventCriteria criteria) throws RuntimeException; - PageList<EventComposite> findEventCompositesByCriteria(EventCriteria criteria); + PageList<EventComposite> findEventCompositesByCriteria(EventCriteria criteria) throws RuntimeException; - int deleteEventsForContext(EntityContext context, List<Integer> eventIds); + int deleteEventsForContext(EntityContext context, List<Integer> eventIds) throws RuntimeException; - int purgeEventsForContext(EntityContext context); + int purgeEventsForContext(EntityContext context) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GroupAlertDefinitionGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GroupAlertDefinitionGWTService.java index ff4299e..55e355d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GroupAlertDefinitionGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GroupAlertDefinitionGWTService.java @@ -24,7 +24,8 @@ import org.rhq.core.domain.alert.AlertDefinition; public interface GroupAlertDefinitionGWTService extends RemoteService { - int createGroupAlertDefinitions(AlertDefinition groupAlertDefinition, Integer resourceGroupId) throws Exception; + int createGroupAlertDefinitions(AlertDefinition groupAlertDefinition, Integer resourceGroupId) + throws RuntimeException; /** * Updates a group alert definition. @@ -35,11 +36,11 @@ public interface GroupAlertDefinitionGWTService extends RemoteService { * @throws Exception */ AlertDefinition updateGroupAlertDefinitions(AlertDefinition groupAlertDefinition, boolean purgeInternals) - throws Exception; + throws RuntimeException; - int enableGroupAlertDefinitions(Integer[] groupAlertDefinitionIds) throws Exception; + int enableGroupAlertDefinitions(Integer[] groupAlertDefinitionIds) throws RuntimeException; - int disableGroupAlertDefinitions(Integer[] groupAlertDefinitionIds) throws Exception; + int disableGroupAlertDefinitions(Integer[] groupAlertDefinitionIds) throws RuntimeException; - int removeGroupAlertDefinitions(Integer[] groupAlertDefinitionIds) throws Exception; + int removeGroupAlertDefinitions(Integer[] groupAlertDefinitionIds) throws RuntimeException; } \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/LdapGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/LdapGWTService.java index 673f3c7..8356773 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/LdapGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/LdapGWTService.java @@ -39,12 +39,12 @@ public interface LdapGWTService extends RemoteService { /** * @return Map with all LDAP groups available */ - Set<Map<String, String>> findAvailableGroups(); + Set<Map<String, String>> findAvailableGroups() throws RuntimeException; /** * @return Map with LDAP details for user passed. */ - Map<String, String> getLdapDetailsFor(String user); + Map<String, String> getLdapDetailsFor(String user) throws RuntimeException; /** In setting the LDAP groups for this role, all previous group * assignments for this role are removed before most up to date @@ -53,19 +53,19 @@ public interface LdapGWTService extends RemoteService { * @param roleId * @param groupIds */ - void setLdapGroupsForRole(int roleId, List<String> groupIds); + void setLdapGroupsForRole(int roleId, List<String> groupIds) throws RuntimeException; /** Finds ldap groups already assigned to this role. * * @param currentRoleId * @return */ - PageList<LdapGroup> findLdapGroupsAssignedToRole(int currentRoleId); + PageList<LdapGroup> findLdapGroupsAssignedToRole(int currentRoleId) throws RuntimeException; /** Boolean response about whether ldap configured.. * * @return */ - Boolean checkLdapConfiguredStatus(); + Boolean checkLdapConfiguredStatus() throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java index 4c145b7..0ecd8a4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java @@ -24,7 +24,6 @@ import java.util.Set; import com.google.gwt.user.client.rpc.RemoteService; import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; -import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.criteria.MeasurementDataTraitCriteria; import org.rhq.core.domain.criteria.MeasurementDefinitionCriteria; @@ -47,46 +46,55 @@ import org.rhq.core.domain.util.PageList; @RemoteServiceRelativePath("MeasurementDataGWTService") public interface MeasurementDataGWTService extends RemoteService { - List<MeasurementDataTrait> findCurrentTraitsForResource(int resourceId, DisplayType displayType); + List<MeasurementDataTrait> findCurrentTraitsForResource(int resourceId, DisplayType displayType) + throws RuntimeException; - Set<MeasurementData> findLiveData(int resourceId, int[] definitionIds); + Set<MeasurementData> findLiveData(int resourceId, int[] definitionIds) throws RuntimeException; List<List<MeasurementDataNumericHighLowComposite>> findDataForResource(int resourceId, int[] definitionIds, - long beginTime, long endTime, int numPoints); + long beginTime, long endTime, int numPoints) throws RuntimeException; PageList<CallTimeDataComposite> findCallTimeDataForResource(int scheduleId, long start, long end, - PageControl pageControl); + PageControl pageControl) throws RuntimeException; - PageList<MeasurementDefinition> findMeasurementDefinitionsByCriteria(MeasurementDefinitionCriteria criteria); + PageList<MeasurementDefinition> findMeasurementDefinitionsByCriteria(MeasurementDefinitionCriteria criteria) + throws RuntimeException; - PageList<MeasurementSchedule> findMeasurementSchedulesByCriteria(MeasurementScheduleCriteria criteria); + PageList<MeasurementSchedule> findMeasurementSchedulesByCriteria(MeasurementScheduleCriteria criteria) + throws RuntimeException; - PageList<MeasurementScheduleComposite> getMeasurementScheduleCompositesByContext(EntityContext context); + PageList<MeasurementScheduleComposite> getMeasurementScheduleCompositesByContext(EntityContext context) + throws RuntimeException; - PageList<MeasurementOOBComposite> getSchedulesWithOOBs(String metricNameFilter, - String resourceNameFilter, String parentNameFilter, PageControl pc); + PageList<MeasurementOOBComposite> getSchedulesWithOOBs(String metricNameFilter, String resourceNameFilter, + String parentNameFilter, PageControl pc) throws RuntimeException; - PageList<MeasurementOOBComposite> getHighestNOOBsForResource(int resourceId, int n); + PageList<MeasurementOOBComposite> getHighestNOOBsForResource(int resourceId, int n) throws RuntimeException; - void enableSchedulesForResource(int resourceId, int[] measurementDefinitionIds); + void enableSchedulesForResource(int resourceId, int[] measurementDefinitionIds) throws RuntimeException; - void disableSchedulesForResource(int resourceId, int[] measurementDefinitionIds); + void disableSchedulesForResource(int resourceId, int[] measurementDefinitionIds) throws RuntimeException; - void updateSchedulesForResource(int resourceId, int[] measurementDefinitionIds, long collectionInterval); + void updateSchedulesForResource(int resourceId, int[] measurementDefinitionIds, long collectionInterval) + throws RuntimeException; - void enableSchedulesForCompatibleGroup(int resourceGroupId, int[] measurementDefinitionIds); + void enableSchedulesForCompatibleGroup(int resourceGroupId, int[] measurementDefinitionIds) throws RuntimeException; - void disableSchedulesForCompatibleGroup(int resourceGroupId, int[] measurementDefinitionIds); + void disableSchedulesForCompatibleGroup(int resourceGroupId, int[] measurementDefinitionIds) + throws RuntimeException; - void updateSchedulesForCompatibleGroup(int resourceGroupId, int[] measurementDefinitionIds, long collectionInterval); + void updateSchedulesForCompatibleGroup(int resourceGroupId, int[] measurementDefinitionIds, long collectionInterval) + throws RuntimeException; - void enableSchedulesForResourceType(int[] measurementDefinitionIds, boolean updateExistingSchedules); + void enableSchedulesForResourceType(int[] measurementDefinitionIds, boolean updateExistingSchedules) + throws RuntimeException; - void disableSchedulesForResourceType(int[] measurementDefinitionIds, boolean updateExistingSchedules); + void disableSchedulesForResourceType(int[] measurementDefinitionIds, boolean updateExistingSchedules) + throws RuntimeException; void updateSchedulesForResourceType(int[] measurementDefinitionIds, long collectionInterval, - boolean updateExistingSchedules); + boolean updateExistingSchedules) throws RuntimeException; + + PageList<MeasurementDataTrait> findTraitsByCriteria(MeasurementDataTraitCriteria criteria) throws RuntimeException; - PageList<MeasurementDataTrait> findTraitsByCriteria(MeasurementDataTraitCriteria criteria); - } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/OperationGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/OperationGWTService.java index badd227..dd52adc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/OperationGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/OperationGWTService.java @@ -33,7 +33,6 @@ import org.rhq.core.domain.operation.composite.ResourceOperationLastCompletedCom import org.rhq.core.domain.operation.composite.ResourceOperationScheduleComposite; import org.rhq.core.domain.resource.composite.DisambiguationReport; import org.rhq.core.domain.util.PageList; -import org.rhq.core.util.exception.ThrowableUtil; /** * @author Greg Hinkle @@ -41,22 +40,25 @@ import org.rhq.core.util.exception.ThrowableUtil; public interface OperationGWTService extends RemoteService { PageList<ResourceOperationHistory> findResourceOperationHistoriesByCriteria( - ResourceOperationHistoryCriteria criteria); + ResourceOperationHistoryCriteria criteria) throws RuntimeException; - PageList<GroupOperationHistory> findGroupOperationHistoriesByCriteria(GroupOperationHistoryCriteria criteria); + PageList<GroupOperationHistory> findGroupOperationHistoriesByCriteria(GroupOperationHistoryCriteria criteria) + throws RuntimeException; - List<DisambiguationReport<ResourceOperationLastCompletedComposite>> findRecentCompletedOperations(int pageSize); + List<DisambiguationReport<ResourceOperationLastCompletedComposite>> findRecentCompletedOperations(int pageSize) + throws RuntimeException; - List<DisambiguationReport<ResourceOperationScheduleComposite>> findScheduledOperations(int pageSize); + List<DisambiguationReport<ResourceOperationScheduleComposite>> findScheduledOperations(int pageSize) + throws RuntimeException; - void invokeResourceOperation(int resourceId, String operationName, Configuration parameters, - String description, int timeout) throws RuntimeException; + void invokeResourceOperation(int resourceId, String operationName, Configuration parameters, String description, + int timeout) throws RuntimeException; - void scheduleResourceOperation(int resourceId, String operationName, Configuration parameters, - String description, int timeout, String cronString) throws RuntimeException; + void scheduleResourceOperation(int resourceId, String operationName, Configuration parameters, String description, + int timeout, String cronString) throws RuntimeException; List<ResourceOperationSchedule> findScheduledResourceOperations(int resourceId) throws RuntimeException; List<GroupOperationSchedule> findScheduledGroupOperations(int groupId) throws RuntimeException; - + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RemoteInstallGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RemoteInstallGWTService.java index bd76bf9..6cd207b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RemoteInstallGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RemoteInstallGWTService.java @@ -36,17 +36,17 @@ import org.rhq.core.domain.install.remote.RemoteAccessInfo; public interface RemoteInstallGWTService extends RemoteService { // --- RemoteInstallManagerRemote - boolean agentInstallCheck(RemoteAccessInfo remoteAccessInfo, String agentInstallPath); + boolean agentInstallCheck(RemoteAccessInfo remoteAccessInfo, String agentInstallPath) throws RuntimeException; - AgentInstallInfo installAgent(RemoteAccessInfo remoteAccessInfo, String parentPath); + AgentInstallInfo installAgent(RemoteAccessInfo remoteAccessInfo, String parentPath) throws RuntimeException; - String startAgent(RemoteAccessInfo remoteAccessInfo, String agentInstallPath); + String startAgent(RemoteAccessInfo remoteAccessInfo, String agentInstallPath) throws RuntimeException; - String stopAgent(RemoteAccessInfo remoteAccessInfo, String agentInstallPath); + String stopAgent(RemoteAccessInfo remoteAccessInfo, String agentInstallPath) throws RuntimeException; - String agentStatus(RemoteAccessInfo remoteAccessInfo, String agentInstallPath); + String agentStatus(RemoteAccessInfo remoteAccessInfo, String agentInstallPath) throws RuntimeException; - String findAgentInstallPath(RemoteAccessInfo remoteAccessInfo, String parentPath); + String findAgentInstallPath(RemoteAccessInfo remoteAccessInfo, String parentPath) throws RuntimeException; - String[] remotePathDiscover(RemoteAccessInfo remoteAccessInfo, String parentPath); + String[] remotePathDiscover(RemoteAccessInfo remoteAccessInfo, String parentPath) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RepoGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RepoGWTService.java index b8a0a6e..1f52491 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RepoGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RepoGWTService.java @@ -33,6 +33,6 @@ import org.rhq.core.domain.util.PageList; */ public interface RepoGWTService extends RemoteService { - PageList<Repo> findReposByCriteria(RepoCriteria criteria) throws Exception; + PageList<Repo> findReposByCriteria(RepoCriteria criteria) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceBossGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceBossGWTService.java index a114335..30531ad 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceBossGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceBossGWTService.java @@ -24,6 +24,7 @@ package org.rhq.enterprise.gui.coregui.client.gwt; import com.google.gwt.user.client.rpc.RemoteService; + import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.resource.InventorySummary; @@ -31,9 +32,9 @@ import org.rhq.core.domain.resource.InventorySummary; * @author John Sanda */ public interface ResourceBossGWTService extends RemoteService { - - InventorySummary getInventorySummaryForLoggedInUser(); - InventorySummary getInventorySummary(Subject user); + InventorySummary getInventorySummaryForLoggedInUser() throws RuntimeException; + + InventorySummary getInventorySummary(Subject user) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java index f0daa9d..68e5342 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java @@ -44,39 +44,42 @@ import org.rhq.core.domain.util.PageList; public interface ResourceGWTService extends RemoteService { void createResource(int parentResourceId, int newResourceTypeId, String newResourceName, - Configuration newResourceConfiguration); + Configuration newResourceConfiguration) throws RuntimeException; void createResource(int parentResourceId, int newResourceTypeId, String newResourceName, - Configuration deploymentTimeConfiguration, int packageVersionId); + Configuration deploymentTimeConfiguration, int packageVersionId) throws RuntimeException; - List<DeleteResourceHistory> deleteResources(int[] resourceIds); + List<DeleteResourceHistory> deleteResources(int[] resourceIds) throws RuntimeException; - List<RecentlyAddedResourceComposite> findRecentlyAddedResources(long ctime, int maxItems); + List<RecentlyAddedResourceComposite> findRecentlyAddedResources(long ctime, int maxItems) throws RuntimeException; - PageList<Resource> findResourcesByCriteria(ResourceCriteria criteria); + PageList<Resource> findResourcesByCriteria(ResourceCriteria criteria) throws RuntimeException; - PageList<ResourceComposite> findResourceCompositesByCriteria(ResourceCriteria criteria); + PageList<ResourceComposite> findResourceCompositesByCriteria(ResourceCriteria criteria) throws RuntimeException; - List<ResourceError> findResourceErrors(int resourceId); + List<ResourceError> findResourceErrors(int resourceId) throws RuntimeException; - List<DisambiguationReport<ProblemResourceComposite>> findProblemResources(long ctime, int maxItems); + List<DisambiguationReport<ProblemResourceComposite>> findProblemResources(long ctime, int maxItems) + throws RuntimeException; - Resource getPlatformForResource(int resourceId); + Resource getPlatformForResource(int resourceId) throws RuntimeException; - Map<Resource, List<Resource>> getQueuedPlatformsAndServers(HashSet<InventoryStatus> statuses, PageControl pc); + Map<Resource, List<Resource>> getQueuedPlatformsAndServers(HashSet<InventoryStatus> statuses, PageControl pc) + throws RuntimeException; - List<ResourceLineageComposite> getResourceLineageAndSiblings(int resourceId); + List<ResourceLineageComposite> getResourceLineageAndSiblings(int resourceId) throws RuntimeException; - void ignoreResources(int[] resourceIds); + void ignoreResources(int[] resourceIds) throws RuntimeException; - void importResources(int[] resourceIds); + void importResources(int[] resourceIds) throws RuntimeException; - Resource manuallyAddResource(int resourceTypeId, int parentResourceId, Configuration pluginConfiguration); + Resource manuallyAddResource(int resourceTypeId, int parentResourceId, Configuration pluginConfiguration) + throws RuntimeException; - void updateResource(Resource resource); + void updateResource(Resource resource) throws RuntimeException; - void unignoreResources(int[] resourceIds); + void unignoreResources(int[] resourceIds) throws RuntimeException; - List<Integer> uninventoryResources(int[] resourceIds); + List<Integer> uninventoryResources(int[] resourceIds) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java index 17c0f6c..bd196fc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGroupGWTService.java @@ -35,7 +35,7 @@ import org.rhq.core.domain.util.PageList; @RemoteServiceRelativePath("ResourceGroupGWTService") public interface ResourceGroupGWTService extends RemoteService { - GroupDefinition createGroupDefinition(GroupDefinition groupDefinition); + GroupDefinition createGroupDefinition(GroupDefinition groupDefinition) throws RuntimeException; /** * The owner will be set to the session subject. @@ -43,31 +43,34 @@ public interface ResourceGroupGWTService extends RemoteService { * @param resourceIds initial members * @return */ - ResourceGroup createPrivateResourceGroup(ResourceGroup group, int[] resourceIds); + ResourceGroup createPrivateResourceGroup(ResourceGroup group, int[] resourceIds) throws RuntimeException; - ResourceGroup createResourceGroup(ResourceGroup group, int[] resourceIds); + ResourceGroup createResourceGroup(ResourceGroup group, int[] resourceIds) throws RuntimeException; - void deleteGroupDefinitions(int[] groupDefinitionIds); + void deleteGroupDefinitions(int[] groupDefinitionIds) throws RuntimeException; - void deleteResourceGroups(int[] groupIds); + void deleteResourceGroups(int[] groupIds) throws RuntimeException; - PageList<GroupDefinition> findGroupDefinitionsByCriteria(ResourceGroupDefinitionCriteria criteria); + PageList<GroupDefinition> findGroupDefinitionsByCriteria(ResourceGroupDefinitionCriteria criteria) + throws RuntimeException; - PageList<ResourceGroup> findResourceGroupsByCriteria(ResourceGroupCriteria criteria); + PageList<ResourceGroup> findResourceGroupsByCriteria(ResourceGroupCriteria criteria) throws RuntimeException; - PageList<ResourceGroupComposite> findResourceGroupCompositesByCriteria(ResourceGroupCriteria criteria); + PageList<ResourceGroupComposite> findResourceGroupCompositesByCriteria(ResourceGroupCriteria criteria) + throws RuntimeException; - void setAssignedResourceGroupsForResource(int resourceId, int[] resourceGroupIds, boolean setType); + void setAssignedResourceGroupsForResource(int resourceId, int[] resourceGroupIds, boolean setType) + throws RuntimeException; - void setAssignedResources(int groupId, int[] resourceIds, boolean setType); + void setAssignedResources(int groupId, int[] resourceIds, boolean setType) throws RuntimeException; - void recalculateGroupDefinitions(int[] groupDefinitionIds); + void recalculateGroupDefinitions(int[] groupDefinitionIds) throws RuntimeException; - void updateGroupDefinition(GroupDefinition groupDefinition); + void updateGroupDefinition(GroupDefinition groupDefinition) throws RuntimeException; - void updateResourceGroup(ResourceGroup group); + void updateResourceGroup(ResourceGroup group) throws RuntimeException; - void updateResourceGroup(ResourceGroup group, boolean updateMembership); + void updateResourceGroup(ResourceGroup group, boolean updateMembership) throws RuntimeException; - void setRecursive(int groupId, boolean isRecursive) throws Exception; + void setRecursive(int groupId, boolean isRecursive) throws RuntimeException; } \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java index 9d4e471..87a6dec 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceTypeGWTService.java @@ -15,13 +15,13 @@ import org.rhq.core.domain.util.PageList; @RemoteServiceRelativePath("ResourceTypeGWTService") public interface ResourceTypeGWTService extends RemoteService { - PageList<ResourceType> findResourceTypesByCriteria(ResourceTypeCriteria criteria); + PageList<ResourceType> findResourceTypesByCriteria(ResourceTypeCriteria criteria) throws RuntimeException; - ArrayList<ResourceType> getResourceTypesForResourceAncestors(int resourceId); + ArrayList<ResourceType> getResourceTypesForResourceAncestors(int resourceId) throws RuntimeException; - ArrayList<ResourceType> getAllResourceTypeAncestors(int resourceTypeId); + ArrayList<ResourceType> getAllResourceTypeAncestors(int resourceTypeId) throws RuntimeException; - HashMap<Integer, String> getResourceTypeDescendantsWithOperations(int resourceTypeId); + HashMap<Integer, String> getResourceTypeDescendantsWithOperations(int resourceTypeId) throws RuntimeException; - Map<Integer, ResourceTypeTemplateCountComposite> getTemplateCountCompositeMap(); + Map<Integer, ResourceTypeTemplateCountComposite> getTemplateCountCompositeMap() throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RoleGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RoleGWTService.java index 1502c16..c2fdcc4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RoleGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/RoleGWTService.java @@ -29,17 +29,17 @@ import org.rhq.core.domain.util.PageList; */ public interface RoleGWTService extends RemoteService { - PageList<Role> findRolesByCriteria(RoleCriteria criteria); + PageList<Role> findRolesByCriteria(RoleCriteria criteria) throws RuntimeException; - Role createRole(Role role); + Role createRole(Role role) throws RuntimeException; - Role updateRole(Role role); + Role updateRole(Role role) throws RuntimeException; - void removeRoles(int[] roleIds); + void removeRoles(int[] roleIds) throws RuntimeException; - void setAssignedResourceGroups(int roleId, int[] resourceGroupIds); + void setAssignedResourceGroups(int roleId, int[] resourceGroupIds) throws RuntimeException; - void setAssignedSubjects(int roleId, int[] subjectIds); + void setAssignedSubjects(int roleId, int[] subjectIds) throws RuntimeException; - void setAssignedRolesForSubject(int subjectId, int[] roleIds); + void setAssignedRolesForSubject(int subjectId, int[] roleIds) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SearchGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SearchGWTService.java index 00b1d73..5ea5641 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SearchGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SearchGWTService.java @@ -36,18 +36,19 @@ public interface SearchGWTService extends RemoteService { * search suggestions */ List<SearchSuggestion> getTabAwareSuggestions(SearchSubsystem searchSubsystem, String expression, - int caretPosition, String tab); + int caretPosition, String tab) throws RuntimeException; - List<SearchSuggestion> getSuggestions(SearchSubsystem searchSubsystem, String expression, int caretPosition); + List<SearchSuggestion> getSuggestions(SearchSubsystem searchSubsystem, String expression, int caretPosition) + throws RuntimeException; /* * saved searches */ - int createSavedSearch(SavedSearch savedSearch); + int createSavedSearch(SavedSearch savedSearch) throws RuntimeException; - void updateSavedSearch(SavedSearch savedSearch); + void updateSavedSearch(SavedSearch savedSearch) throws RuntimeException; - void deleteSavedSearch(int savedSearchId); + void deleteSavedSearch(int savedSearchId) throws RuntimeException; - List<SavedSearch> findSavedSearchesByCriteria(SavedSearchCriteria criteria); + List<SavedSearch> findSavedSearchesByCriteria(SavedSearchCriteria criteria) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SubjectGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SubjectGWTService.java index 67fd05a..a09cdc1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SubjectGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SubjectGWTService.java @@ -18,15 +18,12 @@ */ package org.rhq.enterprise.gui.coregui.client.gwt; -import javax.persistence.EntityExistsException; - import com.google.gwt.user.client.rpc.RemoteService; import org.rhq.core.domain.auth.Principal; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.SubjectCriteria; import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.server.auth.SubjectException; /** * @see org.rhq.enterprise.server.auth.SubjectManagerLocal @@ -41,7 +38,7 @@ public interface SubjectGWTService extends RemoteService { * @param password The password part ofthe principal * @throws Exception if the principal could not be added */ - void createPrincipal(String username, String password); + void createPrincipal(String username, String password) throws RuntimeException; /** * Create a a new subject. This <b>ignores</b> the roles in <code>subject</code>. The created subject will not be @@ -50,7 +47,7 @@ public interface SubjectGWTService extends RemoteService { * @param subjectToCreate The subject to be created. * @return the newly persisted {@link Subject} */ - Subject createSubject(Subject subjectToCreate); + Subject createSubject(Subject subjectToCreate) throws RuntimeException; /** * Creates a new subject, including their assigned roles, as well as an associated principal with the specified @@ -61,7 +58,7 @@ public interface SubjectGWTService extends RemoteService { * * @return the persisted subject */ - Subject createSubject(Subject subjectToCreate, String password) throws Exception; + Subject createSubject(Subject subjectToCreate, String password) throws RuntimeException; /** * Deletes the given set of users, including both the {@link Subject} and {@link org.rhq.core.domain.auth.Principal} objects associated with @@ -70,7 +67,7 @@ public interface SubjectGWTService extends RemoteService { * @param subjectIds identifies the subject IDs for all the users that are to be deleted * @throws Exception if failed to delete one or more users */ - void deleteSubjects(int[] subjectIds); + void deleteSubjects(int[] subjectIds) throws RuntimeException; /** * Logs a user into the system. This will authenticate the given user with the given password. If the user was @@ -82,14 +79,14 @@ public interface SubjectGWTService extends RemoteService { * @throws org.rhq.enterprise.server.exception.LoginException * if the login failed for some reason */ - Subject login(String username, String password); + Subject login(String username, String password) throws RuntimeException; /** * Logs out a user. * * @param subject The username for the current user */ - void logout(Subject subject); + void logout(Subject subject) throws RuntimeException; /** * Updates an existing subject with new data. This does <b>not</b> cascade any changes to the roles, but it will save @@ -99,7 +96,7 @@ public interface SubjectGWTService extends RemoteService { * * @return the merged subject, which may or may not be the same instance of <code>subjectToModify</code> */ - Subject updateSubject(Subject subjectToModify); + Subject updateSubject(Subject subjectToModify) throws RuntimeException; /** * Updates an existing subject with new data. This cascades changes to roles and LDAP roles, so the passed-in @@ -110,7 +107,7 @@ public interface SubjectGWTService extends RemoteService { * * @return the merged subject, which may or may not be the same instance of <code>subjectToModify</code> */ - Subject updateSubject(Subject subjectToModify, String newPassword); + Subject updateSubject(Subject subjectToModify, String newPassword) throws RuntimeException; /** * Queries subjects using current logged in user. @@ -118,7 +115,7 @@ public interface SubjectGWTService extends RemoteService { * @param criteria details for the search * @return PageList<Subject> matching criteria. */ - PageList<Subject> findSubjectsByCriteria(SubjectCriteria criteria); + PageList<Subject> findSubjectsByCriteria(SubjectCriteria criteria) throws RuntimeException; /** * Checks the subject passed in for LDAP processing, to optionally: @@ -129,7 +126,7 @@ public interface SubjectGWTService extends RemoteService { * @param subjectToModify the subject * @param password the LDAP password */ - Subject processSubjectForLdap(Subject subjectToModify, String password); + Subject processSubjectForLdap(Subject subjectToModify, String password) throws RuntimeException; /** * Checks that the user exists <b>and</b> has a {@link Principal} associated with it. This means that the user both @@ -140,5 +137,5 @@ public interface SubjectGWTService extends RemoteService { * * @return <code>true</code> if the user exists and has a {@link Principal}, <code>false</code> otherwise */ - boolean isUserWithPrincipal(String username); + boolean isUserWithPrincipal(String username) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java index 03fb121..1da3e7f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java @@ -26,5 +26,5 @@ import org.rhq.core.domain.common.ProductInfo; * @author Ian Springer */ public interface SystemGWTService extends RemoteService { - ProductInfo getProductInfo(); + ProductInfo getProductInfo() throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/TagGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/TagGWTService.java index 849fbc6..2abfd4a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/TagGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/TagGWTService.java @@ -26,7 +26,6 @@ import java.util.Set; import com.google.gwt.user.client.rpc.RemoteService; -import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.criteria.TagCriteria; import org.rhq.core.domain.tagging.Tag; import org.rhq.core.domain.tagging.compsite.TagReportComposite; @@ -37,24 +36,23 @@ import org.rhq.core.domain.util.PageList; */ public interface TagGWTService extends RemoteService { + PageList<Tag> findTagsByCriteria(TagCriteria tagCriteria) throws RuntimeException; - PageList<Tag> findTagsByCriteria(TagCriteria tagCriteria); + Set<Tag> addTags(Set<Tag> tags) throws RuntimeException; - Set<Tag> addTags(Set<Tag> tags); + void removeTags(Set<Tag> tags) throws RuntimeException; - void removeTags(Set<Tag> tags); + void updateResourceTags(int resourceId, Set<Tag> tags) throws RuntimeException; - void updateResourceTags(int resourceId, Set<Tag> tags); + void updateResourceGroupTags(int resourceGroupId, Set<Tag> tags) throws RuntimeException; - void updateResourceGroupTags(int resourceGroupId, Set<Tag> tags); + void updateBundleTags(int bundleId, Set<Tag> tags) throws RuntimeException; - void updateBundleTags(int bundleId, Set<Tag> tags); + void updateBundleVersionTags(int bundleVersionId, Set<Tag> tags) throws RuntimeException; - void updateBundleVersionTags(int bundleVersionId, Set<Tag> tags); + void updateBundleDeploymentTags(int bundleDeploymentId, Set<Tag> tags) throws RuntimeException; - void updateBundleDeploymentTags(int bundleDeploymentId, Set<Tag> tags); + void updateBundleDestinationTags(int bundleDestinationId, Set<Tag> tags) throws RuntimeException; - void updateBundleDestinationTags(int bundleDestinationId, Set<Tag> tags); - - PageList<TagReportComposite> findTagReportCompositesByCriteria(TagCriteria tagCriteria); + PageList<TagReportComposite> findTagReportCompositesByCriteria(TagCriteria tagCriteria) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertGWTServiceImpl.java index 3072708..5858d84 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertGWTServiceImpl.java @@ -37,7 +37,7 @@ public class AlertGWTServiceImpl extends AbstractGWTServiceImpl implements Alert private AlertManagerLocal alertManager = LookupUtil.getAlertManager(); - public PageList<Alert> findAlertsByCriteria(AlertCriteria criteria) throws RuntimeException { + public PageList<Alert> findAlertsByCriteria(AlertCriteria criteria) throws Exception { try { return SerialUtility.prepare(this.alertManager.findAlertsByCriteria(getSessionSubject(), criteria), "AlertService.findAlertsByCriteria"); @@ -46,7 +46,7 @@ public class AlertGWTServiceImpl extends AbstractGWTServiceImpl implements Alert } } - public int deleteAlerts(int[] alertIds) throws RuntimeException { + public int deleteAlerts(int[] alertIds) throws Exception { try { return this.alertManager.deleteAlerts(getSessionSubject(), alertIds); } catch (Throwable t) { @@ -54,7 +54,7 @@ public class AlertGWTServiceImpl extends AbstractGWTServiceImpl implements Alert } } - public int deleteAlertsByContext(EntityContext context) throws RuntimeException { + public int deleteAlertsByContext(EntityContext context) throws Exception { try { return this.alertManager.deleteAlertsByContext(getSessionSubject(), context); } catch (Throwable t) { @@ -62,7 +62,7 @@ public class AlertGWTServiceImpl extends AbstractGWTServiceImpl implements Alert } } - public int acknowledgeAlerts(int[] alertIds) throws RuntimeException { + public int acknowledgeAlerts(int[] alertIds) throws Exception { try { return this.alertManager.acknowledgeAlerts(getSessionSubject(), alertIds); } catch (Throwable t) { @@ -70,7 +70,7 @@ public class AlertGWTServiceImpl extends AbstractGWTServiceImpl implements Alert } } - public int acknowledgeAlertsByContext(EntityContext context) throws RuntimeException { + public int acknowledgeAlertsByContext(EntityContext context) throws Exception { try { return this.alertManager.acknowledgeAlertsByContext(getSessionSubject(), context); } catch (Throwable t) { commit ac2bd3ab11776fb8b564208ffc12db584efd985d Author: Joseph Marques <joseph(a)redhat.com&gt; Date: Thu Dec 23 12:37:58 2010 -0500 replace global search with always visible message bar diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java index dca51dc..4c74934 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java @@ -338,7 +338,6 @@ public class CoreGUI implements EntryPoint, ValueChangeHandler<String> { // default view History.newItem(DEFAULT_VIEW_PATH); } else { - messageBar.clearMessage(); if (pendingMessage != null) { getMessageCenter().notify(pendingMessage); pendingMessage = null; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java index a4a1e40..99596e0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java @@ -74,7 +74,7 @@ public class MenuBarView extends LocatableVLayout { topStrip.addMember(getActionsSection()); addMember(topStrip); - addMember(new SearchBarPane(this.extendLocatorId("Search"))); + //addMember(new SearchBarPane(this.extendLocatorId("Search"))); markForRedraw(); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java index 122f032..c03b508 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java @@ -38,6 +38,7 @@ public class Message { // TODO: Add Debug severity? public enum Severity { + Blank("InfoBlank", "info/icn_info_blank.png"), // Info("InfoBlock", "info/icn_info_blue.png"), // Warning("WarnBlock", "info/icn_info_orange.png"), // Error("ErrorBlock", "info/icn_info_red.png"), // diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java index f0c901d..9aecd39 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java @@ -35,11 +35,13 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout; */ public class MessageBar extends LocatableHLayout implements MessageCenter.MessageListener { private static final String LOCATOR_ID = "MessageBar"; - private static final int AUTO_HIDE_DELAY_MILLIS = 15000; // 15 seconds + private static final int AUTO_HIDE_DELAY_MILLIS = 30000; - private Label label; + private Label label = new Label(); private Message stickyMessage; + private static final String NON_BREAKING_SPACE = "&nbsp;"; + public MessageBar() { super(LOCATOR_ID); @@ -51,71 +53,63 @@ public class MessageBar extends LocatableHLayout implements MessageCenter.Messag super.onDraw(); setWidth100(); - setHeight(35); - setAlign(Alignment.CENTER); + label.setAlign(Alignment.CENTER); + label.setWidth("400px"); + label.setHeight("25px"); + + setLabelEmpty(); + addMember(label); + CoreGUI.getMessageCenter().addMessageListener(this); } @Override public void onMessage(Message message) { if (!message.isBackgroundJobResult()) { - // First clear any previous message. - clearMessage(message.isSticky()); - displayMessage(message); + updateLabel(message); - // Auto-clear the message after 15 seconds unless it's been designated as sticky. + // Auto-clear the message after some time unless it's been designated as sticky. if (message.isSticky()) { this.stickyMessage = message; } else { - Timer hideTimer = new Timer() { + new Timer() { @Override public void run() { clearMessage(false); if (stickyMessage != null) { - displayMessage(stickyMessage); + updateLabel(stickyMessage); } } - }; - hideTimer.schedule(AUTO_HIDE_DELAY_MILLIS); + }.schedule(AUTO_HIDE_DELAY_MILLIS); } } } - public void clearMessage() { - clearMessage(true); - } - - private void displayMessage(Message message) { - this.label = createLabel(message); - addMember(this.label); + private void clearMessage(boolean clearSticky) { + setLabelEmpty(); markForRedraw(); - } - private void clearMessage(boolean clearSticky) { - if (this.label != null) { - this.label.destroy(); - markForRedraw(); - } if (clearSticky) { this.stickyMessage = null; } } - private Label createLabel(Message message) { - Label label = new Label(); + private void setLabelEmpty() { + label.setContents(NON_BREAKING_SPACE); + label.setIcon(Message.Severity.Blank.getIcon()); + label.setStyleName(Message.Severity.Blank.getStyle()); + } + private void updateLabel(Message message) { String contents = (message.getConciseMessage() != null) ? message.getConciseMessage() : message .getDetailedMessage(); label.setContents(contents); - label.setAlign(Alignment.CENTER); String styleName = (contents != null) ? message.getSeverity().getStyle() : null; label.setStyleName(styleName); - label.setWidth(400); - // TODO: Create some custom edge images in greed, yellow, red, etc. so we can add nice rounded corners to the // label. //label.setShowEdges(true); @@ -123,6 +117,6 @@ public class MessageBar extends LocatableHLayout implements MessageCenter.Messag String icon = (contents != null) ? message.getSeverity().getIcon() : null; label.setIcon(icon); - return label; + markForRedraw(); } } diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/info/icn_info_blank.png b/modules/enterprise/gui/coregui/src/main/webapp/images/info/icn_info_blank.png new file mode 100644 index 0000000..8198687 Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/info/icn_info_blank.png differ commit d67bdf0d39a3899b805c747890ae7180624847e6 Author: Joseph Marques <joseph(a)redhat.com&gt; Date: Thu Dec 23 10:11:56 2010 -0500 enable search bar for all ResourceGroup{Composite} views diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java index 2418ec0..e81a82e 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupCompositeDataSource.java @@ -128,6 +128,7 @@ public class ResourceGroupCompositeDataSource extends RPCDataSource<ResourceGrou criteria.addFilterDownMemberCount(getFilter(request, "downMemberCount", Long.class)); criteria.addFilterExplicitResourceIds(getFilter(request, "explicitResourceId", Integer.class)); criteria.addFilterGroupDefinitionId(getFilter(request, "groupDefinitionId", Integer.class)); + criteria.setSearchExpression(getFilter(request, "search", String.class)); return criteria; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java index 85625d6..f12d6a6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java @@ -39,6 +39,7 @@ import com.smartgwt.client.widgets.grid.events.CellDoubleClickEvent; import com.smartgwt.client.widgets.grid.events.CellDoubleClickHandler; import org.rhq.core.domain.resource.group.GroupCategory; +import org.rhq.core.domain.search.SearchSubsystem; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; @@ -252,4 +253,9 @@ public class ResourceGroupListView extends Table<ResourceGroupCompositeDataSourc return view; } + @Override + protected SearchSubsystem getSearchSubsystem() { + return SearchSubsystem.GROUP; + } + } \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java index 7821ab7..617bffe 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java @@ -124,6 +124,7 @@ public class ResourceGroupsDataSource extends RPCDataSource<ResourceGroup> { criteria.addFilterDownMemberCount(getFilter(request, "downMemberCount", Long.class)); criteria.addFilterExplicitResourceIds(getFilter(request, "explicitResourceId", Integer.class)); criteria.addFilterGroupDefinitionId(getFilter(request, "groupDefinitionId", Integer.class)); + criteria.setSearchExpression(getFilter(request, "search", String.class)); return criteria; } commit cb86da0d33b2f1e5e018d9f1a00d69d6fd552c1c Author: Joseph Marques <joseph(a)redhat.com&gt; Date: Thu Dec 23 10:05:34 2010 -0500 enable search bar for all resource search views diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java index c569234..fcc5909 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java @@ -73,6 +73,7 @@ import com.smartgwt.client.widgets.menu.MenuItem; import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; import com.smartgwt.client.widgets.toolbar.ToolStrip; +import org.rhq.core.domain.search.SearchSubsystem; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.RefreshableView; import org.rhq.enterprise.gui.coregui.client.components.form.SearchBarItem; @@ -181,7 +182,16 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements super.onInit(); filterForm = new TableFilter(this); - configureTableFilters(); + + /* + * table filters and search bar are currently mutually exclusive + */ + if (getSearchSubsystem() == null) { + configureTableFilters(); + } else { + final SearchBarItem searchFilter = new SearchBarItem("search", "Search", getSearchSubsystem()); + setFilterFormItems(searchFilter); + } listGrid = new LocatableListGrid(getLocatorId()); listGrid.setAutoFetchData(autoFetchData); @@ -863,4 +873,12 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements public void setShowFilterForm(boolean showFilterForm) { this.showFilterForm = showFilterForm; } + + /* + * by default, no search bar is shown above this table. if this table represents a subsystem that is capable + * of search, return the specific object here. + */ + protected SearchSubsystem getSearchSubsystem() { + return null; + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java index 07c1bcc..ff8d83c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java @@ -38,6 +38,7 @@ import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.core.domain.resource.ResourceCategory; +import org.rhq.core.domain.search.SearchSubsystem; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; @@ -231,4 +232,9 @@ public class ResourceSearchView extends Table { selectListeners.add(listener); } + @Override + protected SearchSubsystem getSearchSubsystem() { + return SearchSubsystem.RESOURCE; + } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/inventory/TestSearchBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/inventory/TestSearchBarView.java index eb519a9..91fccfc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/inventory/TestSearchBarView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/inventory/TestSearchBarView.java @@ -1,17 +1,9 @@ package org.rhq.enterprise.gui.coregui.client.test.inventory; -import org.rhq.core.domain.search.SearchSubsystem; -import org.rhq.enterprise.gui.coregui.client.components.form.SearchBarItem; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView; public class TestSearchBarView extends ResourceSearchView { public TestSearchBarView(String locatorId) { super(locatorId); } - - @Override - protected void configureTableFilters() { - final SearchBarItem searchFilter = new SearchBarItem("search", "Search", SearchSubsystem.RESOURCE); - setFilterFormItems(searchFilter); - } } commit 59567145c4c931d29961bf25de76b2dc4d960390 Author: Joseph Marques <joseph(a)redhat.com&gt; Date: Thu Dec 23 00:42:11 2010 -0500 remove all filters except the SearchBar for the TestSearchBarView diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/inventory/TestSearchBarView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/inventory/TestSearchBarView.java index 234d775..eb519a9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/inventory/TestSearchBarView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/inventory/TestSearchBarView.java @@ -1,13 +1,6 @@ package org.rhq.enterprise.gui.coregui.client.test.inventory; -import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.CATEGORY; -import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.NAME; - -import com.smartgwt.client.widgets.form.fields.TextItem; - -import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.search.SearchSubsystem; -import org.rhq.enterprise.gui.coregui.client.components.form.EnumSelectItem; import org.rhq.enterprise.gui.coregui.client.components.form.SearchBarItem; import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView; @@ -18,11 +11,7 @@ public class TestSearchBarView extends ResourceSearchView { @Override protected void configureTableFilters() { - final TextItem nameFilter = new TextItem(NAME.propertyName(), NAME.title()); - final EnumSelectItem categoryFilter = new EnumSelectItem(CATEGORY.propertyName(), CATEGORY.title(), - ResourceCategory.class); final SearchBarItem searchFilter = new SearchBarItem("search", "Search", SearchSubsystem.RESOURCE); - - setFilterFormItems(nameFilter, categoryFilter, searchFilter); + setFilterFormItems(searchFilter); } }