[prev in list] [next in list] [prev in thread] [next in thread]
List: rhq-commits
Subject: [rhq] modules/enterprise
From: mazz () fedoraproject ! org (mazz)
Date: 2010-09-28 18:47:49
Message-ID: 20100928184749.46DC712058B () lists ! fedorahosted ! org
[Download RAW message or body]
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java \
| 2 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java \
| 2 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/RecoveryAlertDefinitionForm.java \
| 2 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/AlertDefinitionGWTService.java \
| 4 ++ 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/server/gwt/AlertDefinitionGWTServiceImpl.java \
| 12 ++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertGWTServiceImpl.java \
| 14 ++-------- 7 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 4a91718ee72e1a67eff794eb1a7e3c057c2d2716
Author: John Mazzitelli <mazz at redhat.com>
Date: Tue Sep 28 14:45:46 2010 -0400
we now have a alert definition gwt service - and this is the more appropriate \
place for the getAlertDefinitionsByCriteria API
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java \
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
index bf38e6b..7a53dbe 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsDataSource.java
@@ -120,7 +120,7 @@ public abstract class AbstractAlertDefinitionsDataSource extends \
RPCDataSource<A @Override
protected void executeFetch(final DSRequest request, final DSResponse response) \
{ AlertDefinitionCriteria criteria = getCriteria(request);
- GWTServiceLookup.getAlertService().findAlertDefinitionsByCriteria(criteria,
+ GWTServiceLookup.getAlertDefinitionService().findAlertDefinitionsByCriteria(criteria,
new AsyncCallback<PageList<AlertDefinition>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError("Failed to load alert \
definition data", caught);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java \
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
index 818aaca..89a6c8b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
@@ -148,7 +148,7 @@ public abstract class AbstractAlertDefinitionsView extends \
TableSection {
final AlertDefinitionCriteria criteria = new AlertDefinitionCriteria();
criteria.addFilterId(id);
criteria.fetchGroupAlertDefinition(true);
- GWTServiceLookup.getAlertService().findAlertDefinitionsByCriteria(criteria,
+ GWTServiceLookup.getAlertDefinitionService().findAlertDefinitionsByCriteria(criteria,
new AsyncCallback<PageList<AlertDefinition>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError("Failed to load alert \
definition data", caught);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/RecoveryAlertDefinitionForm.java \
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/RecoveryAlertDefinitionForm.java
index b539d0a..cf8af6a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/RecoveryAlertDefinitionForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/RecoveryAlertDefinitionForm.java
@@ -214,7 +214,7 @@ public class RecoveryAlertDefinitionForm extends \
LocatableDynamicForm implements
private void loadAllAlertDefinitionsAndRefreshRecoverAlertSelection() {
if (allAlertDefinitions == null) {
AlertDefinitionCriteria criteria = \
alertDataSource.getSimpleCriteriaForAll();
- GWTServiceLookup.getAlertService().findAlertDefinitionsByCriteria(criteria,
+ GWTServiceLookup.getAlertDefinitionService().findAlertDefinitionsByCriteria(criteria,
new AsyncCallback<PageList<AlertDefinition>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError("Cannot build recovery \
menu", caught);
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 14c123c..e0d4e94 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
@@ -21,9 +21,13 @@ package org.rhq.enterprise.gui.coregui.client.gwt;
import com.google.gwt.user.client.rpc.RemoteService;
import org.rhq.core.domain.alert.AlertDefinition;
+import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
+import org.rhq.core.domain.util.PageList;
public interface AlertDefinitionGWTService extends RemoteService {
+ PageList<AlertDefinition> findAlertDefinitionsByCriteria(AlertDefinitionCriteria \
criteria); +
int createAlertDefinition(AlertDefinition alertDefinition, Integer resourceId) \
throws Exception;
AlertDefinition updateAlertDefinition(int alertDefinitionId, AlertDefinition \
alertDefinition,
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 38b19ee..aac13a3 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
@@ -19,12 +19,9 @@
package org.rhq.enterprise.gui.coregui.client.gwt;
import com.google.gwt.user.client.rpc.RemoteService;
+
import org.rhq.core.domain.alert.Alert;
-import org.rhq.core.domain.alert.AlertDefinition;
-import org.rhq.core.domain.authz.Role;
import org.rhq.core.domain.criteria.AlertCriteria;
-import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
-import org.rhq.core.domain.criteria.RoleCriteria;
import org.rhq.core.domain.util.PageList;
/**
@@ -57,9 +54,4 @@ public interface AlertGWTService extends RemoteService {
* @param alertIds the ids of the Resource alerts to be acknowledged
*/
void acknowledgeResourceAlerts(Integer[] alertIds);
-
-
-
- PageList<AlertDefinition> findAlertDefinitionsByCriteria(AlertDefinitionCriteria \
criteria);
-
}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java \
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java
index 606195b..392e710 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java
@@ -19,6 +19,8 @@
package org.rhq.enterprise.gui.coregui.server.gwt;
import org.rhq.core.domain.alert.AlertDefinition;
+import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
+import org.rhq.core.domain.util.PageList;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.enterprise.gui.coregui.client.gwt.AlertDefinitionGWTService;
import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
@@ -30,6 +32,16 @@ public class AlertDefinitionGWTServiceImpl extends \
AbstractGWTServiceImpl implem
private AlertDefinitionManagerLocal alertDefManager = \
LookupUtil.getAlertDefinitionManager();
+ public PageList<AlertDefinition> \
findAlertDefinitionsByCriteria(AlertDefinitionCriteria criteria) { + try {
+ PageList<AlertDefinition> results = \
this.alertDefManager.findAlertDefinitionsByCriteria( + \
getSessionSubject(), criteria); + return SerialUtility.prepare(results, \
"findAlertDefinitionsByCriteria"); + } catch (Exception e) {
+ throw new RuntimeException(ThrowableUtil.getAllMessages(e));
+ }
+ }
+
public int createAlertDefinition(AlertDefinition alertDefinition, Integer \
resourceId) throws Exception { try {
int results = alertDefManager.createAlertDefinition(getSessionSubject(), \
alertDefinition, resourceId);
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 bc0d32d..a1f47c9 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
@@ -19,13 +19,10 @@
package org.rhq.enterprise.gui.coregui.server.gwt;
import org.rhq.core.domain.alert.Alert;
-import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.criteria.AlertCriteria;
-import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.gwt.AlertGWTService;
import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
-import org.rhq.enterprise.server.alert.AlertDefinitionManagerLocal;
import org.rhq.enterprise.server.alert.AlertManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
@@ -33,12 +30,13 @@ import org.rhq.enterprise.server.util.LookupUtil;
* @author Ian Springer
*/
public class AlertGWTServiceImpl extends AbstractGWTServiceImpl implements \
AlertGWTService { + private static final long serialVersionUID = 1L;
+
private AlertManagerLocal alertManager = LookupUtil.getAlertManager();
- private AlertDefinitionManagerLocal alertDefinitionManager = \
LookupUtil.getAlertDefinitionManager();
public PageList<Alert> findAlertsByCriteria(AlertCriteria criteria) {
return SerialUtility.prepare(this.alertManager.findAlertsByCriteria(getSessionSubject(), \
criteria),
- "AlertService.findAlertsByCriteria");
+ "AlertService.findAlertsByCriteria");
}
public void deleteResourceAlerts(Integer[] alertIds) {
@@ -48,10 +46,4 @@ public class AlertGWTServiceImpl extends AbstractGWTServiceImpl \
implements Alert public void acknowledgeResourceAlerts(Integer[] alertIds) {
this.alertManager.acknowledgeAlerts(getSessionSubject(), alertIds);
}
-
-
- public PageList<AlertDefinition> \
findAlertDefinitionsByCriteria(AlertDefinitionCriteria criteria) {
- return SerialUtility.prepare(this.alertDefinitionManager.findAlertDefinitionsByCriteria(getSessionSubject(), \
criteria),
- "AlertService.findAlertDefinitionsByCriteria");
- }
}
\ No newline at end of file
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic