20 Dec '12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java | 2 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java | 2 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java | 2 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java | 3 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java | 3 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java | 2 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java | 8 +++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/FailoverListItemDatasource.java | 3 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDatasource.java | 3 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java | 5 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java | 3 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java | 3 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java | 14 ++++++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java | 3 +-
14 files changed, 42 insertions(+), 14 deletions(-)
New commits:
commit e12e4d9e200288cb65be0c15e3bf175b1c0a8b3f
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Thu Dec 20 14:42:00 2012 +0100
Overriding getBasePath() methods for allowing double clicking on table record for detail views & some JavaDoc
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java
index 65efb7c..04949ef 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java
@@ -55,6 +55,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
/**
+ * Component for assigning the agents into affinity group.
+ *
* @author Jirka Kremser
*/
public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCriteria> {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
index 8a8d81b..669ea22 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
@@ -45,7 +45,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
- * Shows details of a server.
+ * Shows details of a affinity group.
*
* @author Jirka Kremser
*/
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
index fe4db20..fcfe892 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
@@ -58,6 +58,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
/**
+ * Component for assigning the servers into affinity group.
+ *
* @author Jirka Kremser
*/
public class AffinityGroupServersSelector extends AbstractSelector<Server, ServerCriteria> {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java
index 87afd6d..ef271dc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java
@@ -60,8 +60,9 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
/**
+ * Shows the table of all affinity groups.
+ *
* @author Jirka Kremser
- *
*/
public class AffinityGroupTableView extends TableSection<AffinityGroupWithCountsDatasource> implements HasViewName {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java
index dd596e9..31dd28b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java
@@ -50,8 +50,9 @@ import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
/**
+ * Datasource for @see FailoverListDetails.
+ *
* @author Jirka Kremser
- *
*/
public class AgentDatasource extends RPCDataSource<Agent, AgentCriteria> {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
index 7e5c3ac..255a571 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
@@ -49,7 +49,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
- * Shows details of a server.
+ * Shows details of an agent.
*
* @author Jirka Kremser
*/
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
index 8f2a658..dbc5bb2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
@@ -44,6 +44,8 @@ import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
+ * Shows the table of all agents.
+ *
* @author Jirka Kremser
*/
public class AgentTableView extends TableSection<AgentDatasource> implements HasViewName {
@@ -141,5 +143,9 @@ public class AgentTableView extends TableSection<AgentDatasource> implements Has
public ViewName getViewName() {
return VIEW_ID;
}
-
+
+ @Override
+ protected String getBasePath() {
+ return VIEW_PATH;
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/FailoverListItemDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/FailoverListItemDatasource.java
index 6bfa378..c21d086 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/FailoverListItemDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/FailoverListItemDatasource.java
@@ -48,8 +48,9 @@ import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellForma
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
/**
+ * Datasource for @see FailoverListDetails.
+ *
* @author Jirka Kremser
- *
*/
public class FailoverListItemDatasource extends AbstractServerNodeDatasource<FailoverListDetails, Criteria> {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDatasource.java
index c3d103b..2eb0d87 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDatasource.java
@@ -49,8 +49,9 @@ import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
/**
+ * Datasource for @see PartitionEvent.
+ *
* @author Jirka Kremser
- *
*/
public class PartitionEventDatasource extends RPCDataSource<PartitionEvent, PartitionEventCriteria> {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java
index 4210202..43ac373 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java
@@ -114,7 +114,6 @@ public class PartitionEventDetailView extends LocatableVLayout implements Bookma
return;
}
});
-
}
public void onFailure(Throwable caught) {
@@ -167,7 +166,9 @@ public class PartitionEventDetailView extends LocatableVLayout implements Bookma
MSG.view_adminTopology_partitionEventsDetail_agentAssignments());
section.setExpanded(true);
if (eventDetails == null || eventDetails.size() == 0) {
- section.setItems(new Label(MSG.view_adminTopology_partitionEventsDetail_agentAssignments_nothing()));
+ Label nothing = new Label(MSG.view_adminTopology_partitionEventsDetail_agentAssignments_nothing());
+ nothing.setMargin(10);
+ section.setItems(nothing);
} else {
// there is no need for datasource, it is a simple table with two columns
ListGrid assignments = new ListGrid();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
index 599b2c2..3cbfdb1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
@@ -53,8 +53,9 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
- * @author Jirka Kremser
+ * Shows the table of all partition events.
*
+ * @author Jirka Kremser
*/
public class PartitionEventTableView extends TableSection<PartitionEventDatasource> implements HasViewName {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java
index 0e7fd48..736e5b6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java
@@ -52,8 +52,9 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.Log;
/**
+ * Datasource for @see Server.
+ *
* @author Jirka Kremser
- *
*/
public class ServerDatasource extends AbstractServerNodeDatasource<Server, ServerCriteria> {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
index 2374685..6cae592 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
@@ -53,8 +53,9 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
- * @author Jirka Kremser
+ * Shows the table of all servers.
*
+ * @author Jirka Kremser
*/
public class ServerTableView extends
TableSection<AbstractServerNodeDatasource<? extends Serializable, ? extends BaseCriteria>> implements HasViewName {
@@ -137,6 +138,11 @@ public class ServerTableView extends
public Canvas getDetailsView(Integer id) {
return new ServerDetailView(extendLocatorId("detailsView"), id);
}
+
+// @Override
+// public abstract void showDetails(ID id) {
+//
+// }
private void showCommonActions() {
addChangeOperationModeAction(OperationMode.NORMAL, MSG.view_adminTopology_server_setNormal());
@@ -249,5 +255,9 @@ public class ServerTableView extends
public ViewName getViewName() {
return VIEW_ID;
}
-
+
+ @Override
+ protected String getBasePath() {
+ return VIEW_PATH;
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java
index addd59d..d686395 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java
@@ -38,8 +38,9 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
/**
+ * Datasource for @see ServerWithAgentCountComposite.
+ *
* @author Jirka Kremser
- *
*/
public class ServerWithAgentCountDatasource extends
AbstractServerNodeDatasource<ServerWithAgentCountComposite, Criteria> {
1
0
20 Dec '12
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java | 10 -
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricBaselineCalculator.java | 76 ++++------
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java | 45 ++---
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 36 ++--
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java | 35 ++--
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java | 14 +
6 files changed, 103 insertions(+), 113 deletions(-)
New commits:
commit 9f57272b4e66724a9d7ccdb5b61894d1c8012182
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Dec 19 18:41:59 2012 -0600
Add the basic algorithm for calculating baselines using Cassandra stored data.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
index 3a2ec9d..d49b8cd 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
@@ -30,7 +30,6 @@ import javax.ejb.TransactionAttributeType;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
-import javax.sql.DataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -46,6 +45,7 @@ import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.authz.AuthorizationManagerLocal;
import org.rhq.enterprise.server.authz.PermissionException;
+import org.rhq.enterprise.server.cassandra.SessionManagerBean;
import org.rhq.enterprise.server.cloud.StatusManagerLocal;
import org.rhq.enterprise.server.measurement.instrumentation.MeasurementMonitor;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
@@ -65,9 +65,6 @@ public class MeasurementBaselineManagerBean implements MeasurementBaselineManage
@PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME)
private EntityManager entityManager;
- @javax.annotation.Resource(name = "RHQ_DS", mappedName = RHQConstants.DATASOURCE_JNDI_NAME)
- private DataSource dataSource;
-
@EJB
private StatusManagerLocal agentStatusManager;
@EJB
@@ -87,6 +84,9 @@ public class MeasurementBaselineManagerBean implements MeasurementBaselineManage
@EJB
private ResourceManagerLocal resourceManager;
+ @EJB
+ private SessionManagerBean sessionManager;
+
private final Log log = LogFactory.getLog(MeasurementBaselineManagerBean.class);
private static final int BASELINE_PROCESSING_LIMIT = 50000;
@@ -228,7 +228,7 @@ public class MeasurementBaselineManagerBean implements MeasurementBaselineManage
List<Integer> scheduleIdsWithoutBaselines = query.getResultList();
//2. calculate the baselines based metrics data
- MetricBaselineCalculator baselineCalculator = new MetricBaselineCalculator();
+ MetricBaselineCalculator baselineCalculator = new MetricBaselineCalculator(this.sessionManager.getSession());
List<MeasurementBaseline> results = baselineCalculator.calculateBaselines(scheduleIdsWithoutBaselines,
startTime, endTime);
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricBaselineCalculator.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricBaselineCalculator.java
index 7ed4442..b8a97c2 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricBaselineCalculator.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricBaselineCalculator.java
@@ -26,7 +26,8 @@ package org.rhq.server.metrics;
import java.util.ArrayList;
import java.util.List;
-import java.util.Random;
+
+import com.datastax.driver.core.Session;
import org.rhq.core.domain.measurement.MeasurementBaseline;
@@ -35,17 +36,18 @@ import org.rhq.core.domain.measurement.MeasurementBaseline;
*/
public class MetricBaselineCalculator {
+ private MetricsDAO metricsDAO;
+
+ public MetricBaselineCalculator(Session session) {
+ this.metricsDAO = new MetricsDAO(session);
+ }
+
public List<MeasurementBaseline> calculateBaselines(List<Integer> scheduleIds, long startTime, long endTime) {
List<MeasurementBaseline> calculatedBaselines = new ArrayList<MeasurementBaseline>();
MeasurementBaseline measurementBaseline;
for (Integer scheduleId : scheduleIds) {
- //TODO: do processing to find the actual baseline for this schedule id
- //!use data from Cassandra!
-
- //for now just return a values
- measurementBaseline = this.generateRandomBaseline(scheduleId);
-
+ measurementBaseline = this.calculateBaseline(scheduleId, startTime, endTime);
if (measurementBaseline != null) {
calculatedBaselines.add(measurementBaseline);
}
@@ -54,44 +56,36 @@ public class MetricBaselineCalculator {
return calculatedBaselines;
}
- private MeasurementBaseline generateRandomBaseline(Integer scheduleId) {
- Random random = new Random(12345);
+ private MeasurementBaseline calculateBaseline(Integer scheduleId, long startTime, long endTime) {
- MeasurementBaseline randomBaseline = new MeasurementBaseline();
- randomBaseline.setMax(random.nextDouble() * 1000);
- randomBaseline.setMin(random.nextDouble() * 1000);
- randomBaseline.setMean(random.nextDouble() * 1000);
+ List<AggregatedNumericMetric> metrics = this.metricsDAO.findAggregateMetrics(MetricsTable.ONE_HOUR, scheduleId, startTime, endTime);
- randomBaseline.setScheduleId(scheduleId);
+ if (metrics.size() != 0) {
+ double min = metrics.get(0).getMin();
+ double max = metrics.get(0).getMax();
+ double average = 0;
- return randomBaseline;
- }
+ for (AggregatedNumericMetric entry : metrics) {
+ if (entry.getMax() > max) {
+ max = entry.getMax();
+ } else if (entry.getMin() < min) {
+ min = entry.getMin();
+ }
+
+ average += entry.getAvg();
+ }
+
+ average = average / (double) metrics.size();
+
+ MeasurementBaseline baseline = new MeasurementBaseline();
+ baseline.setMax(max);
+ baseline.setMin(min);
+ baseline.setMean(average);
+ baseline.setScheduleId(scheduleId);
+
+ return baseline;
+ }
- private MeasurementBaseline calculateBaseline(Integer scheduleId) {
- String NATIVE_QUERY_CALC_FIRST_AUTOBASELINE_POSTGRES = "" //
- + " INSERT INTO RHQ_MEASUREMENT_BLINE ( id, BL_MIN, BL_MAX, BL_MEAN, BL_COMPUTE_TIME, SCHEDULE_ID ) " //
- + " SELECT nextval('RHQ_MEASUREMENT_BLINE_ID_SEQ'), " //
- + " MIN(data1h.minvalue) AS bline_min, " //
- + " MAX(data1h.maxvalue) AS bline_max, " //
- + " AVG(data1h.value) AS bline_mean, " //
- + " ? AS bline_ts, " // ?1=computeTime
- + " data1h.SCHEDULE_ID AS bline_sched_id " //
- + " FROM RHQ_MEASUREMENT_DATA_NUM_1H data1h " // baselines are 1H data statistics
- + " INNER JOIN RHQ_MEASUREMENT_SCHED sched " // baselines are aggregates of schedules
- + " ON data1h.SCHEDULE_ID = sched.id " //
- + " INNER JOIN RHQ_MEASUREMENT_DEF def " // only compute off of dynamic types
- + " ON sched.definition = def.id " //
- + "LEFT OUTER JOIN RHQ_MEASUREMENT_BLINE bline " // we want null entries on purpose
- + " ON sched.id = bline.SCHEDULE_ID " //
- + " WHERE ( def.numeric_type = 0 ) " // only dynamics (NumericType.DYNAMIC)
- + " AND ( bline.id IS NULL ) " // no baseline means it was deleted or never calculated
- + " AND ( data1h.TIME_STAMP BETWEEN ? AND ? ) " // ?2=startTime, ?3=endTime
- + " GROUP BY data1h.SCHEDULE_ID " // baselines are aggregates per schedule
- // but only calculate baselines for schedules where we have data that fills (startTime, endTime)
- + " HAVING data1h.SCHEDULE_ID in ( SELECT distinct (mdata.SCHEDULE_ID) "
- + " FROM RHQ_MEASUREMENT_DATA_NUM_1H mdata " //
- + " WHERE mdata.TIME_STAMP <= ? ) " // ?4=startTime
- + " LIMIT 100000 "; // batch at most 100K inserts at a time to shrink the xtn size
return null;
}
}
commit 937ad0e6dedd0745e613a885cc1157357ed4890c
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Dec 19 18:39:37 2012 -0600
Simplify MetricsDAO interface to use only long type for expressing date&time. Actual date&time manipulations should be done in higher layers, the dao is only used fpr retrieving/updating data so simple time in millis is sufficient.
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java
index 5a6b6a6..dfdfd14 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java
@@ -45,8 +45,6 @@ import com.datastax.driver.core.Row;
import com.datastax.driver.core.Session;
import com.datastax.driver.core.exceptions.NoHostAvailableException;
-import org.joda.time.DateTime;
-
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.util.PageOrdering;
@@ -141,12 +139,12 @@ public class MetricsDAO {
}
}
- public List<RawNumericMetric> findRawMetrics(int scheduleId, DateTime startTime, DateTime endTime) {
+ public List<RawNumericMetric> findRawMetrics(int scheduleId, long startTime, long endTime) {
try {
List<RawNumericMetric> metrics = new ArrayList<RawNumericMetric>();
String cql = "SELECT schedule_id, time, value FROM " + MetricsTable.RAW + " WHERE schedule_id = "
- + scheduleId + " AND time >= " + startTime.getMillis() + " AND time < " + endTime.getMillis()
+ + scheduleId + " AND time >= " + startTime + " AND time < " + endTime
+ " ORDER BY time";
ResultSet resultSet = session.execute(cql);
@@ -182,7 +180,7 @@ public class MetricsDAO {
}
}
- public List<RawNumericMetric> findRawMetrics(int scheduleId, DateTime startTime, DateTime endTime,
+ public List<RawNumericMetric> findRawMetrics(int scheduleId, long startTime, long endTime,
boolean includeMetadata) {
if (!includeMetadata) {
@@ -195,8 +193,8 @@ public class MetricsDAO {
.from(MetricsTable.RAW.toString())
.where(
eq("schedule_id", scheduleId),
- gte("time", startTime.toDate()),
- lt("time", endTime.toDate()))
+ gte("time", new Date(startTime)),
+ lt("time", new Date(endTime)))
.getQueryString()
);
List<RawNumericMetric> metrics = new ArrayList<RawNumericMetric>();
@@ -210,7 +208,7 @@ public class MetricsDAO {
}
}
- public List<RawNumericMetric> findRawMetrics(List<Integer> scheduleIds, DateTime startTime, DateTime endTime) {
+ public List<RawNumericMetric> findRawMetrics(List<Integer> scheduleIds, long startTime, long endTime) {
try {
// TODO investigate possible bug in datastax driver for binding lists as parameters
// I was not able to get the below query working by directly binding the List
@@ -234,8 +232,7 @@ public class MetricsDAO {
// .getQueryString();
String cql = "SELECT schedule_id, time, value FROM " + MetricsTable.RAW + " WHERE schedule_id IN (" +
- listToString(scheduleIds) + ") AND time >= " + startTime.getMillis() + " AND time <= " +
- endTime.getMillis();
+ listToString(scheduleIds) + ") AND time >= " + startTime + " AND time <= " + endTime;
ResultSet resultSet = session.execute(cql);
List<RawNumericMetric> metrics = new ArrayList<RawNumericMetric>();
@@ -270,15 +267,15 @@ public class MetricsDAO {
}
}
- public List<AggregatedNumericMetric> findAggregateMetrics(MetricsTable table, int scheduleId, DateTime startTime,
- DateTime endTime) {
+ public List<AggregatedNumericMetric> findAggregateMetrics(MetricsTable table, int scheduleId, long startTime,
+ long endTime) {
try {
String cql =
"SELECT schedule_id, time, type, value " +
"FROM " + table + " " +
- "WHERE schedule_id = " + scheduleId + " AND time >= " + startTime.getMillis() +
- " AND time < " + endTime.getMillis();
+ "WHERE schedule_id = "
+ + scheduleId + " AND time >= " + startTime + " AND time < " + endTime;
List<AggregatedNumericMetric> metrics = new ArrayList<AggregatedNumericMetric>();
ResultSetMapper<AggregatedNumericMetric> resultSetMapper = new AggregateMetricMapper();
ResultSet resultSet = session.execute(cql);
@@ -294,13 +291,13 @@ public class MetricsDAO {
}
public List<AggregatedNumericMetric> findAggregateMetrics(MetricsTable table, List<Integer> scheduleIds,
- DateTime startTime, DateTime endTime) {
+ long startTime, long endTime) {
try {
String cql =
"SELECT schedule_id, time, type, value " +
"FROM " + table + " " +
- "WHERE schedule_id IN (" + listToString(scheduleIds) + ") AND time >= " + startTime.getMillis() +
- " AND time < " + endTime.getMillis();
+ "WHERE schedule_id IN ("
+ + listToString(scheduleIds) + ") AND time >= " + startTime + " AND time < " + endTime;
List<AggregatedNumericMetric> metrics = new ArrayList<AggregatedNumericMetric>();
ResultSetMapper<AggregatedNumericMetric> resultSetMapper = new AggregateMetricMapper();
ResultSet resultSet = session.execute(cql);
@@ -316,15 +313,14 @@ public class MetricsDAO {
}
List<AggregatedNumericMetric> findAggregateMetricsWithMetadata(MetricsTable table, int scheduleId,
- DateTime startTime,
- DateTime endTime) {
+ long startTime, long endTime) {
try {
String cql =
"SELECT schedule_id, time, type, value, ttl(value), writetime(value) " +
"FROM " + table + " " +
- "WHERE schedule_id = " + scheduleId + " AND time >= " + startTime.getMillis() +
- " AND time < " + endTime.getMillis();
+ "WHERE schedule_id = " + scheduleId + " AND time >= " + startTime +
+ " AND time < " + endTime;
List<AggregatedNumericMetric> metrics = new ArrayList<AggregatedNumericMetric>();
ResultSetMapper<AggregatedNumericMetric> resultSetMapper = new AggregateMetricMapper(true);
ResultSet resultSet = session.execute(cql);
@@ -358,13 +354,12 @@ public class MetricsDAO {
}
}
- public void updateMetricsIndex(MetricsTable table, Map<Integer, DateTime> updates) {
+ public void updateMetricsIndex(MetricsTable table, Map<Integer, Long> updates) {
try {
PreparedStatement statement = session.prepare(UPDATE_METRICS_INDEX);
for (Integer scheduleId : updates.keySet()) {
- BoundStatement boundStatement = statement.bind(table.toString(), updates.get(scheduleId).toDate(),
- scheduleId,
- false);
+ BoundStatement boundStatement = statement.bind(table.toString(), new Date(updates.get(scheduleId)),
+ scheduleId, false);
session.execute(boundStatement);
}
} catch (NoHostAvailableException e) {
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
index 631539d..33c6a13 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
@@ -82,13 +82,12 @@ public class MetricsServer {
DateTime begin = new DateTime(beginTime);
if (dateTimeService.isInRawDataRange(begin)) {
- List<RawNumericMetric> metrics = dao.findRawMetrics(scheduleId, begin, new DateTime(endTime));
+ List<RawNumericMetric> metrics = dao.findRawMetrics(scheduleId, beginTime, endTime);
return createRawComposites(metrics, beginTime, endTime);
}
MetricsTable table = getTable(begin);
- List<AggregatedNumericMetric> metrics = dao.findAggregateMetrics(table, scheduleId, begin,
- new DateTime(endTime));
+ List<AggregatedNumericMetric> metrics = dao.findAggregateMetrics(table, scheduleId, beginTime, endTime);
return createComposites(metrics, beginTime, endTime);
}
@@ -98,13 +97,12 @@ public class MetricsServer {
DateTime begin = new DateTime(beginTime);
if (dateTimeService.isInRawDataRange(begin)) {
- List<RawNumericMetric> metrics = dao.findRawMetrics(scheduleIds, begin, new DateTime(endTime));
+ List<RawNumericMetric> metrics = dao.findRawMetrics(scheduleIds, beginTime, endTime);
return createRawComposites(metrics, beginTime, endTime);
}
MetricsTable table = getTable(begin);
- List<AggregatedNumericMetric> metrics = dao.findAggregateMetrics(table, scheduleIds, begin,
- new DateTime(endTime));
+ List<AggregatedNumericMetric> metrics = dao.findAggregateMetrics(table, scheduleIds, beginTime, endTime);
return createComposites(metrics, beginTime, endTime);
}
@@ -113,13 +111,12 @@ public class MetricsServer {
DateTime begin = new DateTime(beginTime);
if (dateTimeService.isInRawDataRange(begin)) {
- List<RawNumericMetric> metrics = dao.findRawMetrics(scheduleId, begin, new DateTime(endTime));
+ List<RawNumericMetric> metrics = dao.findRawMetrics(scheduleId, beginTime, endTime);
return createSummaryRawAggregate(metrics, beginTime);
}
MetricsTable table = getTable(begin);
- List<AggregatedNumericMetric> metrics = dao.findAggregateMetrics(table, scheduleId, begin,
- new DateTime(endTime));
+ List<AggregatedNumericMetric> metrics = dao.findAggregateMetrics(table, scheduleId, beginTime, endTime);
return createSummaryAggregate(metrics, beginTime);
}
@@ -128,13 +125,12 @@ public class MetricsServer {
DateTime begin = new DateTime(beginTime);
if (dateTimeService.isInRawDataRange(new DateTime(beginTime))) {
- List<RawNumericMetric> metrics = dao.findRawMetrics(scheduleIds, begin, new DateTime(endTime));
+ List<RawNumericMetric> metrics = dao.findRawMetrics(scheduleIds, beginTime, endTime);
return createSummaryRawAggregate(metrics, beginTime);
}
MetricsTable table = getTable(begin);
- List<AggregatedNumericMetric> metrics = dao.findAggregateMetrics(table, scheduleIds, begin,
- new DateTime(endTime));
+ List<AggregatedNumericMetric> metrics = dao.findAggregateMetrics(table, scheduleIds, beginTime, endTime);
return createSummaryAggregate(metrics, beginTime);
}
@@ -193,9 +189,10 @@ public class MetricsServer {
}
void updateMetricsIndex(Set<MeasurementDataNumeric> rawMetrics) {
- Map<Integer, DateTime> updates = new TreeMap<Integer, DateTime>();
+ Map<Integer, Long> updates = new TreeMap<Integer, Long>();
for (MeasurementDataNumeric rawMetric : rawMetrics) {
- updates.put(rawMetric.getScheduleId(), new DateTime(rawMetric.getTimestamp()).hourOfDay().roundFloorCopy());
+ updates.put(rawMetric.getScheduleId(), new DateTime(rawMetric.getTimestamp()).hourOfDay().roundFloorCopy()
+ .getMillis());
}
dao.updateMetricsIndex(MetricsTable.ONE_HOUR, updates);
}
@@ -237,10 +234,10 @@ public class MetricsServer {
}
private void updateMetricsIndex(MetricsTable bucket, List<AggregatedNumericMetric> metrics, Minutes interval) {
- Map<Integer, DateTime> updates = new TreeMap<Integer, DateTime>();
+ Map<Integer, Long> updates = new TreeMap<Integer, Long>();
for (AggregatedNumericMetric metric : metrics) {
- updates.put(metric.getScheduleId(), dateTimeService.getTimeSlice(new DateTime(metric.getTimestamp()),
- interval));
+ updates.put(metric.getScheduleId(),
+ dateTimeService.getTimeSlice(new DateTime(metric.getTimestamp()), interval).getMillis());
}
dao.updateMetricsIndex(bucket, updates);
}
@@ -253,7 +250,8 @@ public class MetricsServer {
DateTime startTime = indexEntry.getTime();
DateTime endTime = startTime.plusMinutes(60);
- List<RawNumericMetric> rawMetrics = dao.findRawMetrics(indexEntry.getScheduleId(), startTime, endTime);
+ List<RawNumericMetric> rawMetrics = dao.findRawMetrics(indexEntry.getScheduleId(), startTime.getMillis(),
+ endTime.getMillis());
AggregatedNumericMetric aggregatedRaw = calculateAggregatedRaw(rawMetrics, startTime.getMillis());
aggregatedRaw.setScheduleId(indexEntry.getScheduleId());
oneHourMetrics.add(aggregatedRaw);
@@ -310,7 +308,7 @@ public class MetricsServer {
}
List<AggregatedNumericMetric> metrics = dao.findAggregateMetrics(fromColumnFamily,
- indexEntry.getScheduleId(), startTime, endTime);
+ indexEntry.getScheduleId(), startTime.getMillis(), endTime.getMillis());
AggregatedNumericMetric aggregatedMetric = calculateAggregate(metrics, startTime.getMillis());
aggregatedMetric.setScheduleId(indexEntry.getScheduleId());
toMetrics.add(aggregatedMetric);
diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java
index 140bc4d..0d6209b 100644
--- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java
+++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java
@@ -93,7 +93,8 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
assertEquals(actualUpdates, data, "The updates do not match expected value.");
- List<RawNumericMetric> actualMetrics = dao.findRawMetrics(scheduleId, currentHour, currentHour.plusHours(1));
+ List<RawNumericMetric> actualMetrics = dao.findRawMetrics(scheduleId, currentHour.getMillis(), currentHour
+ .plusHours(1).getMillis());
List<RawNumericMetric> expectedMetrics = asList(
new RawNumericMetric(scheduleId, threeMinutesAgo.getMillis(), 3.2),
new RawNumericMetric(scheduleId, twoMinutesAgo.getMillis(), 3.9),
@@ -105,8 +106,8 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
// versions of the findRawMetrics method. In production code (so far), we have no
// need to retrieve meta data when retrieving raw metrics, but we need to verify
// that the TTL is set.
- List<RawNumericMetric> actualMetricsWithMetadata = dao.findRawMetrics(scheduleId, currentHour,
- currentHour.plusHours(1), true) ;
+ List<RawNumericMetric> actualMetricsWithMetadata = dao.findRawMetrics(scheduleId, currentHour.getMillis(),
+ currentHour.plusHours(1).getMillis(), true);
assertRawTTLSet(actualMetricsWithMetadata);
}
@@ -159,8 +160,8 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
int ttl = Hours.ONE.toStandardSeconds().getSeconds();
Set<MeasurementDataNumeric> actualUpdates = dao.insertRawMetrics(data, ttl);
- List<RawNumericMetric> actualMetrics = dao.findRawMetrics(asList(scheduleId1, scheduleId2), currentHour,
- currentHour.plusHours(1));
+ List<RawNumericMetric> actualMetrics = dao.findRawMetrics(asList(scheduleId1, scheduleId2),
+ currentHour.getMillis(), currentHour.plusHours(1).getMillis());
List<RawNumericMetric> expectedMetrics = asList(
new RawNumericMetric(scheduleId1, threeMinutesAgo.getMillis(), 1.1),
new RawNumericMetric(scheduleId1, twoMinutesAgo.getMillis(), 2.1),
@@ -197,7 +198,7 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
// verify that the TTL is set
List<AggregatedNumericMetric> actualMetricsWithMetadata = dao.findAggregateMetricsWithMetadata(
- MetricsTable.ONE_HOUR, scheduleId, hour0, hour0().plusHours(1).plusSeconds(1));
+ MetricsTable.ONE_HOUR, scheduleId, hour0.getMillis(), hour0().plusHours(1).plusSeconds(1).getMillis());
assertAggrgateTTLSet(actualMetricsWithMetadata);
}
@@ -218,7 +219,7 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, ttl);
List<AggregatedNumericMetric> actual = dao.findAggregateMetrics(MetricsTable.ONE_HOUR,
- asList(schedule1, schedule2), hour0().plusHours(1), hour0().plusHours(2));
+ asList(schedule1, schedule2), hour0().plusHours(1).getMillis(), hour0().plusHours(2).getMillis());
List<AggregatedNumericMetric> expected = asList(
new AggregatedNumericMetric(schedule1, 2.1, 2.1, 2.1, hour0().plusHours(1).getMillis()),
new AggregatedNumericMetric(schedule2, 2.2, 2.2, 2.2, hour0().plusHours(1).getMillis())
@@ -249,8 +250,8 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
new AggregatedNumericMetric(scheduledId, 4.0, 4.0, 4.0, hour0.plusHours(2).getMillis())
);
- List<AggregatedNumericMetric> actual = dao.findAggregateMetrics(MetricsTable.ONE_HOUR, scheduledId, startTime,
- endTime);
+ List<AggregatedNumericMetric> actual = dao.findAggregateMetrics(MetricsTable.ONE_HOUR, scheduledId,
+ startTime.getMillis(), endTime.getMillis());
assertEquals(actual, expected, "Failed to find one hour metrics for date range");
}
@@ -261,9 +262,9 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
int scheduleId1 = 1;
int scheduleId2 = 2;
- Map<Integer, DateTime> updates = new HashMap<Integer, DateTime>();
- updates.put(scheduleId1, hour0);
- updates.put(scheduleId2, hour0);
+ Map<Integer, Long> updates = new HashMap<Integer, Long>();
+ updates.put(scheduleId1, hour0.getMillis());
+ updates.put(scheduleId2, hour0.getMillis());
dao.updateMetricsIndex(MetricsTable.ONE_HOUR, updates);
List<MetricsIndexEntry> actual = dao.findMetricsIndexEntries(MetricsTable.ONE_HOUR);
@@ -277,11 +278,11 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
public void purge1HourMetricsIndex() {
int scheduleId1 = 1;
int scheduleId2 = 2;
- Map<Integer, DateTime> updates = new HashMap<Integer, DateTime>();
- updates.put(scheduleId1, hour0());
- updates.put(scheduleId2, hour0());
- updates.put(scheduleId1, hour0().plusHours(1));
- updates.put(scheduleId2, hour0().plusHours(1));
+ Map<Integer, Long> updates = new HashMap<Integer, Long>();
+ updates.put(scheduleId1, hour0().getMillis());
+ updates.put(scheduleId2, hour0().getMillis());
+ updates.put(scheduleId1, hour0().plusHours(1).getMillis());
+ updates.put(scheduleId2, hour0().plusHours(1).getMillis());
dao.updateMetricsIndex(MetricsTable.ONE_HOUR, updates);
dao.deleteMetricsIndexEntries(MetricsTable.ONE_HOUR);
diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
index c3f8eca..ca6dd95 100644
--- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
+++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
@@ -118,7 +118,8 @@ public class MetricsServerTest extends CassandraIntegrationTest {
long timestamp = System.currentTimeMillis();
metricsServer.addNumericData(data);
- List<RawNumericMetric> actual = dao.findRawMetrics(scheduleId, hour0.plusHours(4), hour0.plusHours(5));
+ List<RawNumericMetric> actual = dao.findRawMetrics(scheduleId, hour0.plusHours(4).getMillis(),
+ hour0.plusHours(5).getMillis());
List<RawNumericMetric> expected = asList(
new RawNumericMetric(scheduleId, threeMinutesAgo.getMillis(), 3.2),
new RawNumericMetric(scheduleId, twoMinutesAgo.getMillis(), 3.9),
@@ -246,8 +247,8 @@ public class MetricsServerTest extends CassandraIntegrationTest {
dao.insertAggregates(MetricsTable.ONE_HOUR, oneHourMetrics, MetricsTable.ONE_HOUR.getTTL());
// update the 6 hour queue
- Map<Integer, DateTime> indexUpdates = new HashMap<Integer, DateTime>();
- indexUpdates.put(scheduleId, hour6);
+ Map<Integer, Long> indexUpdates = new HashMap<Integer, Long>();
+ indexUpdates.put(scheduleId, hour6.getMillis());
dao.updateMetricsIndex(MetricsTable.SIX_HOUR, indexUpdates);
// execute the system under test
@@ -297,8 +298,8 @@ public class MetricsServerTest extends CassandraIntegrationTest {
dao.insertAggregates(MetricsTable.SIX_HOUR, sixHourMetrics, DateTimeService.ONE_MONTH);
// update the 24 queue
- Map<Integer, DateTime> indexUpdates = new HashMap<Integer, DateTime>();
- indexUpdates.put(scheduleId, hour0);
+ Map<Integer, Long> indexUpdates = new HashMap<Integer, Long>();
+ indexUpdates.put(scheduleId, hour0.getMillis());
dao.updateMetricsIndex(MetricsTable.TWENTY_FOUR_HOUR, indexUpdates);
// execute the system under test
@@ -690,7 +691,8 @@ public class MetricsServerTest extends CassandraIntegrationTest {
private void assertColumnMetadataEquals(int scheduleId, DateTime startTime, DateTime endTime, Integer ttl,
long timestamp) {
- List<RawNumericMetric> metrics = dao.findRawMetrics(scheduleId, startTime, endTime, true);
+ List<RawNumericMetric> metrics = dao.findRawMetrics(scheduleId, startTime.getMillis(), endTime.getMillis(),
+ true);
for (RawNumericMetric metric : metrics) {
assertEquals(metric.getColumnMetadata().getTtl(), ttl, "The TTL does not match the expected value for " +
metric);
1
0
modules/enterprise/agent/src/etc/rhq-agent.sh | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit b17bd0074707cf101dcca638832734a1de2bbb6e
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Dec 20 00:18:51 2012 +0100
[BZ 880795] - The upgraded Augeas library no longer contains the file
"libaugeas.so", which causes the default native library lookup mechanisms
to fail. Standard ld should be able to find the .so.x.y files, too,
but the presence of java.library.path system property seems to be causing
this not to kick in during the library loading as done by the JVM.
To work around this problem, we need to instruct JNA to have a "backup
plan" in case the standard lookup mechanisms fail. This can be done using
the "jna.platform.library.path" system property, which instructs JNA to use
that path to look up libraries if everything else fails (and do the .so.x.y
resolution on its own).
We set this variable to the same value as we override LD_LIBRARY_PATH to
so that JNA library loading and native (as in system-wide) library loading
works the same for the agent process. This way we can load the JNA
libraries using the .so.x.y resolution the same way as the system resolves
the native libraries using stadard ld mechanisms in spite of there being
the java.library.path variable set (which is needed by SIGAR).
(cherry picked from commit e437f5771c4b79ce570ad24cb3c545078d9a944a)
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.sh b/modules/enterprise/agent/src/etc/rhq-agent.sh
index e80581d..b3ee8a7 100755
--- a/modules/enterprise/agent/src/etc/rhq-agent.sh
+++ b/modules/enterprise/agent/src/etc/rhq-agent.sh
@@ -212,7 +212,9 @@ fi
debug_msg "RHQ_AGENT_CMDLINE_OPTS: $RHQ_AGENT_CMDLINE_OPTS"
# ----------------------------------------------------------------------
-# Prepare LD_LIBRARY_PATH to include libraries shipped with the agent
+# Prepare LD_LIBRARY_PATH to include libraries shipped with the agent and
+# prepare jna.platform.library.path for JNA to be able to load augeas from our
+# custom location.
# ----------------------------------------------------------------------
if [ -n "$_LINUX" ]; then
@@ -230,6 +232,13 @@ if [ -n "$_LINUX" ]; then
fi
fi
export LD_LIBRARY_PATH
+
+ # We need to force our custom library path as the "system" look up path to
+ # JNA. Without this, the lookup of .so.x.y versions wouldn't work.
+ # We also need to keep the LD_LIBRARY_PATH in place so that the default
+ # system lookup works for libfa, which libaugeas depends on.
+ _JNA_LIBRARY_PATH="\"-Djna.platform.library.path=${LD_LIBRARY_PATH}\""
+
debug_msg "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
fi
@@ -265,7 +274,7 @@ if [ -z "$RHQ_AGENT_MAINCLASS" ]; then
fi
# Build the command line that starts the VM
-CMD="\"${RHQ_AGENT_JAVA_EXE_FILE_PATH}\" ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${RHQ_AGENT_JAVA_OPTS} ${RHQ_AGENT_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp \"${CLASSPATH}\" ${RHQ_AGENT_MAINCLASS} ${RHQ_AGENT_CMDLINE_OPTS}"
+CMD="\"${RHQ_AGENT_JAVA_EXE_FILE_PATH}\" ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${_JNA_LIBRARY_PATH} ${RHQ_AGENT_JAVA_OPTS} ${RHQ_AGENT_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp \"${CLASSPATH}\" ${RHQ_AGENT_MAINCLASS} ${RHQ_AGENT_CMDLINE_OPTS}"
debug_msg "Executing the agent with this command line:"
debug_msg "$CMD"
1
0
modules/enterprise/agent/src/etc/rhq-agent.sh | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit e437f5771c4b79ce570ad24cb3c545078d9a944a
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Dec 20 00:18:51 2012 +0100
[BZ 880795] - The upgraded Augeas library no longer contains the file
"libaugeas.so", which causes the default native library lookup mechanisms
to fail. Standard ld should be able to find the .so.x.y files, too,
but the presence of java.library.path system property seems to be causing
this not to kick in during the library loading as done by the JVM.
To work around this problem, we need to instruct JNA to have a "backup
plan" in case the standard lookup mechanisms fail. This can be done using
the "jna.platform.library.path" system property, which instructs JNA to use
that path to look up libraries if everything else fails (and do the .so.x.y
resolution on its own).
We set this variable to the same value as we override LD_LIBRARY_PATH to
so that JNA library loading and native (as in system-wide) library loading
works the same for the agent process. This way we can load the JNA
libraries using the .so.x.y resolution the same way as the system resolves
the native libraries using stadard ld mechanisms in spite of there being
the java.library.path variable set (which is needed by SIGAR).
diff --git a/modules/enterprise/agent/src/etc/rhq-agent.sh b/modules/enterprise/agent/src/etc/rhq-agent.sh
index e80581d..b3ee8a7 100755
--- a/modules/enterprise/agent/src/etc/rhq-agent.sh
+++ b/modules/enterprise/agent/src/etc/rhq-agent.sh
@@ -212,7 +212,9 @@ fi
debug_msg "RHQ_AGENT_CMDLINE_OPTS: $RHQ_AGENT_CMDLINE_OPTS"
# ----------------------------------------------------------------------
-# Prepare LD_LIBRARY_PATH to include libraries shipped with the agent
+# Prepare LD_LIBRARY_PATH to include libraries shipped with the agent and
+# prepare jna.platform.library.path for JNA to be able to load augeas from our
+# custom location.
# ----------------------------------------------------------------------
if [ -n "$_LINUX" ]; then
@@ -230,6 +232,13 @@ if [ -n "$_LINUX" ]; then
fi
fi
export LD_LIBRARY_PATH
+
+ # We need to force our custom library path as the "system" look up path to
+ # JNA. Without this, the lookup of .so.x.y versions wouldn't work.
+ # We also need to keep the LD_LIBRARY_PATH in place so that the default
+ # system lookup works for libfa, which libaugeas depends on.
+ _JNA_LIBRARY_PATH="\"-Djna.platform.library.path=${LD_LIBRARY_PATH}\""
+
debug_msg "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
fi
@@ -265,7 +274,7 @@ if [ -z "$RHQ_AGENT_MAINCLASS" ]; then
fi
# Build the command line that starts the VM
-CMD="\"${RHQ_AGENT_JAVA_EXE_FILE_PATH}\" ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${RHQ_AGENT_JAVA_OPTS} ${RHQ_AGENT_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp \"${CLASSPATH}\" ${RHQ_AGENT_MAINCLASS} ${RHQ_AGENT_CMDLINE_OPTS}"
+CMD="\"${RHQ_AGENT_JAVA_EXE_FILE_PATH}\" ${_JAVA_ENDORSED_DIRS_OPT} ${_JAVA_LIBRARY_PATH_OPT} ${_JNA_LIBRARY_PATH} ${RHQ_AGENT_JAVA_OPTS} ${RHQ_AGENT_ADDITIONAL_JAVA_OPTS} ${_LOG_CONFIG} -cp \"${CLASSPATH}\" ${RHQ_AGENT_MAINCLASS} ${RHQ_AGENT_CMDLINE_OPTS}"
debug_msg "Executing the agent with this command line:"
debug_msg "$CMD"
1
0
[rhq] Branch 'jkremser/ha-jsf-to-gwt-rewrite' - 21 commits - .gitignore modules/common modules/core modules/enterprise modules/integration-tests modules/plugins modules/test-utils
by Jiri Kremser 19 Dec '12
by Jiri Kremser 19 Dec '12
19 Dec '12
.gitignore | 3
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/SystemServiceType.java | 4
modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/Address.java | 2
modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java | 12
modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java | 25
modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/WebJBossASClient.java | 377 +++++++-
modules/core/arquillian-integration/pom.xml | 1
modules/core/arquillian-integration/suite-extension/pom.xml | 29
modules/core/arquillian-integration/suite-extension/src/main/java/org/rhq/arquillian/extension/suite/SuiteDeploymentArquillianExtension.java | 176 +++
modules/core/arquillian-integration/suite-extension/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension | 1
modules/core/dbutils/pom.xml | 5
modules/core/domain/pom.xml | 45
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java | 1
modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java | 9
modules/core/domain/src/test/java/org/rhq/core/domain/shared/StartStopContainerArquillianExtension.java | 3
modules/core/domain/src/test/java/org/rhq/core/domain/shared/SuiteDeploymentArquillianExtension.java | 176 ---
modules/core/domain/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension | 1
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 30
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 11
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 6
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java | 159 +++
modules/enterprise/server/itests-2/pom.xml | 81 +
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java | 14
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java | 10
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java | 229 ++++
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 5
modules/enterprise/server/itests-2/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension | 1
modules/enterprise/server/jar/pom.xml | 13
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java | 62 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/AccessCheckingInitialContextFactoryBuilder.java | 5
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java | 26
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertHandlerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java | 5
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerBean.java | 42
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java | 64 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java | 18
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java | 101 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RootHandlerBean.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/UserHandlerBean.java | 159 +++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Baseline.java | 24
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/EventDefinitionRest.java | 74 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Link.java | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/OperationDefinitionRest.java | 4
modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 307 ++----
modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java | 242 +++--
modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/arquillian.xml | 5
modules/integration-tests/jndi-access/remote-server/pom.xml | 2
modules/integration-tests/pom.xml | 11
modules/integration-tests/rest-api/pom.xml | 28
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/AbstractBase.java | 48 +
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/EventTest.java | 223 ++++
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/GetStatusTest.java | 78 -
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/GroupTest.java | 469 ++++++++++
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/MetricsTest.java | 361 +++++++
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java | 248 +++++
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ResourcesTest.java | 276 ++++-
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/RootURITest.java | 112 ++
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/StatusTest.java | 93 +
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/UserTest.java | 158 +++
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Baseline.java | 107 ++
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Event.java | 85 +
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/EventSource.java | 116 ++
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Group.java | 65 +
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/GroupDef.java | 76 +
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/MDataPoint.java | 91 +
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Operation.java | 129 ++
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/OperationHistory.java | 108 ++
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Schedule.java | 61 +
modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java | 3
modules/test-utils/src/main/java/org/rhq/test/AssertUtils.java | 41
modules/test-utils/src/main/java/org/rhq/test/PropertyMatcher.java | 22
73 files changed, 4711 insertions(+), 897 deletions(-)
New commits:
commit 8aa16ccbb947f95aee01f25a1c4d8c800c133a8c
Merge: 764fb31 17d9ac9
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Dec 19 23:50:44 2012 +0100
Merge branch 'master' into jkremser/ha-jsf-to-gwt-rewrite
commit 17d9ac9e8b5a926b468da48eb4cde5c8765453c3
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 19 16:57:06 2012 -0500
[Bug 888927 -Availability duration conditions limited to one alert definition per resource]
Add the hooks to further qualify AvailDuration checkCondition quartz job
trigger names with the alertDefId. This will allow avail duration conditions
on any number of alert defs for the same resource.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java
index 386cef9..a43816f 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java
@@ -150,6 +150,7 @@ import org.rhq.core.domain.operation.OperationRequestStatus;
+ " SELECT new org.rhq.core.domain.alert.composite.AlertConditionAvailabilityCategoryComposite " //
+ " ( " //
+ " ac, " //
+ + " ad.id, " // needed for avail duration
+ " res.id, " //
+ " (" //
+ " SELECT a.availabilityType " //
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java
index 4798f41..870dbd2 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java
@@ -33,19 +33,26 @@ import org.rhq.core.domain.measurement.AvailabilityType;
*/
public class AlertConditionAvailabilityCategoryComposite extends AbstractAlertConditionCategoryComposite {
+ private final Integer alertDefinitionId;
private final Integer resourceId;
private final AvailabilityType availabilityType;
- public AlertConditionAvailabilityCategoryComposite(AlertCondition condition, Integer resourceId,
+ public AlertConditionAvailabilityCategoryComposite(AlertCondition condition, Integer alertDefinitionId,
+ Integer resourceId,
AvailabilityType availabilityType) {
super(condition);
+ this.alertDefinitionId = alertDefinitionId;
this.resourceId = resourceId;
// For a resource with no Availability records we initialize to UNKNOWN
this.availabilityType = (null != availabilityType) ? availabilityType : AvailabilityType.UNKNOWN;
}
+ public Integer getAlertDefinitionId() {
+ return alertDefinitionId;
+ }
+
public Integer getResourceId() {
return resourceId;
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
index a74550d..657ec05 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
@@ -285,12 +285,14 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
SchedulerLocal scheduler = LookupUtil.getSchedulerBean();
scheduler.scheduleTriggeredJob(AlertAvailabilityDurationJob.class, false, null);
- // create our resource with alert definition
+ // create our resource with two alert definitions (we use 2 to test BZ888927)
@SuppressWarnings("unused")
MeasurementDefinition metricDef = createResourceWithMetricSchedule();
// use a 10s duration, this is not allowed in general, the gui forces 1 minute minimum
- createAlertDefinitionWithAvailDurationCondition(resource.getId(), AlertConditionOperator.AVAIL_DURATION_DOWN,
- 10);
+ createAlertDefinitionWithAvailDurationCondition(resource.getId(), "testAvailDurationAlertDef_1",
+ AlertConditionOperator.AVAIL_DURATION_DOWN, 10);
+ createAlertDefinitionWithAvailDurationCondition(resource.getId(), "testAvailDurationAlertDef_2",
+ AlertConditionOperator.AVAIL_DURATION_DOWN, 10);
// resource has initial UNKNOWN ResourceAvailability and no Availability records. simulate an avail report
// coming from the agent and setting the initial avail to UP.
@@ -321,7 +323,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
Thread.sleep(6000);
alerts = getAlerts(resource.getId());
- assert alerts.size() == 1 : "One alert should have fired on the avail duration: " + alerts;
+ assert alerts.size() == 2 : "Two alerts should have fired on the avail duration: " + alerts;
// purge the resource fully, which should remove all alert defs and alert conditions and condition logs
int resourceId = resource.getId();
@@ -546,7 +548,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
return alertDefinition;
}
- private AlertDefinition createAlertDefinitionWithAvailDurationCondition(int resourceId,
+ private AlertDefinition createAlertDefinitionWithAvailDurationCondition(int resourceId, String alertDefName,
AlertConditionOperator condition, int duration) {
HashSet<AlertCondition> conditions = new HashSet<AlertCondition>(1);
AlertCondition cond1 = new AlertCondition();
@@ -559,7 +561,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
conditions.add(cond1);
AlertDefinition alertDefinition = new AlertDefinition();
- alertDefinition.setName("avail duration: " + condition.name());
+ alertDefinition.setName(alertDefName);
alertDefinition.setEnabled(true);
alertDefinition.setPriority(AlertPriority.HIGH);
alertDefinition.setAlertDampening(new AlertDampening(Category.NONE));
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java
index a787557..e5c6572 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java
@@ -164,8 +164,8 @@ class GlobalConditionCache extends AbstractConditionCache {
try {
AvailabilityDurationCacheElement cacheElement = new AvailabilityDurationCacheElement(
- alertConditionOperator, alertCondition.getOption(), availabilityComposite.getAvailabilityType(),
- alertConditionId);
+ availabilityComposite.getAlertDefinitionId(), alertConditionOperator, alertCondition.getOption(),
+ availabilityComposite.getAvailabilityType(), alertConditionId);
addTo("availabilityDurationCache", availabilityDurationCache, availabilityComposite.getResourceId(),
cacheElement, alertConditionId, stats);
} catch (InvalidCacheElementException icee) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java
index ea608f5..8b3ff23 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java
@@ -41,16 +41,21 @@ import org.rhq.enterprise.server.util.LookupUtil;
public final class AvailabilityDurationCacheElement extends AbstractEnumCacheElement<AvailabilityType> {
+ private int alertDefinitionId;
+
/**
* @param operator
* @param operatorOption the duration, in seconds (as String)
* @param value
* @param conditionTriggerId this is actually the alertConditionId, renamed here.
*/
- public AvailabilityDurationCacheElement(AlertConditionOperator operator, String operatorOption,
+ public AvailabilityDurationCacheElement(int alertDefinitionId, AlertConditionOperator operator,
+ String operatorOption,
AvailabilityType value, int conditionTriggerId) {
super(operator, operatorOption, value, conditionTriggerId);
+
+ this.alertDefinitionId = alertDefinitionId;
}
/**
@@ -62,6 +67,7 @@ public final class AvailabilityDurationCacheElement extends AbstractEnumCacheEle
* @param resource
* @param providedValue
*/
+ @SuppressWarnings("incomplete-switch")
public static void checkCacheElements(List<AvailabilityDurationCacheElement> cacheElements, Resource resource,
AvailabilityType providedValue) {
if (null == cacheElements) {
@@ -90,6 +96,10 @@ public final class AvailabilityDurationCacheElement extends AbstractEnumCacheEle
}
}
+ public int getAlertDefinitionId() {
+ return alertDefinitionId;
+ }
+
/**
* Each avail duration check is performed by triggering an execution of {@link AlertAvailabilityDurationJob}.
* Note that each of the scheduled jobs is relevant to only 1 condition evaluation.
@@ -104,7 +114,7 @@ public final class AvailabilityDurationCacheElement extends AbstractEnumCacheEle
String jobName = AlertAvailabilityDurationJob.class.getName();
String jobGroupName = AlertAvailabilityDurationJob.class.getName();
String operator = cacheElement.getAlertConditionOperator().name();
- String triggerName = operator + "-" + resource.getId();
+ String triggerName = operator + "-" + resource.getId() + cacheElement.getAlertDefinitionId();
String duration = (String) cacheElement.getAlertConditionOperatorOption();
// convert from seconds to milliseconds
Date jobTime = new Date(System.currentTimeMillis() + (Long.valueOf(duration).longValue() * 1000));
commit d5564f3562ee960115cc533f029521000c870f45
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Dec 19 12:39:24 2012 -0500
[BZ 887411] don't uninventory everything just because we commited some top level server
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index 473b0d0..eaca661 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -1087,7 +1087,24 @@ public class InventoryManager extends AgentService implements ContainerService,
return true;
}
+ /**
+ * Performs a sync so that resources passed in are reflected in the agent's inventory.
+ * This assumes the resource sync infos passed in represent the full inventory tree.
+ *
+ * @param syncInfo information on all resources in the entire inventory tree
+ */
private void synchInventory(ResourceSyncInfo syncInfo) {
+ synchInventory(syncInfo, false);
+ }
+
+ /**
+ * Performs a sync so that resources passed in are reflected in the agent's inventory.
+ *
+ * @param syncInfo the resources' sync data
+ * @param partialInventory if true, syncInfo represents only a partial inventory.
+ * if false, syncInfo represents the full inventory tree of all resources
+ */
+ private void synchInventory(ResourceSyncInfo syncInfo, boolean partialInventory) {
log.info("Syncing local inventory with Server inventory...");
long startTime = System.currentTimeMillis();
Set<Resource> syncedResources = new LinkedHashSet<Resource>();
@@ -1099,7 +1116,12 @@ public class InventoryManager extends AgentService implements ContainerService,
// rhq-980 Adding agent-side logging to report any unexpected synch failure.
try {
- getAllUuids(syncInfo, allServerSideUuids);
+ // don't bother doing this if we are processing a partial inventory.
+ // allServerSideUuids is only ever used to purge obsolete resources, but we don't
+ // do that for partial inventories, so we don't need to prepare that collection for partials.
+ if (!partialInventory) {
+ getAllUuids(syncInfo, allServerSideUuids);
+ }
log.debug("Processing Server sync info...");
processSyncInfo(syncInfo, syncedResources, unknownResourceIds, modifiedResourceIds, deletedResourceIds,
@@ -1113,7 +1135,9 @@ public class InventoryManager extends AgentService implements ContainerService,
mergeUnknownResources(unknownResourceIds);
mergeModifiedResources(modifiedResourceIds);
- purgeObsoleteResources(allServerSideUuids);
+ if (!partialInventory) {
+ purgeObsoleteResources(allServerSideUuids);
+ }
postProcessNewlyCommittedResources(newlyCommittedResources);
if (log.isDebugEnabled()) {
if (!deletedResourceIds.isEmpty()) {
@@ -2188,7 +2212,7 @@ public class InventoryManager extends AgentService implements ContainerService,
+ "] and its descendants...");
// Get the latest resource data rooted at the given id.
- synchInventory(syncInfo);
+ synchInventory(syncInfo, true); // this method assumes we only get a single resource and its children (BZ 887411)
performServiceScan(syncInfo.getId()); // NOTE: This will block (the initial scan blocks).
}
commit a06a6ff899355823a42c3e79ac70a82510fddbe2
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 19 10:45:43 2012 -0500
Try forcing ojdbc driver resolution usinbg the local repo since it
can't always be found in profile-defined repositories.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
index dd46a29..e038fe0 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java
@@ -341,6 +341,11 @@ public abstract class AbstractEJB3Test extends Arquillian {
// If we're running oracle we need to include the OJDBC driver because dbunit needs it. Note that we need
// add it explicitly even though it is a provided module used by the datasource.
if (!Boolean.valueOf(System.getProperty("rhq.skip.oracle"))) {
+ // in proxy situations (like Jenkins) shrinkwrap won't be able to find repositories defined in
+ // settings.xml profiles. We know at this point the driver is in the local repo, try going offline
+ // at this point to force local repo resolution since the oracle driver is not in public repos.
+ // see http://stackoverflow.com/questions/6291146/arquillian-shrinkwrap-mavendepen…
+ resolver.goOffline();
dependencies.addAll(resolver.artifact("com.oracle:ojdbc6:jar:" + System.getProperty("rhq.ojdbc.version"))
.resolveAs(JavaArchive.class));
}
commit becf9e4f40c63b8c3a6b1d6aea7122fa9eab67ab
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Dec 18 14:28:03 2012 -0500
Avoid the unzipping if it is already unzipped. It takes time for unzip to
actually do all of the file compares just to know it doesn't need to add
anything.
diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
index 5811fef..db60c86 100644
--- a/modules/enterprise/server/itests-2/pom.xml
+++ b/modules/enterprise/server/itests-2/pom.xml
@@ -26,8 +26,8 @@
<jboss.vm.args>-Xmx700m -XX:MaxPermSize=200m -Djava.security.manager
-Djava.security.policy==${jboss.unzip.location}/security.policy</jboss.vm.args>
<jboss.vm.args.debug></jboss.vm.args.debug> <!-- -Ditest.debug can override this, see below -->
- <!-- These properties guide which datasources are used for integration tests. Only one should be true.
- The default is Postgres, specify -Pitest.oracle to use Oracle -->
+ <!-- These properties guide which datasources are used for integration tests. Only one should be true. The default is
+ Postgres, specify -Pitest.oracle to use Oracle -->
<skip.postgres>false</skip.postgres>
<skip.oracle>true</skip.oracle>
</properties>
@@ -96,12 +96,12 @@
</dependency>
<dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-arquillian-suite-extension</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-arquillian-suite-extension</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-domain</artifactId>
@@ -231,15 +231,30 @@
<id>prepare Standalone XML</id>
<phase>process-test-resources</phase>
<configuration>
- <target>
- <echo>Unzipping JBossAS ${jboss.version} found at ${jboss.zip}</echo>
- <unzip src="${jboss.zip}" dest="${jboss.unzip.location}/.." />
- <echo>JBossAS ${jboss.version} should now be at: ${jboss.unzip.location}</echo>
-
- <echo>Copying security policy to JBossAS</echo>
- <copy file="${project.build.directory}/test-classes/security.policy" tofile="${jboss.unzip.location}/security.policy" />
-
+ <tasks>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<property name="jboss.conf" location="${jboss.unzip.location}/standalone/configuration/standalone.xml" />
+ <property name="jboss.conf.safe" location="${jboss.conf}.safe" />
+ <if>
+ <available file="${jboss.unzip.location}" />
+ <then>
+ <echo>Skipping unzipping JBossAS ${jboss.version}, it is already unzipped</echo>
+ <echo>Restoring safe copy of standalone.xml for pending test additions</echo>
+ <copy file="${jboss.conf.safe}" tofile="${jboss.conf}" overwrite="true" />
+ </then>
+ <else>
+ <echo>Unzipping JBossAS ${jboss.version} found at ${jboss.zip}</echo>
+ <unzip src="${jboss.zip}" dest="${jboss.unzip.location}/.." />
+ <echo>JBossAS ${jboss.version} should now be at: ${jboss.unzip.location}</echo>
+
+ <echo>Copying security policy to JBossAS</echo>
+ <copy file="${project.build.directory}/test-classes/security.policy" tofile="${jboss.unzip.location}/security.policy" />
+
+ <echo>Saving copy of standalone.xml</echo>
+ <copy file="${jboss.conf}" tofile="${jboss.conf.safe}" />
+ </else>
+ </if>
+
<echo>Will now add test configuration to JBossAS config file: ${jboss.conf}</echo>
<replace file="${jboss.conf}">
@@ -460,8 +475,7 @@
</dependencies>
</module>
]]></echo>
-
- </target>
+ </tasks>
</configuration>
<goals>
<goal>run</goal>
@@ -703,8 +717,8 @@
</properties>
<dependencies>
- <!-- The provided scope in the root pom is not sufficient, we need this fo shrinkwrap to resolve
- dependency and add the jar to the deployment. -->
+ <!-- The provided scope in the root pom is not sufficient, we need this fo shrinkwrap to resolve dependency and add
+ the jar to the deployment. -->
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
commit 245fb391a81fe6a3c5c7331bb6c683fce63a7530
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Dec 18 17:10:41 2012 +0100
Add tests for the operations part of the rest-api
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/OperationDefinitionRest.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/OperationDefinitionRest.java
index 2f5055c..f84149e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/OperationDefinitionRest.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/OperationDefinitionRest.java
@@ -1,9 +1,7 @@
package org.rhq.enterprise.server.rest.domain;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlRootElement;
@@ -15,7 +13,7 @@ import com.wordnik.swagger.annotations.ApiProperty;
* @author Heiko W. Rupp
*/
@ApiClass(value = "The template from which operations are created")
-@XmlRootElement
+@XmlRootElement(name = "operationDefinition")
public class OperationDefinitionRest {
public OperationDefinitionRest() {
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java
new file mode 100644
index 0000000..72d40c9
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/OperationsTest.java
@@ -0,0 +1,248 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+package org.rhq.modules.integrationTests.restApi;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.response.Response;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.rhq.modules.integrationTests.restApi.d.Operation;
+
+import static com.jayway.restassured.RestAssured.expect;
+import static com.jayway.restassured.RestAssured.get;
+import static com.jayway.restassured.RestAssured.given;
+import static org.hamcrest.core.Is.is;
+
+/**
+ * Test the operations part of the rest api
+ * @author Heiko W. Rupp
+ */
+public class OperationsTest extends AbstractBase {
+
+ private int definitionId;
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp(); // Junit does not call that for us
+ Response r =
+ given()
+ .header(acceptJson)
+ .queryParam("resourceId",10001)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/operation/definitions");
+
+ definitionId = -1;
+ List<Map<String,Object>> list = r.as(List.class);
+ for (Map<String,Object> map : list) {
+ if (map.get("name").equals("discovery"))
+ definitionId = (Integer) map.get("id");
+ }
+
+ assert definitionId !=-1 : "No discovery operation found";
+ }
+
+ @Test
+ public void testGetDefinitionById() throws Exception {
+
+ // Now retrieve that definition by id
+
+ given()
+ .header(acceptJson)
+ .pathParam("did",definitionId)
+ .expect()
+ .statusCode(200)
+ .body("name",is("discovery"))
+ .when()
+ .get("/operation/definition/{did}");
+
+ }
+
+ @Test
+ public void testCreateDraftOperation() throws Exception {
+
+ Operation draft =
+ given()
+ .header(acceptJson)
+ .pathParam("definitionId",definitionId)
+ .queryParam("resourceId",10001)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .post("/operation/definition/{definitionId}")
+ .as(Operation.class);
+
+ assert draft != null;
+ assert draft.getDefinitionId() == definitionId;
+
+ int draftId = draft.getId();
+
+ // check if we can retrieve one single draft
+
+ Operation op = get("/operation/" + draftId).as(Operation.class);
+ assert op !=null;
+ assert op.equals(draft);
+
+ }
+
+ @Test
+ public void testCreateAndUpdateDraftOperation() throws Exception {
+
+ Operation draft =
+ given()
+ .header(acceptJson)
+ .pathParam("definitionId",definitionId)
+ .queryParam("resourceId",10001)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .post("/operation/definition/{definitionId}")
+ .as(Operation.class);
+
+ assert draft != null;
+ assert draft.getDefinitionId() == definitionId;
+
+ int draftId = draft.getId();
+ draft.getParams().put("detailed",true);
+
+ try {
+ given()
+ .contentType(ContentType.JSON)
+ .pathParam("id", draftId)
+ .body(draft)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .put("/operation/{id}");
+ } finally {
+ // delete the draft again
+ expect()
+ .statusCode(204)
+ .when()
+ .delete("/operation/" + draftId);
+ }
+
+
+ }
+
+ @Test
+ public void testCreateDraftOperationAndScheduleExecution() throws Exception {
+
+ Operation draft =
+ given()
+ .header(acceptJson)
+ .pathParam("definitionId",definitionId)
+ .queryParam("resourceId",10001)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .post("/operation/definition/{definitionId}")
+ .as(Operation.class);
+
+ assert draft != null;
+ assert draft.getDefinitionId() == definitionId;
+
+ int draftId = draft.getId();
+
+ draft.setReadyToSubmit(true);
+ draft.getParams().put("detailed", true);
+
+ // update to schedule
+ Operation scheduled =
+ given()
+ .contentType(ContentType.JSON)
+ .pathParam("id",draftId)
+ .body(draft)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .put("/operation/{id}")
+ .as(Operation.class);
+
+ System.out.println(scheduled);
+ String history = null;
+ List<Map<String,Object>> links = scheduled.getLinks();
+ for (Map<String,Object> link : links) {
+ if (link.get("rel").equals("history"))
+ history = (String) link.get("href");
+ }
+ assert history != null;
+
+ String historyId = history.substring(history.lastIndexOf("/")+1);
+ try {
+ Thread.sleep(5000); // we need to wait a little as the execution may take time
+
+ given()
+ .pathParam("hid",historyId)
+ .expect()
+ .statusCode(200)
+ .log().everything()
+ .when()
+ .get("/operation/history/{hid}");
+
+ // See if we also find it when we are looking for histories on the resource
+ Response response =
+ given()
+ .queryParam("resourceId",10001)
+ .header(acceptJson)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/operation/history");
+
+ // compare
+ List<Map<String,Object>> list = response.as(List.class);
+ boolean found = false;
+ for (Map<String,Object> map : list) {
+ if (map.get("jobId").equals(historyId)) {
+ found = true;
+ }
+ }
+ assert found;
+
+ } finally {
+
+ // Delete the history item
+ given()
+ .pathParam("hid",historyId)
+ .expect()
+ .statusCode(204)
+ .log().ifError()
+ .when()
+ .delete("/operation/history/{hid}");
+
+ }
+
+ }
+
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Operation.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Operation.java
new file mode 100644
index 0000000..54a1505
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Operation.java
@@ -0,0 +1,129 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+package org.rhq.modules.integrationTests.restApi.d;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * An operation for testing
+ * @author Heiko W. Rupp
+ */
+public class Operation {
+
+ int id;
+ String name;
+ boolean readyToSubmit;
+ int resourceId;
+ int definitionId;
+ Map<String,Object> params = new HashMap<String, Object>();
+ List<Map<String,Object>> links;
+
+ public Operation() {
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public boolean isReadyToSubmit() {
+ return readyToSubmit;
+ }
+
+ public void setReadyToSubmit(boolean readyToSubmit) {
+ this.readyToSubmit = readyToSubmit;
+ }
+
+ public int getResourceId() {
+ return resourceId;
+ }
+
+ public void setResourceId(int resourceId) {
+ this.resourceId = resourceId;
+ }
+
+ public int getDefinitionId() {
+ return definitionId;
+ }
+
+ public void setDefinitionId(int definitionId) {
+ this.definitionId = definitionId;
+ }
+
+ public Map<String, Object> getParams() {
+ return params;
+ }
+
+ public void setParams(Map<String, Object> params) {
+ this.params = params;
+ }
+
+ public List<Map<String, Object>> getLinks() {
+ return links;
+ }
+
+ public void setLinks(List<Map<String, Object>> links) {
+ this.links = links;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ Operation operation = (Operation) o;
+
+ if (definitionId != operation.definitionId) return false;
+ if (id != operation.id) return false;
+ if (readyToSubmit != operation.readyToSubmit) return false;
+ if (resourceId != operation.resourceId) return false;
+ if (links != null ? !links.equals(operation.links) : operation.links != null) return false;
+ if (!name.equals(operation.name)) return false;
+ if (params != null ? !params.equals(operation.params) : operation.params != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = id;
+ result = 31 * result + name.hashCode();
+ result = 31 * result + (readyToSubmit ? 1 : 0);
+ result = 31 * result + resourceId;
+ result = 31 * result + definitionId;
+ result = 31 * result + (params != null ? params.hashCode() : 0);
+ result = 31 * result + (links != null ? links.hashCode() : 0);
+ return result;
+ }
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/OperationHistory.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/OperationHistory.java
new file mode 100644
index 0000000..fa0af5c
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/OperationHistory.java
@@ -0,0 +1,108 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+package org.rhq.modules.integrationTests.restApi.d;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * An operationhistory item for testing
+ * @author Heiko W. Rupp
+ */
+public class OperationHistory {
+
+ String operationName;
+ String resourceName;
+ long lastModified;
+ String status;
+ String errorMessage;
+ String jobId;
+
+ Map<String,Object> result = new HashMap<String, Object>();
+ List<Object> links;
+
+ public OperationHistory() {
+ }
+
+ public String getOperationName() {
+ return operationName;
+ }
+
+ public void setOperationName(String operationName) {
+ this.operationName = operationName;
+ }
+
+ public String getResourceName() {
+ return resourceName;
+ }
+
+ public void setResourceName(String resourceName) {
+ this.resourceName = resourceName;
+ }
+
+ public long getLastModified() {
+ return lastModified;
+ }
+
+ public void setLastModified(long lastModified) {
+ this.lastModified = lastModified;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getErrorMessage() {
+ return errorMessage;
+ }
+
+ public void setErrorMessage(String errorMessage) {
+ this.errorMessage = errorMessage;
+ }
+
+ public String getJobId() {
+ return jobId;
+ }
+
+ public void setJobId(String jobId) {
+ this.jobId = jobId;
+ }
+
+ public Map<String, Object> getResult() {
+ return result;
+ }
+
+ public void setResult(Map<String, Object> result) {
+ this.result = result;
+ }
+
+ public List<Object> getLinks() {
+ return links;
+ }
+
+ public void setLinks(List<Object> links) {
+ this.links = links;
+ }
+}
commit 3605ce3398557277d8ddf4deb3ffaa83337b7c58
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Dec 18 10:06:59 2012 -0500
[Bug 884338 (not a fix) - Agent's availability report is ignored due to bogus stale resource error]
I failed to reproduce this issue but:
- Add some better logging and some attempted repair code for this situation
- Add a couple more tests
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
index f180036..ff1193d 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java
@@ -24,7 +24,6 @@ import java.util.Date;
import java.util.List;
import java.util.Random;
-import javax.persistence.EntityManager;
import javax.persistence.Query;
import javax.transaction.Status;
@@ -37,6 +36,7 @@ import org.rhq.core.domain.measurement.Availability;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.measurement.ResourceAvailability;
import org.rhq.core.domain.resource.Agent;
+import org.rhq.core.domain.resource.InventoryStatus;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
@@ -117,7 +117,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
if (additionalResources != null) {
getTransactionManager().begin();
- EntityManager em = getEntityManager();
for (Resource res : additionalResources) {
Resource res2 = em.find(Resource.class, res.getId());
@@ -130,7 +129,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
if (theResourceType != null) {
getTransactionManager().begin();
- EntityManager em = getEntityManager();
em.remove(em.find(ResourceType.class, theResourceType.getId()));
theResourceType = null;
@@ -159,7 +157,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
beginTx();
try {
- setupResource(em);
+ setupResource();
commitAndClose();
Availability aThen = new Availability(theResource, then, UP);
@@ -211,7 +209,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
beginTx();
try {
- setupResource(em);
+ setupResource();
commitAndClose();
Availability aThen = new Availability(theResource, then, UP);
@@ -278,7 +276,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
List<AvailabilityPoint> availPoints;
Availability avail;
- setupResource(em);
+ setupResource();
// platform: UNKNOWN(0) -->
commitAndClose();
@@ -430,7 +428,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
beginTx();
try {
- setupResource(em);
+ setupResource();
commitAndClose();
@@ -460,7 +458,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
beginTx();
try {
- setupResource(em);
+ setupResource();
commitAndClose();
@@ -490,7 +488,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
try {
prepareForTestAgents();
- setupResource(em);
+ setupResource();
commitAndClose();
@@ -561,13 +559,13 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
try {
prepareForTestAgents();
- setupResource(em); // setup theResource
+ setupResource(); // setup theResource
allResources.add(theResource);
// now create a bunch more resources
for (int i = 0; i < 99; i++) {
- allResources.add(setupAnotherResource(em, i, theResource));
+ allResources.add(setupAnotherResource(i, theResource));
}
em.flush();
@@ -736,7 +734,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
beginTx();
try {
- setupResource(em); // inserts initial UNKNOWN Availability at epoch
+ setupResource(); // inserts initial UNKNOWN Availability at epoch
commitAndClose();
@@ -823,7 +821,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
beginTx();
try {
- setupResource(em);
+ setupResource();
commitAndClose();
@@ -884,7 +882,7 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
try {
Availability avail;
- setupResource(em);
+ setupResource();
commitAndClose();
@@ -972,11 +970,11 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
Availability avail;
AvailabilityReport report;
- setupResource(em);
+ setupResource();
commitAndClose();
- long allAvailCount = setUpAvailabilities(em);
+ long allAvailCount = setUpAvailabilities();
// we now have 1:00 UP, 1:20 DOWN, 1:40 UP
Subject overlord = LookupUtil.getSubjectManager().getOverlord();
@@ -1050,11 +1048,10 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
Availability avail;
AvailabilityReport report;
- setupResource(em);
+ setupResource();
commitAndClose();
-
- long allAvailCount = setUpAvailabilities(em);
+ long allAvailCount = setUpAvailabilities();
// we now have 1:00 UP, 1:20 DOWN, 1:40 UP
Subject overlord = LookupUtil.getSubjectManager().getOverlord();
@@ -1121,19 +1118,174 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
}
}
+ /**
+ * This was an attempt to get the behavior of this bug but it didn't. This inserts duplicate avail records, which
+ * should be discarded.
+ */
+ @Test(enabled = ENABLE_TESTS)
+ public void testBZ884338_1() throws Exception {
+ beginTx();
+
+ try {
+ Availability avail;
+ AvailabilityReport report;
+
+ setupResource();
+ commitAndClose();
+
+ long allAvailCount = setUpAvailabilities();
+ assertTrue("should have >= 3 avail records", 3 <= allAvailCount);
+ List<Availability> avails = getResourceAvailabilities(theResource);
+ // there is always the UNKNOWN period starting at epoch, plus the three created in setup
+ assertEquals(avails.toString(), 4, avails.size());
+
+ // we now have 1:00 UP, 1:20 DOWN, 1:40 UP
+ avail = availabilityManager.getCurrentAvailabilityForResource(overlord, theResource.getId());
+ assert avail.getAvailabilityType() == UP;
+
+ // insert a duplicate current 1:40 UP and an out-of-order 1:20 DOWN, these should be ignored
+ Long currentStartTime = avail.getStartTime();
+ long newStartTime = currentStartTime;
+ avail = new Availability(theResource, newStartTime, UP);
+ report = new AvailabilityReport(false, theAgent.getName());
+ report.addAvailability(avail);
+
+ newStartTime = (currentStartTime - (20 * 60 * 1000L));
+ avail = new Availability(theResource, newStartTime, DOWN);
+ report = new AvailabilityReport(false, theAgent.getName());
+ report.addAvailability(avail);
+
+ Thread.sleep(1000);
+ availabilityManager.mergeAvailabilityReport(report);
+
+ // the agent should have been updated, but no new rows in availability were added
+ Agent agent = LookupUtil.getAgentManager().getAgentByName(theAgent.getName());
+ Date lastReport = new Date(agent.getLastAvailabilityReport());
+ assert lastReport != null;
+ assertEquals(allAvailCount, countAvailabilitiesInDB().longValue());
+ avails = getResourceAvailabilities(theResource);
+ assertEquals(avails.toString(), 4, avails.size());
+
+ // avail start times should be unchanged 0, 1:00 (UP), 1:20(DOWN), 1:40(UP)
+ avail = avails.get(0); // 0..1:00
+ assertTrue(avail.toString(), Math.abs(avail.getStartTime() - 0L) < 1000L);
+ assertEquals(avail.toString(), AvailabilityType.UNKNOWN, avail.getAvailabilityType());
+ assertTrue(avail.toString(), Math.abs(avail.getEndTime() - avails.get(1).getStartTime()) < 1000L);
+ avail = avails.get(1); // 1:00..1:20
+ assertTrue(avail.toString(), Math.abs(currentStartTime - (avail.getStartTime() + (40 * 60 * 1000))) < 1000L);
+ assertEquals(avail.toString(), AvailabilityType.UP, avail.getAvailabilityType());
+ assertTrue(avail.toString(), Math.abs(avail.getEndTime() - avails.get(2).getStartTime()) < 1000L);
+ avail = avails.get(2); // 1:20..1:40
+ assertTrue(avail.toString(), Math.abs(currentStartTime - (avail.getStartTime() + (20 * 60 * 1000))) < 1000L);
+ assertEquals(avail.toString(), AvailabilityType.DOWN, avail.getAvailabilityType());
+ assertTrue(avail.toString(), Math.abs(avail.getEndTime() - avails.get(3).getStartTime()) < 1000L);
+ avail = avails.get(3); // 1:40
+ assertTrue(avail.toString(), Math.abs(currentStartTime - avail.getStartTime()) < 1000L);
+ assertEquals(avail.toString(), AvailabilityType.UP, avail.getAvailabilityType());
+ assertEquals(avail.toString(), avail.getEndTime(), null);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw e;
+ } finally {
+ if (Status.STATUS_ACTIVE == getTransactionManager().getStatus()) {
+ getTransactionManager().rollback();
+ }
+ }
+ }
+
+ /**
+ * Still can't reproduce the bug but this test tries to validate the repair code we have in case we detect
+ * the problem.
+ */
+ @Test(enabled = ENABLE_TESTS)
+ public void testBZ884338_2() throws Exception {
+ beginTx();
+
+ try {
+ Availability avail;
+ AvailabilityReport report;
+
+ setupResource();
+
+ commitAndClose();
+
+ long allAvailCount = setUpAvailabilities();
+ assertTrue("should have >= 3 avail records", 3 <= allAvailCount);
+ List<Availability> avails = getResourceAvailabilities(theResource);
+ // there is always the UNKNOWN period starting at epoch, plus the three created in setup
+ assertEquals(avails.toString(), 4, avails.size());
+
+ // we now have 1:00 UP, 1:20 DOWN, 1:40 UP
+ avail = availabilityManager.getCurrentAvailabilityForResource(overlord, theResource.getId());
+
+ beginTx();
+
+ avail = em.find(Availability.class, avail.getId());
+ assert avail.getAvailabilityType() == UP;
+
+ // mess things up by assigning an end time to the latest avail record.
+ Long currentStartTime = avail.getStartTime();
+
+ Long nonNullEndTime = currentStartTime + 1000L;
+ avail.setEndTime(nonNullEndTime);
+ avail = em.merge(avail);
+
+ commitAndClose();
+
+ // try to insert new avail, this should trigger the repair code
+ long newStartTime = (currentStartTime + (5 * 60 * 1000L));
+ avail = new Availability(theResource, newStartTime, DOWN);
+ report = new AvailabilityReport(false, theAgent.getName());
+ report.addAvailability(avail);
+
+ Thread.sleep(1000);
+ availabilityManager.mergeAvailabilityReport(report);
+
+ avails = getResourceAvailabilities(theResource);
+ assertEquals(avails.toString(), 4, avails.size());
+
+ // avail start times should now be 0, 1:00 (UP), 1:10(DOWN), 1:40(UP)
+ avail = avails.get(0); // 0..1:00
+ assertTrue(avail.toString(), Math.abs(avail.getStartTime() - 0L) < 1000L);
+ assertEquals(avail.toString(), AvailabilityType.UNKNOWN, avail.getAvailabilityType());
+ assertTrue(avail.toString(), Math.abs(avail.getEndTime() - avails.get(1).getStartTime()) < 1000L);
+ avail = avails.get(1); // 1:00..1:20
+ assertTrue(avail.toString(), Math.abs(currentStartTime - (avail.getStartTime() + (40 * 60 * 1000))) < 1000L);
+ assertEquals(avail.toString(), AvailabilityType.UP, avail.getAvailabilityType());
+ assertTrue(avail.toString(), Math.abs(avail.getEndTime() - avails.get(2).getStartTime()) < 1000L);
+ avail = avails.get(2); // 1:20..1:40
+ assertTrue(avail.toString(), Math.abs(currentStartTime - (avail.getStartTime() + (20 * 60 * 1000))) < 1000L);
+ assertEquals(avail.toString(), AvailabilityType.DOWN, avail.getAvailabilityType());
+ assertTrue(avail.toString(), Math.abs(avail.getEndTime() - avails.get(3).getStartTime()) < 1000L);
+ avail = avails.get(3); // 1:40
+ assertTrue(avail.toString(), Math.abs(currentStartTime - avail.getStartTime()) < 1000L);
+ assertEquals(avail.toString(), AvailabilityType.UP, avail.getAvailabilityType());
+ assertEquals(avail.toString(), null, avail.getEndTime()); // THIS IS THE CHANGE
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw e;
+ } finally {
+ if (Status.STATUS_ACTIVE == getTransactionManager().getStatus()) {
+ getTransactionManager().rollback();
+ }
+ }
+ }
+
@Test(enabled = ENABLE_TESTS)
public void testMergeReportPerformance() throws Exception {
beginTx();
List<Resource> allResources = new ArrayList<Resource>();
try {
- setupResource(em); // setup theResource
+ setupResource(); // setup theResource
allResources.add(theResource);
// now create a bunch more resources
for (int i = 0; i < 100; i++) {
- allResources.add(setupAnotherResource(em, i, theResource));
+ allResources.add(setupAnotherResource(i, theResource));
}
em.flush();
@@ -1260,8 +1412,6 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
/**
* See how many rows we have in the availability table
*
- * @param em EntityManager to use
- *
* @return the rowcount
*
* @throws Exception
@@ -1277,22 +1427,36 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
}
/**
- * Just set up a resource where we can attach the availabilities to
+ * See how many rows we have in the availability table
*
- * @param em The EntityManager to use
+ * @return the rowcount
+ *
+ * @throws Exception
+ */
+ private List<Availability> getResourceAvailabilities(Resource r) throws Exception {
+ AvailabilityCriteria c = new AvailabilityCriteria();
+ c.addFilterResourceId(r.getId());
+ c.addSortStartTime(PageOrdering.ASC);
+ return availabilityManager.findAvailabilityByCriteria(overlord, c);
+ }
+
+ /**
+ * Just set up a resource where we can attach the availabilities to
*
* @return A Resource ready to use
*/
- private Resource setupResource(EntityManager em) {
- theAgent = new Agent("testagent", "localhost", 1234, "", "randomToken");
+ private Resource setupResource() {
+ String prefix = this.getClass().getSimpleName() + "_";
+ theAgent = new Agent(prefix + "agent", "localhost", 1234, "", "randomToken");
em.persist(theAgent);
- theResourceType = new ResourceType("test-plat", "test-plugin", ResourceCategory.PLATFORM, null);
+ theResourceType = new ResourceType(prefix + "type", prefix + "plugin", ResourceCategory.PLATFORM, null);
em.persist(theResourceType);
- theResource = new Resource("test-platform-key", "test-platform-name", theResourceType);
+ theResource = new Resource(prefix + "resourceKey", prefix + "resourceName", theResourceType);
theResource.setUuid("" + new Random().nextInt());
theResource.setAgent(theAgent);
+ theResource.setInventoryStatus(InventoryStatus.COMMITTED);
em.persist(theResource);
em.flush();
@@ -1303,12 +1467,11 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
* Set up another unique resource that will be related to <code>theAgent</code>. The resource will be of type <code>
* theResourceType</code>.
*
- * @param em The EntityManager to use
* @param uniqueNumber used to define a unique key for the resource
*
* @return A Resource ready to use
*/
- private Resource setupAnotherResource(EntityManager em, int uniqueNumber, Resource parentResource) {
+ private Resource setupAnotherResource(int uniqueNumber, Resource parentResource) {
Resource newResource;
newResource = new Resource("test-platform-key-" + uniqueNumber, "test-platform-name-" + uniqueNumber,
@@ -1326,13 +1489,11 @@ public class AvailabilityManagerTest extends AbstractEJB3Test {
* Set up an availability scenario where we set up availability for one hour, split it in the middle and have 20min
* up, 20min down, 20min up starting at 1:00am.
*
- * @param em An EntityManager to use
- *
* @return total number of availability records in the DB after we've added ours
*
* @throws Exception
*/
- private long setUpAvailabilities(EntityManager em) throws Exception {
+ private long setUpAvailabilities() throws Exception {
Calendar cal = Calendar.getInstance();
cal.setTime(new Date());
cal.set(Calendar.HOUR, 1);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
index 05dd802..31f1040 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java
@@ -46,6 +46,7 @@ import org.rhq.core.domain.discovery.AvailabilityReport;
import org.rhq.core.domain.measurement.Availability;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.measurement.ResourceAvailability;
+import org.rhq.core.domain.resource.InventoryStatus;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.composite.ResourceIdWithAvailabilityComposite;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
@@ -556,9 +557,41 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
} catch (NoResultException nre) {
// This should not happen unless the Resource in the report is stale, which can happen in certain
// sync scenarios. A Resource is given its initial Availability/ResourceAvailability when it is
- // persisted so it is guaranteed to have Availability, so, the Resource must not exist.
- log.info("Skipping mergeAvailabilityReport() for stale resource [" + reported.getResource()
- + "]. These messages should go away after the next agent synchronization with the server.");
+ // persisted so it is guaranteed to have Availability, so, the Resource must not exist. At least
+ // it must not exist in my utopian view of the world. Let's just make sure...
+ Resource attachedResource = (Resource) entityManager.find(Resource.class, reported.getResource()
+ .getId());
+ if (null == attachedResource) {
+ // expected case
+ log.info("Skipping mergeAvailabilityReport() for stale resource [" + reported.getResource()
+ + "]. These messages should go away after the next agent synchronization with the server.");
+
+ } else if (InventoryStatus.COMMITTED == attachedResource.getInventoryStatus()) {
+ // this should not happen, it means the resource exists but has no latest Availability
+ // record (i.e. sendTime == null). Try to correct the situation.
+ log.warn("Resource [" + reported.getResource()
+ + "] has no latest availability record (i.e. no endtime) - will attempt to repair.\n"
+ + report.toString(false));
+ try {
+ List<Availability> attachedAvails = attachedResource.getAvailability();
+ if (attachedAvails.isEmpty()) {
+ attachedResource.initCurrentAvailability();
+ entityManager.merge(attachedResource);
+
+ } else {
+ Availability attachedLastAvail = attachedAvails.get(attachedAvails.size() - 1);
+ attachedLastAvail.setEndTime(null);
+ entityManager.merge(attachedLastAvail);
+ }
+
+ // ask the agent for a full report so as to ensure we are in sync with agent
+ askForFullReport = true;
+
+ } catch (Throwable t) {
+ log.warn("Unable to repair latest availablity for Resource [" + reported.getResource()
+ + "]", t);
+ }
+ }
} catch (NonUniqueResultException nure) {
// This condition should never happen. In my world of la-la land, I've done everything
@@ -661,7 +694,7 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
public void updateAgentResourceAvailabilities(int agentId, AvailabilityType platformAvailType,
AvailabilityType childAvailType) {
- platformAvailType = (null == platformAvailType) ? AvailabilityType.UNKNOWN : platformAvailType;
+ platformAvailType = (null == platformAvailType) ? AvailabilityType.DOWN : platformAvailType;
childAvailType = (null == childAvailType) ? AvailabilityType.UNKNOWN : childAvailType;
// get the platform resource if not already at platformAvailType (since this is the one
@@ -681,17 +714,8 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
query.setParameter("disabled", AvailabilityType.DISABLED);
List<ResourceIdWithAvailabilityComposite> resourcesWithStatus = query.getResultList();
- // The above queries only return resources if they have at least one row in Availability.
- // This may be a problem in the future, and may need to be fixed.
- // If a resource has 0 rows of availability, then it is by definition "unknown". If,
- // availabilityType is null, we don't have to do anything since the unknown state hasn't changed.
- // If this method is told to set all agent resources to something of other than unknown (null)
- // availability, then we may need to completely rethink the query we do above so it returns composite
- // objects for all resources, even those that have 0 rows of availability. Remember though, that once
- // we get an availability report from an agent, a resource will have at least 1 availability row. So,
- // a resource should rarely have 0 avail rows; if it does, it normally gets one within a minute
- // (since the agent sends avail reports every 60 seconds or so by default). So this problem might not
- // be as bad as first thought.
+ // The above queries only return resources if they have at least one row in Availability. This should
+ // not be a problem since a new Resource gets an initial UNKNOWN Availability record at persist-time.
if (log.isDebugEnabled()) {
log.debug("Agent #[" + agentId + "] is going to have [" + resourcesWithStatus.size()
@@ -815,6 +839,14 @@ public class AvailabilityManagerBean implements AvailabilityManagerLocal, Availa
}
return;
+
+ } catch (NonUniqueResultException nure) {
+ // This should not happen but can happen if the startTime exactly matches an existing start time. In
+ // this case assume we have somehow been passed a duplicate report, and ignore the entry.
+ log.warn("Resource [" + toInsert.getResource()
+ + "] received a duplicate Availability. It is being ignored: " + toInsert);
+
+ return;
}
// If we are inserting the same availability type, the first one can just continue
commit f908a455b968de7826667f5b1a0628290dcda537
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Dec 18 10:23:53 2012 +0100
Add tests for the REST-Api endpoints and fix some issues in the API.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java
index 1e8b99f..6e7f1de 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AbstractRestBean.java
@@ -57,6 +57,7 @@ import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal;
+import org.rhq.enterprise.server.rest.domain.GroupRest;
import org.rhq.enterprise.server.rest.domain.Link;
import org.rhq.enterprise.server.rest.domain.ResourceWithType;
@@ -426,6 +427,31 @@ public class AbstractRestBean {
return resourceGroup;
}
+ protected GroupRest fillGroup(ResourceGroup group, UriInfo uriInfo) {
+
+ GroupRest gr = new GroupRest(group.getName());
+ gr.setId(group.getId());
+ gr.setCategory(group.getGroupCategory());
+ gr.setRecursive(group.isRecursive());
+ if (group.getGroupDefinition()!=null)
+ gr.setDynaGroupDefinitionId(group.getGroupDefinition().getId());
+ gr.setExplicitCount(group.getExplicitResources().size());
+ gr.setImplicitCount(group.getImplicitResources().size());
+ UriBuilder uriBuilder = uriInfo.getBaseUriBuilder();
+ uriBuilder.path("/group/{id}");
+ URI uri = uriBuilder.build(group.getId());
+ Link link = new Link("edit",uri.toASCIIString());
+ gr.getLinks().add(link);
+
+ uriBuilder = uriInfo.getBaseUriBuilder();
+ uriBuilder.path("/group/{id}/metricDefinitions");
+ uri = uriBuilder.build(group.getId());
+ link = new Link("metricDefinitions",uri.toASCIIString());
+ gr.getLinks().add(link);
+
+ return gr;
+ }
+
private static class CacheKey {
private String namespace;
private int id;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertHandlerBean.java
index 9e3b41a..9835b58 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertHandlerBean.java
@@ -93,7 +93,7 @@ public class AlertHandlerBean extends AbstractRestBean {
@Path("/")
@ApiOperation(value = "List all alerts", multiValueResponse = true, responseClass = "List<AlertRest>")
public Response listAlerts(
- @ApiParam(value = "Page number", defaultValue = "0") @QueryParam("page") int page,
+ @ApiParam(value = "Page number", defaultValue = "1") @QueryParam("page") int page,
@ApiParam(value = "Limit to priority", allowableValues = "High, Medium, Low, All") @DefaultValue("All") @QueryParam("prio") String prio,
@ApiParam(value = "Should full resources and definitions be sent") @QueryParam("slim") @DefaultValue(
"false") boolean slim,
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java
index 5d5671f..f0ffdb4 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/CustomExceptionMapper.java
@@ -30,6 +30,7 @@ import org.apache.commons.logging.LogFactory;
import org.rhq.enterprise.server.authz.PermissionException;
import org.rhq.enterprise.server.resource.ResourceNotFoundException;
+import org.rhq.enterprise.server.resource.group.ResourceGroupNotFoundException;
import org.rhq.enterprise.server.rest.domain.RHQErrorWrapper;
/**
@@ -57,8 +58,12 @@ public class CustomExceptionMapper implements ExceptionMapper<Exception> {
status =Response.Status.NOT_FOUND;
else if (cause instanceof ResourceNotFoundException)
status = Response.Status.NOT_FOUND;
+ else if (cause instanceof ResourceGroupNotFoundException)
+ status = Response.Status.NOT_FOUND;
else if (cause instanceof ParameterMissingException)
status = Response.Status.NOT_ACCEPTABLE;
+ else if (cause instanceof IllegalArgumentException)
+ status = Response.Status.NOT_ACCEPTABLE;
else if (cause instanceof PermissionException)
status = Response.Status.FORBIDDEN;
else
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerBean.java
index ad1b7b0..3d7abe0 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerBean.java
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
package org.rhq.enterprise.server.rest;
import java.util.ArrayList;
@@ -62,6 +61,7 @@ import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageControl;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.event.EventManagerLocal;
+import org.rhq.enterprise.server.rest.domain.EventDefinitionRest;
import org.rhq.enterprise.server.rest.domain.EventRest;
import org.rhq.enterprise.server.rest.domain.EventSourceRest;
@@ -112,6 +112,40 @@ public class EventHandlerBean extends AbstractRestBean {
}
@GET
+ @Path("/{id}/definitions")
+ @ApiOperation(value = "List the defined event source definitions for the resource", responseClass = "EventDefintionRest", multiValueResponse = true)
+ public Response listEventDefinitionsForResource(@ApiParam("id of the resource") @PathParam("id") int resourceId,
+ @Context Request request,
+ @Context HttpHeaders headers) {
+
+ Resource res = fetchResource(resourceId);
+ ResourceType resourceType = res.getResourceType();
+ em.refresh(resourceType);
+ Set<EventDefinition> eventDefinitions = resourceType.getEventDefinitions();
+
+ List<EventDefinitionRest> definitionsRest = new ArrayList<EventDefinitionRest>(eventDefinitions.size());
+ for (EventDefinition source : eventDefinitions) {
+ EventDefinitionRest esr = new EventDefinitionRest();
+ esr.setDescription(source.getDescription());
+ esr.setId(source.getId());
+ esr.setDisplayName(source.getDisplayName());
+ esr.setName(source.getName());
+ definitionsRest.add(esr);
+ }
+
+ Response.ResponseBuilder builder;
+ MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
+ if (mediaType.equals(MediaType.APPLICATION_XML_TYPE)) {
+ GenericEntity<List<EventDefinitionRest>> list = new GenericEntity<List<EventDefinitionRest>>(definitionsRest) {};
+ builder = Response.ok(list, mediaType);
+ }
+ else {
+ builder = Response.ok(definitionsRest, mediaType);
+ }
+ return builder.build();
+ }
+
+ @GET
@Path("/source/{id}")
@ApiOperation(value = "Retrieve the event source with the passed id", responseClass = "EventSourceRest")
public EventSourceRest getEventSource(@ApiParam("Id of the source to retrieve") @PathParam("id") int sourceId) {
@@ -127,7 +161,7 @@ public class EventHandlerBean extends AbstractRestBean {
@ApiOperation("Add a new event source for a resource. This can e.g. be a different logfile. " +
"The source.name must match an existing definition fo this resource. " +
"If an event source for the definition name and resource with the same location already exists, no new source is created. " +
- "NOTE: An Event source added this way will not sow up in the connection properties.")
+ "NOTE: An Event source added this way will not show up in the connection properties.")
public EventSourceRest addEventSource(@ApiParam("id of the resource") @PathParam("id") int resourceId,
EventSourceRest esr) {
@@ -177,8 +211,8 @@ public class EventHandlerBean extends AbstractRestBean {
}
@GET @GZIP
- @Path("/source/{id}/events")
- @ApiOperation(value = "List the events for the event source with the passed id. If no time range is given, the last 200 entries will be displayed",
+ @Path("/source/{id}/events")
+ @ApiOperation(value = "List the events for the event source with the passed id. If no time range is given, the last 200 entries will be displayed",
responseClass = "EventRest", multiValueResponse = true)
public Response getEventsForSource(@PathParam("id") int sourceId,
@QueryParam("startTime") long startTime,
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java
index 9f0ed9f..59739b1 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java
@@ -54,6 +54,7 @@ import com.wordnik.swagger.annotations.ApiParam;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.jboss.resteasy.annotations.Form;
import org.jboss.resteasy.annotations.GZIP;
import org.jboss.resteasy.annotations.cache.Cache;
@@ -114,7 +115,7 @@ public class GroupHandlerBean extends AbstractRestBean {
if (q!=null) {
criteria.addFilterName(q);
}
- List<ResourceGroup> groups = resourceGroupManager.findResourceGroupsByCriteria(caller,criteria);
+ List<ResourceGroup> groups = resourceGroupManager.findResourceGroupsByCriteria(caller, criteria);
List<GroupRest> list = new ArrayList<GroupRest>(groups.size());
for (ResourceGroup group : groups) {
@@ -177,14 +178,13 @@ public class GroupHandlerBean extends AbstractRestBean {
resourceType = resourceTypeManager.getResourceTypeById(caller,group.getResourceTypeId());
newGroup.setResourceType(resourceType);
} catch (ResourceTypeNotFoundException e) {
- e.printStackTrace(); // TODO: Customise this generated block
throw new StuffNotFoundException("ResourceType with id " + group.getResourceTypeId());
}
}
Response.ResponseBuilder builder;
try {
- newGroup = resourceGroupManager.createResourceGroup(caller,newGroup);
+ newGroup = resourceGroupManager.createResourceGroup(caller, newGroup);
UriBuilder uriBuilder = uriInfo.getBaseUriBuilder();
uriBuilder.path("/group/{id}");
URI uri = uriBuilder.build(newGroup.getId());
@@ -200,7 +200,7 @@ public class GroupHandlerBean extends AbstractRestBean {
@PUT
@Path("{id}")
- @ApiOperation(value = "Update the passed group")
+ @ApiOperation(value = "Update the passed group. Currently only name change is supported")
public Response updateGroup(@ApiParam(value = "Id of the group to update") @PathParam("id") int id,
@ApiParam(value = "New version of the group") GroupRest in,
@Context HttpHeaders headers,
@@ -304,7 +304,7 @@ public class GroupHandlerBean extends AbstractRestBean {
@Context HttpHeaders headers, @Context UriInfo uriInfo) {
ResourceGroup resourceGroup = fetchGroup(id, false);
- Resource res = resourceManager.getResource(caller,resourceId);
+ Resource res = resourceManager.getResource(caller, resourceId);
if (res==null)
throw new StuffNotFoundException("Resource with id " + resourceId);
@@ -351,31 +351,6 @@ public class GroupHandlerBean extends AbstractRestBean {
return builder.build();
}
- private GroupRest fillGroup(ResourceGroup group, UriInfo uriInfo) {
-
- GroupRest gr = new GroupRest(group.getName());
- gr.setId(group.getId());
- gr.setCategory(group.getGroupCategory());
- gr.setRecursive(group.isRecursive());
- if (group.getGroupDefinition()!=null)
- gr.setDynaGroupDefinitionId(group.getGroupDefinition().getId());
- gr.setExplicitCount(group.getExplicitResources().size());
- gr.setImplicitCount(group.getImplicitResources().size());
- UriBuilder uriBuilder = uriInfo.getBaseUriBuilder();
- uriBuilder.path("/group/{id}");
- URI uri = uriBuilder.build(group.getId());
- Link link = new Link("edit",uri.toASCIIString());
- gr.getLinks().add(link);
-
- uriBuilder = uriInfo.getBaseUriBuilder();
- uriBuilder.path("/group/{id}/metricDefinitions");
- uri = uriBuilder.build(group.getId());
- link = new Link("metricDefinitions",uri.toASCIIString());
- gr.getLinks().add(link);
-
- return gr;
- }
-
@GZIP
@GET
@Path("/definitions")
@@ -523,9 +498,11 @@ public class GroupHandlerBean extends AbstractRestBean {
} catch (GroupDefinitionAlreadyExistsException e) {
builder =Response.status(Response.Status.CONFLICT);
+ builder.entity(e.getMessage());
} catch (GroupDefinitionCreateException e) {
e.printStackTrace(); // TODO: Customise this generated block
- builder = Response.status(Response.Status.INTERNAL_SERVER_ERROR);
+ builder = Response.status(Response.Status.NOT_ACCEPTABLE);
+ builder.entity(e.getMessage());
}
return builder.build();
}
@@ -533,10 +510,11 @@ public class GroupHandlerBean extends AbstractRestBean {
@PUT
@Path("/definition/{id}")
@Consumes({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
- @ApiOperation("Update an existing GroupDefinition")
+ @ApiOperation("Update an existing GroupDefinition or recalculate it if the query param 'recalculate' is set to true")
public Response updateGroupDefinition(@ApiParam("Id fo the definition to update") @PathParam("id") int definitionId,
@ApiParam("If true, trigger a re-calculation") @QueryParam( "recalculate")
- @DefaultValue("false") boolean recalculate, GroupDefinitionRest definition,
+ @DefaultValue("false") boolean recalculate,
+ GroupDefinitionRest definition, // TODO mark as optional?
@Context HttpHeaders headers,
@Context UriInfo uriInfo) {
@@ -549,6 +527,19 @@ public class GroupHandlerBean extends AbstractRestBean {
Response.ResponseBuilder builder = null;
+ if (recalculate) {
+ try {
+ definitionManager.calculateGroupMembership(caller,gd.getId());
+ builder = Response.noContent();
+ } catch (Exception e) {
+ builder = Response.status(Response.Status.NOT_ACCEPTABLE);
+ builder.entity(e.getLocalizedMessage());
+ }
+ return builder.build();
+ }
+
+ // Not recalculation, but an update
+
if (!definition.getName().isEmpty())
gd.setName(definition.getName());
gd.setDescription(definition.getDescription());
@@ -566,18 +557,11 @@ public class GroupHandlerBean extends AbstractRestBean {
try {
definitionManager.updateGroupDefinition(caller,gd);
} catch (Exception e) {
- e.printStackTrace(); // TODO: Customise this generated block
builder = Response.status(Response.Status.NOT_ACCEPTABLE);
builder.entity(e.getLocalizedMessage());
return builder.build();
}
- if (recalculate) {
- try {
- definitionManager.calculateGroupMembership(caller,gd.getId());
- } catch (Exception e) {
- }
- }
try {
// Re-fetch, as groups may have changed
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index b927acf..115452d 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -747,14 +747,20 @@ public class MetricHandlerBean extends AbstractRestBean {
@Path("data/{scheduleId}/baseline")
@Consumes({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML})
@ApiOperation(value = "Set a new baseline for the schedule")
- @ApiError(code = 404, reason = NO_SCHEDULE_FOR_ID)
- public void setBaseline(@ApiParam("Id of the schedule") @PathParam("scheduleId") int scheduleId,
- Baseline baseline, HttpHeaders headers, @Context UriInfo uriInfo) {
+ @ApiErrors({
+ @ApiError(code = 404, reason = NO_SCHEDULE_FOR_ID),
+ @ApiError(code = 406 ,reason = "Baseline data is incorrect")
+ })
+ public Response setBaseline(@ApiParam("Id of the schedule") @PathParam("scheduleId") int scheduleId,
+ Baseline baseline, @Context HttpHeaders headers, @Context UriInfo uriInfo) {
MeasurementSchedule schedule = obtainSchedule(scheduleId, false, DataType.MEASUREMENT);
// little bit of sanity checking
- if (baseline.getMin()>baseline.getMean() || baseline.getMean()>baseline.getMax() || baseline.getMin()>baseline.getMax())
- throw new IllegalArgumentException("Baseline not correct. it should be min<=mean<=max");
+ if (baseline.getMin()>baseline.getMean() || baseline.getMean()>baseline.getMax() || baseline.getMin()>baseline.getMax()) {
+ Response.ResponseBuilder builder = Response.status(Response.Status.NOT_ACCEPTABLE);
+ builder.entity("Baseline not correct. it should be min<=mean<=max");
+ return builder.build();
+ }
MeasurementBaseline mBase = schedule.getBaseline();
if (mBase == null) {
@@ -770,6 +776,8 @@ public class MetricHandlerBean extends AbstractRestBean {
scheduleManager.updateSchedule(caller,schedule);
+ return Response.created(uriInfo.getRequestUriBuilder().build()).build();
+
}
/**
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java
index 98b2e6e..22d8111 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java
@@ -33,6 +33,7 @@ import javax.ejb.Stateless;
import javax.interceptor.Interceptors;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -51,6 +52,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriInfo;
+import com.arjuna.ats.internal.jdbc.drivers.modifiers.list;
import com.wordnik.swagger.annotations.Api;
import com.wordnik.swagger.annotations.ApiError;
import com.wordnik.swagger.annotations.ApiOperation;
@@ -77,6 +79,7 @@ import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.util.PageControl;
+import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.alert.AlertManagerLocal;
@@ -115,11 +118,10 @@ public class ResourceHandlerBean extends AbstractRestBean {
private EntityManager entityManager;
@GET
- @Path("/{id}")
+ @Path("/{id:\\d+}")
@Cache(isPrivate = true,maxAge = 120)
@ApiOperation(value = "Retrieve a single resource", responseClass = "ResourceWithType")
@ApiError(code = 404, reason = NO_RESOURCE_FOR_ID)
-
public Response getResource(@ApiParam("Id of the resource to retrieve") @PathParam("id") int id,
@Context Request request, @Context HttpHeaders headers,
@Context UriInfo uriInfo) {
@@ -151,15 +153,27 @@ public class ResourceHandlerBean extends AbstractRestBean {
@GET @GZIP
@Path("/")
- @ApiOperation(value = "Search for resources by the given search string", responseClass = "ResourceWithType")
+ @ApiOperation(value = "Search for resources by the given search string, possibly limited by category and paged", responseClass = "ResourceWithType")
public Response getResourcesByQuery(@ApiParam("String to search in the resource name") @QueryParam("q") String q,
+ @ApiParam("Limit to category (PLATFORM, SERVER, SERVICE") @QueryParam("category") String category,
+ @ApiParam("Page size for paging") @QueryParam("ps") @DefaultValue("20") int pageSize,
+ @ApiParam("Page for paging") @QueryParam("page") Integer page,
@Context HttpHeaders headers,
@Context UriInfo uriInfo) {
ResourceCriteria criteria = new ResourceCriteria();
- criteria.addFilterName(q);
- List<Resource> ret = resMgr.findResourcesByCriteria(caller,criteria);
+ if (q!=null) {
+ criteria.addFilterName(q);
+ }
+ if (category!=null) {
+ criteria.addFilterResourceCategories(ResourceCategory.valueOf(category.toUpperCase()));
+ }
+ if (page!=null) {
+ criteria.setPaging(page,pageSize);
+ criteria.addSortName(PageOrdering.ASC);
+ }
+ PageList<Resource> ret = resMgr.findResourcesByCriteria(caller,criteria);
- Response.ResponseBuilder builder = getResponseBuilderForResourceList(headers,uriInfo,ret);
+ Response.ResponseBuilder builder = getResponseBuilderForResourceList(headers,uriInfo,ret, page, pageSize);
return builder.build();
}
@@ -173,22 +187,27 @@ public class ResourceHandlerBean extends AbstractRestBean {
@Context UriInfo uriInfo) {
PageControl pc = new PageControl();
- List<Resource> ret = resMgr.findResourcesByCategory(caller, ResourceCategory.PLATFORM,
+ PageList<Resource> ret = resMgr.findResourcesByCategory(caller, ResourceCategory.PLATFORM,
InventoryStatus.COMMITTED, pc);
- Response.ResponseBuilder builder = getResponseBuilderForResourceList(headers, uriInfo, ret);
+ Response.ResponseBuilder builder = getResponseBuilderForResourceList(headers, uriInfo, ret, null, 20);
return builder.build();
}
/**
* Translate the passed list of resources into a response according to the acceptable mime types etc.
+ *
+ *
* @param headers HttpHeaders from the request
* @param uriInfo Uri from the request
* @param resources List of resources
+ * @param page Page of pageSize. If null, paging is ignored
+ * @param pageSize numer of elements on a page
* @return An initialized ResponseBuilder
*/
private Response.ResponseBuilder getResponseBuilderForResourceList(HttpHeaders headers, UriInfo uriInfo,
- List<Resource> resources) {
+ PageList<Resource> resources, Integer page,
+ int pageSize) {
List<ResourceWithType> rwtList = new ArrayList<ResourceWithType>(resources.size());
for (Resource r : resources) {
putToCache(r.getId(), Resource.class, r);
@@ -197,14 +216,35 @@ public class ResourceHandlerBean extends AbstractRestBean {
}
// What media type does the user request?
MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
- Response.ResponseBuilder builder;
+ Response.ResponseBuilder builder = Response.ok();
+ builder.type(mediaType);
+ UriBuilder uriBuilder;
+ if (page!=null) {
+
+ // TODO look a the page control and check if there is a next page at all
+ if (resources.getTotalSize()> page*pageSize) {
+ int nextPage = page+1;
+ uriBuilder = uriInfo.getRequestUriBuilder(); // adds ?q, ?ps and ?category if needed
+ uriBuilder.replaceQueryParam("page",nextPage);
+
+ builder.header("Link",new Link("next",uriBuilder.build().toString()));
+ }
+
+ if (page>1) {
+ int prevPage = page -1;
+ uriBuilder = uriInfo.getRequestUriBuilder(); // adds ?q, ?ps and ?category if needed
+ uriBuilder.replaceQueryParam("page",prevPage);
+ builder.header("prev",uriBuilder.build().toString());
+ }
+ }
if (mediaType.equals(MediaType.TEXT_HTML_TYPE)) {
- builder = Response.ok(renderTemplate("listResourceWithType", rwtList), mediaType);
+ builder.entity(renderTemplate("listResourceWithType", rwtList));
+
} else {
GenericEntity<List<ResourceWithType>> list = new GenericEntity<List<ResourceWithType>>(rwtList) {
};
- builder = Response.ok(list);
+ builder.entity(list);
}
return builder;
}
@@ -453,7 +493,7 @@ public class ResourceHandlerBean extends AbstractRestBean {
}
private Resource obtainResource(int resourceId) {
- Resource resource = getFromCache(resourceId, Resource.class);
+ Resource resource = resMgr.getResource(caller,resourceId);
if (resource == null) {
resource = resMgr.getResource(caller, resourceId);
if (resource != null)
@@ -487,7 +527,6 @@ public class ResourceHandlerBean extends AbstractRestBean {
"via a normal RHQ agent")
@POST
@Path("platform/{name}")
-
public Response createPlatform(
@ApiParam(value = "Name of the platform") @PathParam("name") String name,
@ApiParam(value = "Type of the platform", allowableValues = "Linux,Windows,... TODO") StringValue typeValue,
@@ -510,8 +549,8 @@ public class ResourceHandlerBean extends AbstractRestBean {
URI uri = uriBuilder.build(r.getId());
- javax.ws.rs.core.Response.ResponseBuilder builder = Response.ok(rwt);
- builder.location(uri);
+ Response.ResponseBuilder builder = Response.created(uri);
+ builder.entity(rwt);
return builder.build();
}
@@ -541,7 +580,7 @@ public class ResourceHandlerBean extends AbstractRestBean {
uriBuilder.path("/resource/{id}");
URI uri = uriBuilder.build(platform.getId());
- javax.ws.rs.core.Response.ResponseBuilder builder = Response.created(uri);
+ Response.ResponseBuilder builder = Response.created(uri);
builder.entity(rwt);
return builder.build();
@@ -587,21 +626,18 @@ public class ResourceHandlerBean extends AbstractRestBean {
Resource r = resMgr.getResourceByParentAndKey(caller,null,resourceKey,plugin,typeName);
if (r!=null) {
- // platform exists - return it
+ // resource exists - return it
ResourceWithType rwt = fillRWT(r,uriInfo);
UriBuilder uriBuilder = uriInfo.getBaseUriBuilder();
uriBuilder.path("/resource/{id}");
URI uri = uriBuilder.build(r.getId());
-
- javax.ws.rs.core.Response.ResponseBuilder builder = Response.ok(rwt);
- builder.location(uri);
+ Response.ResponseBuilder builder = Response.created(uri);
+ builder.entity(rwt);
return builder.build();
-
}
-
Resource res = new Resource(resourceKey,name,resType);
res.setUuid(resourceKey);
res.setAgent(parent.getAgent());
@@ -616,15 +652,30 @@ public class ResourceHandlerBean extends AbstractRestBean {
ResourceWithType rwt = fillRWT(res,uriInfo);
- javax.ws.rs.core.Response.ResponseBuilder builder = Response.ok(rwt);
+ UriBuilder uriBuilder = uriInfo.getBaseUriBuilder();
+ uriBuilder.path("/resource/{id}");
+ URI uri = uriBuilder.build(res.getId());
+
+ Response.ResponseBuilder builder = Response.created(uri);
+ builder.entity(rwt);
return builder.build();
} catch (ResourceAlreadyExistsException e) {
throw new IllegalArgumentException(e);
}
+ }
+ @DELETE
+ @Path("/{id}")
+ @ApiOperation("Remove a resource from inventory")
+ public Response uninventoryOrDeleteResource(
+ @PathParam("id") int resourceId
+ /*,@DefaultValue("false") @QueryParam("physical") boolean delete*/) {
- }
+ resMgr.uninventoryResource(caller,resourceId);
+
+ return Response.status(Response.Status.NO_CONTENT).build();
+ }
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RootHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RootHandlerBean.java
index 8d2f130..7998294 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RootHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RootHandlerBean.java
@@ -53,7 +53,7 @@ public class RootHandlerBean extends AbstractRestBean {
"dynaGroups","group/definitions",
"alerts","alert",
"status","status",
- "favoriteResource","user/favorites/resource",
+ "favoriteResources","user/favorites/resource",
"operationHistory","operation/history",
"self",""
};
@@ -87,6 +87,7 @@ public class RootHandlerBean extends AbstractRestBean {
} else if (mediaType.equals(MediaType.APPLICATION_XML_TYPE)) {
target += ".xml";
} else {
+ log.error("Unknown media type " + mediaType);
throw new WebApplicationException(Response.Status.NOT_ACCEPTABLE);
}
Link link = new Link(rel,target);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/UserHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/UserHandlerBean.java
index bdd613e..a0f1177 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/UserHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/UserHandlerBean.java
@@ -27,6 +27,8 @@ import java.util.TreeSet;
import javax.ejb.EJB;
import javax.ejb.Stateless;
import javax.interceptor.Interceptors;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.PUT;
@@ -53,9 +55,13 @@ import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.group.ResourceGroup;
+import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.resource.ResourceManagerLocal;
import org.rhq.enterprise.server.resource.ResourceNotFoundException;
+import org.rhq.enterprise.server.resource.group.ResourceGroupNotFoundException;
+import org.rhq.enterprise.server.rest.domain.GroupRest;
import org.rhq.enterprise.server.rest.domain.ResourceWithType;
import org.rhq.enterprise.server.rest.domain.UserRest;
@@ -90,6 +96,10 @@ public class UserHandlerBean extends AbstractRestBean {
@EJB
ResourceManagerLocal resourceManager;
+ @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME)
+ private EntityManager entityManager;
+
+
@GZIP
@GET
@Path("favorites/resource")
@@ -102,10 +112,19 @@ public class UserHandlerBean extends AbstractRestBean {
MediaType mediaType = httpHeaders.getAcceptableMediaTypes().get(0);
for (Integer id : favIds) {
try {
- Resource res = resourceManager.getResource(caller,id);
+ /*
+ * In theory we should not have any bad resource ids in favorites, but ...
+ * First check if the resource exists, as otherwise resourceManager.getResource()
+ * throws an exception that seems to kill the transaction and backend connection
+ * See https://bugzilla.redhat.com/show_bug.cgi?id=886850
+ */
+ Resource res = entityManager.find(Resource.class,id);
+ if (res!=null) {
+ res = resourceManager.getResource(caller,id);
- ResourceWithType rwt = fillRWT(res,uriInfo);
- ret.add(rwt);
+ ResourceWithType rwt = fillRWT(res,uriInfo);
+ ret.add(rwt);
+ }
}
catch (Exception e) {
if (e.getCause()!=null && e.getCause() instanceof ResourceNotFoundException)
@@ -127,16 +146,82 @@ public class UserHandlerBean extends AbstractRestBean {
}
+ @GZIP
+ @GET
+ @Path("favorites/group")
+ @ApiOperation(value = "Return a list of favorite groups of the caller", multiValueResponse = true, responseClass = "GroupRest")
+ public Response getGroupFavorites(@Context UriInfo uriInfo, @Context HttpHeaders httpHeaders) {
+
+ Set<Integer> favIds = getGroupIdsForFavorites();
+ List<GroupRest> ret = new ArrayList<GroupRest>();
+
+ MediaType mediaType = httpHeaders.getAcceptableMediaTypes().get(0);
+ for (Integer id : favIds) {
+ try {
+ /*
+ * In theory we should not have any bad group ids in favorites, but ...
+ * First check if the group exists, as otherwise resourceGroupManager.getResourceGroup()
+ * throws an exception that seems to kill the transaction and backend connection
+ * See https://bugzilla.redhat.com/show_bug.cgi?id=886850
+ */
+ ResourceGroup res = entityManager.find(ResourceGroup.class,id);
+ if (res!=null) {
+ res = resourceGroupManager.getResourceGroup(caller, id);
+
+ GroupRest rwt = fillGroup(res, uriInfo);
+ ret.add(rwt);
+ }
+ }
+ catch (Exception e) {
+ if (e.getCause()!=null && e.getCause() instanceof ResourceGroupNotFoundException)
+ log.debug("Favorite group with id "+ id + " not found - not returning to the user");
+ else
+ log.warn("Retrieving group with id " + id + " failed: " + e.getLocalizedMessage());
+ }
+ }
+ Response.ResponseBuilder builder;
+ if (mediaType.equals(MediaType.TEXT_HTML_TYPE)) {
+ builder = Response.ok(renderTemplate("listGroup", ret), mediaType);
+ } else {
+ GenericEntity<List<GroupRest>> list = new GenericEntity<List<GroupRest>>(ret) {
+ };
+ builder = Response.ok(list);
+ }
+
+ return builder.build();
+
+ }
+
@PUT
@Path("favorites/resource/{id}")
@ApiOperation(value = "Add a resource as favorite for the caller")
public void addFavoriteResource(@ApiParam(name = "id", value = "Id of the resource")
- @PathParam("id") int id) {
+ @PathParam("id") int resourceId) {
+
+ // Check if the resource exists and throw an error if not
+ fetchResource(resourceId);
+
Set<Integer> favIds = getResourceIdsForFavorites();
- if (!favIds.contains(id)) {
- favIds.add(id);
- updateFavorites(favIds);
+ if (!favIds.contains(resourceId)) {
+ favIds.add(resourceId);
+ updateResourceFavorites(favIds);
+ }
+ }
+
+ @PUT
+ @Path("favorites/group/{id}")
+ @ApiOperation(value = "Add a group as favorite for the caller")
+ public void addFavoriteResourceGroup(@ApiParam(name = "id", value = "Id of the group")
+ @PathParam("id") int groupId) {
+
+ // Check if the resource exists and throw an error if not
+ fetchGroup(groupId, false);
+
+ Set<Integer> favIds = getGroupIdsForFavorites();
+ if (!favIds.contains(groupId)) {
+ favIds.add(groupId);
+ updateGroupFavorites(favIds);
}
}
@@ -148,9 +233,20 @@ public class UserHandlerBean extends AbstractRestBean {
Set<Integer> favIds = getResourceIdsForFavorites();
if (favIds.contains(id)) {
favIds.remove(id);
- updateFavorites(favIds);
+ updateResourceFavorites(favIds);
}
+ }
+ @DELETE
+ @Path("favorites/group/{id}")
+ @ApiOperation(value="Remove a group from favorites")
+ public void removeResourceGroupFromFavorites(@ApiParam(name="id", value = "Id of the group")
+ @PathParam("id") int id) {
+ Set<Integer> favIds = getGroupIdsForFavorites();
+ if (favIds.contains(id)) {
+ favIds.remove(id);
+ updateGroupFavorites(favIds);
+ }
}
@GET
@@ -182,15 +278,9 @@ public class UserHandlerBean extends AbstractRestBean {
return builder.build();
}
- private void updateFavorites(Set<Integer> favIds) {
+ private void updateResourceFavorites(Set<Integer> favIds) {
Configuration conf = caller.getUserConfiguration();
- StringBuilder builder = new StringBuilder();
- Iterator<Integer> iter = favIds.iterator();
- while (iter.hasNext()) {
- builder.append(iter.next());
- if (iter.hasNext())
- builder.append('|');
- }
+ StringBuilder builder = buildFavStringFromSet(favIds);
PropertySimple prop = conf.getSimple(RESOURCE_HEALTH_RESOURCES);
if (prop==null) {
conf.put(new PropertySimple(RESOURCE_HEALTH_RESOURCES,builder.toString()));
@@ -201,9 +291,35 @@ public class UserHandlerBean extends AbstractRestBean {
subjectManager.updateSubject(caller,caller);
}
+
+ private void updateGroupFavorites(Set<Integer> favIds) {
+ Configuration conf = caller.getUserConfiguration();
+ StringBuilder builder = buildFavStringFromSet(favIds);
+ PropertySimple prop = conf.getSimple(GROUP_HEALTH_GROUPS);
+ if (prop==null) {
+ conf.put(new PropertySimple(GROUP_HEALTH_GROUPS,builder.toString()));
+ } else {
+ prop.setStringValue(builder.toString());
+ }
+ caller.setUserConfiguration(conf);
+ subjectManager.updateSubject(caller,caller);
+ }
+
private Set<Integer> getResourceIdsForFavorites() {
Configuration conf = caller.getUserConfiguration();
String favsString = conf.getSimpleValue(RESOURCE_HEALTH_RESOURCES,"");
+ Set<Integer> favIds = getIdsFromFavString(favsString);
+ return favIds;
+ }
+
+ private Set<Integer> getGroupIdsForFavorites() {
+ Configuration conf = caller.getUserConfiguration();
+ String favsString = conf.getSimpleValue(GROUP_HEALTH_GROUPS,"");
+ Set<Integer> favIds = getIdsFromFavString(favsString);
+ return favIds;
+ }
+
+ private Set<Integer> getIdsFromFavString(String favsString) {
Set<Integer> favIds = new TreeSet<Integer>();
if (!favsString.isEmpty()) {
String[] favStringArray = favsString.split("\\|");
@@ -214,4 +330,15 @@ public class UserHandlerBean extends AbstractRestBean {
return favIds;
}
+ private StringBuilder buildFavStringFromSet(Set<Integer> favIds) {
+ StringBuilder builder = new StringBuilder();
+ Iterator<Integer> iter = favIds.iterator();
+ while (iter.hasNext()) {
+ builder.append(iter.next());
+ if (iter.hasNext())
+ builder.append('|');
+ }
+ return builder;
+ }
+
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Baseline.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Baseline.java
index 69623fb..ad5e43c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Baseline.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Baseline.java
@@ -1,3 +1,25 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
package org.rhq.enterprise.server.rest.domain;
import javax.xml.bind.annotation.XmlRootElement;
@@ -9,7 +31,7 @@ import com.wordnik.swagger.annotations.ApiProperty;
* A baseline
* @author Heiko W. Rupp
*/
-@ApiClass("Representation of a metic baseline/-band")
+@ApiClass("Representation of a metric baseline/-band")
@XmlRootElement
public class Baseline {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/EventDefinitionRest.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/EventDefinitionRest.java
new file mode 100644
index 0000000..3154042
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/EventDefinitionRest.java
@@ -0,0 +1,74 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.server.rest.domain;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import com.wordnik.swagger.annotations.ApiClass;
+import com.wordnik.swagger.annotations.ApiProperty;
+
+/**
+ * An Event definition
+ * @author Heiko W. Rupp
+ */
+@ApiClass(value = "An Event definition", description = "You can retrieve an EventDefinition and with its name create new EventSources for that resource")
+@XmlRootElement
+public class EventDefinitionRest {
+
+ int id;
+ String name;
+ String displayName;
+ String description;
+
+ public EventDefinitionRest() {
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ @ApiProperty("The name of the definition, used to create EventSources")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Link.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Link.java
index 3287750..a00e270 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Link.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/Link.java
@@ -48,9 +48,8 @@ public class Link {
@Override
public String toString() {
- return "Link{" +
- "rel='" + rel + '\'' +
- ", href='" + href + '\'' +
- '}';
+ return
+ href + "; " +
+ "rel='" + rel + '\'' ;
}
}
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index 95d947a..4c31380 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -40,15 +40,15 @@
<name>integration.tests</name>
</property>
</activation>
-
+
<modules>
<module>apache-plugin-test</module>
<module>jndi-access</module>
<!--<module>mod_cluster-plugin-test</module>-->
- <!--<module>rest-api</module>-->
+ <module>rest-api</module>
</modules>
</profile>
-
+
<profile>
<id>code-coverage</id>
<activation>
@@ -62,7 +62,7 @@
<!--<module>mod_cluster-plugin-test</module>-->
<!--<module>rest-api</module>-->
</modules>
- </profile>
+ </profile>
</profiles>
diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml
index a2e25f5..3ba07c4 100644
--- a/modules/integration-tests/rest-api/pom.xml
+++ b/modules/integration-tests/rest-api/pom.xml
@@ -18,6 +18,8 @@
<properties>
<surefire-plugin.version>2.10</surefire-plugin.version>
+ <jackson.version>1.9.5</jackson.version>
+ <rest-assured.version>1.7.2</rest-assured.version>
</properties>
<build>
@@ -39,18 +41,32 @@
</build>
<dependencies>
- <dependency>
- <groupId>com.restfuse</groupId>
- <artifactId>com.eclipsesource.restfuse</artifactId>
- <version>1.0.0</version>
+ <dependency>
+ <groupId>com.jayway.restassured</groupId>
+ <artifactId>rest-assured</artifactId>
+ <version>${rest-assured.version}</version>
<scope>test</scope>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/AbstractBase.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/AbstractBase.java
new file mode 100644
index 0000000..3dd20e2
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/AbstractBase.java
@@ -0,0 +1,48 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.modules.integrationTests.restApi;
+
+import com.jayway.restassured.RestAssured;
+import com.jayway.restassured.response.Header;
+
+import org.junit.Before;
+
+import static com.jayway.restassured.RestAssured.basic;
+
+/**
+ * Common setup for the tests
+ * @author Heiko W. Rupp
+ */
+public abstract class AbstractBase {
+
+ static final String APPLICATION_JSON = "application/json";
+ private static final String APPLICATION_XML = "application/xml";
+ static Header acceptJson = new Header("Accept", APPLICATION_JSON);
+ static Header acceptXml = new Header("Accept", APPLICATION_XML);
+
+ @Before
+ public void setUp() throws Exception {
+
+ RestAssured.baseURI = "http://" + System.getProperty("rest.server","localhost") ;
+ RestAssured.port = 7080;
+ RestAssured.basePath = "/rest/";
+ RestAssured.authentication = basic("rhqadmin","rhqadmin");
+
+ }
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/EventTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/EventTest.java
new file mode 100644
index 0000000..697d6f0
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/EventTest.java
@@ -0,0 +1,223 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.modules.integrationTests.restApi;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.response.Response;
+
+import org.junit.Test;
+
+import org.rhq.modules.integrationTests.restApi.d.Event;
+import org.rhq.modules.integrationTests.restApi.d.EventSource;
+
+import static com.jayway.restassured.RestAssured.given;
+
+/**
+ * Test the event endpoints of the REST api
+ * @author Heiko W. Rupp
+ */
+public class EventTest extends AbstractBase {
+
+ @Test
+ public void testGetSourcesForResource() throws Exception {
+
+ given()
+ .header(acceptJson)
+ .pathParam("id",10001)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/event/{id}/sources");
+
+ }
+
+ @Test
+ public void testGetDefinitionsForResource() throws Exception {
+
+ given()
+ .header(acceptJson)
+ .pathParam("id",10001)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/event/{id}/definitions");
+
+ }
+
+ @Test
+ public void testAddGetDeleteEventSource() throws Exception {
+
+ EventSource es = new EventSource();
+ es.setResourceId(10001);
+ es.setName("Event Log"); // Name of the event definition
+ es.setLocation("-x-test-location");
+
+ Response response =
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .pathParam("id",10001)
+ .body(es)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .post("/event/{id}/sources");
+
+ EventSource result = response.as(EventSource.class);
+
+ try {
+
+ // Directly find our generated source
+
+ response =
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .pathParam("id",result.getId())
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/event/source/{id}");
+
+ EventSource ev2 = response.as(EventSource.class);
+ assert result.equals(ev2);
+
+ // Search in the list for the resource
+ response =
+ given()
+ .header(acceptJson)
+ .pathParam("id",10001)
+ .expect()
+ .statusCode(200)
+ .when()
+ .get("/event/{id}/sources");
+
+ List<Map<String,Object>> listOfMaps = response.as(List.class);
+ boolean found = false;
+ for (Map<String,Object> map: listOfMaps) {
+ if (map.get("id").equals(result.getId()) && map.get("name").equals(result.getName()))
+ found=true;
+ }
+ assert found;
+ }
+ finally {
+
+ // Delete the source again
+ given()
+ .pathParam("id", result.getId())
+ .expect()
+ .statusCode(200)
+ .when()
+ .delete("/event/source/{id}");
+ }
+ }
+ @Test
+ public void testAddGetEventOnSource() throws Exception {
+
+ EventSource es = new EventSource();
+ es.setResourceId(10001);
+ es.setName("Event Log"); // Name of the event definition
+ es.setLocation("-x-test-location");
+
+ Response response =
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .pathParam("id",10001)
+ .body(es)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .post("/event/{id}/sources");
+
+ EventSource eventSource = response.as(EventSource.class);
+
+ long now = System.currentTimeMillis();
+ try {
+
+ // Add an event
+ Event event = new Event(eventSource.getId(),now,"Li la lu :->");
+ List<Event> events = new ArrayList<Event>(1);
+ events.add(event);
+
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .pathParam("id",eventSource.getId())
+ .body(events)
+ .expect()
+ .statusCode(204) // no content returned
+ .log().ifError()
+ .when()
+ .post("/event/source/{id}/events");
+
+
+ // and retrieve it again from the event source
+ response =
+ given()
+ .header(acceptJson)
+ .pathParam("id", eventSource.getId())
+ .queryParam("startTime",now - 10)
+ .queryParam("endTime",now + 10)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/event/source/{id}/events");
+ List list = response.as(List.class);
+ assert list.size()>0;
+
+ // Get the list of events from the resource
+ response =
+ given()
+ .header(acceptJson)
+ .pathParam("id", 10001)
+ .queryParam("startTime",now - 10)
+ .queryParam("endTime",now + 10)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/event/{id}/events");
+ list = response.as(List.class);
+ assert list.size()>0;
+
+
+ }
+ finally {
+
+ // Delete the source again
+ given()
+ .pathParam("id", eventSource.getId())
+ .expect()
+ .statusCode(200)
+ .when()
+ .delete("/event/source/{id}");
+ }
+ }
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/GetStatusTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/GetStatusTest.java
deleted file mode 100644
index 570e2bf..0000000
--- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/GetStatusTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.modules.integrationTests.restApi;
-
-
-import com.eclipsesource.restfuse.AuthenticationType;
-import com.eclipsesource.restfuse.Destination;
-import com.eclipsesource.restfuse.HttpJUnitRunner;
-import com.eclipsesource.restfuse.Method;
-import com.eclipsesource.restfuse.Response;
-import com.eclipsesource.restfuse.annotation.Authentication;
-import com.eclipsesource.restfuse.annotation.Context;
-import com.eclipsesource.restfuse.annotation.HttpTest;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * Test the status part of the API
- */
-(a)RunWith(HttpJUnitRunner.class)
-public class GetStatusTest {
-
-
-
- @Rule
- public Destination destination = new Destination("http://" + System.getProperty("rest.server","localhost") + ":7080/rest");
-
- @Context
- private Response response;
-
-
- @Test
- @HttpTest( method = Method.GET, path = "/status" )
- public void testAuthRequired() {
- com.eclipsesource.restfuse.Assert.assertUnauthorized(response);
- }
-
-
- @Test
- @HttpTest( method = Method.GET, path = "/status" ,authentications =
- @Authentication(type = AuthenticationType.BASIC, user = "rhqadmin", password = "rhqadmin")
- )
- public void testAuthRhqadmin() {
- com.eclipsesource.restfuse.Assert.assertOk(response);
- }
-
- @Test
- @HttpTest( method = Method.GET, path = "/status" ,authentications =
- @Authentication(type = AuthenticationType.BASIC, user = "user", password = "name23")
- )
- public void testAuthRestricted() {
- com.eclipsesource.restfuse.Assert.assertUnauthorized(response);
- }
-
-
-}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/GroupTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/GroupTest.java
new file mode 100644
index 0000000..2194281
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/GroupTest.java
@@ -0,0 +1,469 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.modules.integrationTests.restApi;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.path.json.JsonPath;
+import com.jayway.restassured.response.Response;
+
+import org.apache.http.HttpStatus;
+import org.junit.Test;
+
+import org.rhq.modules.integrationTests.restApi.d.Group;
+import org.rhq.modules.integrationTests.restApi.d.GroupDef;
+
+import static com.jayway.restassured.RestAssured.expect;
+import static com.jayway.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.CoreMatchers.is;
+
+/**
+ * Test group related stuff
+ * @author Heiko W. Rupp
+ */
+public class GroupTest extends AbstractBase {
+
+ @Test
+ public void testGetGroups() throws Exception {
+ expect().statusCode(200)
+ .when().get("/group");
+ }
+
+ @Test
+ public void testGetGroupsQuery() throws Exception {
+ given()
+ .queryParam("q","lala")
+ .expect()
+ .statusCode(200)
+ .when().get("/group");
+ }
+
+ @Test
+ public void testCreateGroupAndRemove() throws Exception {
+ Group group = new Group("-x-test-group");
+
+ // create the group
+ Response created =
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .body(group)
+ .expect()
+ .statusCode(HttpStatus.SC_CREATED)
+ .log().ifError()
+ .when()
+ .post("/group");
+
+ // Determine location from response
+ // and compare id with the found group below
+ String location = created.header("Location");
+ int createdId = Integer.parseInt(location.substring(location.lastIndexOf("/")+1));
+
+ // Search for it
+ Response response =
+ given()
+ .queryParam("q", "-x-test-group")
+ .expect()
+ .statusCode(200)
+ .when()
+ .get("/group");
+
+ JsonPath jsonPath = response.jsonPath();
+ assert jsonPath.get("[0].name").equals("-x-test-group"); // [0] as the query returns a list
+ int groupId = jsonPath.get("[0].id");
+ assert groupId == createdId;
+
+ // delete the group again
+ given()
+ .pathParam("id",groupId)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .delete("/group/{id}");
+
+ }
+
+ @Test
+ public void testUpdateGroup() throws Exception {
+ Group group = new Group("-x-test-group");
+
+ // Generate the group
+ Response response =
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .body(group)
+ .expect()
+ .statusCode(HttpStatus.SC_CREATED)
+ .log().ifError()
+ .when()
+ .post("/group");
+
+ String location = response.header("Location");
+ int id = Integer.parseInt(location.substring(location.lastIndexOf("/")+1));
+
+ try {
+ group.setName("-x-test-2");
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .body(group)
+ .pathParam("id",id)
+ .expect()
+ .statusCode(HttpStatus.SC_OK)
+ .log().ifError()
+ .when()
+ .put("/group/{id}");
+ }
+ finally {
+ // delete the group
+ given()
+ .pathParam("id", id)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .delete("/group/{id}");
+ }
+ }
+
+ @Test
+ public void testAddResourceToGroup() throws Exception {
+ Group group = new Group("-x-test-group");
+
+ // Generate the group
+ Response response =
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .body(group)
+ .expect()
+ .statusCode(HttpStatus.SC_CREATED)
+ .log().ifError()
+ .when()
+ .post("/group");
+
+ String location = response.header("Location");
+ int id = Integer.parseInt(location.substring(location.lastIndexOf("/")+1));
+
+ try {
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .body(group)
+ .pathParam("id",id)
+ .pathParam("resourceId",10001)
+ .expect()
+ .statusCode(HttpStatus.SC_OK)
+ .log().ifError()
+ .when()
+ .put("/group/{id}/resource/{resourceId}");
+ }
+ finally {
+ // delete the group
+ given()
+ .pathParam("id",id)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .delete("/group/{id}");
+ }
+ }
+
+ @Test
+ public void testAddNonExistingResourceToGroup() throws Exception {
+ Group group = new Group("-x-test-group");
+
+ // Generate the group
+ Response response =
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .body(group)
+ .expect()
+ .statusCode(HttpStatus.SC_CREATED)
+ .log().ifError()
+ .when()
+ .post("/group");
+
+ String location = response.header("Location");
+ int id = Integer.parseInt(location.substring(location.lastIndexOf("/")+1));
+
+ try {
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .body(group)
+ .pathParam("id",id)
+ .pathParam("resourceId",1)
+ .expect()
+ .statusCode(HttpStatus.SC_NOT_FOUND)
+ .log().ifError()
+ .when()
+ .put("/group/{id}/resource/{resourceId}");
+ }
+ finally {
+ // delete the group
+ given()
+ .pathParam("id",id)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .delete("/group/{id}");
+ }
+ }
+
+ @Test
+ public void testRemoveResourceFromGroup() throws Exception {
+ Group group = new Group("-x-test-group");
+
+ // Generate the group
+ Response response =
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .body(group)
+ .expect()
+ .statusCode(HttpStatus.SC_CREATED)
+ .log().ifError()
+ .when()
+ .post("/group");
+
+ String location = response.header("Location");
+ int id = Integer.parseInt(location.substring(location.lastIndexOf("/")+1));
+
+ try {
+ // Add a resource to the group
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .body(group)
+ .pathParam("id",id)
+ .pathParam("resourceId",10001)
+ .expect()
+ .statusCode(HttpStatus.SC_OK)
+ .log().ifError()
+ .when()
+ .put("/group/{id}/resource/{resourceId}");
+
+ // and remove it again
+ given()
+ .header(acceptJson)
+ .pathParam("id",id)
+ .pathParam("resourceId",10001)
+ .expect()
+ .statusCode(HttpStatus.SC_OK)
+ .log().ifError()
+ .when()
+ .delete("/group/{id}/resource/{resourceId}");
+
+ }
+ finally {
+ // delete the group
+ given()
+ .pathParam("id",id)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .delete("/group/{id}");
+ }
+ }
+
+ @Test
+ public void testGetMetricDefinitionsForGroup() throws Exception {
+ Group group = new Group("-x-test-group");
+ group.setCategory("COMPATIBLE");
+ group.setResourceTypeId(10001);
+
+ // Generate the group
+ Response response =
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .body(group)
+ .log().everything()
+ .expect()
+ .statusCode(HttpStatus.SC_CREATED)
+ .log().ifError()
+ .when()
+ .post("/group");
+
+ String location = response.header("Location");
+ int id = Integer.parseInt(location.substring(location.lastIndexOf("/")+1));
+
+ try {
+ response =
+ given()
+ .header(acceptJson)
+ .pathParam("id",id)
+ .expect()
+ .statusCode(HttpStatus.SC_OK)
+ .log().ifError()
+ .when()
+ .get("/group/{id}/metricDefinitions");
+
+ }
+ finally {
+ // delete the group
+ given()
+ .pathParam("id",id)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .delete("/group/{id}");
+ }
+ }
+
+ @Test
+ public void testGetGroupDefinitions() throws Exception {
+
+ expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/group/definitions");
+ }
+
+ @Test
+ public void testCreateRetrieveDeleteDefinition() throws Exception {
+
+ GroupDef gd = new GroupDef("-x-test-def");
+ gd.setDescription("Just testing");
+ List<String> list = new ArrayList<String>();
+ list.add("groupby resource");
+ list.add("resource.name");
+ gd.setExpression(list);
+
+ Response response =
+ given()
+ .contentType(ContentType.JSON)
+ .header("Accept","application/json")
+ .body(gd)
+ .expect()
+ .statusCode(201)
+ .log().ifError()
+ .when()
+ .post("/group/definitions");
+
+
+ String location = response.getHeader("Location");
+ int defintionId = Integer.parseInt(location.substring(location.lastIndexOf("/")+1));
+
+ try {
+ // retrieve by id
+ given()
+ .pathParam("id", defintionId)
+ .expect()
+ .statusCode(200)
+ .when()
+ .get("/group/definition/{id}");
+
+ // retrieve by query
+ Response resp =
+ given()
+ .queryParam("q", "-x-test-def")
+ .expect()
+ .statusCode(200)
+ .body("name", hasItem("-x-test-def"))
+ .log().ifError()
+ .when()
+ .get("/group/definitions");
+ } finally {
+
+ // remove the definition again
+ expect()
+ .statusCode(204)
+ .when()
+ .delete("/group/definition/" + defintionId);
+ }
+
+ }
+
+ @Test
+ public void testCreateUpdateRecalcDeleteDefinition() throws Exception {
+
+ GroupDef gd = new GroupDef("-x-test-def2");
+ gd.setDescription("Just testing");
+ List<String> list = new ArrayList<String>();
+ list.add("groupby resource.trait[partitionName]");
+ list.add("resource.type.plugin = JBossAS");
+ list.add("resource.type.name = JBossAS Server");
+ gd.setExpression(list);
+
+ Response response =
+ given()
+ .contentType(ContentType.JSON)
+ .header("Accept","application/json")
+ .body(gd)
+ .expect()
+ .statusCode(201)
+ .log().ifError()
+ .when()
+ .post("/group/definitions");
+
+
+ String location = response.getHeader("Location");
+ int defintionId = Integer.parseInt(location.substring(location.lastIndexOf("/")+1));
+
+ try {
+ gd.setDescription("Hulla");
+ list = new ArrayList<String>(1);
+ list.add("groupby resource.pluginConfiguration[productType]");
+ gd.setExpression(list);
+
+ given()
+ .contentType(ContentType.JSON)
+ .header("Accept", "application/json")
+ .body(gd)
+ .pathParam("id", defintionId)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .put("/group/definition/{id}");
+
+ given()
+ .contentType(ContentType.JSON)
+ .header("Accept","application/json")
+ .body(gd) // needs to be supplied as dummy
+ .pathParam("id", defintionId)
+ .queryParam("recalculate",true)
+ .expect()
+ .statusCode(204)
+ .log().ifError()
+ .when()
+ .put("/group/definition/{id}");
+ }
+ finally {
+
+ expect()
+ .statusCode(204)
+ .when()
+ .delete("/group/definition/" + defintionId);
+ }
+ }
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/MetricsTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/MetricsTest.java
new file mode 100644
index 0000000..28fa806
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/MetricsTest.java
@@ -0,0 +1,361 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.modules.integrationTests.restApi;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.path.json.JsonPath;
+import com.jayway.restassured.response.Response;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.rhq.modules.integrationTests.restApi.d.Baseline;
+import org.rhq.modules.integrationTests.restApi.d.MDataPoint;
+import org.rhq.modules.integrationTests.restApi.d.Schedule;
+
+import static com.jayway.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
+
+/**
+ * Test stuff related to metrics
+ * @author Heiko W. Rupp
+ */
+public class MetricsTest extends AbstractBase {
+
+ private int numericScheduleId;
+ private long defaultInterval;
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();// is not called by junit before this one
+
+ // Determine a schedule id for the common cases
+ Response r =
+ given()
+ .header(acceptJson)
+ .queryParam("type", "metric")
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/resource/10001/schedules");
+
+ JsonPath jp = r.jsonPath();
+ numericScheduleId = jp.getInt("[0].scheduleId");
+ defaultInterval = jp.getLong("[0].collectionInterval");
+ }
+
+ @Test
+ public void testGetScheduleById() throws Exception {
+
+ given()
+ .header(acceptJson)
+ .pathParam("id", numericScheduleId)
+ .expect()
+ .statusCode(200)
+ .body("scheduleId", containsString("" + numericScheduleId))
+ .log().ifError()
+ .when()
+ .get("/metric/schedule/{id}");
+
+ }
+
+ @Test
+ public void testPutGetRawData() throws Exception {
+
+ long now = System.currentTimeMillis();
+
+ MDataPoint dataPoint = new MDataPoint();
+ dataPoint.setScheduleId(numericScheduleId);
+ dataPoint.setTimeStamp(now);
+ dataPoint.setValue(1.5);
+
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .pathParam("id", numericScheduleId)
+ .pathParam("timestamp",now)
+ .body(dataPoint)
+ .expect()
+ .statusCode(201)
+ .log().ifError()
+ .when()
+ .put("/metric/data/{id}/raw/{timestamp}");
+
+ Response response =
+ given()
+ .header(acceptJson)
+ .pathParam("id", numericScheduleId)
+ .queryParam("startTime",now - 10)
+ .queryParam("endTime",now + 10)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/metric/data/{id}/raw");
+
+ List<Map<String,Object>> list = response.as(List.class);
+ assert list.size()>0;
+
+ boolean found = false;
+ for (Map<String, Object> map : list) {
+ MDataPoint mp = new MDataPoint(map);
+ if (mp.equals(dataPoint))
+ found = true;
+ }
+ assert found;
+
+ }
+
+ @Test
+ public void testPostGetRawData() throws Exception {
+
+ long now = System.currentTimeMillis();
+
+ MDataPoint dataPoint = new MDataPoint();
+ dataPoint.setScheduleId(numericScheduleId);
+ dataPoint.setTimeStamp(now);
+ dataPoint.setValue(1.5);
+ List<MDataPoint> points = new ArrayList<MDataPoint>(1);
+ points.add(dataPoint);
+
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .body(points)
+ .expect()
+ .statusCode(204)
+ .log().ifError()
+ .when()
+ .post("/metric/data/raw");
+
+ Response response =
+ given()
+ .header(acceptJson)
+ .pathParam("id", numericScheduleId)
+ // no start and end time -> last 8h of data
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/metric/data/{id}/raw");
+
+ List<Map<String,Object>> list = response.as(List.class);
+ assert list.size()>0 : "No data retrieved";
+
+ boolean found = false;
+ for (Map<String, Object> map : list) {
+ MDataPoint mp = new MDataPoint(map);
+ if (mp.equals(dataPoint))
+ found = true;
+ }
+ assert found;
+
+ }
+
+ @Test
+ public void testUpdateSchedule() throws Exception {
+
+ Schedule schedule = new Schedule();
+ schedule.setCollectionInterval(1234567);
+ schedule.setEnabled(true);
+
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .pathParam("id", numericScheduleId)
+ .body(schedule)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .put("/metric/schedule/{id}");
+
+ // reset to original interval
+
+ schedule.setCollectionInterval(defaultInterval);
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .pathParam("id", numericScheduleId)
+ .body(schedule)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .put("/metric/schedule/{id}");
+
+ }
+
+ @Test
+ public void testAddGetTrait() throws Exception {
+ // Determine a trait schedule
+ Response r =
+ given()
+ .header(acceptJson)
+ .queryParam("type", "trait")
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/resource/10001/schedules");
+
+ JsonPath jp = r.jsonPath();
+ int tsId = jp.getInt("[0].scheduleId");
+
+ String trait = "{\"value\":\"Hello World!\" }";
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .body(trait)
+ .pathParam("id",tsId)
+ .expect()
+ .statusCode(200) // TODO 201 ?
+ .log().ifError()
+ .when()
+ .put("/metric/data/{id}/trait");
+
+ given()
+ .header(acceptJson)
+ .pathParam("id",tsId)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .body("value",is("Hello World!"))
+ .when()
+ .get("/metric/data/{id}/trait");
+
+ }
+
+ @Test
+ public void testSetGetBaseline() throws Exception {
+
+ long now = System.currentTimeMillis();
+
+ Baseline baseline = new Baseline(0.0,2.0,1.0,now);
+
+ given()
+ .contentType(ContentType.XML)
+ .header(acceptJson)
+ .body(baseline)
+ .pathParam("sid", numericScheduleId)
+ .expect()
+ .statusCode(201)
+ .log().ifError()
+ .when()
+ .put("/metric/data/{sid}/baseline");
+
+ Baseline result =
+ given()
+ .header(acceptJson)
+ .pathParam("sid",numericScheduleId)
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/metric/data/{sid}/baseline")
+ .as(Baseline.class);
+
+ assert result.equals(baseline);
+ }
+
+ @Test
+ public void testSetBadBaseline() throws Exception {
+
+ long now = System.currentTimeMillis();
+
+ Baseline baseline = new Baseline(10.0,1.0,2.0,now);
+
+ given()
+ .contentType(ContentType.JSON)
+ .header(acceptJson)
+ .body(baseline)
+ .pathParam("sid", numericScheduleId)
+ .expect()
+ .statusCode(406)
+ .log().ifError()
+ .when()
+ .put("/metric/data/{sid}/baseline");
+ }
+
+ @Test
+ public void testGetAggregate() throws Exception {
+
+ long now = System.currentTimeMillis();
+
+ Response r =
+ given()
+ .header(acceptJson)
+ .pathParam("scheduleId", numericScheduleId)
+ .expect()
+ .statusCode(200)
+ .body("scheduleId", is(numericScheduleId))
+ .body("numDataPoints", is(60))
+ .log().ifError()
+ .when()
+ .get("/metric/data/{scheduleId}");
+
+ Map map = r.as(Map.class);
+ List<MDataPoint> points = (List<MDataPoint>) map.get("dataPoints");
+ assert points.size()==60;
+
+ }
+
+// @Test Not yet - see https://bugzilla.redhat.com/show_bug.cgi?id=835647 TODO
+ public void testGetAggregate120Points() throws Exception {
+
+ long now = System.currentTimeMillis();
+
+ Response r =
+ given()
+ .header(acceptJson)
+ .pathParam("scheduleId", numericScheduleId)
+ .queryParam("dataPoints",120)
+ .expect()
+ .statusCode(200)
+ .body("scheduleId", is(numericScheduleId))
+ .body("numDataPoints", is(120))
+ .log().ifError()
+ .when()
+ .get("/metric/data/{scheduleId}");
+
+ Map map = r.as(Map.class);
+ List<MDataPoint> points = (List<MDataPoint>) map.get("dataPoints");
+ assert points.size()==120;
+
+ }
+ @Test
+ public void testGetAggregateMinusOnePoints() throws Exception {
+
+ given()
+ .header(acceptJson)
+ .pathParam("scheduleId", numericScheduleId)
+ .queryParam("dataPoints",-1)
+ .expect()
+ .statusCode(406)
+ .when()
+ .get("/metric/data/{scheduleId}");
+ }
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ResourcesTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ResourcesTest.java
index ca63c32..f6164ba 100644
--- a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ResourcesTest.java
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ResourcesTest.java
@@ -22,83 +22,253 @@
*/
package org.rhq.modules.integrationTests.restApi;
-import com.eclipsesource.restfuse.AuthenticationType;
-import com.eclipsesource.restfuse.Destination;
-import com.eclipsesource.restfuse.HttpJUnitRunner;
-import com.eclipsesource.restfuse.Method;
-import com.eclipsesource.restfuse.Response;
-import com.eclipsesource.restfuse.annotation.Authentication;
-import com.eclipsesource.restfuse.annotation.Context;
-import com.eclipsesource.restfuse.annotation.Header;
-import com.eclipsesource.restfuse.annotation.HttpTest;
-
-import org.junit.Rule;
+
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.path.json.JsonPath;
+import com.jayway.restassured.response.Response;
+
+import org.apache.http.HttpStatus;
+import org.hamcrest.CoreMatchers;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import static junit.framework.Assert.assertTrue;
+import static com.jayway.restassured.RestAssured.expect;
+import static com.jayway.restassured.RestAssured.get;
+import static com.jayway.restassured.RestAssured.given;
+import static com.jayway.restassured.RestAssured.with;
+import static org.hamcrest.CoreMatchers.containsString;
/**
* Test the resources part
* @author Heiko W. Rupp
*/
-(a)RunWith(HttpJUnitRunner.class)
-public class ResourcesTest {
+public class ResourcesTest extends AbstractBase {
- @Rule
- public Destination destination = new Destination("http://" + System.getProperty("rest.server","localhost") + ":7080/rest");
+ @Test
+ public void testPlatformsPresent() {
+ expect()
+ .statusCode(200)
+ .body("links[0].rel", CoreMatchers.hasItem("self"))
+ .when()
+ .get("/resource/platforms.json");
+ }
- @Context
- private Response response;
+ @Test
+ public void testGetPlatformJson() {
+ given()
+ .header("Accept","application/json")
+ .expect()
+ .statusCode(200)
+ .contentType(ContentType.JSON)
+ .body("links.rel", CoreMatchers.hasItem("self"))
+ .when()
+ .get("/resource/10001");
- @HttpTest( method = Method.GET, path = "/resource/platforms" )
- public void testAuthRequired() {
- com.eclipsesource.restfuse.Assert.assertUnauthorized(response);
}
- @HttpTest( method = Method.GET, path = "/resource/platforms",authentications =
- @Authentication(type = AuthenticationType.BASIC, user = "rhqadmin", password = "rhqadmin")
- )
- public void testPlatformsPresent() {
- com.eclipsesource.restfuse.Assert.assertOk(response);
- assertTrue(response.hasBody());
+ @Test
+ public void testResourceQuery() throws Exception {
+ String json = get("/resource/platforms.json").asString();
+ String platformName = JsonPath.with(json).get("[0].resourceName");
+
+ given()
+ .header("Accept","application/json")
+ .with()
+ .queryParam("q",platformName)
+ .queryParam("category","platform")
+ .expect()
+ .statusCode(200)
+ .body("links[0].rel", CoreMatchers.hasItem("self"))
+ .when()
+ .get("/resource");
}
- @HttpTest( method = Method.GET, path = "/resource/10001",authentications =
- @Authentication(type = AuthenticationType.BASIC, user = "rhqadmin", password = "rhqadmin"),
- headers = {@Header(name = "Accept",value ="application/json")}
- )
- public void testGetPlatformJson() {
- com.eclipsesource.restfuse.Assert.assertOk(response);
- assertTrue(response.hasBody());
+ @Test
+ public void testResourceQueryCategory() throws Exception {
+
+ with()
+ .queryParam("category","PlAtForM")
+ .expect()
+ .statusCode(200)
+ .when()
+ .get("/resource");
+
+
+ with()
+ .queryParam("category","SeRvEr")
+ .expect()
+ .statusCode(200)
+ .when()
+ .get("/resource");
+
+
+ with()
+ .queryParam("category", "seRVice")
+ .expect()
+ .statusCode(200)
+ .when()
+ .get("/resource");
+ }
+
+ @Test
+ public void testPaging() throws Exception {
+
+ given()
+ .header("Accept", "application/json")
+ .with()
+ .queryParam("page", 1)
+ .queryParam("ps", 2) // Unusually small to provoke having more than 1 page
+ .queryParam("category", "service")
+ .expect()
+ .statusCode(200)
+ .header("Link", containsString("page=2"))
+ .body("links[0].rel", CoreMatchers.hasItem("self"))
+ .when().get("/resource");
}
- @HttpTest( method = Method.GET, path = "/resource/10001",authentications =
- @Authentication(type = AuthenticationType.BASIC, user = "rhqadmin", password = "rhqadmin"),
- headers = {@Header(name = "Accept",value ="application/xml")}
- )
+ @Test
public void testGetPlatformXml() {
- com.eclipsesource.restfuse.Assert.assertOk(response);
- assertTrue(response.hasBody());
+ given()
+ .header("Accept","application/xml")
+ .expect()
+ .statusCode(200)
+ .contentType(ContentType.XML)
+ .when()
+ .get("/resource/10001");
}
- @HttpTest( method = Method.GET, path = "/resource/10001/schedules",authentications =
- @Authentication(type = AuthenticationType.BASIC, user = "rhqadmin", password = "rhqadmin"),
- headers = {@Header(name = "Accept",value ="application/json")}
- )
+ @Test
public void testGetPlatformSchedules() {
- com.eclipsesource.restfuse.Assert.assertOk(response);
- assertTrue(response.hasBody());
+ given()
+ .header("Accept","application/json")
+ .expect()
+ .statusCode(200)
+ .when()
+ .get("/resource/10001/schedules");
}
- @HttpTest( method = Method.GET, path = "/resource/10001/children",authentications =
- @Authentication(type = AuthenticationType.BASIC, user = "rhqadmin", password = "rhqadmin"),
- headers = {@Header(name = "Accept",value ="application/json")}
- )
+ @Test
public void testGetPlatformChildren() {
- com.eclipsesource.restfuse.Assert.assertOk(response);
- assertTrue(response.hasBody());
+ given()
+ .header("Accept","application/json")
+ .expect()
+ .statusCode(200)
+ .when()
+ .get("/resource/10001/children");
}
+ @Test
+ public void testCreatePlatform() throws Exception {
+
+ given().body("{\"value\":\"Linux\"}")
+ .header("Content-Type","application/json")
+ .header("Accept","application/json")
+ .expect().statusCode(201)
+ .when().post("/resource/platform/api-test-dummy");
+ }
+
+ @Test
+ public void testCreatePlatformAndRemove() throws Exception {
+
+ Response response =
+ with().body("{\"value\":\"Linux\"}")
+ .header("Content-Type","application/json")
+ .header("Accept","application/json")
+ .expect().statusCode(201)
+ .when().post("/resource/platform/api-test-dummy").andReturn();
+
+ String platformId = response.jsonPath().getString("resourceId");
+
+ given().pathParam("id",platformId)
+ .expect().statusCode(HttpStatus.SC_NO_CONTENT)
+ .when().delete("/resource/{id}");
+ }
+
+ @Test
+ public void testCreatePlatformWithChildAndRemove() throws Exception {
+
+ Response response =
+ with().body("{\"value\":\"Linux\"}")
+ .header("Content-Type","application/json")
+ .header("Accept","application/json")
+ .expect()
+ .statusCode(201)
+ .when()
+ .post("/resource/platform/api-test-dummy");
+
+ String platformId = response.jsonPath().getString("resourceId");
+
+ try {
+ Response child =
+ with().body("{\"value\":\"CPU\"}") // Type of new resource
+ .header("Content-Type", "application/json")
+ .header("Accept", "application/json")
+ .pathParam("name", "test")
+ .queryParam("plugin", "Platforms")
+ .queryParam("parentId", platformId)
+ .expect()
+ .statusCode(201)
+ .log().ifError()
+ .when().post("/resource/{name}").andReturn();
+ }
+ finally {
+ given().pathParam("id",platformId)
+ .expect().statusCode(HttpStatus.SC_NO_CONTENT)
+ .when().delete("/resource/{id}");
+ }
+ }
+
+ @Test
+ public void testAlertsForResource() throws Exception {
+ given()
+ .header("Accept","application/json")
+ .expect().statusCode(200)
+ .when().get("/resource/10001/alerts");
+ }
+
+ @Test
+ public void testSchedulesForResource() throws Exception {
+ given()
+ .header("Accept","application/json")
+ .expect().statusCode(200)
+ .when().get("/resource/10001/schedules");
+ }
+
+ @Test
+ public void testAvailabilityForResource() throws Exception {
+ given()
+ .header("Accept", "application/json")
+ .expect().statusCode(200)
+ .when().get("/resource/10001/availability");
+ }
+
+ @Test
+ public void testAvailabilityHistoryForResource() throws Exception {
+ given()
+ .header("Accept", "application/json")
+ .expect().statusCode(200)
+ .when().get("/resource/10001/availability/history");
+ }
+
+ @Test
+ public void testUpdateAvailablity() throws Exception {
+ long now = System.currentTimeMillis()-100;
+ given().body("{\"since\":" + now + ",\"type\":\"DISABLED\",\"resourceId\":10001}")
+ .header("Content-Type","application/json")
+ .header("Accept","application/json")
+ .pathParam("id",10001)
+ .expect()
+ .statusCode(HttpStatus.SC_NO_CONTENT)
+ .log().ifError()
+ .when().put("/resource/{id}/availability");
+
+ Response response = given()
+ .header("Accept", "application/json")
+ .expect().statusCode(200)
+ .when().get("/resource/10001/availability");
+
+ String currentType = response.jsonPath().get("type");
+ assert currentType.equals("DISABLED"); // TODO small window where an agent may have sent an update
+
+ }
}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/RootURITest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/RootURITest.java
new file mode 100644
index 0000000..35111f0
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/RootURITest.java
@@ -0,0 +1,112 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.modules.integrationTests.restApi;
+
+import java.util.List;
+import java.util.Map;
+
+import com.jayway.restassured.path.json.JsonPath;
+
+import org.junit.Test;
+
+import static com.jayway.restassured.RestAssured.expect;
+import static com.jayway.restassured.RestAssured.get;
+import static com.jayway.restassured.RestAssured.given;
+
+/**
+ * Test the / resource (http://localhost:7080/rest/ )
+ * @author Heiko W. Rupp
+ */
+public class RootURITest extends AbstractBase {
+
+ @Test
+ public void testRootPresent() throws Exception {
+
+ given().header("Accept","text/html")
+ .expect().statusCode(200)
+ .when().get("/");
+
+ given().header("Accept","text/html")
+ .expect().statusCode(200)
+ .when().get("/index");
+
+ given().header("Accept","application/json")
+ .expect().statusCode(200)
+ .when().get("/");
+
+ given().header("Accept","application/json")
+ .expect().statusCode(200)
+ .when().get("/index");
+
+ expect().statusCode(200)
+ .when().get("/.json");
+
+ expect().statusCode(200)
+ .when().get("/.xml");
+
+ expect().statusCode(200)
+ .when().get("/.html");
+
+ expect().statusCode(200)
+ .when().get("/index.json");
+
+ expect().statusCode(200)
+ .when().get("/index.xml");
+
+ expect().statusCode(200)
+ .when().get("/index.html");
+
+ }
+
+ @Test
+ public void testLinksInRoot() throws Exception {
+
+ String json = get("/index.json").asString();
+ List<Map<String,String>> links = JsonPath.with(json).getList(""); // with() already returns the list
+
+ assert links != null;
+ assert links.size()>0;
+
+ String[] mediaTypes = {"text/html","application/xml","application/json"};
+
+ for (Map<String,String> link : links) {
+ String href= link.get("href");
+
+ for (String mediaType : mediaTypes) {
+ given().header("Accept",mediaType)
+ .expect().statusCode(200)
+ .log().ifError()
+ .when().get(href);
+ }
+ }
+ }
+
+ @Test
+ public void testJsonPWrapping() throws Exception {
+
+ String json = get("/index.json").asString();
+ assert !json.startsWith("foo(");
+
+ String jsonp = get("/index.json?jsonp=foo").asString();
+ assert jsonp.startsWith("foo(");
+ String jp2 = "foo(" + json+ ");";
+ assert jsonp.equals(jp2);
+
+ }
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/StatusTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/StatusTest.java
new file mode 100644
index 0000000..073a56a
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/StatusTest.java
@@ -0,0 +1,93 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.modules.integrationTests.restApi;
+
+
+import static com.jayway.restassured.RestAssured.*;
+
+import org.junit.Test;
+
+/**
+ * Test the status part of the API
+ */
+public class StatusTest extends AbstractBase{
+
+
+ @Test
+ public void testAuthRequired() {
+ given()
+ .auth().none()
+ .expect()
+ .statusCode(401)
+ .when()
+ .get("/status");
+ }
+
+
+ @Test
+ public void testAuthRhqadmin() {
+ expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/status");
+
+ given()
+ .header("Accept","text/html")
+ .expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/status");
+
+ given().header("Accept","application/json")
+ .expect().statusCode(200)
+ .when().get("/status");
+
+ given().header("Accept","application/xml")
+ .expect().statusCode(200)
+ .when().get("/status");
+
+ }
+
+ @Test
+ public void testAuthRestricted() {
+ given()
+ .auth().basic("user","name23")
+ .expect()
+ .statusCode(401)
+ .when()
+ .get("/rest/status"); // Wrong url does not matter, as the access is checked before hitting the rest api
+ }
+
+ @Test
+ public void testServerOpMode() throws Exception {
+
+ expect()
+ .statusCode(200)
+ .log().ifError()
+ .when()
+ .get("/status/server");
+
+ }
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/UserTest.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/UserTest.java
new file mode 100644
index 0000000..07e2f29
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/UserTest.java
@@ -0,0 +1,158 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.modules.integrationTests.restApi;
+
+import com.jayway.restassured.http.ContentType;
+import com.jayway.restassured.path.json.JsonPath;
+import com.jayway.restassured.response.Response;
+
+import org.apache.http.HttpStatus;
+import org.junit.Test;
+
+import org.rhq.modules.integrationTests.restApi.d.Group;
+
+import static com.jayway.restassured.RestAssured.delete;
+import static com.jayway.restassured.RestAssured.expect;
+import static com.jayway.restassured.RestAssured.given;
+
+/**
+ * Test user related functionality of the rest api
+ * @author Heiko W. Rupp
+ */
+public class UserTest extends AbstractBase {
+
+ @Test
+ public void testGetFavoritesResources() throws Exception {
+
+ expect().statusCode(200)
+ .log().ifError()
+ .when().get("/user/favorites/resource");
+ }
+
+ @Test
+ public void testGetFavoriteGroups() throws Exception {
+
+ expect().statusCode(200)
+ .log().ifError()
+ .when().get("/user/favorites/group");
+ }
+
+ @Test
+ public void testAddRemoveFavoriteResources() throws Exception {
+
+ expect().statusCode(204)
+ .when().put("/user/favorites/resource/10001");
+
+ try {
+ Response r =
+ expect()
+ .statusCode(200)
+ .when()
+ .get("/user/favorites/resource");
+ JsonPath jp = r.jsonPath();
+ assert jp.getList("resourceId").contains("10001");
+ }
+ finally {
+ expect()
+ .statusCode(204)
+ .when().delete("/user/favorites/resource/10001");
+ }
+ }
+
+ @Test
+ public void testAddRemoveFavoriteGroup() throws Exception {
+ Group group = new Group("-x-test-group-user");
+
+ // create a group
+ Response created =
+ given()
+ .header(acceptJson)
+ .contentType(ContentType.JSON)
+ .body(group)
+ .expect()
+ .statusCode(HttpStatus.SC_CREATED)
+ .log().ifError()
+ .when()
+ .post("/group");
+
+ String location = created.header("Location");
+ int groupId = Integer.parseInt(location.substring(location.lastIndexOf("/")+1));
+
+ try {
+ given()
+ .header("Accept", "application/json")
+ .contentType(ContentType.XML)
+ .pathParam("id", groupId)
+ .expect()
+ .statusCode(204)
+ .when()
+ .put("/user/favorites/group/{id}");
+
+ Response r =
+ given()
+ .header("Accept", "application/json")
+ .expect()
+ .statusCode(200)
+ .when()
+ .get("/user/favorites/group");
+// JsonPath jp = r.jsonPath(); // TODO enable as soon as JsonPath syntax is known
+// assert jp.getList("$[].id").contains(""+groupId);
+ }
+ finally {
+ given()
+ .pathParam("id",groupId)
+ .expect()
+ .statusCode(204)
+ .when()
+ .delete("/user/favorites/group/{id}");
+
+ delete("/group/" + groupId);
+ }
+ }
+
+ @Test
+ public void testAddNonExistingResource() throws Exception {
+
+ expect()
+ .statusCode(404)
+ .when()
+ .put("/user/favorites/resource/1"); // RHQ resource ids are > 10k
+ }
+
+ @Test
+ public void testAddNonExistingGroup() throws Exception {
+
+ expect()
+ .statusCode(404)
+ .log().everything()
+ .when()
+ .put("/user/favorites/group/1"); // RHQ group ids are > 10k
+ }
+
+ @Test
+ public void testGetUserInfo() throws Exception {
+ given()
+ .pathParam("id","rhqadmin")
+ .expect()
+ .statusCode(200)
+ .when()
+ .get("/user/{id}");
+
+ }
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Baseline.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Baseline.java
new file mode 100644
index 0000000..f596e96
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Baseline.java
@@ -0,0 +1,107 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.modules.integrationTests.restApi.d;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * A metric baseline
+ * @author Heiko W. Rupp
+ */
+@XmlRootElement
+public class Baseline {
+
+ double min;
+ double max;
+ double mean;
+ long computeTime;
+
+ public Baseline() {
+ }
+
+ public Baseline(double min, double max, double mean, long computeTime) {
+ this.min = min;
+ this.max = max;
+ this.mean = mean;
+ this.computeTime = computeTime;
+ }
+
+ public double getMin() {
+ return min;
+ }
+
+ public void setMin(double min) {
+ this.min = min;
+ }
+
+ public double getMax() {
+ return max;
+ }
+
+ public void setMax(double max) {
+ this.max = max;
+ }
+
+ public double getMean() {
+ return mean;
+ }
+
+ public void setMean(double mean) {
+ this.mean = mean;
+ }
+
+ public long getComputeTime() {
+ return computeTime;
+ }
+
+ public void setComputeTime(long computeTime) {
+ this.computeTime = computeTime;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ Baseline baseline = (Baseline) o;
+
+ if (Double.compare(baseline.max, max) != 0) return false;
+ if (Double.compare(baseline.mean, mean) != 0) return false;
+ if (Double.compare(baseline.min, min) != 0) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result;
+ long temp;
+ temp = min != +0.0d ? Double.doubleToLongBits(min) : 0L;
+ result = (int) (temp ^ (temp >>> 32));
+ temp = max != +0.0d ? Double.doubleToLongBits(max) : 0L;
+ result = 31 * result + (int) (temp ^ (temp >>> 32));
+ temp = mean != +0.0d ? Double.doubleToLongBits(mean) : 0L;
+ result = 31 * result + (int) (temp ^ (temp >>> 32));
+ return result;
+ }
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Event.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Event.java
new file mode 100644
index 0000000..89adef2
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Event.java
@@ -0,0 +1,85 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.modules.integrationTests.restApi.d;
+
+/**
+ * An Event for testing
+ * @author Heiko W. Rupp
+ */
+public class Event {
+
+ int id;
+ String detail;
+ int sourceId;
+ long timestamp;
+ String severity = "INFO";
+
+ public Event() {
+ }
+
+ public Event(int sourceId, long timestamp, String detail) {
+ this.detail = detail;
+ this.sourceId = sourceId;
+ this.timestamp = timestamp;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getDetail() {
+ return detail;
+ }
+
+ public void setDetail(String detail) {
+ this.detail = detail;
+ }
+
+ public int getSourceId() {
+ return sourceId;
+ }
+
+ public void setSourceId(int sourceId) {
+ this.sourceId = sourceId;
+ }
+
+ public long getTimestamp() {
+ return timestamp;
+ }
+
+ public void setTimestamp(long timestamp) {
+ this.timestamp = timestamp;
+ }
+
+ public String getSeverity() {
+ return severity;
+ }
+
+ public void setSeverity(String severity) {
+ this.severity = severity;
+ }
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/EventSource.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/EventSource.java
new file mode 100644
index 0000000..9ba191d
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/EventSource.java
@@ -0,0 +1,116 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.modules.integrationTests.restApi.d;
+
+/**
+ * EventSource for testing
+ * @author Heiko W. Rupp
+ */
+public class EventSource {
+
+ int id;
+ String name;
+ String location;
+ int resourceId;
+ String displayName;
+ String description;
+
+ public EventSource() {
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getLocation() {
+ return location;
+ }
+
+ public void setLocation(String location) {
+ this.location = location;
+ }
+
+ public int getResourceId() {
+ return resourceId;
+ }
+
+ public void setResourceId(int resourceId) {
+ this.resourceId = resourceId;
+ }
+
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ EventSource that = (EventSource) o;
+
+ if (id != that.id) return false;
+ if (resourceId != that.resourceId) return false;
+ if (description != null ? !description.equals(that.description) : that.description != null) return false;
+ if (displayName != null ? !displayName.equals(that.displayName) : that.displayName != null) return false;
+ if (!location.equals(that.location)) return false;
+ if (!name.equals(that.name)) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = id;
+ result = 31 * result + name.hashCode();
+ result = 31 * result + location.hashCode();
+ result = 31 * result + resourceId;
+ result = 31 * result + (displayName != null ? displayName.hashCode() : 0);
+ result = 31 * result + (description != null ? description.hashCode() : 0);
+ return result;
+ }
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Group.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Group.java
new file mode 100644
index 0000000..d576f4e
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Group.java
@@ -0,0 +1,65 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.modules.integrationTests.restApi.d;
+
+/**
+ * A group for testing
+ * @author Heiko W. Rupp
+ */
+public class Group {
+
+ String name;
+ String category = "MIXED";
+ Integer resourceTypeId;
+
+ public Group() {
+ }
+
+ public Group(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getCategory() {
+ return category;
+ }
+
+ public void setCategory(String category) {
+ this.category = category;
+ }
+
+ public Integer getResourceTypeId() {
+ return resourceTypeId;
+ }
+
+ public void setResourceTypeId(Integer resourceTypeId) {
+ this.resourceTypeId = resourceTypeId;
+ }
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/GroupDef.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/GroupDef.java
new file mode 100644
index 0000000..16bfda3
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/GroupDef.java
@@ -0,0 +1,76 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.modules.integrationTests.restApi.d;
+
+import java.util.List;
+
+/**
+ * A Group definition for testing
+ * @author Heiko W. Rupp
+ */
+public class GroupDef {
+
+ private int id;
+ private String name;
+ private String description;
+ private List<String> expression;
+
+ public GroupDef() {
+ }
+
+ public GroupDef(String name) {
+ this.name = name;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public List<String> getExpression() {
+ return expression;
+ }
+
+ public void setExpression(List<String> expression) {
+ this.expression = expression;
+ }
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/MDataPoint.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/MDataPoint.java
new file mode 100644
index 0000000..f42155d
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/MDataPoint.java
@@ -0,0 +1,91 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.modules.integrationTests.restApi.d;
+
+import java.util.Map;
+
+/**
+ * A numeric data point for testing
+ * @author Heiko W. Rupp
+ */
+public class MDataPoint {
+
+ long timeStamp;
+ Double value;
+ private int scheduleId;
+
+ public MDataPoint() {
+ }
+
+ public MDataPoint(Map<String,Object> in) {
+ timeStamp = (Long) in.get("timeStamp");
+ value = (Double) in.get("value");
+ scheduleId = (Integer)in.get("scheduleId");
+ }
+
+ public long getTimeStamp() {
+ return timeStamp;
+ }
+
+ public void setTimeStamp(long timeStamp) {
+ this.timeStamp = timeStamp;
+ }
+
+ public Double getValue() {
+ return value;
+ }
+
+ public void setValue(Double value) {
+ this.value = value;
+ }
+
+ public int getScheduleId() {
+ return scheduleId;
+ }
+
+ public void setScheduleId(int scheduleId) {
+ this.scheduleId = scheduleId;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ MDataPoint that = (MDataPoint) o;
+
+ if (scheduleId != that.scheduleId) return false;
+ if (timeStamp != that.timeStamp) return false;
+ if (value != null ? !value.equals(that.value) : that.value != null) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = (int) (timeStamp ^ (timeStamp >>> 32));
+ result = 31 * result + (value != null ? value.hashCode() : 0);
+ result = 31 * result + scheduleId;
+ return result;
+ }
+}
diff --git a/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Schedule.java b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Schedule.java
new file mode 100644
index 0000000..be7344d
--- /dev/null
+++ b/modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/d/Schedule.java
@@ -0,0 +1,61 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.modules.integrationTests.restApi.d;
+
+/**
+ * A metric schedule for testing
+ * @author Heiko W. Rupp
+ */
+public class Schedule {
+
+ private int scheduleId;
+ private boolean enabled;
+ private long collectionInterval;
+
+ public Schedule() {
+ }
+
+ public int getScheduleId() {
+ return scheduleId;
+ }
+
+ public void setScheduleId(int scheduleId) {
+ this.scheduleId = scheduleId;
+ }
+
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ public long getCollectionInterval() {
+ return collectionInterval;
+ }
+
+ public void setCollectionInterval(long collectionInterval) {
+ this.collectionInterval = collectionInterval;
+ }
+}
commit f414d81fc9e0ce155982f25c4afcba615ec936d2
Author: Thomas SEGISMONT <tsegismo(a)redhat.com>
Date: Mon Dec 17 23:30:19 2012 +0100
Revert "Bug 887320 - Agent raise OutOfMemoryError when adding new Deployment child resource on AS7"
This reverts commit 52bdd6fa4f1fa658abd0a190282ea2f8f3b10b4d.
Fix will not work (HttpRetryException): streaming mode does not support authentication
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
index e1c50cb..a7fe82d 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
@@ -97,7 +97,6 @@ public class ASUploadConnection {
connection.setReadTimeout(timeout * 1000); // default 60s
connection.setDoInput(true);
connection.setDoOutput(true);
- connection.setChunkedStreamingMode(1024 * 64); // 64k chunks
connection.setRequestMethod(POST_REQUEST_METHOD);
connection.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + BOUNDARY_PARAM);
commit d937bc35698d34ca39aa99f885b82656762269ee
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Dec 17 16:57:58 2012 -0500
add a comment to the props file
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index 9b2742e..4e27030 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -401,6 +401,8 @@ rhq.server.email.from-address=rhqadmin@localhost
# the RHQ Server will bind to (jboss.bind.address) and the ports
# browsers will use to access the RHQ web application
# (rhq.server.socket.binding.port.http, rhq.server.socket.binding.port.https)
+# If you change the binding address, you might also want to change
+# "rhq.autoinstall.public-endpoint-address" as well.
#############################################################################
jboss.bind.address=0.0.0.0
commit 52bdd6fa4f1fa658abd0a190282ea2f8f3b10b4d
Author: Thomas SEGISMONT <tsegismo(a)redhat.com>
Date: Mon Dec 17 15:01:42 2012 +0100
Bug 887320 - Agent raise OutOfMemoryError when adding new Deployment child resource on AS7
HttpUrlConnection keeps data in memory until output stream is closed if content length is unknown.
Setting transfer mechanism to chunks solves the problem.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
index a7fe82d..e1c50cb 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASUploadConnection.java
@@ -97,6 +97,7 @@ public class ASUploadConnection {
connection.setReadTimeout(timeout * 1000); // default 60s
connection.setDoInput(true);
connection.setDoOutput(true);
+ connection.setChunkedStreamingMode(1024 * 64); // 64k chunks
connection.setRequestMethod(POST_REQUEST_METHOD);
connection.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + BOUNDARY_PARAM);
commit 35000db271b01396052737dbda03551802277c3b
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Sat Dec 15 00:44:26 2012 +0100
Ooops, forgot to implement the exception check in the JndiAccessTest.
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
index d330ba1..2e088f8 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
@@ -35,6 +35,7 @@ import javax.script.ScriptException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.testng.Assert;
import org.testng.annotations.Parameters;
import org.testng.annotations.Test;
@@ -253,7 +254,14 @@ public class JndiAccessTest extends Arquillian {
}
private void checkIsDesiredSecurityException(Throwable t) {
- //TODO implement
- System.out.println(t);
+ String message = t.getMessage();
+ String permissionTrace = "org.rhq.allow.server.internals.access";
+
+ if (!message.contains(permissionTrace)) {
+ Assert
+ .fail(
+ "The script exception doesn't seem to be caused by the AllowRhqServerInternalsAccessPermission security exception. ",
+ t);
+ }
}
}
commit c195ba605e0c7816db5bfe212e9265268d6c5030
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Fri Dec 14 18:33:53 2012 -0500
add https connector - use self-signed cert by default
diff --git a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/Address.java b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/Address.java
index c35bbda..d07f469 100644
--- a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/Address.java
+++ b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/Address.java
@@ -69,7 +69,7 @@ public class Address implements Cloneable {
}
@Override
- public Address clone() throws CloneNotSupportedException {
+ public Address clone() {
Address clone = new Address();
clone.addressNode = addressNode.clone();
return clone;
diff --git a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java
index c3ceec2..fc7ae88 100644
--- a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java
+++ b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java
@@ -238,11 +238,7 @@ public class DatasourceJBossASClient extends JBossASClient {
final ModelNode requestN = new ModelNode();
requestN.get(OPERATION).set(ADD);
requestN.get(ADDRESS).set(addr.getAddressNode());
- if (entry.getValue().indexOf("${") > -1) {
- requestN.get(VALUE).setExpression(entry.getValue());
- } else {
- requestN.get(VALUE).set(entry.getValue());
- }
+ setPossibleExpression(requestN, VALUE, entry.getValue());
batch[n++] = requestN;
}
@@ -327,11 +323,7 @@ public class DatasourceJBossASClient extends JBossASClient {
final ModelNode requestN = new ModelNode();
requestN.get(OPERATION).set(ADD);
requestN.get(ADDRESS).set(addr.getAddressNode());
- if (entry.getValue().indexOf("${") > -1) {
- requestN.get(VALUE).setExpression(entry.getValue());
- } else {
- requestN.get(VALUE).set(entry.getValue());
- }
+ setPossibleExpression(requestN, VALUE, entry.getValue());
batch[n++] = requestN;
}
diff --git a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java
index 9ceb300..fa4a5b9 100644
--- a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java
+++ b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java
@@ -107,7 +107,7 @@ public class JBossASClient {
public static ModelNode createWriteAttributeRequest(String attributeName, String attributeValue, Address address) {
final ModelNode op = createRequest(WRITE_ATTRIBUTE, address);
op.get(NAME).set(attributeName);
- op.get(VALUE).set(attributeValue);
+ setPossibleExpression(op, VALUE, attributeValue);
return op;
}
@@ -220,6 +220,29 @@ public class JBossASClient {
return "Unknown failure";
}
+ /**
+ * This sets the given node's named attribute to the given value. If the value
+ * appears to be an expression (that is, contains "${" somewhere in it), this will
+ * set the value as an expression on the node.
+ *
+ * @param node the node whose attribute is to be set
+ * @param name the name of the attribute whose value is to be set
+ * @param value the value, possibly an expression
+ *
+ * @return returns the node
+ */
+ public static ModelNode setPossibleExpression(ModelNode node, String name, String value) {
+ if (value != null) {
+ if (value.contains("${")) {
+ return node.get(name).setExpression(value);
+ } else {
+ return node.get(name).set(value);
+ }
+ } else {
+ return node.get(name).clear();
+ }
+ }
+
/////////////////////////////////////////////////////////////////
// Non-static methods that need the client
diff --git a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/WebJBossASClient.java b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/WebJBossASClient.java
index 59ab471..f1d030d 100644
--- a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/WebJBossASClient.java
+++ b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/WebJBossASClient.java
@@ -31,6 +31,8 @@ public class WebJBossASClient extends JBossASClient {
public static final String SUBSYSTEM_WEB = "web";
public static final String VIRTUAL_SERVER = "virtual-server";
public static final String DEFAULT_HOST = "default-host";
+ public static final String CONNECTOR = "connector";
+ public static final String SSL = "ssl";
public WebJBossASClient(ModelControllerClient client) {
super(client);
@@ -45,12 +47,381 @@ public class WebJBossASClient extends JBossASClient {
* @throws Exception
*/
public void setEnableWelcomeRoot(boolean enableFlag) throws Exception {
- Address address = Address.root().add(SUBSYSTEM, SUBSYSTEM_WEB, VIRTUAL_SERVER, DEFAULT_HOST);
- ModelNode req = createWriteAttributeRequest("enable-welcome-root", Boolean.toString(enableFlag), address);
- ModelNode response = execute(req);
+ final Address address = Address.root().add(SUBSYSTEM, SUBSYSTEM_WEB, VIRTUAL_SERVER, DEFAULT_HOST);
+ final ModelNode req = createWriteAttributeRequest("enable-welcome-root", Boolean.toString(enableFlag), address);
+ final ModelNode response = execute(req);
if (!isSuccess(response)) {
throw new FailureException(response);
}
return;
}
+
+ /**
+ * Checks to see if there is already a connector with the given name.
+ *
+ * @param name the name to check
+ * @return true if there is a connector with the given name already in existence
+ */
+ public boolean isConnector(String name) throws Exception {
+ final Address address = Address.root().add(SUBSYSTEM, SUBSYSTEM_WEB, CONNECTOR, name);
+ return null != readResource(address);
+ }
+
+ /**
+ * Use this to modify an attribute for an existing connector.
+ * @param connectorName the existing connector whose attribute is to be changed
+ * @param attribName the attribute to get a new value
+ * @param attribValue the new value of the attribute
+ * @throws Exception if failed to change the attribute on the named connector
+ */
+ public void changeConnector(String connectorName, String attribName, String attribValue) throws Exception {
+ final Address address = Address.root().add(SUBSYSTEM, SUBSYSTEM_WEB, CONNECTOR, connectorName);
+ final ModelNode op = createWriteAttributeRequest(attribName, attribValue, address);
+ final ModelNode response = execute(op);
+ if (!isSuccess(response)) {
+ throw new FailureException(response);
+ }
+ return;
+ }
+
+ /**
+ * Add a new web connector, which may be a secure SSL connector (HTTPS) or not (HTTP).
+ *
+ * @param name
+ * @param connectorConfig
+ * @throws Exception
+ */
+ public void addConnector(String name, ConnectorConfiguration connectorConfig) throws Exception {
+ ModelNode fullRequest;
+
+ final Address connectorAddress = Address.root().add(SUBSYSTEM, SUBSYSTEM_WEB, CONNECTOR, name);
+ final ModelNode connectorRequest = createRequest(ADD, connectorAddress);
+ setPossibleExpression(connectorRequest, "executor", connectorConfig.getExecutor());
+ setPossibleExpression(connectorRequest, "max-connections", connectorConfig.getMaxConnections());
+ setPossibleExpression(connectorRequest, "max-post-size", connectorConfig.getMaxPostSize());
+ setPossibleExpression(connectorRequest, "max-save-post-size", connectorConfig.getMaxSavePostSize());
+ setPossibleExpression(connectorRequest, "protocol", connectorConfig.getProtocol());
+ setPossibleExpression(connectorRequest, "proxy-name", connectorConfig.getProxyName());
+ setPossibleExpression(connectorRequest, "proxy-port", connectorConfig.getProxyPort());
+ setPossibleExpression(connectorRequest, "scheme", connectorConfig.getScheme());
+ setPossibleExpression(connectorRequest, "socket-binding", connectorConfig.getSocketBinding());
+ setPossibleExpression(connectorRequest, "redirect-port", connectorConfig.getRedirectPort());
+ setPossibleExpression(connectorRequest, "enabled", String.valueOf(connectorConfig.isEnabled()));
+ setPossibleExpression(connectorRequest, "enable-lookups", String.valueOf(connectorConfig.isEnableLookups()));
+ setPossibleExpression(connectorRequest, "secure", String.valueOf(connectorConfig.isSecure()));
+
+ SSLConfiguration sslConfig = connectorConfig.getSslConfiguration();
+ if (sslConfig != null) {
+ final Address sslAddress = connectorAddress.clone().add(SSL, "configuration"); // name MUST be "configuration" here
+ final ModelNode sslRequest = createRequest(ADD, sslAddress);
+ setPossibleExpression(sslRequest, "ca-certificate-file", sslConfig.getCaCertificateFile());
+ setPossibleExpression(sslRequest, "ca-certificate-password", sslConfig.getCaCertificatePassword());
+ setPossibleExpression(sslRequest, "ca-revocation-url", sslConfig.getCaRevocationUrl());
+ setPossibleExpression(sslRequest, "certificate-file", sslConfig.getCertificateFile());
+ setPossibleExpression(sslRequest, "certificate-key-file", sslConfig.getCertificateKeyFile());
+ setPossibleExpression(sslRequest, "cipher-suite", sslConfig.getCipherSuite());
+ setPossibleExpression(sslRequest, "key-alias", sslConfig.getKeyAlias());
+ setPossibleExpression(sslRequest, "keystore-type", sslConfig.getKeystoreType());
+ setPossibleExpression(sslRequest, "name", sslConfig.getName());
+ setPossibleExpression(sslRequest, "password", sslConfig.getPassword());
+ setPossibleExpression(sslRequest, "protocol", sslConfig.getProtocol());
+ setPossibleExpression(sslRequest, "session-cache-size", sslConfig.getSessionCacheSize());
+ setPossibleExpression(sslRequest, "session-timeout", sslConfig.getSessionTimeout());
+ setPossibleExpression(sslRequest, "truststore-type", sslConfig.getTruststoreType());
+ setPossibleExpression(sslRequest, "verify-client", sslConfig.getVerifyClient());
+ setPossibleExpression(sslRequest, "verify-depth", sslConfig.getVerifyDepth());
+ fullRequest = createBatchRequest(connectorRequest, sslRequest);
+ } else {
+ fullRequest = connectorRequest;
+ }
+
+ final ModelNode response = execute(fullRequest);
+ if (!isSuccess(response)) {
+ throw new FailureException(response, "Failed to add new connector [" + name + "]");
+ }
+ return;
+ }
+
+ public static class ConnectorConfiguration {
+ private boolean enabled = true;
+ private boolean enableLookups = false;
+ private String executor;
+ private String maxConnections;
+ private String maxSavePostSize;
+ private String maxPostSize;
+ private String protocol = "HTTP/1.1";
+ private String proxyPort;
+ private String proxyName;
+ private String scheme;
+ private boolean secure = false;
+ private String socketBinding;
+ private String redirectPort;
+ private SSLConfiguration sslConfiguration;
+
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ public boolean isEnableLookups() {
+ return enableLookups;
+ }
+
+ public void setEnableLookups(boolean enableLookups) {
+ this.enableLookups = enableLookups;
+ }
+
+ public String getExecutor() {
+ return executor;
+ }
+
+ public void setExecutor(String executor) {
+ this.executor = executor;
+ }
+
+ public String getMaxConnections() {
+ return maxConnections;
+ }
+
+ public void setMaxConnections(String maxConnections) {
+ this.maxConnections = maxConnections;
+ }
+
+ public String getMaxSavePostSize() {
+ return maxSavePostSize;
+ }
+
+ public void setMaxSavePostSize(String maxSavePostSize) {
+ this.maxSavePostSize = maxSavePostSize;
+ }
+
+ public String getMaxPostSize() {
+ return maxPostSize;
+ }
+
+ public void setMaxPostSize(String maxPostSize) {
+ this.maxPostSize = maxPostSize;
+ }
+
+ public String getProtocol() {
+ return protocol;
+ }
+
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
+ }
+
+ public String getProxyPort() {
+ return proxyPort;
+ }
+
+ public void setProxyPort(String proxyPort) {
+ this.proxyPort = proxyPort;
+ }
+
+ public String getProxyName() {
+ return proxyName;
+ }
+
+ public void setProxyName(String proxyName) {
+ this.proxyName = proxyName;
+ }
+
+ public String getScheme() {
+ return scheme;
+ }
+
+ public void setScheme(String scheme) {
+ this.scheme = scheme;
+ }
+
+ public boolean isSecure() {
+ return secure;
+ }
+
+ public void setSecure(boolean secure) {
+ this.secure = secure;
+ }
+
+ public String getSocketBinding() {
+ return socketBinding;
+ }
+
+ public void setSocketBinding(String socketBinding) {
+ this.socketBinding = socketBinding;
+ }
+
+ public String getRedirectPort() {
+ return redirectPort;
+ }
+
+ public void setRedirectPort(String redirectPort) {
+ this.redirectPort = redirectPort;
+ }
+
+ public SSLConfiguration getSslConfiguration() {
+ return sslConfiguration;
+ }
+
+ public void setSslConfiguration(SSLConfiguration sslConfiguration) {
+ this.sslConfiguration = sslConfiguration;
+ // if we are given an SSL config, we must be secure, so set that now, too
+ if (sslConfiguration != null) {
+ this.secure = true;
+ }
+ }
+ }
+
+ public static class SSLConfiguration {
+ private String caCertificateFile;
+ private String caCertificatePassword;
+ private String caRevocationUrl;
+ private String certificateKeyFile;
+ private String certificateFile;
+ private String cipherSuite;
+ private String keyAlias;
+ private String keystoreType;
+ private String name;
+ private String password;
+ private String protocol = "HTTP/1.1";
+ private String sessionCacheSize;
+ private String sessionTimeout;
+ private String truststoreType;
+ private String verifyClient;
+ private String verifyDepth;
+
+ public String getCaCertificateFile() {
+ return caCertificateFile;
+ }
+
+ public void setCaCertificateFile(String caCertificateFile) {
+ this.caCertificateFile = caCertificateFile;
+ }
+
+ public String getCaCertificatePassword() {
+ return caCertificatePassword;
+ }
+
+ public void setCaCertificationPassword(String caCertificatePassword) {
+ this.caCertificatePassword = caCertificatePassword;
+ }
+
+ public String getCaRevocationUrl() {
+ return caRevocationUrl;
+ }
+
+ public void setCaRevocationUrl(String caRevocationUrl) {
+ this.caRevocationUrl = caRevocationUrl;
+ }
+
+ public String getCertificateKeyFile() {
+ return certificateKeyFile;
+ }
+
+ public void setCertificateKeyFile(String certificateKeyFile) {
+ this.certificateKeyFile = certificateKeyFile;
+ }
+
+ public String getCertificateFile() {
+ return certificateFile;
+ }
+
+ public void setCertificateFile(String certificateFile) {
+ this.certificateFile = certificateFile;
+ }
+
+ public String getCipherSuite() {
+ return cipherSuite;
+ }
+
+ public void setCipherSuite(String cipherSuite) {
+ this.cipherSuite = cipherSuite;
+ }
+
+ public String getKeyAlias() {
+ return keyAlias;
+ }
+
+ public void setKeyAlias(String keyAlias) {
+ this.keyAlias = keyAlias;
+ }
+
+ public String getKeystoreType() {
+ return keystoreType;
+ }
+
+ public void setKeystoreType(String keystoreType) {
+ this.keystoreType = keystoreType;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getProtocol() {
+ return protocol;
+ }
+
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
+ }
+
+ public String getSessionCacheSize() {
+ return sessionCacheSize;
+ }
+
+ public void setSessionCacheSize(String sessionCacheSize) {
+ this.sessionCacheSize = sessionCacheSize;
+ }
+
+ public String getSessionTimeout() {
+ return sessionTimeout;
+ }
+
+ public void setSessionTimeout(String sessionTimeout) {
+ this.sessionTimeout = sessionTimeout;
+ }
+
+ public String getTruststoreType() {
+ return truststoreType;
+ }
+
+ public void setTruststoreType(String truststoreType) {
+ this.truststoreType = truststoreType;
+ }
+
+ public String getVerifyClient() {
+ return verifyClient;
+ }
+
+ /**
+ * @param verifyClient can be "true" or "want" (and preassumably "need")
+ */
+ public void setVerifyClient(String verifyClient) {
+ this.verifyClient = verifyClient;
+ }
+
+ public String getVerifyDepth() {
+ return verifyDepth;
+ }
+
+ public void setVerifyDepth(String verifyDepth) {
+ this.verifyDepth = verifyDepth;
+ }
+ }
}
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index d84f8c4..9b2742e 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -484,16 +484,17 @@ rhq.communications.multicast-detector.port=16162
# Server-side SSL Security Configuration for HTTPS thru Tomcat
# These are used for browser https access and
-# for incoming messages from agents over sslservlet transport
-# [you cannot use ${x} variables - see https://jira.jboss.org/jira/browse/JBWEB-74]
+# for incoming messages from agents over sslservlet transport.
+# Relative filenames are relative to jboss.server.config.dir.
+# [you cannot use ${x} variables in these rhq.server.tomcat settings]
rhq.server.tomcat.security.client-auth-mode=want
rhq.server.tomcat.security.secure-socket-protocol=TLS
rhq.server.tomcat.security.algorithm=SunX509
rhq.server.tomcat.security.keystore.alias=RHQ
-rhq.server.tomcat.security.keystore.file=conf/rhq.keystore
+rhq.server.tomcat.security.keystore.file=rhq.keystore
rhq.server.tomcat.security.keystore.password=RHQManagement
rhq.server.tomcat.security.keystore.type=JKS
-rhq.server.tomcat.security.truststore.file=conf/rhq.truststore
+rhq.server.tomcat.security.truststore.file=rhq.truststore
rhq.server.tomcat.security.truststore.password=RHQManagement
rhq.server.tomcat.security.truststore.type=JKS
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
index 589efca..81dcdd0 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
@@ -384,9 +384,6 @@ public class InstallerServiceImpl implements InstallerService {
String appServerConfigDir = getAppServerConfigDir();
- // create a keystore whose cert has a CN of this server's public endpoint address
- ServerInstallUtil.createKeystore(serverDetails, appServerConfigDir);
-
// create an rhqadmin/rhqadmin management user so when discovered, the AS7 plugin can immediately
// connect to the RHQ Server.
ServerInstallUtil.createDefaultManagementUser(serverDetails, appServerConfigDir);
@@ -401,6 +398,9 @@ public class InstallerServiceImpl implements InstallerService {
// Make sure our deployment scanner is configured as we need it
ServerInstallUtil.configureDeploymentScanner(mcc);
+
+ // create a keystore whose cert has a CN of this server's public endpoint address
+ ServerInstallUtil.prepareWebConnectors(mcc, serverDetails, appServerConfigDir, serverProperties);
} finally {
safeClose(mcc);
}
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
index 5c0316d..85dedf9 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
@@ -55,6 +55,9 @@ import org.rhq.common.jbossas.client.controller.JBossASClient;
import org.rhq.common.jbossas.client.controller.MessagingJBossASClient;
import org.rhq.common.jbossas.client.controller.SecurityDomainJBossASClient;
import org.rhq.common.jbossas.client.controller.SocketBindingJBossASClient;
+import org.rhq.common.jbossas.client.controller.WebJBossASClient;
+import org.rhq.common.jbossas.client.controller.WebJBossASClient.ConnectorConfiguration;
+import org.rhq.common.jbossas.client.controller.WebJBossASClient.SSLConfiguration;
import org.rhq.core.db.DatabaseType;
import org.rhq.core.db.DatabaseTypeFactory;
import org.rhq.core.db.DbUtil;
@@ -162,9 +165,9 @@ public class ServerInstallUtil {
public static void setupMailService(ModelControllerClient mcc, HashMap<String, String> serverProperties)
throws Exception {
- String fromAddressExpr = "${" + ServerProperties.PROP_EMAIL_FROM_ADDRESS + ":rhqadmin@localhost.com}";
- //String smtpHostExpr = "${" + ServerProperties.PROP_EMAIL_SMTP_HOST + ":localhost}";
- String smtpPortExpr = "${" + ServerProperties.PROP_EMAIL_SMTP_PORT + ":25}";
+ String fromAddressExpr = buildExpression(ServerProperties.PROP_EMAIL_FROM_ADDRESS, serverProperties, true);
+ String smtpHostExpr = buildExpression(ServerProperties.PROP_EMAIL_SMTP_HOST, serverProperties, false); // enable when AS7-5321 is fixed
+ String smtpPortExpr = buildExpression(ServerProperties.PROP_EMAIL_SMTP_PORT, serverProperties, true);
// Tweek the mail configuration that comes out of box. Setup a batch request to write the proper attributes.
@@ -179,16 +182,14 @@ public class ServerInstallUtil {
"remote-destination-outbound-socket-binding", "mail-smtp");
ModelNode writeHost = JBossASClient.createRequest(JBossASClient.WRITE_ATTRIBUTE, addr);
writeHost.get(JBossASClient.NAME).set("host");
- // TODO: see https://issues.jboss.org/browse/AS7-5321 - that must be fixed before supporting expressions
- //writeHost.get(JBossASClient.VALUE).setExpression(smtpHostExpr);
- writeHost.get(JBossASClient.VALUE).set(serverProperties.get(ServerProperties.PROP_EMAIL_SMTP_HOST)); // remove when AS7-5321 is fixed
+ JBossASClient.setPossibleExpression(writeHost, JBossASClient.VALUE, smtpHostExpr);
// now the SMTP port
addr = Address.root().add("socket-binding-group", "standard-sockets",
"remote-destination-outbound-socket-binding", "mail-smtp");
ModelNode writePort = JBossASClient.createRequest(JBossASClient.WRITE_ATTRIBUTE, addr);
writePort.get(JBossASClient.NAME).set("port");
- writePort.get(JBossASClient.VALUE).setExpression(smtpPortExpr);
+ JBossASClient.setPossibleExpression(writePort, JBossASClient.VALUE, smtpPortExpr);
ModelNode batch = JBossASClient.createBatchRequest(writeFromAddr, writeHost, writePort);
JBossASClient client = new JBossASClient(mcc);
@@ -1166,12 +1167,150 @@ public class ServerInstallUtil {
}
/**
+ * Ensures our web connectors are configured properly.
+ *
+ * @param mcc the AS client
+ * @param serverDetails details of the server being installed
+ * @param configDirStr location of a configuration directory where the keystore is to be stored
+ * @param serverProperties the full set of server properties
+ * @throws Exception
+ */
+ public static void prepareWebConnectors(ModelControllerClient mcc, ServerDetails serverDetails, String configDirStr,
+ HashMap<String, String> serverProperties) throws Exception {
+
+ // first create our keystore
+ File keystoreFile = createKeystore(serverDetails, configDirStr);
+
+ // out of box, we always get a non-secure connector (called "http")...
+ final String connectorName = "http";
+
+ // ...but we want a secure SSL connector, too.
+ // This is the name of the secure connector we want to create.
+ final String sslConnectorName = "https";
+
+ WebJBossASClient client = new WebJBossASClient(mcc);
+
+ if (!client.isConnector(sslConnectorName)) {
+ LOG.info("Creating https connector...");
+
+ SSLConfiguration ssl = new SSLConfiguration();
+
+ // truststore
+ ssl.setCaCertificateFile(getAbsoluteFileLocation("rhq.server.tomcat.security.truststore.file",
+ serverProperties, configDirStr)); // this cannot be an expression - AS7 doesn't support that now
+ ssl.setCaCertificationPassword(buildExpression("rhq.server.tomcat.security.truststore.password",
+ serverProperties, false));
+ ssl.setTruststoreType(buildExpression("rhq.server.tomcat.security.truststore.type", serverProperties, false));
+
+ // keystore
+ ssl.setCertificateKeyFile(getAbsoluteFileLocation("rhq.server.tomcat.security.keystore.file",
+ serverProperties, configDirStr)); // this cannot be an expression - AS7 doesn't support that now
+ ssl.setPassword(buildExpression("rhq.server.tomcat.security.keystore.password", serverProperties, false));
+ ssl.setKeyAlias(buildExpression("rhq.server.tomcat.security.keystore.alias", serverProperties, false));
+ ssl.setKeystoreType(buildExpression("rhq.server.tomcat.security.keystore.type", serverProperties, false));
+
+ // SSL protocol config
+ ssl.setProtocol(buildExpression("rhq.server.tomcat.security.secure-socket-protocol", serverProperties,
+ false));
+ ssl.setVerifyClient(buildExpression("rhq.server.tomcat.security.client-auth-mode", serverProperties,
+ false));
+
+ // note: there doesn't appear to be a way for AS7 to support algorithm, like SunX509 or IbmX509
+ // so I think it just uses the JVM's default. This means "rhq.server.tomcat.security.algorithm" is unused
+
+ ConnectorConfiguration connector = new ConnectorConfiguration();
+ connector.setMaxConnections(buildExpression("rhq.server.startup.web.max-connections", serverProperties,
+ false));
+ connector.setScheme("https");
+ connector.setSocketBinding("https");
+ connector.setSslConfiguration(ssl);
+
+ // create it now
+ client.addConnector("https", connector);
+
+ LOG.info("https connector created.");
+ }
+
+ if (client.isConnector(connectorName)) {
+ client.changeConnector(connectorName, "redirect-port",
+ buildExpression("rhq.server.socket.binding.port.https", serverProperties, false));
+ } else {
+ LOG.warn("There doesn't appear to be a http connector configured already - this is strange.");
+ }
+ }
+
+ /**
+ * For a property whose value might be a file, return that file's absolute path. If the property
+ * has a value whose pathname is already absolute, return it. If the property has a value whose path
+ * is relative, it is considered relative to defaultRootDir and its absolute path based on that root dir
+ * is returned.
+ *
+ * @param propertyName the property whose value in properties is considered a pathname (which may
+ * relative or it may be absolute).
+ * @param properties where to find the named property
+ * @param defaultRootDir if the property value is a relative file path, this is what it is relative to
+ * @return the absolute path of the file
+ */
+ private static String getAbsoluteFileLocation(String propertyName, HashMap<String, String> properties,
+ String defaultRootDir) {
+
+ if (properties == null || !properties.containsKey(propertyName)) {
+ return null;
+ }
+
+ String propertyValue = properties.get(propertyName);
+ File path = new File(propertyValue);
+ if (path.isAbsolute()) {
+ return path.getAbsolutePath();
+ } else {
+ return new File(defaultRootDir, propertyValue).getAbsolutePath();
+ }
+ }
+
+ /**
+ * You would think this would be simple - just set a value to ${propName:defaultVal} but some
+ * JBossAS attributes don't support expressions when you think they could or should. In this
+ * case, we'll pass in supportsExpression=false until we support AS versions that support
+ * expressions (at which time we'll change to code to pass in true for those attributes).
+ * If supportsExpression is true, the returned string will be ${propName} if defaultProperties is
+ * null or doesn't have that property defined; ${propName:defaultVal} if the default property
+ * is found.
+ * If supportsExpression is false, this will take the actual property value for
+ * propName found in the givem default properties and return that string.
+ * If there is no sysprop of that name, this method returns an empty string.
+ *
+ * @param propName
+ * @param defaultProperties
+ * @param supportsExpression
+ * @return the attribute expression value (or real value if supportsExpression is false).
+ */
+ private static String buildExpression(String propName, HashMap<String, String> defaultProperties,
+ boolean supportsExpression) {
+
+ if (supportsExpression) {
+ if ((defaultProperties != null) && (defaultProperties.containsKey(propName))) {
+ return "${" + propName + ":" + defaultProperties.get(propName) + "}";
+ } else {
+ return "${" + propName + "}";
+ }
+ } else {
+ if ((defaultProperties != null) && (defaultProperties.containsKey(propName))) {
+ return defaultProperties.get(propName);
+ } else {
+ LOG.warn("There is no known value for property [" + propName + "]");
+ return "";
+ }
+ }
+ }
+
+ /**
* Creates a keystore whose cert has a CN of this server's public endpoint address.
*
* @param serverDetails details of the server being installed
* @param configDirStr location of a configuration directory where the keystore is to be stored
+ * @return where the keystore file should be created (if an error occurs, this file won't exist)
*/
- public static void createKeystore(ServerDetails serverDetails, String configDirStr) {
+ private static File createKeystore(ServerDetails serverDetails, String configDirStr) {
File confDir = new File(configDirStr);
File keystore = new File(confDir, "rhq.keystore");
File keystoreBackup = new File(confDir, "rhq.keystore.backup");
@@ -1182,7 +1321,7 @@ public class ServerInstallUtil {
if (!keystore.renameTo(keystoreBackup)) {
LOG.warn("Cannot backup existing keystore - cannot generate a new cert with a proper domain name. ["
+ keystore + "] will be the keystore used by this server");
- return;
+ return keystore;
}
}
@@ -1205,6 +1344,8 @@ public class ServerInstallUtil {
+ "] to [" + keystore + "]");
}
}
+
+ return keystore;
}
/**
commit f834d9e091c2598f51cc620f3a9e27ae39252d76
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Sat Dec 15 00:25:50 2012 +0100
added a .gitignore entry for cachedir of the python script engine generated
during some tests.
diff --git a/.gitignore b/.gitignore
index 07d07ab..32f606a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,6 @@ modules/enterprise/gui/content_http-war/build/classes/
.*.jsfdia
.wtpmodules
*~
+
+#these are created by the python script engine during the tests
+cachedir/
\ No newline at end of file
commit e00d4e22f5e32593b366a23f908fc521be1a8f44
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Sat Dec 15 00:23:02 2012 +0100
Made the JndiAccessTest remote integration test work again.
For that (among other things) the suite extension previously defined in
the core/domain test-jar was moved into a standalone module
core/arquillian-integration/suite-extension.
Also fixed a problem in the AccessCheckingInitialContextFactoryBuilder that
would create incorrect InitialContextFactory in the pass-through mode
when constructing context factories for remote connections, which is
exactly what this integration test is for.
diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml
index a6a9cab..cbdc2a9 100644
--- a/modules/core/arquillian-integration/pom.xml
+++ b/modules/core/arquillian-integration/pom.xml
@@ -22,6 +22,7 @@
<modules>
<module>container</module>
<module>archive</module>
+ <module>suite-extension</module>
</modules>
</project>
diff --git a/modules/core/arquillian-integration/suite-extension/pom.xml b/modules/core/arquillian-integration/suite-extension/pom.xml
new file mode 100644
index 0000000..3ccb886
--- /dev/null
+++ b/modules/core/arquillian-integration/suite-extension/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-arquillian-parent</artifactId>
+ <version>4.6.0-SNAPSHOT</version>
+ </parent>
+
+ <!-- Model Version -->
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- Artifact Configuration -->
+
+ <artifactId>rhq-arquillian-suite-extension</artifactId>
+ <name>RHQ Arquillian Suite Extension</name>
+ <description>RHQ Suite Extension for Arquillian - enabling a single deployment per test-suite</description>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-container-test-impl-base</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/modules/core/arquillian-integration/suite-extension/src/main/java/org/rhq/arquillian/extension/suite/SuiteDeploymentArquillianExtension.java b/modules/core/arquillian-integration/suite-extension/src/main/java/org/rhq/arquillian/extension/suite/SuiteDeploymentArquillianExtension.java
new file mode 100644
index 0000000..0b3ea6e
--- /dev/null
+++ b/modules/core/arquillian-integration/suite-extension/src/main/java/org/rhq/arquillian/extension/suite/SuiteDeploymentArquillianExtension.java
@@ -0,0 +1,176 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2012, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.arquillian.extension.suite;
+
+import java.util.concurrent.Callable;
+
+import org.jboss.arquillian.config.descriptor.api.ArquillianDescriptor;
+import org.jboss.arquillian.container.spi.Container;
+import org.jboss.arquillian.container.spi.ContainerRegistry;
+import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
+import org.jboss.arquillian.container.spi.client.deployment.Deployment;
+import org.jboss.arquillian.container.spi.client.deployment.DeploymentScenario;
+import org.jboss.arquillian.container.spi.event.DeployDeployment;
+import org.jboss.arquillian.container.spi.event.DeploymentEvent;
+import org.jboss.arquillian.container.spi.event.UnDeployDeployment;
+import org.jboss.arquillian.container.spi.event.container.AfterStart;
+import org.jboss.arquillian.container.spi.event.container.BeforeStop;
+import org.jboss.arquillian.container.test.impl.client.deployment.event.GenerateDeployment;
+import org.jboss.arquillian.core.api.Event;
+import org.jboss.arquillian.core.api.Instance;
+import org.jboss.arquillian.core.api.InstanceProducer;
+import org.jboss.arquillian.core.api.annotation.Inject;
+import org.jboss.arquillian.core.api.annotation.Observes;
+import org.jboss.arquillian.core.api.event.ManagerStarted;
+import org.jboss.arquillian.core.spi.EventContext;
+import org.jboss.arquillian.core.spi.LoadableExtension;
+import org.jboss.arquillian.test.spi.TestClass;
+import org.jboss.arquillian.test.spi.annotation.ClassScoped;
+import org.jboss.arquillian.test.spi.context.ClassContext;
+import org.jboss.arquillian.test.spi.event.suite.AfterClass;
+import org.jboss.arquillian.test.spi.event.suite.BeforeClass;
+
+/**
+ * This the extension Aslak did to provide some ability for Arquillian (1.0.2) to run multiple
+ * test classes against a single Deployment. I've only changed the class name and package.
+ * See https://gist.github.com/3975179.
+ *
+ * The Deployment is declared in the arquillian.launch file. The extension is declared in
+ * resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension .
+ *
+ * @author Aslak Knutsen
+ * @author Jay Shaughnessy
+ */
+public class SuiteDeploymentArquillianExtension implements LoadableExtension {
+
+ public void register(ExtensionBuilder builder) {
+ builder.observer(SuiteDeployer.class);
+ }
+
+ public static class SuiteDeployer {
+
+ private Class<?> deploymentClass;
+ private DeploymentScenario suiteDeploymentScenario;
+
+ @Inject
+ @ClassScoped
+ private InstanceProducer<DeploymentScenario> classDeploymentScenario;
+
+ @Inject
+ private Event<DeploymentEvent> deploymentEvent;
+
+ @Inject
+ private Event<GenerateDeployment> generateDeploymentEvent;
+
+ @Inject
+ // Active some form of ClassContext around our deployments due to assumption bug in AS7 extension.
+ private Instance<ClassContext> classContext;
+
+ public void startup(@Observes(precedence = -100)
+ ManagerStarted event, ArquillianDescriptor descriptor) {
+ deploymentClass = getDeploymentClass(descriptor);
+
+ executeInClassScope(new Callable<Void>() {
+ public Void call() throws Exception {
+ generateDeploymentEvent.fire(new GenerateDeployment(new TestClass(deploymentClass)));
+ suiteDeploymentScenario = classDeploymentScenario.get();
+ return null;
+ }
+ });
+ }
+
+ public void deploy(@Observes
+ final AfterStart event, final ContainerRegistry registry) {
+ executeInClassScope(new Callable<Void>() {
+ public Void call() throws Exception {
+ for (Deployment d : suiteDeploymentScenario.deployments()) {
+ deploymentEvent.fire(new DeployDeployment(findContainer(registry,
+ event.getDeployableContainer()), d));
+ }
+ return null;
+ }
+ });
+ }
+
+ public void undeploy(@Observes
+ final BeforeStop event, final ContainerRegistry registry) {
+ executeInClassScope(new Callable<Void>() {
+ public Void call() throws Exception {
+ for (Deployment d : suiteDeploymentScenario.deployments()) {
+ deploymentEvent.fire(new UnDeployDeployment(findContainer(registry,
+ event.getDeployableContainer()), d));
+ }
+ return null;
+ }
+ });
+ }
+
+ public void overrideBefore(@Observes
+ EventContext<BeforeClass> event) {
+ // Don't continue TestClass's BeforeClass context as normal.
+ // No DeploymentGeneration or Deploy will take place.
+
+ classDeploymentScenario.set(suiteDeploymentScenario);
+ }
+
+ public void overrideAfter(@Observes
+ EventContext<AfterClass> event) {
+ // Don't continue TestClass's AfterClass context as normal.
+ // No UnDeploy will take place.
+ }
+
+ private void executeInClassScope(Callable<Void> call) {
+ try {
+ classContext.get().activate(deploymentClass);
+ call.call();
+ } catch (Exception e) {
+ throw new RuntimeException("Could not invoke operation", e);
+ } finally {
+ classContext.get().deactivate();
+ }
+ }
+
+ private Container findContainer(ContainerRegistry registry, DeployableContainer<?> deployable) {
+ for (Container container : registry.getContainers()) {
+ if (container.getDeployableContainer() == deployable) {
+ return container;
+ }
+ }
+ return null;
+ }
+
+ private Class<?> getDeploymentClass(ArquillianDescriptor descriptor) {
+ if (descriptor == null) {
+ throw new IllegalArgumentException("Descriptor must be specified");
+ }
+ String className = descriptor.extension("suite").getExtensionProperties().get("deploymentClass");
+ if (className == null) {
+ throw new IllegalArgumentException(
+ "A extension element with property deploymentClass must be specified in arquillian.xml");
+ }
+ try {
+ return Class.forName(className);
+ } catch (ClassNotFoundException e) {
+ throw new RuntimeException("Could not load defined deploymentClass: " + className, e);
+ }
+ }
+ }
+}
diff --git a/modules/core/arquillian-integration/suite-extension/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/modules/core/arquillian-integration/suite-extension/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
new file mode 100644
index 0000000..c058acc
--- /dev/null
+++ b/modules/core/arquillian-integration/suite-extension/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
@@ -0,0 +1 @@
+org.rhq.arquillian.extension.suite.SuiteDeploymentArquillianExtension
diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/shared/StartStopContainerArquillianExtension.java b/modules/core/domain/src/test/java/org/rhq/core/domain/shared/StartStopContainerArquillianExtension.java
index da01d45..f3842d3 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/shared/StartStopContainerArquillianExtension.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/shared/StartStopContainerArquillianExtension.java
@@ -32,6 +32,9 @@ import org.jboss.arquillian.test.spi.event.enrichment.BeforeEnrichment;
import org.jboss.arquillian.test.spi.event.suite.AfterSuite;
/**
+ * TODO if we ever decide to use this class, please move it into its standalone module so that it can be used
+ * independently of domain jar.
+ *
* @author Jay Shaughnessy
*/
public class StartStopContainerArquillianExtension implements LoadableExtension {
diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/shared/SuiteDeploymentArquillianExtension.java b/modules/core/domain/src/test/java/org/rhq/core/domain/shared/SuiteDeploymentArquillianExtension.java
deleted file mode 100644
index 677df75..0000000
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/shared/SuiteDeploymentArquillianExtension.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright 2012, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.core.domain.shared;
-
-import java.util.concurrent.Callable;
-
-import org.jboss.arquillian.config.descriptor.api.ArquillianDescriptor;
-import org.jboss.arquillian.container.spi.Container;
-import org.jboss.arquillian.container.spi.ContainerRegistry;
-import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
-import org.jboss.arquillian.container.spi.client.deployment.Deployment;
-import org.jboss.arquillian.container.spi.client.deployment.DeploymentScenario;
-import org.jboss.arquillian.container.spi.event.DeployDeployment;
-import org.jboss.arquillian.container.spi.event.DeploymentEvent;
-import org.jboss.arquillian.container.spi.event.UnDeployDeployment;
-import org.jboss.arquillian.container.spi.event.container.AfterStart;
-import org.jboss.arquillian.container.spi.event.container.BeforeStop;
-import org.jboss.arquillian.container.test.impl.client.deployment.event.GenerateDeployment;
-import org.jboss.arquillian.core.api.Event;
-import org.jboss.arquillian.core.api.Instance;
-import org.jboss.arquillian.core.api.InstanceProducer;
-import org.jboss.arquillian.core.api.annotation.Inject;
-import org.jboss.arquillian.core.api.annotation.Observes;
-import org.jboss.arquillian.core.api.event.ManagerStarted;
-import org.jboss.arquillian.core.spi.EventContext;
-import org.jboss.arquillian.core.spi.LoadableExtension;
-import org.jboss.arquillian.test.spi.TestClass;
-import org.jboss.arquillian.test.spi.annotation.ClassScoped;
-import org.jboss.arquillian.test.spi.context.ClassContext;
-import org.jboss.arquillian.test.spi.event.suite.AfterClass;
-import org.jboss.arquillian.test.spi.event.suite.BeforeClass;
-
-/**
- * This the extension Aslak did to provide some ability for Arquillian (1.0.2) to run multiple
- * test classes against a single Deployment. I've only changed the class name and package.
- * See https://gist.github.com/3975179.
- *
- * The Deployment is declared in the arquillian.launch file. The extension is declared in
- * resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension .
- *
- * @author Aslak Knutsen
- * @author Jay Shaughnessy
- */
-public class SuiteDeploymentArquillianExtension implements LoadableExtension {
-
- public void register(ExtensionBuilder builder) {
- builder.observer(SuiteDeployer.class);
- }
-
- public static class SuiteDeployer {
-
- private Class<?> deploymentClass;
- private DeploymentScenario suiteDeploymentScenario;
-
- @Inject
- @ClassScoped
- private InstanceProducer<DeploymentScenario> classDeploymentScenario;
-
- @Inject
- private Event<DeploymentEvent> deploymentEvent;
-
- @Inject
- private Event<GenerateDeployment> generateDeploymentEvent;
-
- @Inject
- // Active some form of ClassContext around our deployments due to assumption bug in AS7 extension.
- private Instance<ClassContext> classContext;
-
- public void startup(@Observes(precedence = -100)
- ManagerStarted event, ArquillianDescriptor descriptor) {
- deploymentClass = getDeploymentClass(descriptor);
-
- executeInClassScope(new Callable<Void>() {
- public Void call() throws Exception {
- generateDeploymentEvent.fire(new GenerateDeployment(new TestClass(deploymentClass)));
- suiteDeploymentScenario = classDeploymentScenario.get();
- return null;
- }
- });
- }
-
- public void deploy(@Observes
- final AfterStart event, final ContainerRegistry registry) {
- executeInClassScope(new Callable<Void>() {
- public Void call() throws Exception {
- for (Deployment d : suiteDeploymentScenario.deployments()) {
- deploymentEvent.fire(new DeployDeployment(findContainer(registry,
- event.getDeployableContainer()), d));
- }
- return null;
- }
- });
- }
-
- public void undeploy(@Observes
- final BeforeStop event, final ContainerRegistry registry) {
- executeInClassScope(new Callable<Void>() {
- public Void call() throws Exception {
- for (Deployment d : suiteDeploymentScenario.deployments()) {
- deploymentEvent.fire(new UnDeployDeployment(findContainer(registry,
- event.getDeployableContainer()), d));
- }
- return null;
- }
- });
- }
-
- public void overrideBefore(@Observes
- EventContext<BeforeClass> event) {
- // Don't continue TestClass's BeforeClass context as normal.
- // No DeploymentGeneration or Deploy will take place.
-
- classDeploymentScenario.set(suiteDeploymentScenario);
- }
-
- public void overrideAfter(@Observes
- EventContext<AfterClass> event) {
- // Don't continue TestClass's AfterClass context as normal.
- // No UnDeploy will take place.
- }
-
- private void executeInClassScope(Callable<Void> call) {
- try {
- classContext.get().activate(deploymentClass);
- call.call();
- } catch (Exception e) {
- throw new RuntimeException("Could not invoke operation", e);
- } finally {
- classContext.get().deactivate();
- }
- }
-
- private Container findContainer(ContainerRegistry registry, DeployableContainer<?> deployable) {
- for (Container container : registry.getContainers()) {
- if (container.getDeployableContainer() == deployable) {
- return container;
- }
- }
- return null;
- }
-
- private Class<?> getDeploymentClass(ArquillianDescriptor descriptor) {
- if (descriptor == null) {
- throw new IllegalArgumentException("Descriptor must be specified");
- }
- String className = descriptor.extension("suite").getExtensionProperties().get("deploymentClass");
- if (className == null) {
- throw new IllegalArgumentException(
- "A extension element with property deploymentClass must be specified in arquillian.xml");
- }
- try {
- return Class.forName(className);
- } catch (ClassNotFoundException e) {
- throw new RuntimeException("Could not load defined deploymentClass: " + className, e);
- }
- }
- }
-}
diff --git a/modules/core/domain/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/modules/core/domain/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
deleted file mode 100644
index cd4854a..0000000
--- a/modules/core/domain/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
+++ /dev/null
@@ -1 +0,0 @@
-org.rhq.core.domain.shared.SuiteDeploymentArquillianExtension
diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
index 407dc0b..5811fef 100644
--- a/modules/enterprise/server/itests-2/pom.xml
+++ b/modules/enterprise/server/itests-2/pom.xml
@@ -96,6 +96,13 @@
</dependency>
<dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-arquillian-suite-extension</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-domain</artifactId>
<version>${project.version}</version>
@@ -672,6 +679,17 @@
</executions>
</plugin>
+
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/modules/enterprise/server/itests-2/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/modules/enterprise/server/itests-2/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
deleted file mode 100644
index cd4854a..0000000
--- a/modules/enterprise/server/itests-2/src/test/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
+++ /dev/null
@@ -1 +0,0 @@
-org.rhq.core.domain.shared.SuiteDeploymentArquillianExtension
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/AccessCheckingInitialContextFactoryBuilder.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/AccessCheckingInitialContextFactoryBuilder.java
index 52addaa..370fb10 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/AccessCheckingInitialContextFactoryBuilder.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/AccessCheckingInitialContextFactoryBuilder.java
@@ -32,7 +32,6 @@ import java.util.EnumMap;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Hashtable;
-import java.util.List;
import java.util.Set;
import javax.naming.Context;
@@ -174,9 +173,7 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
@Override
public InitialContextFactory wrap(InitialContextFactory factory) {
- List<DecoratorPicker<Context, ContextDecorator>> pickers = Collections.emptyList();
-
- return new DecoratingInitialContextFactory(factory, pickers);
+ return factory;
}
};
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
index 36da98a..a0cffa7 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -7,7 +7,6 @@
<version>4.6.0-SNAPSHOT</version>
</parent>
- <groupId>org.rhq</groupId>
<artifactId>jndi-access-test</artifactId>
<packaging>jar</packaging>
@@ -15,9 +14,10 @@
<description>Tests for local and remote JNDI access from within serverside scripts.</description>
<properties>
- <rhq.server.datasource>java:/RHQDS</rhq.server.datasource>
- <rhq.server.ds-mapping>PostgreSQL</rhq.server.ds-mapping>
- <jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
+ <jboss.zip>${settings.localRepository}/org/jboss/as/jboss-as-dist/${jboss.version}/jboss-as-dist-${jboss.version}.zip</jboss.zip>
+ <jboss.unzip.location>${basedir}/target/jboss-as-${jboss.version}</jboss.unzip.location>
+ <jnp.port>54987</jnp.port>
+ <jnp.rmiPort>54988</jnp.rmiPort>
</properties>
<dependencies>
@@ -28,247 +28,166 @@
<scope>runtime</scope>
</dependency>
- <!--================ Test Deps ================ -->
-
- <!-- Note, the test deps are intentionally placed above the other
- scoped deps because of classpath reasons. Maven orders the [test] classpath
- in the order listed in the pom. We specifically need the embeddable-ejb3
- jar above the standard ejb3 jars because we need the embeddble packages loaded
- when testing. -->
-
<dependency>
- <groupId>org.rhq</groupId>
- <artifactId>test-utils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-dist</artifactId>
+ <type>zip</type>
+ <scope>provided</scope>
</dependency>
-
+
<dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>${jboss.version}</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
+ <artifactId>rhq-scripting-api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
+ <artifactId>rhq-scripting-javascript</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.rhq</groupId>
- <artifactId>rhq-scripting-javascript</artifactId>
+ <artifactId>rhq-scripting-python</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-core-client-api</artifactId>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-script-bindings</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+ <!-- We need to pull some classes from the server jar and itests-2 - namely the naming hack to be able to test
+ that it actually works -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-container-lib</artifactId>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-server-client-api</artifactId>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-server-itests-2</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
+ <type>test-jar</type>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
+ <artifactId>rhq-arquillian-suite-extension</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>
</dependency>
-
+
+ <!-- Arquillian -->
<dependency>
- <groupId>org.rhq</groupId>
- <artifactId>jndi-access-remote-server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>org.jboss.arquillian.testng</groupId>
+ <artifactId>arquillian-testng-container</artifactId>
+ <scope>test</scope>
</dependency>
-
+
<dependency>
- <groupId>jboss.jboss-embeddable-ejb3</groupId>
- <artifactId>jboss-ejb3-all</artifactId>
- <version>${jboss-embeddable-ejb3.version}</version>
- <scope>test</scope>
+ <groupId>org.jboss.arquillian.protocol</groupId>
+ <artifactId>arquillian-protocol-servlet</artifactId>
+ <scope>provided</scope>
</dependency>
-
- <!-- NOTE: The remaining test deps correspond to the classes contained
- in hibernate-all.jar and thirdparty-all.jar. -->
-
+
<dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-api</artifactId>
<scope>test</scope>
</dependency>
-
- <!-- needed by embedded ejb container -->
+
<dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- <version>1.0.2</version>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-api</artifactId>
<scope>test</scope>
</dependency>
- <!-- needed by embedded ejb container -->
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xercesImpl.version}</version>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-api-maven</artifactId>
<scope>test</scope>
</dependency>
- <!-- 3rd Party Deps -->
-
- <!-- required by RHQ server classes, as well as EJB3 Embedded -->
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1-jboss</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>hibernate-annotations</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>hibernate-entitymanager</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <scope>provided</scope>
- </dependency>
-
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope> <!-- by JBossAS -->
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+ <scope>test</scope>
</dependency>
+ <!-- We'll try remote connections using JNP -->
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
- </dependency>
-
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-annotations-ejb3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
+ <groupId>jboss</groupId>
+ <artifactId>jnp-client</artifactId>
+ <version>4.2.2.GA</version>
+ <scope>test</scope>
</dependency>
-
- <!-- includes the org.jboss.ejb3.StrictMaxPool class, which is needed
- by the PoolClass annotation used on some of our SLSB's -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- for the transaction interrupt EJB3 interceptor -->
- <dependency>
- <groupId>org.jboss.transaction</groupId>
- <artifactId>jboss-jta</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 -->
- </dependency>
-
- <dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz-oracle</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement
- section. -->
- <scope>provided</scope> <!-- by JBossAS itself, which the container build has packaged with 1.6.5 -->
- </dependency>
-
- <!-- This is needed cglib which is in turn needed by hibernate -->
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
-
+
+ <!-- This is here only to ensure the build order and HAS TO COME AS LAST to avoid any classpath
+ collisions. -->
<dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.18</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jndi-access-remote-server</artifactId>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
- </dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>managed-test-server</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-managed</artifactId>
+ <version>${jboss.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>remote-test-server</id>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-6.0</artifactId>
+ <version>1.0.0.Final</version>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-remote</artifactId>
+ <version>${jboss.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<build>
<testResources>
<testResource>
@@ -281,25 +200,13 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
- <!-- in order to get JMS to work properly in embedded
- test container, extract jms-rs.rar classes -->
<execution>
- <id>Extract JMS classes from RAR needed for JMS tests</id>
- <phase>process-classes</phase>
+ <id>Prepare AS7 for test</id>
+ <phase>process-test-resources</phase>
<configuration>
<target>
- <unzip src="src/test/resources/jms-ra.rar"
- dest="target">
- <patternset>
- <include name="jms-ra.jar" />
- </patternset>
- </unzip>
- <unzip src="target/jms-ra.jar"
- dest="target/test-classes">
- <patternset>
- <include name="org/**" />
- </patternset>
- </unzip>
+ <unzip src="${jboss.zip}" dest="${jboss.unzip.location}/.." />
+ <copy file="src/test/resources/security.policy" toDir="${jboss.unzip.location}"/>
</target>
</configuration>
<goals>
@@ -308,6 +215,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<!-- Everything but the web service tests, this is the standard
@@ -316,11 +224,10 @@
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
<groups>${rhq.testng.includedGroups}</groups>
<systemPropertyVariables>
- <embeddedDeployment>true</embeddedDeployment>
<deploymentDirectory>target/test-classes</deploymentDirectory>
- <hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
- <clean.db>${clean.db}</clean.db>
<test.server.jar.path>${settings.localRepository}/org/rhq/jndi-access-remote-server/${project.version}/jndi-access-remote-server-${project.version}.jar</test.server.jar.path>
+ <jnp.port>${jnp.port}</jnp.port>
+ <jnp.rmiPort>${jnp.rmiPort}</jnp.rmiPort>
</systemPropertyVariables>
<argLine>${jacoco.unit-test.args} -Djava.security.manager -Djava.security.policy==${basedir}/target/test-classes/security.policy</argLine>
<additionalClasspathElements>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
index 40f1ed2..d330ba1 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
@@ -19,11 +19,13 @@
package org.rhq.jndi.test;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.fail;
+
import java.io.BufferedReader;
-import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.io.PrintWriter;
+import java.util.Collection;
import java.util.Collections;
import java.util.Properties;
@@ -33,70 +35,87 @@ import javax.script.ScriptException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.Parameters;
import org.testng.annotations.Test;
-import org.rhq.bindings.ScriptEngineFactory;
-import org.rhq.bindings.StandardBindings;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.container.test.api.RunAsClient;
+import org.jboss.arquillian.testng.Arquillian;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.resolver.api.DependencyResolvers;
+import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver;
+
import org.rhq.bindings.StandardScriptPermissions;
-import org.rhq.bindings.util.PackageFinder;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.enterprise.client.LocalClient;
import org.rhq.enterprise.server.AllowRhqServerInternalsAccessPermission;
-import org.rhq.enterprise.server.test.AbstractEJB3Test;
-import org.rhq.enterprise.server.util.LookupUtil;
-import org.rhq.test.PortScout;
+import org.rhq.enterprise.server.test.StrippedDownStartupBean;
+import org.rhq.enterprise.server.test.StrippedDownStartupBeanPreparation;
+import org.rhq.scripting.javascript.JsEngineProvider;
+import org.rhq.scripting.python.PythonScriptEngineProvider;
/**
- *
- * !!!!!!! THIS TEST CLASS HAS BEEN MOVED TO ENTERPRISE/SERVER/ITESTS-2 !!!!!!
*
- * TODO: since this class has been updated and now differs from the version in itests-2 it is left here for
- * reference. Also, the jndi access strategy needs to be updated for AS7. When all is settled, this
- * whole src branch should be deleted.
- *
* @author Lukas Krejci
*/
-@Test(enabled = false)
-// TODO JNDI: re-enable after secure JNDI lookups are fixed
-public class JndiAccessTest extends AbstractEJB3Test {
+@Test
+public class JndiAccessTest extends Arquillian {
+
private static final Log JNP_SERVER_LOG = LogFactory.getLog("Test JNP Server");
- private static final Log LOG = LogFactory.getLog(JndiAccessTest.class);
-
+
+ private static final String GROUP_FOR_NORMAL_TESTS = "JndiAccessTest";
+
private Process testServerProcess;
private Thread testServerStdErrReader;
private Thread testServerStdOutReader;
-
- int jnpPort;
- @BeforeClass
- @Parameters({ "test.server.jar.path" })
- public void startTestJnpServer(String testServerJar) throws Exception {
- int rmiPort = 0;
- PortScout scout = new PortScout();
+ @Deployment
+ public static EnterpriseArchive TestEar() {
+ JavaArchive testEjb = ShrinkWrap.create(JavaArchive.class, "test-ejb.jar").addClass(TestEjb.class)
+ .addClass(TestEjbBean.class).addAsManifestResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
- try {
- jnpPort = scout.getNextFreePort();
- rmiPort = scout.getNextFreePort();
- } finally {
- scout.close();
- }
+ Collection<JavaArchive> deps = DependencyResolvers.use(MavenDependencyResolver.class)
+ .loadMetadataFromPom("pom.xml")
+ .artifacts("jboss:jnp-client", "org.rhq:rhq-scripting-api", "org.rhq:rhq-scripting-javascript",
+ "org.rhq:rhq-scripting-python").scope("test").resolveAs(JavaArchive.class);
- LOG.info("Starting the remote JNP server on jnpPort=" + jnpPort + ", rmiPort=" + rmiPort);
- ProcessBuilder bld = new ProcessBuilder("java", "-Djnp.port=" + jnpPort, "-Djnp.rmiPort=" + rmiPort, "-jar", testServerJar);
+ //we need to pull in the naming hack classes from the server jar so that our EAR behaves the same
+ testEjb.addPackages(true, "org.rhq.enterprise.server.naming").addClass(
+ AllowRhqServerInternalsAccessPermission.class);
- testServerProcess = bld.start();
+ //we also need to pull in the special startup beans from the server/itests-2 that will initialize the naming
+ //subsystem
+ testEjb.addClasses(StrippedDownStartupBean.class, StrippedDownStartupBeanPreparation.class);
+ //to work around https://issues.jboss.org/browse/ARQ-659
+ //we need to include this test class in the EAR manually
+
+ //Instead of pulling the whole rhq-script-bindings (which has a lot of deps), we're just picking the
+ //StandardScriptPermissions from there so that it can be used in the tests
+ JavaArchive classes = ShrinkWrap.create(JavaArchive.class, "test-class.jar").addClasses(JndiAccessTest.class,
+ StandardScriptPermissions.class);
+
+ return ShrinkWrap.create(EnterpriseArchive.class, "test-ear.ear").addAsModule(testEjb).addAsLibraries(deps)
+ .addAsLibrary(classes);
+ }
+
+ @RunAsClient
+ @Parameters({ "test.server.jar.path", "jnp.port", "jnp.rmiPort" })
+ public void startTestJnpServer(String testServerJar, int jnpPort, int rmiPort) throws Exception {
+ ProcessBuilder bld = new ProcessBuilder("java", "-Djnp.port=" + jnpPort, "-Djnp.rmiPort=" + rmiPort, "-jar",
+ testServerJar);
+
+ testServerProcess = bld.start();
+
testServerStdErrReader = new Thread(new Runnable() {
@Override
public void run() {
BufferedReader rdr = new BufferedReader(new InputStreamReader(testServerProcess.getErrorStream()));
try {
String line;
- while((line = rdr.readLine()) != null) {
+ while ((line = rdr.readLine()) != null) {
JNP_SERVER_LOG.warn(line);
}
} catch (IOException e) {
@@ -111,14 +130,14 @@ public class JndiAccessTest extends AbstractEJB3Test {
}
});
testServerStdErrReader.start();
-
+
testServerStdOutReader = new Thread(new Runnable() {
@Override
public void run() {
BufferedReader rdr = new BufferedReader(new InputStreamReader(testServerProcess.getInputStream()));
try {
String line;
- while((line = rdr.readLine()) != null) {
+ while ((line = rdr.readLine()) != null) {
JNP_SERVER_LOG.debug(line);
}
} catch (IOException e) {
@@ -133,73 +152,108 @@ public class JndiAccessTest extends AbstractEJB3Test {
}
});
testServerStdOutReader.start();
-
+
//give the JNP server some time to start up
Thread.sleep(5000);
}
-
- @AfterClass
+
+ @RunAsClient
+ @Test(dependsOnGroups = GROUP_FOR_NORMAL_TESTS, alwaysRun = true)
public void stopTestJnpServer() throws Exception {
testServerProcess.destroy();
testServerStdErrReader.join();
testServerStdOutReader.join();
}
-
- public void testRemoteConnectionWorkingFromJava() throws Exception {
+
+ @Test(dependsOnMethods = "startTestJnpServer", groups = GROUP_FOR_NORMAL_TESTS)
+ @Parameters("jnp.port")
+ public void testRemoteConnectionWorkingFromJava(int jnpPort) throws Exception {
Properties env = new Properties();
- env.put("java.naming.factory.initial", "org.jboss.naming.NamingContextFactory");
+ env.put("java.naming.factory.initial", "org.jnp.interfaces.NamingContextFactory");
+ env.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
env.put("java.naming.provider.url", "jnp://localhost:" + jnpPort);
InitialContext ctx = new InitialContext(env);
Object kachny = ctx.lookup("kachny");
-
- assert kachny != null;
+
+ assertNotNull(kachny);
+ }
+
+ @Test(dependsOnMethods = "startTestJnpServer", groups = GROUP_FOR_NORMAL_TESTS)
+ @Parameters("jnp.port")
+ public void testRemoteConnectionWorkingFromScripts_javascript(int jnpPort) throws Exception {
+ getJavascriptScriptEngine().eval("" //
+ + "var env = new java.util.Properties;" //
+ + "env.put('java.naming.factory.initial', 'org.jnp.interfaces.NamingContextFactory');" //
+ + "env.put('java.naming.factory.url.pkgs', 'org.jboss.naming:org.jnp.interfaces');" //
+ + "env.put('java.naming.provider.url', 'jnp://localhost:" + jnpPort + "');" //
+ + "var ctx = new javax.naming.InitialContext(env);" //
+ + "var kachny = ctx.lookup('kachny');" //
+ + "if (kachny == null) throw 'The object retrieved from the remote server should not be null';");
+ }
+
+ @Test(dependsOnMethods = "startTestJnpServer", groups = GROUP_FOR_NORMAL_TESTS)
+ @Parameters("jnp.port")
+ public void testRemoteConnectionWorkingFromScripts_python(int jnpPort) throws Exception {
+ getPythonScriptEngine()
+ .eval(
+ "" //
+ + "import java.util as u\n" //
+ + "import javax.naming as n\n" //
+ + "env = u.Properties()\n" //
+ + "env.put('java.naming.factory.initial', 'org.jnp.interfaces.NamingContextFactory')\n" //
+ + "env.put('java.naming.factory.url.pkgs', 'org.jboss.naming:org.jnp.interfaces')\n" //
+ + "env.put('java.naming.provider.url', 'jnp://localhost:"
+ + jnpPort
+ + "')\n" //
+ + "ctx = n.InitialContext(env)\n" //
+ + "kachny = ctx.lookup('kachny')\n" //
+ + "if (kachny is None):\n raise Exception('The object retrieved from the remote server should not be null')\n");
+ }
+
+ @Test(dependsOnMethods = "startTestJnpServer", groups = GROUP_FOR_NORMAL_TESTS)
+ public void testLocalJNDILookupWorksFromJava() throws Exception {
+ InitialContext ctx = new InitialContext();
+ Object bean = ctx.lookup("java:app/test-ejb/TestEjbBean");
+
+ assertNotNull(bean);
}
-
- public void testLocalJNDILookupFailsFromScripts() throws Exception {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
+ @Test(dependsOnMethods = "startTestJnpServer", groups = GROUP_FOR_NORMAL_TESTS)
+ public void testLocalJNDILookupFailsFromScripts_javascript() throws Exception {
try {
- engine.eval(""
- + "var ctx = new javax.naming.InitialContext();\n"
- + "var entityManagerFactory = ctx.lookup('java:/RHQEntityManagerFactory');\n"
- + "var entityManager = entityManagerFactory.createEntityManager();\n"
- + "entityManager.find(java.lang.Class.forName('org.rhq.core.domain.resource.Resource'), java.lang.Integer.valueOf('10001'));");
-
- Assert.fail("The script shouldn't have been able to use the EntityManager.");
- } catch (ScriptException e) {
+ getJavascriptScriptEngine().eval(
+ "var ctx = new javax.naming.InitialContext();\n"
+ + "var bean = ctx.lookup('java:app/test-ejb/TestEjbBean');\n");
+ fail("Script was able to perform local JNDI lookup.");
+ } catch (Exception e) {
checkIsDesiredSecurityException(e);
- }
+ }
}
-
- public void testRemoteJNDILookupWorksFromScripts() throws Exception {
- Subject overlord = LookupUtil.getSubjectManager().getOverlord();
-
- ScriptEngine engine = getEngine(overlord);
+ @Test(dependsOnMethods = "startTestJnpServer", groups = GROUP_FOR_NORMAL_TESTS)
+ public void testLocalJNDILookupFailsFromScripts_python() throws Exception {
try {
- engine.eval(""
- + "var env = new java.util.Hashtable();"
- + "env.put('java.naming.factory.initial', 'org.jboss.naming.NamingContextFactory');"
- + "env.put('java.naming.provider.url', 'jnp://localhost:" + jnpPort + "');"
- + "var ctx = new javax.naming.InitialContext(env);\n"
- + "var kachny = ctx.lookup('kachny');\n"
- + "assertNotNull(kachny);\n");
- } catch (ScriptException e) {
- Assert.fail("The script should have been able to access a remote JNDI server.", e);
- }
+ getPythonScriptEngine().eval("import javax.naming as n\n" //
+ + "ctx = n.InitialContext()\n" //
+ + "bean = ctx.lookup('java:app/test-ejb/TestEjbBean')\n");
+ fail("Script was able to perform local JNDI lookup.");
+ } catch (Exception e) {
+ checkIsDesiredSecurityException(e);
+ }
}
-
- private ScriptEngine getEngine(Subject subject) throws ScriptException, IOException {
- StandardBindings bindings = new StandardBindings(new PrintWriter(System.out), new LocalClient(subject));
- return ScriptEngineFactory.getSecuredScriptEngine("javascript", new PackageFinder(Collections.<File>emptyList()), bindings, new StandardScriptPermissions());
+
+ private ScriptEngine getJavascriptScriptEngine() throws ScriptException {
+ return new JsEngineProvider().getInitializer().instantiate(Collections.<String> emptySet(),
+ new StandardScriptPermissions());
+ }
+
+ private ScriptEngine getPythonScriptEngine() throws ScriptException {
+ return new PythonScriptEngineProvider().getInitializer().instantiate(Collections.<String> emptySet(),
+ new StandardScriptPermissions());
+ }
+
+ private void checkIsDesiredSecurityException(Throwable t) {
+ //TODO implement
+ System.out.println(t);
}
-
- private static void checkIsDesiredSecurityException(ScriptException e) {
- String message = e.getMessage();
- String permissionTrace = null; // TODO JNDI: AllowRhqServerInternalsAccessPermission.class.getName();
-
- Assert.assertTrue(message.contains(permissionTrace), "The script exception doesn't seem to be caused by the AllowRhqServerInternalsAccessPermission security exception. " + message);
- }
}
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/arquillian.xml b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/arquillian.xml
index 23502f1..fbf2891 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/arquillian.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/arquillian.xml
@@ -9,9 +9,4 @@
<property name="javaVmArguments">-Xmx512m -XX:MaxPermSize=128m -Djava.security.manager -Djava.security.policy==${jboss.unzip.location}/security.policy -Djnp.port=${jnp.port}</property>
</configuration>
</container>
-
- <extension qualifier="jacoco">
- <property name="includes">org.rhq.*</property>
- </extension>
-
</arquillian>
diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml
index 453687f..2bc2fdd 100644
--- a/modules/integration-tests/jndi-access/remote-server/pom.xml
+++ b/modules/integration-tests/jndi-access/remote-server/pom.xml
@@ -7,7 +7,6 @@
<version>4.6.0-SNAPSHOT</version>
</parent>
- <groupId>org.rhq</groupId>
<artifactId>jndi-access-remote-server</artifactId>
<packaging>jar</packaging>
@@ -34,7 +33,6 @@
<dependency>
<groupId>oswego-concurrent</groupId>
<artifactId>concurrent</artifactId>
- <version>1.3.4-jboss</version>
</dependency>
<dependency>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index 4818c3a..95d947a 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -10,7 +10,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.rhq</groupId>
<artifactId>rhq-integration-tests</artifactId>
<packaging>pom</packaging>
@@ -59,7 +58,7 @@
</activation>
<modules>
<module>apache-plugin-test</module>
- <!--<module>jndi-access</module> commented out until Lukas updates for AS7 -->
+ <module>jndi-access</module>
<!--<module>mod_cluster-plugin-test</module>-->
<!--<module>rest-api</module>-->
</modules>
commit bd0cba4c258ef0f6884ce1465e744e0d37acc9a9
Author: Remy Maucherat <rmaucher(a)redhat.com>
Date: Fri Dec 14 11:53:16 2012 -0500
[BZ 865459] adding support for adding users for tomcat 7 UserDatabase.
diff --git a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java
index bb13097..23a20e1 100644
--- a/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java
+++ b/modules/plugins/tomcat/src/main/java/org/jboss/on/plugins/tomcat/TomcatUserDatabaseComponent.java
@@ -47,6 +47,7 @@ public class TomcatUserDatabaseComponent extends MBeanResourceComponent<TomcatSe
try {
if (TomcatGroupComponent.RESOURCE_TYPE_NAME.equals(resourceTypeName)) {
name = report.getResourceConfiguration().getSimple("groupname").getStringValue();
+ report.getResourceConfiguration().remove(TomcatGroupComponent.CONFIG_ROLES);
objectName = String.format("Users:type=Group,groupname=\"%s\",database=UserDatabase", name);
operation = "createGroup";
} else if (TomcatRoleComponent.RESOURCE_TYPE_NAME.equals(resourceTypeName)) {
@@ -55,6 +56,8 @@ public class TomcatUserDatabaseComponent extends MBeanResourceComponent<TomcatSe
operation = "createRole";
} else if (TomcatUserComponent.RESOURCE_TYPE_NAME.equals(resourceTypeName)) {
name = report.getResourceConfiguration().getSimple("username").getStringValue();
+ report.getResourceConfiguration().remove(TomcatUserComponent.CONFIG_ROLES);
+ report.getResourceConfiguration().remove(TomcatUserComponent.CONFIG_GROUPS);
objectName = String.format("Users:type=User,username=\"%s\",database=UserDatabase", name);
operation = "createUser";
} else {
commit 49a48ea47dde77506b48bb1c699dd6aab0ab8a20
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Fri Dec 14 14:50:57 2012 +0100
[BZ 886287 - NullPointerException when another exception should have been thrown] quick fix, lazy evaluation of Java should ensure the prevention of throwing NPE
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/SystemServiceType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/SystemServiceType.java
index 6521d2e..006e1e4 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/SystemServiceType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/SystemServiceType.java
@@ -87,14 +87,14 @@ public class SystemServiceType extends AbstractBundleType {
}
public void init() throws BuildException {
- if (!OS_NAME.equals("Linux") || !REDHAT_RELEASE_FILE.exists()) {
+ if (!"Linux".equals(OS_NAME) || !REDHAT_RELEASE_FILE.exists()) {
throw new BuildException("The system-service element is only supported on Red Hat Linux systems.");
}
if (!this.scriptFile.exists() || this.scriptFile.isDirectory()) {
throw new BuildException("The 'scriptFile' attribute must be set to the path of an existing regular file.");
}
- if (this.configFile != null && !this.configFile.exists() || this.configFile.isDirectory()) {
+ if (this.configFile != null && (!this.configFile.exists() || this.configFile.isDirectory())) {
throw new BuildException("The 'configFile' attribute must be set to the path of an existing regular file.");
}
}
commit 3b27674c0810da01bd7d4031f5f3ea852b62e538
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Thu Dec 13 20:27:06 2012 -0500
Add test dep to ensure the oracle driver can be found when testing against oracle.
diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
index ba7dd7e..407dc0b 100644
--- a/modules/enterprise/server/itests-2/pom.xml
+++ b/modules/enterprise/server/itests-2/pom.xml
@@ -26,10 +26,10 @@
<jboss.vm.args>-Xmx700m -XX:MaxPermSize=200m -Djava.security.manager
-Djava.security.policy==${jboss.unzip.location}/security.policy</jboss.vm.args>
<jboss.vm.args.debug></jboss.vm.args.debug> <!-- -Ditest.debug can override this, see below -->
- <!-- These properties guide which datasources are used for integration tests. Only one should be true.
- The default is Postgres, specify -Pitest.oracle to use Oracle -->
- <skip.postgres>false</skip.postgres>
- <skip.oracle>true</skip.oracle>
+ <!-- These properties guide which datasources are used for integration tests. Only one should be true.
+ The default is Postgres, specify -Pitest.oracle to use Oracle -->
+ <skip.postgres>false</skip.postgres>
+ <skip.oracle>true</skip.oracle>
</properties>
<dependencies>
@@ -683,6 +683,17 @@
<skip.postgres>true</skip.postgres>
<skip.oracle>false</skip.oracle>
</properties>
+
+ <dependencies>
+ <!-- The provided scope in the root pom is not sufficient, we need this fo shrinkwrap to resolve
+ dependency and add the jar to the deployment. -->
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc6</artifactId>
+ <version>${ojdbc6.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
commit 8dbf3bd0b887c1b371f11394112755a714fa9e2b
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Thu Dec 13 17:12:57 2012 -0500
Make sure oracle driver dependency is in place for -Ddbreset
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index c8fef74..aa9a2ce 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -435,6 +435,17 @@
<profile>
<id>ojdbc-driver</id>
+ <dependencies>
+ <!-- The provided scope in the root pom is not sufficient, we need this
+ dependency for dbreset, if it is used. -->
+ <dependency>
+ <groupId>com.oracle</groupId>
+ <artifactId>ojdbc6</artifactId>
+ <version>${ojdbc6.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
<!-- TODO: defer to root pom version when we can agree on a version -->
<build>
<plugins>
commit d5a7ec0bed4d88493a5213ea0a43a9cda0f60610
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 13 16:12:49 2012 -0500
Add ability to specify Double comparison tolerances in our matcher test utils.
Hopefully this will handle the minor roundoff errors that are sinking some
some tests. When we move to cassandra we may be able to remove these tolerances from
the tests, given more precision in our math.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
index e87bff2..9e8b4e3 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
@@ -169,9 +169,9 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
buckets.get(29), Double.NaN, Double.NaN, Double.NaN);
assertPropertiesMatch("The data for bucket 0 does not match the expected values.", expectedBucket0Data,
- actualData.get(0));
+ actualData.get(0), 0.0001D);
assertPropertiesMatch("The data for bucket 59 does not match the expected values.", expectedBucket59Data,
- actualData.get(59));
+ actualData.get(59), 0.0001D);
assertPropertiesMatch("The data for bucket 29 does not match the expected values.", expectedBucket29Data,
actualData.get(29));
}
@@ -206,7 +206,7 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
MeasurementAggregate expected = new MeasurementAggregate(1.1, divide((1.1 + 2.2 + 3.3 + 4.4 + 5.5 + 6.6), 6),
6.6);
- AssertUtils.assertPropertiesMatch(expected, actual, "Aggregate does not match");
+ AssertUtils.assertPropertiesMatch("Aggregate does not match", expected, actual, 0.0001D);
}
@Test(enabled = ENABLED)
@@ -242,9 +242,9 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
buckets.get(59), divide((5.0 + 5.0 + 3.0), 3), 9.0, 2.0);
assertPropertiesMatch("The data for bucket 0 does not match the expected values.", expectedBucket0Data,
- actualData.get(0));
+ actualData.get(0), 0.0001D);
assertPropertiesMatch("The data for bucket 59 does not match the expected values.", expectedBucket59Data,
- actualData.get(59));
+ actualData.get(59), 0.0001D);
}
private void createInventory() throws Exception {
diff --git a/modules/test-utils/src/main/java/org/rhq/test/AssertUtils.java b/modules/test-utils/src/main/java/org/rhq/test/AssertUtils.java
index 7524fc8..50c1212 100644
--- a/modules/test-utils/src/main/java/org/rhq/test/AssertUtils.java
+++ b/modules/test-utils/src/main/java/org/rhq/test/AssertUtils.java
@@ -23,14 +23,14 @@
package org.rhq.test;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
public class AssertUtils {
/**
@@ -44,7 +44,7 @@ public class AssertUtils {
* @param <T> The type of the objects to be compared
*/
public static <T> void assertPropertiesMatch(T expected, T actual, String msg) {
- assertPropertiesMatch(msg, expected, actual, Collections.<String>emptyList());
+ assertPropertiesMatch(msg, expected, actual, null, Collections.<String> emptyList());
}
/**
@@ -55,7 +55,20 @@ public class AssertUtils {
* @param <T> The type of the objects to be compared.
*/
public static <T> void assertPropertiesMatch(String msg, T expected, T actual, String... ignoredProperties) {
- assertPropertiesMatch(msg, expected, actual, Arrays.asList(ignoredProperties));
+ assertPropertiesMatch(msg, expected, actual, null, Arrays.asList(ignoredProperties));
+ }
+
+ /**
+ * @param msg An error message
+ * @param expected The expected object to compare against. Should be non-null.
+ * @param actual The actual object to be compared. Should be non-null.
+ * @param ignoredProperties A list of property names to exclude from comparison.
+ * @param maxDifference When matching doubles, the max roundoff difference still considered equal. If null Double.equals() is used.
+ * @param <T> The type of the objects to be compared.
+ */
+ public static <T> void assertPropertiesMatch(String msg, T expected, T actual, Double maxDifference,
+ String... ignoredProperties) {
+ assertPropertiesMatch(msg, expected, actual, maxDifference, Arrays.asList(ignoredProperties));
}
/**
@@ -70,12 +83,30 @@ public class AssertUtils {
* @param <T> The type of the objects to be compared.
*/
public static <T> void assertPropertiesMatch(String msg, T expected, T actual, List<String> ignoredProperties) {
+ assertPropertiesMatch(msg, expected, actual, null, ignoredProperties);
+ }
+
+ /**
+ * Verifies that all public, accessible properties of the two objects are equal, excluding those specified in the
+ * <code>ignoredProperties</code> argument. This method might be used when you want to compare two objects without
+ * using their <code>equals()</code> methods or when they do not implement <code>equals</code>.
+ *
+ * @param msg An error message
+ * @param expected The expected object to compare against. Should be non-null.
+ * @param actual The actual object to be compared. Should be non-null.
+ * @param maxDifference When matching doubles, the max roundoff difference still considered equal. If null Double.equals() is used.
+ * @param ignoredProperties A list of property names to exclude from comparison.
+ * @param <T> The type of the objects to be compared.
+ */
+ public static <T> void assertPropertiesMatch(String msg, T expected, T actual, Double maxDifference,
+ List<String> ignoredProperties) {
assertNotNull(expected, "Expected object should not be null");
assertNotNull(actual, "Actual object should not be null");
PropertyMatcher<T> matcher = new PropertyMatcher<T>();
matcher.setExpected(expected);
matcher.setActual(actual);
+ matcher.setMaxDifference(maxDifference);
matcher.setIgnoredProperties(ignoredProperties);
MatchResult result = matcher.execute();
diff --git a/modules/test-utils/src/main/java/org/rhq/test/PropertyMatcher.java b/modules/test-utils/src/main/java/org/rhq/test/PropertyMatcher.java
index 8d9b3cc..7f07c2d 100644
--- a/modules/test-utils/src/main/java/org/rhq/test/PropertyMatcher.java
+++ b/modules/test-utils/src/main/java/org/rhq/test/PropertyMatcher.java
@@ -23,14 +23,14 @@
package org.rhq.test;
-import org.apache.commons.beanutils.PropertyUtils;
-
import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import org.apache.commons.beanutils.PropertyUtils;
+
public class PropertyMatcher<T> {
private T expected;
@@ -39,6 +39,8 @@ public class PropertyMatcher<T> {
private Set<String> ignoredProperties = new HashSet<String>();
+ private Double maxDifference;
+
public void setExpected(T expected) {
this.expected = expected;
}
@@ -51,6 +53,10 @@ public class PropertyMatcher<T> {
this.ignoredProperties.addAll(ignoredProperties);
}
+ public void setMaxDifference(Double maxDifference) {
+ this.maxDifference = maxDifference;
+ }
+
public MatchResult execute() {
try {
Map<String, ?> expectedProps = PropertyUtils.describe(expected);
@@ -96,6 +102,18 @@ public class PropertyMatcher<T> {
if (expected == null && actual != null) {
return false;
}
+
+ if (maxDifference != null && expected instanceof Double) {
+ boolean result = expected.equals(actual);
+ if (!result) {
+ Double dExpected = (Double) expected;
+ Double dActual = (Double) actual;
+ Double diff = Math.abs(dExpected - dActual);
+ result = ((!diff.isNaN()) && (!diff.isInfinite()) && (diff < maxDifference));
+ }
+ return result;
+ }
+
return expected.equals(actual);
}
}
commit 165b4f583ca08f6a7c20ebcdaad7fe7f43508b90
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Thu Dec 13 13:18:09 2012 -0500
Fix an issue where the domain and server itests needed one of
-Ppostgres or -Poracle to be defined. Now it will default to
postgres unless -Pitest.oracle is set.
Also, removed some ojdbc-driver profile declarations that were
redundant with what is already defined in the root pom and should
be inherited.
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index c110636..c8fef74 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -435,13 +435,7 @@
<profile>
<id>ojdbc-driver</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>${ojdbc6.version}</version>
- </dependency>
- </dependencies>
+ <!-- TODO: defer to root pom version when we can agree on a version -->
<build>
<plugins>
<plugin>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index cb7699b..23d5fe0 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -18,6 +18,10 @@
<jboss.zip>${settings.localRepository}/org/jboss/as/jboss-as-dist/${jboss.version}/jboss-as-dist-${jboss.version}.zip</jboss.zip>
<jboss.unzip.location>${basedir}/target/jboss-as-${jboss.version}</jboss.unzip.location>
<rhq.internal>false</rhq.internal>
+ <!-- These properties guide which datasources are used for integration tests. Only one should be true.
+ The default is Postgres, specify -Pitest.oracle to use Oracle -->
+ <skip.postgres>false</skip.postgres>
+ <skip.oracle>true</skip.oracle>
</properties>
@@ -542,18 +546,14 @@
</build>
- <profiles>
-
- <!-- if you want to test on oracle, this can pull down the oracle jdbc driver that is needed -->
- <profile>
- <id>ojdbc-driver</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>${ojdbc6.version}</version>
- </dependency>
- </dependencies>
+ <profiles>
+ <!-- If testing against oracle, override the default property settings -->
+ <profile>
+ <id>itest.oracle</id>
+ <properties>
+ <skip.postgres>true</skip.postgres>
+ <skip.oracle>false</skip.oracle>
+ </properties>
</profile>
<profile>
@@ -669,26 +669,7 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>postgres</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <skip.postgres>false</skip.postgres>
- <skip.oracle>true</skip.oracle>
- </properties>
- </profile>
-
- <profile>
- <id>oracle</id>
- <properties>
- <skip.postgres>true</skip.postgres>
- <skip.oracle>false</skip.oracle>
- </properties>
- </profile>
-
+
<profile>
<id>itest.debug</id>
<activation>
diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
index 01b377f..ba7dd7e 100644
--- a/modules/enterprise/server/itests-2/pom.xml
+++ b/modules/enterprise/server/itests-2/pom.xml
@@ -26,6 +26,10 @@
<jboss.vm.args>-Xmx700m -XX:MaxPermSize=200m -Djava.security.manager
-Djava.security.policy==${jboss.unzip.location}/security.policy</jboss.vm.args>
<jboss.vm.args.debug></jboss.vm.args.debug> <!-- -Ditest.debug can override this, see below -->
+ <!-- These properties guide which datasources are used for integration tests. Only one should be true.
+ The default is Postgres, specify -Pitest.oracle to use Oracle -->
+ <skip.postgres>false</skip.postgres>
+ <skip.oracle>true</skip.oracle>
</properties>
<dependencies>
@@ -672,19 +676,9 @@
</build>
<profiles>
+ <!-- If testing against oracle, override the default property settings -->
<profile>
- <id>postgres</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <skip.postgres>false</skip.postgres>
- <skip.oracle>true</skip.oracle>
- </properties>
- </profile>
-
- <profile>
- <id>oracle</id>
+ <id>itest.oracle</id>
<properties>
<skip.postgres>true</skip.postgres>
<skip.oracle>false</skip.oracle>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 98a7895..2033a2c 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -694,19 +694,6 @@
</build>
</profile>
- <!-- if you want to test on oracle, this can pull down the oracle jdbc driver that is needed -->
- <profile>
- <id>ojdbc-driver</id>
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc6</artifactId>
- <version>${ojdbc6.version}</version>
- </dependency>
- </dependencies>
- </profile>
-
-
<profile>
<id>dev</id>
1
0
[rhq] Branch 'jkremser/ha-jsf-to-gwt-rewrite' - 2 commits - modules/enterprise
by Jiri Kremser 19 Dec '12
by Jiri Kremser 19 Dec '12
19 Dec '12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 49 ++--------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AbstractServerNodeDatasource.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java | 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java | 5 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java | 9 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java | 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java | 7 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ListServersUIBean.java | 4
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java | 3
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java | 5 -
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java | 5 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java | 13 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java | 8 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/ShutdownListener.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java | 3
21 files changed, 55 insertions(+), 94 deletions(-)
New commits:
commit 764fb31756c961b5f5a31df71a8b04def6fce249
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Dec 19 23:47:56 2012 +0100
AuthZ for CloudManagerBean (adding Subject param to methods)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java
index 3659082..addd59d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java
@@ -64,9 +64,8 @@ public class ServerWithAgentCountDatasource extends
ListGridField agentCountField = FIELD_AGENT_COUNT.getListGridField("75");
agentCountField.setHoverCustomizer(new HoverCustomizer() {
public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) {
- return MSG.view_adminTopology_message_agentsCount(FIELD_AGENT_COUNT.propertyName());
- // "There are " + record.getAttributeAsInt(FIELD_AGENT_COUNT.propertyName())
- // + " agents registered to this server.";
+ return MSG.view_adminTopology_message_agentsCount(record.getAttributeAsString(FIELD_AGENT_COUNT
+ .propertyName()));
}
});
agentCountField.setShowHover(true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java
index dd63fa0..ab46527 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java
@@ -77,7 +77,7 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud
@Override
public void deleteServers(int[] serverIds) throws RuntimeException {
try {
- cloudManager.deleteServers(ArrayUtils.toObject(serverIds));
+ cloudManager.deleteServers(getSessionSubject(), ArrayUtils.toObject(serverIds));
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
}
@@ -86,7 +86,7 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud
@Override
public void updateServerMode(int[] serverIds, OperationMode mode) throws RuntimeException {
try {
- cloudManager.updateServerMode(ArrayUtils.toObject(serverIds), mode);
+ cloudManager.updateServerMode(getSessionSubject(), ArrayUtils.toObject(serverIds), mode);
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
}
@@ -96,7 +96,8 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud
public List<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc)
throws RuntimeException {
try {
- return SerialUtility.prepare(cloudManager.getFailoverListDetailsByAgentId(agentId, pc),
+ return SerialUtility.prepare(
+ cloudManager.getFailoverListDetailsByAgentId(getSessionSubject(), agentId, pc),
"CloudGWTServiceImpl.getFailoverListDetailsByAgentId");
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ListServersUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ListServersUIBean.java
index 49dee0d..ef4b65a 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ListServersUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ListServersUIBean.java
@@ -49,7 +49,7 @@ public class ListServersUIBean extends PagedDataTableUIBean {
if (ids.length > 0) {
try {
- cloudManager.deleteServers(ids);
+ cloudManager.deleteServers(subject, ids);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Removed [" + ids.length
+ "] servers from the cloud.");
@@ -70,7 +70,7 @@ public class ListServersUIBean extends PagedDataTableUIBean {
if (ids.length > 0) {
try {
- cloudManager.updateServerMode(ids, mode);
+ cloudManager.updateServerMode(EnterpriseFacesContextUtility.getSubject(), ids, mode);
FacesContextUtility.addMessage(FacesMessage.SEVERITY_INFO, "Set [" + ids.length + "] servers to mode "
+ mode);
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java
index 90d7042..4ccba78 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/ha/ViewAgentUIBean.java
@@ -81,7 +81,8 @@ public class ViewAgentUIBean extends PagedDataTableUIBean {
@Override
public PageList<FailoverListDetails> fetchPage(PageControl pc) {
int agentId = getAgent().getId();
- PageList<FailoverListDetails> pageList = cloudManager.getFailoverListDetailsByAgentId(agentId, pc);
+ PageList<FailoverListDetails> pageList = cloudManager.getFailoverListDetailsByAgentId(
+ EnterpriseFacesContextUtility.getSubject(), agentId, pc);
return pageList;
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
index a74550d..a33d77c 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
@@ -683,7 +683,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
private void deleteServerIdentity() throws Exception {
if (server != null) {
cleanupAgent(); // can't remove the server before we purge the agent
- LookupUtil.getCloudManager().deleteServer(server.getId());
+ LookupUtil.getCloudManager().deleteServer(LookupUtil.getSubjectManager().getOverlord(), server.getId());
server = null;
}
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java
index 26a6254..2494ece 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/cloud/FailoverListManagerBeanTest.java
@@ -95,8 +95,9 @@ public class FailoverListManagerBeanTest extends AbstractEJB3Test {
try {
for (Server server : servers) {
// must set to down to allow for a delete
- cloudManager.updateServerMode(new Integer[] { server.getId() }, Server.OperationMode.DOWN);
- cloudManager.deleteServer(server.getId());
+ cloudManager.updateServerMode(LookupUtil.getSubjectManager().getOverlord(),
+ new Integer[] { server.getId() }, Server.OperationMode.DOWN);
+ cloudManager.deleteServer(LookupUtil.getSubjectManager().getOverlord(), server.getId());
}
for (Agent agent : agents) {
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
index 0e25ee4..3857afc 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java
@@ -178,8 +178,9 @@ public class CoreServerServiceImplTest extends AbstractEJB3Test {
protected void afterMethod() throws Exception {
// cleanup our test server
- LookupUtil.getCloudManager().updateServerMode(new Integer[] { server.getId() }, OperationMode.DOWN);
- LookupUtil.getCloudManager().deleteServer(server.getId());
+ LookupUtil.getCloudManager().updateServerMode(LookupUtil.getSubjectManager().getOverlord(),
+ new Integer[] { server.getId() }, OperationMode.DOWN);
+ LookupUtil.getCloudManager().deleteServer(LookupUtil.getSubjectManager().getOverlord(), server.getId());
// shutdown our mock mbean server
unprepareCustomServerService(CoreServerMBean.OBJECT_NAME);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java
index 455e375..37029b4 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java
@@ -87,9 +87,5 @@ public interface AffinityGroupManagerLocal {
*/
PageList<Agent> getAgentNonMembers(Subject subject, int affinityGroupId, PageControl pageControl);
- /**
- * @deprecated portal war was using it (use finders <code>AgentManagerBean.findAgentsByCriteria()</code> and
- * <code>CloudManagerBean.findServersByCriteria()</code> instead)
- */
PageList<AffinityGroupCountComposite> getComposites(Subject subject, PageControl pageControl);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
index d1ffb1b..2c775d4 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
@@ -163,19 +163,19 @@ public class CloudManagerBean implements CloudManagerLocal {
@RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
@RequiredPermission(Permission.MANAGE_INVENTORY) })
- public void deleteServers(Integer[] serverIds) throws CloudManagerException {
+ public void deleteServers(Subject subject, Integer[] serverIds) throws CloudManagerException {
if (serverIds == null) {
return;
}
for (Integer nextServerId : serverIds) {
- cloudManager.deleteServer(nextServerId);
+ cloudManager.deleteServer(subject, nextServerId);
}
}
@RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
@RequiredPermission(Permission.MANAGE_INVENTORY) })
- public void deleteServer(Integer serverId) throws CloudManagerException {
+ public void deleteServer(Subject subject, Integer serverId) throws CloudManagerException {
try {
Server server = entityManager.find(Server.class, serverId);
@@ -214,7 +214,7 @@ public class CloudManagerBean implements CloudManagerLocal {
@RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
@RequiredPermission(Permission.MANAGE_INVENTORY) })
- public void updateServerMode(Integer[] serverIds, Server.OperationMode mode) {
+ public void updateServerMode(Subject subject, Integer[] serverIds, Server.OperationMode mode) {
if (serverIds == null) {
return;
}
@@ -249,14 +249,15 @@ public class CloudManagerBean implements CloudManagerLocal {
}
}
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public Server updateServer(Subject subject, Server server) {
return entityManager.merge(server);
}
@RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
@RequiredPermission(Permission.MANAGE_INVENTORY) })
- public PageList<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc) {
+ public PageList<FailoverListDetails> getFailoverListDetailsByAgentId(Subject subject, int agentId, PageControl pc) {
pc.initDefaultOrderingField("fld.ordinal");
Query query = PersistenceUtility.createQueryWithOrderBy(entityManager,
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java
index 595ca8f..8ba595a 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java
@@ -37,9 +37,9 @@ import org.rhq.core.domain.util.PageList;
@Local
public interface CloudManagerLocal {
- void deleteServers(Integer[] serverIds) throws CloudManagerException;
+ void deleteServers(Subject subject, Integer[] serverIds) throws CloudManagerException;
- void deleteServer(Integer serverId) throws CloudManagerException;
+ void deleteServer(Subject subject, Integer serverId) throws CloudManagerException;
List<Agent> getAgentsByServerName(String serverName);
@@ -83,11 +83,11 @@ public interface CloudManagerLocal {
*/
int getNormalServerCount();
- void updateServerMode(Integer[] serverIds, Server.OperationMode mode);
+ void updateServerMode(Subject subject, Integer[] serverIds, Server.OperationMode mode);
Server updateServer(Subject subject, Server server);
- PageList<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc);
+ PageList<FailoverListDetails> getFailoverListDetailsByAgentId(Subject subject, int agentId, PageControl pc);
void markStaleServersDown(Subject subject);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/ShutdownListener.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/ShutdownListener.java
index 3490df6..0749543 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/ShutdownListener.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/ShutdownListener.java
@@ -169,7 +169,7 @@ public class ShutdownListener {
// Set the server operation mode to DOWN unless in MM
Server server = serverManager.getServer();
if (Server.OperationMode.MAINTENANCE != server.getOperationMode()) {
- cloudManager.updateServerMode(new Integer[] { server.getId() }, OperationMode.DOWN);
+ cloudManager.updateServerMode(LookupUtil.getSubjectManager().getOverlord(), new Integer[] { server.getId() }, OperationMode.DOWN);
}
} catch (Throwable t) {
// only show ugly stack traces if the user runs the server in debug mode
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
index f7e0606..3240c1e 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
@@ -258,7 +258,8 @@ public class StartupBean {
log.info("Server is configured to start up in MAINTENANCE mode.");
Server server = serverManager.getServer();
Integer[] serverId = new Integer[] { server.getId() };
- cloudManager.updateServerMode(serverId, OperationMode.MAINTENANCE);
+ cloudManager.updateServerMode(LookupUtil.getSubjectManager().getOverlord(), serverId,
+ OperationMode.MAINTENANCE);
}
// Establish the current server mode for the server. This will move the server to NORMAL
commit 5a78346ff88d4b2694a68b6c519c01d52da12df6
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Dec 19 22:46:03 2012 +0100
Old JSF views are not accessible from UI anymore, instead the new GWT views are on their place (without the "GWT" suffix)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
index 6afe5e4..652299d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
@@ -144,69 +144,40 @@ public class AdministrationView extends AbstractSectionedLeftNavigationView {
ProductInfo productInfo = CoreGUI.get().getProductInfo();
boolean isRHQ = (productInfo != null) && "RHQ".equals(productInfo.getShortName());
- NavigationItem serversItem = new NavigationItem(PAGE_SERVERS_VIEW_ID, new ViewFactory() {
- public Canvas createView() {
- return new FullHTMLPane(extendLocatorId(PAGE_SERVERS_VIEW_ID.getName()),
- "/rhq/ha/listServers-plain.xhtml?nomenu=true");
- }
- }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
-
- NavigationItem agentsItem = new NavigationItem(PAGE_AGENTS_VIEW_ID, new ViewFactory() {
- public Canvas createView() {
- return new FullHTMLPane(extendLocatorId(PAGE_AGENTS_VIEW_ID.getName()),
- "/rhq/ha/listAgents-plain.xhtml?nomenu=true");
- }
- }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
-
- NavigationItem affinityGroupsItem = new NavigationItem(PAGE_AFFINITY_GROUPS_VIEW_ID, new ViewFactory() {
- public Canvas createView() {
- return new FullHTMLPane(extendLocatorId(PAGE_AFFINITY_GROUPS_VIEW_ID.getName()),
- "/rhq/ha/listAffinityGroups-plain.xhtml?nomenu=true");
- }
- }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
-
- NavigationItem partitionEventsItem = new NavigationItem(PAGE_PARTITION_EVENTS_VIEW_ID, new ViewFactory() {
- public Canvas createView() {
- return new FullHTMLPane(extendLocatorId(PAGE_PARTITION_EVENTS_VIEW_ID.getName()),
- "/rhq/ha/listPartitionEvents-plain.xhtml?nomenu=true");
- }
- }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
-
NavigationItem remoteAgentInstallItem = new NavigationItem(RemoteAgentInstallView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
return new RemoteAgentInstallView(extendLocatorId("RemoteAgentInstall"));
}
- }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
+ }, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
- NavigationItem serversItemGwt = new NavigationItem(ServerTableView.VIEW_ID, new ViewFactory() {
+ NavigationItem serversItem = new NavigationItem(ServerTableView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
return new ServerTableView(extendLocatorId(ServerTableView.VIEW_ID.getName()), null, false);
}
- }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
+ }, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
- NavigationItem agentsItemGwt = new NavigationItem(AgentTableView.VIEW_ID, new ViewFactory() {
+ NavigationItem agentsItem = new NavigationItem(AgentTableView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
return new AgentTableView(extendLocatorId(AgentTableView.VIEW_ID.getName()), null, false);
}
- }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
+ }, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
- NavigationItem affinityGroupsItemGwt = new NavigationItem(AffinityGroupTableView.VIEW_ID, new ViewFactory() {
+ NavigationItem affinityGroupsItem = new NavigationItem(AffinityGroupTableView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
return new AffinityGroupTableView(extendLocatorId(AffinityGroupTableView.VIEW_ID.getName()));
}
- }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
+ }, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
- NavigationItem partitionEventsGwt = new NavigationItem(PartitionEventTableView.VIEW_ID, new ViewFactory() {
+ NavigationItem partitionEventsItem = new NavigationItem(PartitionEventTableView.VIEW_ID, new ViewFactory() {
public Canvas createView() {
return new PartitionEventTableView(extendLocatorId(PartitionEventTableView.VIEW_ID.getName()),
PartitionEventTableView.VIEW_ID.getTitle());
}
- }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY));
+ }, getGlobalPermissions().contains(Permission.MANAGE_SETTINGS));
// Arrays.asList returns a list with a fixed size, therefore there is the wrapping ArrayList
List<NavigationItem> navigationItems = new ArrayList<NavigationItem>(Arrays.asList(serversItem, agentsItem,
- affinityGroupsItem, partitionEventsItem, serversItemGwt, agentsItemGwt, affinityGroupsItemGwt,
- partitionEventsGwt));
+ affinityGroupsItem, partitionEventsItem));
if (isRHQ) {
navigationItems.add(remoteAgentInstallItem);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AbstractServerNodeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AbstractServerNodeDatasource.java
index 528ab8e..ac4c736 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AbstractServerNodeDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AbstractServerNodeDatasource.java
@@ -22,10 +22,14 @@ import java.util.List;
import com.smartgwt.client.widgets.grid.ListGridField;
+import org.rhq.core.domain.cloud.FailoverListDetails;
+import org.rhq.core.domain.cloud.composite.ServerWithAgentCountComposite;
import org.rhq.core.domain.criteria.BaseCriteria;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
/**
+ * Base class for all Server derivatives like {@link ServerWithAgentCountComposite} and {@link FailoverListDetails}
+ *
* @author Jirka Kremser
*/
public abstract class AbstractServerNodeDatasource<T, C extends BaseCriteria> extends RPCDataSource<T, C> {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java
index 6786a89..65efb7c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java
@@ -60,9 +60,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCriteria> {
private final Integer affinityGroupId;
-
private static RPCDataSource<Agent, AgentCriteria> datasource = null;
-
private static final int MAX_AVAIL_AGENTS = 3000;
private static Window modalWindow;
private static boolean shouldBeClosed;
@@ -104,7 +102,6 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
selector.reset();
}
- @Override
public void onFailure(Throwable t) {
CoreGUI.getErrorHandler().handleError(
MSG.view_adminTopology_message_fetchAgentsFail(String.valueOf(affinityGroupId)), t);
@@ -187,7 +184,6 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
shouldBeClosed = false;
GWTServiceLookup.getCloudService().removeAgentsFromGroup(
originallySelected.toArray(new Integer[originallySelected.size()]), new AsyncCallback<Void>() {
-
public void onSuccess(Void result) {
closeAndRefresh(parrent, true);
}
@@ -203,7 +199,6 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
shouldBeClosed = false;
GWTServiceLookup.getCloudService().addAgentsToGroup(selector.getAffinityGroupId(),
actuallySelected.toArray(new Integer[actuallySelected.size()]), new AsyncCallback<Void>() {
-
public void onSuccess(Void result) {
closeAndRefresh(parrent, true);
}
@@ -258,5 +253,4 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
public Integer getAffinityGroupId() {
return affinityGroupId;
}
-
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
index fbd832e..8a8d81b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
@@ -199,7 +199,7 @@ public class AffinityGroupDetailView extends LocatableVLayout implements Bookmar
footer.addMember(saveButton);
form.setItems(nameItem);
SectionStackSection section = new SectionStackSection(MSG.common_title_details());
- section.setExpanded(true);
+ section.setExpanded(false);
section.setItems(form, footer);
detailsSection = section;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
index b21b2a6..fe4db20 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
@@ -63,9 +63,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
public class AffinityGroupServersSelector extends AbstractSelector<Server, ServerCriteria> {
private final Integer affinityGroupId;
-
private static RPCDataSource<Server, ServerCriteria> datasource = null;
-
private static Window modalWindow;
private static boolean shouldBeClosed;
private static VLayout layout;
@@ -93,7 +91,6 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
MSG.view_adminTopology_serverDetail_operationMode());
operationModeSelect.setValueMap(buildOperationModeOptions());
operationModeSelect.setValue("ALL");
-
availableFilterForm.setItems(search, operationModeSelect);
}
return availableFilterForm;
@@ -122,7 +119,6 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
selector.reset();
}
- @Override
public void onFailure(Throwable t) {
CoreGUI.getErrorHandler().handleError(
MSG.view_adminTopology_message_fetchServersFail(String.valueOf(affinityGroupId)), t);
@@ -279,5 +275,4 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
public Integer getAffinityGroupId() {
return affinityGroupId;
}
-
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java
index dbe8d0f..87afd6d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java
@@ -65,8 +65,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
*/
public class AffinityGroupTableView extends TableSection<AffinityGroupWithCountsDatasource> implements HasViewName {
- public static final ViewName VIEW_ID = new ViewName("AffinityGroups(GWT)", MSG.view_adminTopology_affinityGroups()
- + "(GWT)", IconEnum.ALL_GROUPS);
+ public static final ViewName VIEW_ID = new ViewName("AffinityGroups", MSG.view_adminTopology_affinityGroups(),
+ IconEnum.ALL_GROUPS);
public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/"
+ AdministrationView.SECTION_TOPOLOGY_VIEW_ID + "/" + VIEW_ID;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
index 8c47813..8f2a658 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
@@ -48,14 +48,12 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
*/
public class AgentTableView extends TableSection<AgentDatasource> implements HasViewName {
- public static final ViewName VIEW_ID = new ViewName("Agents(GWT)", MSG.view_adminTopology_agents() + "(GWT)",
- IconEnum.AGENT);
+ public static final ViewName VIEW_ID = new ViewName("Agents", MSG.view_adminTopology_agents(), IconEnum.AGENT);
public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/"
+ AdministrationView.SECTION_TOPOLOGY_VIEW_ID + "/" + VIEW_ID;
private final boolean isAffinityGroupId;
-
private final Integer id;
public AgentTableView(String locatorId, Integer id, boolean isAffinityGroupId) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
index 7fa9a7c..599b2c2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
@@ -58,8 +58,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
*/
public class PartitionEventTableView extends TableSection<PartitionEventDatasource> implements HasViewName {
- public static final ViewName VIEW_ID = new ViewName("PartitionEvents(GWT)",
- MSG.view_adminTopology_partitionEvents() + "(GWT)", IconEnum.EVENTS);
+ public static final ViewName VIEW_ID = new ViewName("PartitionEvents", MSG.view_adminTopology_partitionEvents(),
+ IconEnum.EVENTS);
public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/"
+ AdministrationView.SECTION_TOPOLOGY_VIEW_ID + "/" + VIEW_ID;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
index d38d95d..2374685 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
@@ -18,8 +18,8 @@
*/
package org.rhq.enterprise.gui.coregui.client.admin.topology;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AFFINITY_GROUP;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AFFINITY_GROUP_ID;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_AFFINITY_GROUP;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_AFFINITY_GROUP_ID;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_ORDINAL;
import java.io.Serializable;
@@ -59,16 +59,13 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
public class ServerTableView extends
TableSection<AbstractServerNodeDatasource<? extends Serializable, ? extends BaseCriteria>> implements HasViewName {
- public static final ViewName VIEW_ID = new ViewName("Servers(GWT)", MSG.view_adminTopology_servers() + "(GWT)",
- IconEnum.SERVERS);
+ public static final ViewName VIEW_ID = new ViewName("Servers", MSG.view_adminTopology_servers(), IconEnum.SERVERS);
public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/"
+ AdministrationView.SECTION_TOPOLOGY_VIEW_ID + "/" + VIEW_ID;
private final boolean showActions;
-
private final boolean isAffinityGroupId;
-
private final Integer id;
public ServerTableView(String locatorId, Integer id, boolean isAffinityGroupId) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java
index 1b6609b..3659082 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java
@@ -44,6 +44,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
public class ServerWithAgentCountDatasource extends
AbstractServerNodeDatasource<ServerWithAgentCountComposite, Criteria> {
+ // server datasource delegate
private final ServerDatasource serverDatasource;
public ServerWithAgentCountDatasource() {
1
0
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java | 1
modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java | 9 +++++-
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java | 14 +++++-----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java | 4 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java | 14 ++++++++--
5 files changed, 31 insertions(+), 11 deletions(-)
New commits:
commit 17d9ac9e8b5a926b468da48eb4cde5c8765453c3
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 19 16:57:06 2012 -0500
[Bug 888927 -Availability duration conditions limited to one alert definition per resource]
Add the hooks to further qualify AvailDuration checkCondition quartz job
trigger names with the alertDefId. This will allow avail duration conditions
on any number of alert defs for the same resource.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java
index 386cef9..a43816f 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertCondition.java
@@ -150,6 +150,7 @@ import org.rhq.core.domain.operation.OperationRequestStatus;
+ " SELECT new org.rhq.core.domain.alert.composite.AlertConditionAvailabilityCategoryComposite " //
+ " ( " //
+ " ac, " //
+ + " ad.id, " // needed for avail duration
+ " res.id, " //
+ " (" //
+ " SELECT a.availabilityType " //
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java
index 4798f41..870dbd2 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/alert/composite/AlertConditionAvailabilityCategoryComposite.java
@@ -33,19 +33,26 @@ import org.rhq.core.domain.measurement.AvailabilityType;
*/
public class AlertConditionAvailabilityCategoryComposite extends AbstractAlertConditionCategoryComposite {
+ private final Integer alertDefinitionId;
private final Integer resourceId;
private final AvailabilityType availabilityType;
- public AlertConditionAvailabilityCategoryComposite(AlertCondition condition, Integer resourceId,
+ public AlertConditionAvailabilityCategoryComposite(AlertCondition condition, Integer alertDefinitionId,
+ Integer resourceId,
AvailabilityType availabilityType) {
super(condition);
+ this.alertDefinitionId = alertDefinitionId;
this.resourceId = resourceId;
// For a resource with no Availability records we initialize to UNKNOWN
this.availabilityType = (null != availabilityType) ? availabilityType : AvailabilityType.UNKNOWN;
}
+ public Integer getAlertDefinitionId() {
+ return alertDefinitionId;
+ }
+
public Integer getResourceId() {
return resourceId;
}
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
index a74550d..657ec05 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
@@ -285,12 +285,14 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
SchedulerLocal scheduler = LookupUtil.getSchedulerBean();
scheduler.scheduleTriggeredJob(AlertAvailabilityDurationJob.class, false, null);
- // create our resource with alert definition
+ // create our resource with two alert definitions (we use 2 to test BZ888927)
@SuppressWarnings("unused")
MeasurementDefinition metricDef = createResourceWithMetricSchedule();
// use a 10s duration, this is not allowed in general, the gui forces 1 minute minimum
- createAlertDefinitionWithAvailDurationCondition(resource.getId(), AlertConditionOperator.AVAIL_DURATION_DOWN,
- 10);
+ createAlertDefinitionWithAvailDurationCondition(resource.getId(), "testAvailDurationAlertDef_1",
+ AlertConditionOperator.AVAIL_DURATION_DOWN, 10);
+ createAlertDefinitionWithAvailDurationCondition(resource.getId(), "testAvailDurationAlertDef_2",
+ AlertConditionOperator.AVAIL_DURATION_DOWN, 10);
// resource has initial UNKNOWN ResourceAvailability and no Availability records. simulate an avail report
// coming from the agent and setting the initial avail to UP.
@@ -321,7 +323,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
Thread.sleep(6000);
alerts = getAlerts(resource.getId());
- assert alerts.size() == 1 : "One alert should have fired on the avail duration: " + alerts;
+ assert alerts.size() == 2 : "Two alerts should have fired on the avail duration: " + alerts;
// purge the resource fully, which should remove all alert defs and alert conditions and condition logs
int resourceId = resource.getId();
@@ -546,7 +548,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
return alertDefinition;
}
- private AlertDefinition createAlertDefinitionWithAvailDurationCondition(int resourceId,
+ private AlertDefinition createAlertDefinitionWithAvailDurationCondition(int resourceId, String alertDefName,
AlertConditionOperator condition, int duration) {
HashSet<AlertCondition> conditions = new HashSet<AlertCondition>(1);
AlertCondition cond1 = new AlertCondition();
@@ -559,7 +561,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
conditions.add(cond1);
AlertDefinition alertDefinition = new AlertDefinition();
- alertDefinition.setName("avail duration: " + condition.name());
+ alertDefinition.setName(alertDefName);
alertDefinition.setEnabled(true);
alertDefinition.setPriority(AlertPriority.HIGH);
alertDefinition.setAlertDampening(new AlertDampening(Category.NONE));
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java
index a787557..e5c6572 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/internal/GlobalConditionCache.java
@@ -164,8 +164,8 @@ class GlobalConditionCache extends AbstractConditionCache {
try {
AvailabilityDurationCacheElement cacheElement = new AvailabilityDurationCacheElement(
- alertConditionOperator, alertCondition.getOption(), availabilityComposite.getAvailabilityType(),
- alertConditionId);
+ availabilityComposite.getAlertDefinitionId(), alertConditionOperator, alertCondition.getOption(),
+ availabilityComposite.getAvailabilityType(), alertConditionId);
addTo("availabilityDurationCache", availabilityDurationCache, availabilityComposite.getResourceId(),
cacheElement, alertConditionId, stats);
} catch (InvalidCacheElementException icee) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java
index ea608f5..8b3ff23 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/engine/model/AvailabilityDurationCacheElement.java
@@ -41,16 +41,21 @@ import org.rhq.enterprise.server.util.LookupUtil;
public final class AvailabilityDurationCacheElement extends AbstractEnumCacheElement<AvailabilityType> {
+ private int alertDefinitionId;
+
/**
* @param operator
* @param operatorOption the duration, in seconds (as String)
* @param value
* @param conditionTriggerId this is actually the alertConditionId, renamed here.
*/
- public AvailabilityDurationCacheElement(AlertConditionOperator operator, String operatorOption,
+ public AvailabilityDurationCacheElement(int alertDefinitionId, AlertConditionOperator operator,
+ String operatorOption,
AvailabilityType value, int conditionTriggerId) {
super(operator, operatorOption, value, conditionTriggerId);
+
+ this.alertDefinitionId = alertDefinitionId;
}
/**
@@ -62,6 +67,7 @@ public final class AvailabilityDurationCacheElement extends AbstractEnumCacheEle
* @param resource
* @param providedValue
*/
+ @SuppressWarnings("incomplete-switch")
public static void checkCacheElements(List<AvailabilityDurationCacheElement> cacheElements, Resource resource,
AvailabilityType providedValue) {
if (null == cacheElements) {
@@ -90,6 +96,10 @@ public final class AvailabilityDurationCacheElement extends AbstractEnumCacheEle
}
}
+ public int getAlertDefinitionId() {
+ return alertDefinitionId;
+ }
+
/**
* Each avail duration check is performed by triggering an execution of {@link AlertAvailabilityDurationJob}.
* Note that each of the scheduled jobs is relevant to only 1 condition evaluation.
@@ -104,7 +114,7 @@ public final class AvailabilityDurationCacheElement extends AbstractEnumCacheEle
String jobName = AlertAvailabilityDurationJob.class.getName();
String jobGroupName = AlertAvailabilityDurationJob.class.getName();
String operator = cacheElement.getAlertConditionOperator().name();
- String triggerName = operator + "-" + resource.getId();
+ String triggerName = operator + "-" + resource.getId() + cacheElement.getAlertDefinitionId();
String duration = (String) cacheElement.getAlertConditionOperatorOption();
// convert from seconds to milliseconds
Date jobTime = new Date(System.currentTimeMillis() + (Long.valueOf(duration).longValue() * 1000));
1
0
[rhq] Branch 'feature/cassandra-backend' - 2 commits - .classpath modules/core modules/enterprise
by snegrea 19 Dec '12
by snegrea 19 Dec '12
19 Dec '12
.classpath | 1
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1D.java | 11
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1H.java | 7
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric6H.java | 11
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigrator.java | 148 ++++++++++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 22 -
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsTable.java | 22 +
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java | 16 -
8 files changed, 204 insertions(+), 34 deletions(-)
New commits:
commit 68e0d2b86b047bd71a3062319fb91dc07ce9faf0
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Dec 19 15:38:20 2012 -0600
Initial data migrator work, only aggregate tables included.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1D.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1D.java
index 33cef49..35c958b 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1D.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1D.java
@@ -36,14 +36,19 @@ import javax.persistence.Table;
* @author Greg Hinkle
*/
@Entity
-@NamedQueries( { @NamedQuery(name = MeasurementDataNumeric1D.GET_NUM_AGGREGATE, query = "SELECT min(nmd.min), avg(nmd.value), max(nmd.max) "
- + "FROM MeasurementDataNumeric1D nmd "
- + "WHERE nmd.id.scheduleId = :schedId AND nmd.id.timestamp BETWEEN :start AND :end") })
+@NamedQueries({
+ @NamedQuery(name = MeasurementDataNumeric1D.GET_NUM_AGGREGATE, query = "SELECT min(nmd.min), avg(nmd.value), max(nmd.max) "
+ + "FROM MeasurementDataNumeric1D nmd "
+ + "WHERE nmd.id.scheduleId = :schedId AND nmd.id.timestamp BETWEEN :start AND :end"),
+ @NamedQuery(name = MeasurementDataNumeric1D.QUERY_FIND_ALL, query = "SELECT m From MeasurementDataNumeric1D m"),
+ @NamedQuery(name = MeasurementDataNumeric1D.QUERY_DELETE_ALL, query = "DELETE FROM MeasurementDataNumeric1D m ") })
@Table(name = "RHQ_MEASUREMENT_DATA_NUM_1D")
public class MeasurementDataNumeric1D extends MeasurementData implements Serializable {
private static final long serialVersionUID = 1L;
public static final String GET_NUM_AGGREGATE = "MeasurementDataNumeric1D.getNumAggregate";
+ public static final String QUERY_FIND_ALL = "MeasurementDataNumeric1D.findAll";
+ public static final String QUERY_DELETE_ALL = "MeasurementDataNumeric1D.deleteAll";
@Column(precision = 24, scale = 3)
private Double value;
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1H.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1H.java
index 1b75d3f..6766293 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1H.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1H.java
@@ -36,12 +36,17 @@ import javax.persistence.Table;
* @author Greg Hinkle
*/
@Entity
-@NamedQueries( { @NamedQuery(name = MeasurementDataNumeric1H.GET_MAX_TIMESTAMP, query = "SELECT max(nmd.id.timestamp) FROM MeasurementDataNumeric1H nmd") })
+@NamedQueries({
+ @NamedQuery(name = MeasurementDataNumeric1H.GET_MAX_TIMESTAMP, query = "SELECT max(nmd.id.timestamp) FROM MeasurementDataNumeric1H nmd"),
+ @NamedQuery(name = MeasurementDataNumeric1H.QUERY_FIND_ALL, query = "SELECT m From MeasurementDataNumeric1H m"),
+ @NamedQuery(name = MeasurementDataNumeric1H.QUERY_DELETE_ALL, query = "DELETE FROM MeasurementDataNumeric1D m ") })
@Table(name = "RHQ_MEASUREMENT_DATA_NUM_1H")
public class MeasurementDataNumeric1H extends MeasurementData implements Serializable {
private static final long serialVersionUID = 1L;
public static final String GET_MAX_TIMESTAMP = "MeasurementDataNumeric1H.getMaxTimestamp";
+ public static final String QUERY_FIND_ALL = "MeasurementDataNumeric1H.findAll";
+ public static final String QUERY_DELETE_ALL = "MeasurementDataNumeric1H.deleteAll";
@Column(precision = 24, scale = 3)
private Double value;
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric6H.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric6H.java
index 366d21f..75f3aed 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric6H.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric6H.java
@@ -36,14 +36,19 @@ import javax.persistence.Table;
* @author Greg Hinkle
*/
@Entity
-@NamedQueries( { @NamedQuery(name = MeasurementDataNumeric6H.GET_NUM_AGGREGATE, query = "SELECT min(nmd.min), avg(nmd.value), max(nmd.max) "
- + "FROM MeasurementDataNumeric6H nmd "
- + "WHERE nmd.id.scheduleId = :schedId AND nmd.id.timestamp BETWEEN :start AND :end") })
+@NamedQueries({
+ @NamedQuery(name = MeasurementDataNumeric6H.GET_NUM_AGGREGATE, query = "SELECT min(nmd.min), avg(nmd.value), max(nmd.max) "
+ + "FROM MeasurementDataNumeric6H nmd "
+ + "WHERE nmd.id.scheduleId = :schedId AND nmd.id.timestamp BETWEEN :start AND :end"),
+ @NamedQuery(name = MeasurementDataNumeric6H.QUERY_FIND_ALL, query = "SELECT m From MeasurementDataNumeric6H m"),
+ @NamedQuery(name = MeasurementDataNumeric6H.QUERY_DELETE_ALL, query = "DELETE FROM MeasurementDataNumeric6H m ") })
@Table(name = "RHQ_MEASUREMENT_DATA_NUM_6H")
public class MeasurementDataNumeric6H extends MeasurementData implements Serializable {
private static final long serialVersionUID = 1L;
public static final String GET_NUM_AGGREGATE = "MeasurementDataNumeric6H.getNumAggregate";
+ public static final String QUERY_FIND_ALL = "MeasurementDataNumeric6H.findAll";
+ public static final String QUERY_DELETE_ALL = "MeasurementDataNumeric6H.deleteAll";
@Column(precision = 24, scale = 3)
private Double value;
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigrator.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigrator.java
new file mode 100644
index 0000000..c783f93
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigrator.java
@@ -0,0 +1,148 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.server.metrics;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+
+import com.datastax.driver.core.BoundStatement;
+import com.datastax.driver.core.PreparedStatement;
+import com.datastax.driver.core.Session;
+import com.datastax.driver.core.exceptions.NoHostAvailableException;
+
+import org.rhq.core.domain.measurement.MeasurementDataNumeric1D;
+import org.rhq.core.domain.measurement.MeasurementDataNumeric1H;
+import org.rhq.core.domain.measurement.MeasurementDataNumeric6H;
+
+/**
+ * @author Stefan Negrea
+ *
+ */
+public class DataMigrator {
+
+ private final EntityManager entityManager;
+
+ private Session session;
+
+ public DataMigrator(EntityManager entityManager, Session session) {
+ this.entityManager = entityManager;
+ this.session = session;
+ }
+
+ public void migrateData() {
+
+ migrateRawData();
+ migrateOneHourData();
+ migrateSixHourData();
+ migrateTwentyFourHourData();
+
+ clearAllData();
+ }
+
+ private void migrateRawData() {
+
+ }
+
+ @SuppressWarnings("unchecked")
+ private void migrateOneHourData() {
+ Query q = this.entityManager.createNamedQuery(MeasurementDataNumeric1H.QUERY_FIND_ALL);
+ List<MeasurementDataNumeric1H> existingData = q.getResultList();
+
+ try {
+ PreparedStatement statement = createPreparedStatement(MetricsTable.ONE_HOUR);
+
+ for (MeasurementDataNumeric1H measurement : existingData) {
+ insertData(statement, measurement.getScheduleId(), measurement.getMin(), measurement.getMax(),
+ Double.parseDouble(measurement.getValue().toString()), measurement.getTimestamp());
+ }
+ } catch (NoHostAvailableException e) {
+ throw new CQLException(e);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private void migrateSixHourData() {
+ Query q = this.entityManager.createNamedQuery(MeasurementDataNumeric6H.QUERY_FIND_ALL);
+ List<MeasurementDataNumeric6H> existingData = q.getResultList();
+
+ try {
+ PreparedStatement statement = createPreparedStatement(MetricsTable.SIX_HOUR);
+
+ for (MeasurementDataNumeric6H measurement : existingData) {
+ insertData(statement, measurement.getScheduleId(), measurement.getMin(), measurement.getMax(),
+ Double.parseDouble(measurement.getValue().toString()), measurement.getTimestamp());
+ }
+ } catch (NoHostAvailableException e) {
+ throw new CQLException(e);
+ }
+ }
+
+ private void migrateTwentyFourHourData() {
+ Query q = this.entityManager.createNamedQuery(MeasurementDataNumeric1D.QUERY_FIND_ALL);
+ List<MeasurementDataNumeric1D> existingData = q.getResultList();
+
+ try {
+ PreparedStatement statement = createPreparedStatement(MetricsTable.TWENTY_FOUR_HOUR);
+
+ for (MeasurementDataNumeric1D measurement : existingData) {
+ insertData(statement, measurement.getScheduleId(), measurement.getMin(), measurement.getMax(),
+ Double.parseDouble(measurement.getValue().toString()), measurement.getTimestamp());
+ }
+ } catch (NoHostAvailableException e) {
+ throw new CQLException(e);
+ }
+ }
+
+ private void clearAllData() {
+ Query q = this.entityManager.createNamedQuery(MeasurementDataNumeric1H.QUERY_DELETE_ALL);
+ q.executeUpdate();
+
+ q = this.entityManager.createNamedQuery(MeasurementDataNumeric6H.QUERY_DELETE_ALL);
+ q.executeUpdate();
+
+ q = this.entityManager.createNamedQuery(MeasurementDataNumeric1D.QUERY_DELETE_ALL);
+ q.executeUpdate();
+ }
+
+ private PreparedStatement createPreparedStatement(MetricsTable metricsTable) throws NoHostAvailableException {
+ String cql = "INSERT INTO " + metricsTable + " (schedule_id, time, type, value) VALUES (?, ?, ?, ?) USING TTL "
+ + metricsTable.getTTL();
+ PreparedStatement statement = session.prepare(cql);
+ return statement;
+ }
+
+ private void insertData(PreparedStatement statement, int scheduleId, double min, double max, double average,
+ long timestamp)
+ throws NoHostAvailableException {
+ BoundStatement boundStatement = statement.bind(scheduleId, new Date(timestamp), AggregateType.MIN.ordinal(),
+ min);
+ session.execute(boundStatement);
+
+ boundStatement = statement.bind(scheduleId, new Date(timestamp), AggregateType.MAX.ordinal(), max);
+ session.execute(boundStatement);
+
+ boundStatement = statement.bind(scheduleId, new Date(timestamp), AggregateType.AVG.ordinal(), average);
+ session.execute(boundStatement);
+ }
+}
commit 0f568515957ad84a82b3e71ea42df03f8c186e6a
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Dec 19 14:19:06 2012 -0600
Update metrics table enum to have default ttl for data.
diff --git a/.classpath b/.classpath
index 85d43a0..8ca6ab7 100644
--- a/.classpath
+++ b/.classpath
@@ -188,6 +188,7 @@
<classpathentry kind="src" path="modules/enterprise/server/server-metrics/src/main/java"/>
<classpathentry kind="src" path="modules/common/cassandra-common-itests/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/server/server-metrics/src/test/java"/>
+ <classpathentry kind="src" path="modules/common/cassandra-schema/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.SP1/jboss-profileservice-spi-5.1.0.SP1.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar"/>
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
index 3772933..631539d 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
@@ -26,7 +26,6 @@
package org.rhq.server.metrics;
import static org.rhq.core.domain.util.PageOrdering.DESC;
-import static org.rhq.server.metrics.DateTimeService.TWO_WEEKS;
import java.math.BigDecimal;
import java.math.MathContext;
@@ -42,7 +41,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.joda.time.DateTime;
import org.joda.time.DateTimeComparator;
-import org.joda.time.Days;
import org.joda.time.Hours;
import org.joda.time.Minutes;
@@ -56,8 +54,6 @@ public class MetricsServer {
private static final int DEFAULT_PAGE_SIZE = 200;
- public static int RAW_TTL = Days.days(7).toStandardSeconds().getSeconds();
-
private final Log log = LogFactory.getLog(MetricsServer.class);
private DateTimeService dateTimeService = new DateTimeService();
@@ -192,7 +188,7 @@ public class MetricsServer {
}
public void addNumericData(Set<MeasurementDataNumeric> dataSet) {
- Set<MeasurementDataNumeric> updates = dao.insertRawMetrics(dataSet, RAW_TTL);
+ Set<MeasurementDataNumeric> updates = dao.insertRawMetrics(dataSet, MetricsTable.RAW.getTTL());
updateMetricsIndex(updates);
}
@@ -227,15 +223,14 @@ public class MetricsServer {
updateMetricsIndex(MetricsTable.SIX_HOUR, updatedSchedules, Minutes.minutes(60 * 6));
}
- updatedSchedules = calculateAggregates(MetricsTable.ONE_HOUR, MetricsTable.SIX_HOUR, Minutes.minutes(60 * 6),
- DateTimeService.ONE_MONTH);
+ updatedSchedules = calculateAggregates(MetricsTable.ONE_HOUR, MetricsTable.SIX_HOUR, Minutes.minutes(60 * 6));
if (!updatedSchedules.isEmpty()) {
dao.deleteMetricsIndexEntries(MetricsTable.SIX_HOUR);
updateMetricsIndex(MetricsTable.TWENTY_FOUR_HOUR, updatedSchedules, Hours.hours(24).toStandardMinutes());
}
- updatedSchedules = calculateAggregates(MetricsTable.SIX_HOUR, MetricsTable.TWENTY_FOUR_HOUR,
- Hours.hours(24).toStandardMinutes(), DateTimeService.ONE_YEAR);
+ updatedSchedules = calculateAggregates(MetricsTable.SIX_HOUR, MetricsTable.TWENTY_FOUR_HOUR, Hours.hours(24)
+ .toStandardMinutes());
if (!updatedSchedules.isEmpty()) {
dao.deleteMetricsIndexEntries(MetricsTable.TWENTY_FOUR_HOUR);
}
@@ -264,8 +259,8 @@ public class MetricsServer {
oneHourMetrics.add(aggregatedRaw);
}
- List<AggregatedNumericMetric> updatedSchedules = dao.insertAggregates(MetricsTable.ONE_HOUR,
- oneHourMetrics, TWO_WEEKS);
+ List<AggregatedNumericMetric> updatedSchedules = dao.insertAggregates(MetricsTable.ONE_HOUR, oneHourMetrics,
+ MetricsTable.ONE_HOUR.getTTL());
return updatedSchedules;
}
@@ -298,7 +293,7 @@ public class MetricsServer {
}
private List<AggregatedNumericMetric> calculateAggregates(MetricsTable fromColumnFamily,
- MetricsTable toColumnFamily, Minutes nextInterval, int ttl) {
+ MetricsTable toColumnFamily, Minutes nextInterval) {
List<MetricsIndexEntry> indexEntries = dao.findMetricsIndexEntries(toColumnFamily);
List<AggregatedNumericMetric> toMetrics = new ArrayList<AggregatedNumericMetric>();
@@ -321,7 +316,8 @@ public class MetricsServer {
toMetrics.add(aggregatedMetric);
}
- List<AggregatedNumericMetric> updatedSchedules = dao.insertAggregates(toColumnFamily, toMetrics, ttl);
+ List<AggregatedNumericMetric> updatedSchedules = dao.insertAggregates(toColumnFamily, toMetrics,
+ toColumnFamily.getTTL());
return updatedSchedules;
}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsTable.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsTable.java
index abcd196..6bf01ae 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsTable.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsTable.java
@@ -2,16 +2,26 @@ package org.rhq.server.metrics;
public enum MetricsTable {
- INDEX("metrics_index"),
- RAW("raw_metrics"),
- ONE_HOUR("one_hour_metrics"),
- SIX_HOUR("six_hour_metrics"),
- TWENTY_FOUR_HOUR("twenty_four_hour_metrics");
+ INDEX("metrics_index", -1),
+ RAW("raw_metrics", DateTimeService.SEVEN_DAYS),
+ ONE_HOUR("one_hour_metrics", DateTimeService.TWO_WEEKS),
+ SIX_HOUR("six_hour_metrics", DateTimeService.ONE_MONTH),
+ TWENTY_FOUR_HOUR("twenty_four_hour_metrics", DateTimeService.ONE_YEAR);
private final String tableName;
+ private final int ttl;
- private MetricsTable(String tableName) {
+ private MetricsTable(String tableName, int ttl) {
this.tableName = tableName;
+ this.ttl = ttl;
+ }
+
+ public String getTableName() {
+ return this.tableName;
+ }
+
+ public int getTTL() {
+ return this.ttl;
}
@Override
diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
index 0c478eb..c3f8eca 100644
--- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
+++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
@@ -27,7 +27,6 @@ package org.rhq.server.metrics;
import static java.util.Arrays.asList;
import static org.joda.time.DateTime.now;
-import static org.rhq.server.metrics.MetricsServer.RAW_TTL;
import static org.rhq.server.metrics.MetricsServer.divide;
import static org.rhq.test.AssertUtils.assertCollectionMatchesNoOrder;
import static org.rhq.test.AssertUtils.assertPropertiesMatch;
@@ -127,7 +126,8 @@ public class MetricsServerTest extends CassandraIntegrationTest {
);
assertEquals(actual, expected, "Failed to retrieve raw metric data");
- assertColumnMetadataEquals(scheduleId, hour0.plusHours(4), hour0.plusHours(5), RAW_TTL, timestamp);
+ assertColumnMetadataEquals(scheduleId, hour0.plusHours(4), hour0.plusHours(5), MetricsTable.RAW.getTTL(),
+ timestamp);
List<MetricsIndexEntry> expectedIndex = asList(new MetricsIndexEntry(MetricsTable.ONE_HOUR,
hour0.plusHours(4), scheduleId));
@@ -189,7 +189,7 @@ public class MetricsServerTest extends CassandraIntegrationTest {
rawMetrics.add(new MeasurementDataNumeric(secondMetricTime.getMillis(), scheduleId, secondValue));
rawMetrics.add(new MeasurementDataNumeric(thirdMetricTime.getMillis(), scheduleId, thirdValue));
- Set<MeasurementDataNumeric> insertedRawMetrics = dao.insertRawMetrics(rawMetrics, RAW_TTL);
+ Set<MeasurementDataNumeric> insertedRawMetrics = dao.insertRawMetrics(rawMetrics, MetricsTable.RAW.getTTL());
metricsServer.updateMetricsIndex(insertedRawMetrics);
metricsServer.setCurrentHour(hour9);
@@ -243,7 +243,7 @@ public class MetricsServerTest extends CassandraIntegrationTest {
new AggregatedNumericMetric(scheduleId, avg1, min1, max1, hour7.getMillis()),
new AggregatedNumericMetric(scheduleId, avg2, min2, max2, hour8.getMillis())
);
- dao.insertAggregates(MetricsTable.ONE_HOUR, oneHourMetrics, DateTimeService.TWO_WEEKS);
+ dao.insertAggregates(MetricsTable.ONE_HOUR, oneHourMetrics, MetricsTable.ONE_HOUR.getTTL());
// update the 6 hour queue
Map<Integer, DateTime> indexUpdates = new HashMap<Integer, DateTime>();
@@ -425,7 +425,7 @@ public class MetricsServerTest extends CassandraIntegrationTest {
new AggregatedNumericMetric(scheduleId, 5.0, 4.0, 6.0, bucket59Time.plusHours(1).getMillis()),
new AggregatedNumericMetric(scheduleId, 3.0, 3.0, 3.0, bucket59Time.plusHours(2).getMillis())
);
- dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, DateTimeService.TWO_WEEKS);
+ dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, MetricsTable.ONE_HOUR.getTTL());
AggregatedNumericMetric actual = metricsServer.getSummaryAggregate(scheduleId, beginTime.getMillis(),
endTime.getMillis());
@@ -454,7 +454,7 @@ public class MetricsServerTest extends CassandraIntegrationTest {
new AggregatedNumericMetric(scheduleId1, 5.1, 5.1, 5.1, bucket59Time.getMillis()),
new AggregatedNumericMetric(scheduleId2, 5.2, 5.2, 5.2, bucket59Time.getMillis())
);
- dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, DateTimeService.TWO_WEEKS);
+ dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, MetricsTable.ONE_HOUR.getTTL());
AggregatedNumericMetric actual = metricsServer.getSummaryAggregate(asList(scheduleId1, scheduleId2),
beginTime.getMillis(), endTime.getMillis());
@@ -585,7 +585,7 @@ public class MetricsServerTest extends CassandraIntegrationTest {
new AggregatedNumericMetric(scheduleId, 5.0, 4.0, 6.0, bucket59Time.plusHours(1).getMillis()),
new AggregatedNumericMetric(scheduleId, 3.0, 3.0, 3.0, bucket59Time.plusHours(2).getMillis())
);
- dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, DateTimeService.TWO_WEEKS);
+ dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, MetricsTable.ONE_HOUR.getTTL());
List<MeasurementDataNumericHighLowComposite> actualData = metricsServer.findDataForResource(scheduleId,
beginTime.getMillis(), endTime.getMillis());
@@ -629,7 +629,7 @@ public class MetricsServerTest extends CassandraIntegrationTest {
new AggregatedNumericMetric(scheduleId1, 4.1, 4.1, 4.1, bucket59Time.getMillis()),
new AggregatedNumericMetric(scheduleId2, 4.2, 4.2, 4.2, bucket59Time.getMillis())
);
- dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, DateTimeService.TWO_WEEKS);
+ dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, MetricsTable.ONE_HOUR.getTTL());
List<MeasurementDataNumericHighLowComposite> actual = metricsServer.findDataForGroup(
asList(scheduleId1, scheduleId2), beginTime.getMillis(), endTime.getMillis());
1
0
[rhq] Branch 'jkremser/ha-jsf-to-gwt-rewrite' - 2 commits - modules/enterprise
by Jiri Kremser 19 Dec '12
by Jiri Kremser 19 Dec '12
19 Dec '12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java | 21 +++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java | 21 +++----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerBean.java | 28 ++++++----
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java | 20 +++++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java | 14 ++++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/PartitionEventManagerBean.java | 22 +++++--
6 files changed, 83 insertions(+), 43 deletions(-)
New commits:
commit dfa080a3388830a3c948b64090af7f586b97bbe8
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Dec 19 21:56:55 2012 +0100
Deprecation of newly unused methods (were used from portal war before), checking the rights
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerBean.java
index 2ebbdab..fb37d77 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerBean.java
@@ -43,6 +43,7 @@ import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.authz.RequiredPermission;
+import org.rhq.enterprise.server.authz.RequiredPermissions;
/**
* Manages CRUD operations for {@link AffinityGroup}s
@@ -60,7 +61,8 @@ public class AffinityGroupManagerBean implements AffinityGroupManagerLocal {
@EJB
private PartitionEventManagerLocal partitionEventManager;
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public AffinityGroup getById(Subject subject, int affinityGroupId) {
AffinityGroup affinityGroup = entityManager.find(AffinityGroup.class, affinityGroupId);
return affinityGroup;
@@ -132,14 +134,16 @@ public class AffinityGroupManagerBean implements AffinityGroupManagerLocal {
return new PageList<Server>(results, (int) count, pageControl);
}
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public AffinityGroup update(Subject subject, AffinityGroup affinityGroup) throws AffinityGroupException {
validate(affinityGroup, true);
return entityManager.merge(affinityGroup);
}
@SuppressWarnings("unchecked")
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public PageList<AffinityGroupCountComposite> getComposites(Subject subject, PageControl pageControl) {
pageControl.initDefaultOrderingField("ag.name");
@@ -164,7 +168,8 @@ public class AffinityGroupManagerBean implements AffinityGroupManagerLocal {
}
}
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public int create(Subject subject, AffinityGroup affinityGroup) throws AffinityGroupException {
validate(affinityGroup, false);
entityManager.persist(affinityGroup);
@@ -198,7 +203,8 @@ public class AffinityGroupManagerBean implements AffinityGroupManagerLocal {
}
}
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public int delete(Subject subject, Integer[] affinityGroupIds) {
// A deleted affinity group forces a cloud repartitioning. Note, it is ok to request multiple
@@ -229,7 +235,8 @@ public class AffinityGroupManagerBean implements AffinityGroupManagerLocal {
return removedAffinityGroups;
}
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public void addAgentsToGroup(Subject subject, int affinityGroupId, Integer[] agentIds) {
List<Integer> agentIdsList = Arrays.asList(agentIds);
@@ -254,7 +261,8 @@ public class AffinityGroupManagerBean implements AffinityGroupManagerLocal {
.getName());
}
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public void removeAgentsFromGroup(Subject subject, Integer[] agentIds) {
List<Integer> agentIdsList = Arrays.asList(agentIds);
@@ -275,7 +283,8 @@ public class AffinityGroupManagerBean implements AffinityGroupManagerLocal {
PartitionEventType.AGENT_AFFINITY_GROUP_REMOVE.name());
}
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public void addServersToGroup(Subject subject, int affinityGroupId, Integer[] serverIds) {
List<Integer> serverIdsList = Arrays.asList(serverIds);
@@ -300,7 +309,8 @@ public class AffinityGroupManagerBean implements AffinityGroupManagerLocal {
.getName());
}
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public void removeServersFromGroup(Subject subject, Integer[] serverIds) {
List<Integer> serverIdsList = Arrays.asList(serverIds);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java
index 115d0a4..455e375 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/AffinityGroupManagerLocal.java
@@ -63,13 +63,33 @@ public interface AffinityGroupManagerLocal {
int getAffinityGroupCount();
+ /**
+ * @deprecated portal war was using it (use finders <code>AgentManagerBean.findAgentsByCriteria()</code> and
+ * <code>CloudManagerBean.findServersByCriteria()</code> instead)
+ */
PageList<Server> getServerMembers(Subject subject, int affinityGroupId, PageControl pageControl);
+ /**
+ * @deprecated portal war was using it (use finders <code>AgentManagerBean.findAgentsByCriteria()</code> and
+ * <code>CloudManagerBean.findServersByCriteria()</code> instead)
+ */
PageList<Server> getServerNonMembers(Subject subject, int affinityGroupId, PageControl pageControl);
+ /**
+ * @deprecated portal war was using it (use finders <code>AgentManagerBean.findAgentsByCriteria()</code> and
+ * <code>CloudManagerBean.findServersByCriteria()</code> instead)
+ */
PageList<Agent> getAgentMembers(Subject subject, int affinityGroupId, PageControl pageControl);
+ /**
+ * @deprecated portal war was using it (use finders <code>AgentManagerBean.findAgentsByCriteria()</code> and
+ * <code>CloudManagerBean.findServersByCriteria()</code> instead)
+ */
PageList<Agent> getAgentNonMembers(Subject subject, int affinityGroupId, PageControl pageControl);
+ /**
+ * @deprecated portal war was using it (use finders <code>AgentManagerBean.findAgentsByCriteria()</code> and
+ * <code>CloudManagerBean.findServersByCriteria()</code> instead)
+ */
PageList<AffinityGroupCountComposite> getComposites(Subject subject, PageControl pageControl);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
index f51b246..d1ffb1b 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
@@ -44,6 +44,7 @@ import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.authz.AuthorizationManagerLocal;
import org.rhq.enterprise.server.authz.RequiredPermission;
+import org.rhq.enterprise.server.authz.RequiredPermissions;
import org.rhq.enterprise.server.cloud.instance.ServerManagerLocal;
import org.rhq.enterprise.server.util.CriteriaQueryGenerator;
import org.rhq.enterprise.server.util.CriteriaQueryRunner;
@@ -123,7 +124,8 @@ public class CloudManagerBean implements CloudManagerLocal {
}
@SuppressWarnings("unchecked")
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public PageList<ServerWithAgentCountComposite> getServerComposites(Subject subject, PageControl pc) {
pc.initDefaultOrderingField("s.name");
@@ -159,6 +161,8 @@ public class CloudManagerBean implements CloudManagerLocal {
}
}
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public void deleteServers(Integer[] serverIds) throws CloudManagerException {
if (serverIds == null) {
return;
@@ -169,6 +173,8 @@ public class CloudManagerBean implements CloudManagerLocal {
}
}
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public void deleteServer(Integer serverId) throws CloudManagerException {
try {
Server server = entityManager.find(Server.class, serverId);
@@ -206,6 +212,8 @@ public class CloudManagerBean implements CloudManagerLocal {
}
}
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public void updateServerMode(Integer[] serverIds, Server.OperationMode mode) {
if (serverIds == null) {
return;
@@ -246,6 +254,8 @@ public class CloudManagerBean implements CloudManagerLocal {
return entityManager.merge(server);
}
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public PageList<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc) {
pc.initDefaultOrderingField("fld.ordinal");
@@ -295,7 +305,7 @@ public class CloudManagerBean implements CloudManagerLocal {
// regardless of the number of pending requests, as the work would be duplicated.
partitionEventManager.processRequestedPartitionEvents();
}
-
+
@RequiredPermission(Permission.MANAGE_SETTINGS)
public PageList<Server> findServersByCriteria(Subject subject, ServerCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/PartitionEventManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/PartitionEventManagerBean.java
index 0b82063..961af25 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/PartitionEventManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/PartitionEventManagerBean.java
@@ -48,6 +48,7 @@ import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.authz.RequiredPermission;
+import org.rhq.enterprise.server.authz.RequiredPermissions;
import org.rhq.enterprise.server.core.AgentManagerLocal;
import org.rhq.enterprise.server.util.CriteriaQueryGenerator;
import org.rhq.enterprise.server.util.CriteriaQueryRunner;
@@ -125,7 +126,8 @@ public class PartitionEventManagerBean implements PartitionEventManagerLocal {
return failoverListManager.refresh(partitionEvent);
}
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public void cloudPartitionEventRequest(Subject subject, PartitionEventType eventType, String eventDetail) {
if (!eventType.isCloudPartitionEvent()) {
throw new IllegalArgumentException("Invalid cloud partition event type: " + eventType);
@@ -143,7 +145,8 @@ public class PartitionEventManagerBean implements PartitionEventManagerLocal {
entityManager.persist(partitionEvent);
}
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public void deletePartitionEvents(Subject subject, Integer[] partitionEventIds) {
for (int partitionEventId : partitionEventIds) {
PartitionEvent doomedEvent = entityManager.find(PartitionEvent.class, partitionEventId);
@@ -151,7 +154,8 @@ public class PartitionEventManagerBean implements PartitionEventManagerLocal {
}
}
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public int purgeAllEvents(Subject subject) {
List<PartitionEvent> events = getPartitionEvents(subject, null, null, null, PageControl.getUnlimitedInstance());
@@ -221,7 +225,7 @@ public class PartitionEventManagerBean implements PartitionEventManagerLocal {
query.setParameter("details", details);
countQuery.setParameter("details", details);
query.setParameter("escapeChar", QueryUtility.getEscapeCharacter());
- countQuery.setParameter("escapeChar", QueryUtility.getEscapeCharacter());
+ countQuery.setParameter("escapeChar", QueryUtility.getEscapeCharacter());
List<PartitionEvent> results = query.getResultList();
long count = (Long) countQuery.getSingleResult();
@@ -230,7 +234,8 @@ public class PartitionEventManagerBean implements PartitionEventManagerLocal {
}
@SuppressWarnings("unchecked")
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermissions({ @RequiredPermission(Permission.MANAGE_SETTINGS),
+ @RequiredPermission(Permission.MANAGE_INVENTORY) })
public PageList<PartitionEventDetails> getPartitionEventDetails(Subject subject, int partitionEventId,
PageControl pageControl) {
pageControl.initDefaultOrderingField("ped.id", PageOrdering.ASC);
@@ -248,11 +253,12 @@ public class PartitionEventManagerBean implements PartitionEventManagerLocal {
return new PageList<PartitionEventDetails>(detailsList, (int) count, pageControl);
}
-
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+
+ @RequiredPermission(Permission.MANAGE_SETTINGS)
public PageList<PartitionEvent> findPartitionEventsByCriteria(Subject subject, PartitionEventCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
- CriteriaQueryRunner<PartitionEvent> runner = new CriteriaQueryRunner<PartitionEvent>(criteria, generator, entityManager);
+ CriteriaQueryRunner<PartitionEvent> runner = new CriteriaQueryRunner<PartitionEvent>(criteria, generator,
+ entityManager);
return runner.execute();
}
}
commit 2d4217f767b2e2d7860edf153ea4bb714e0cfc6f
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Dec 19 21:55:50 2012 +0100
Modal window for assigning the servers/agents into affinity group has now the buttons in the ToolStrip
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java
index b1a1a6c..6786a89 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java
@@ -29,7 +29,6 @@ import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
-import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.widgets.IButton;
import com.smartgwt.client.widgets.Window;
@@ -40,8 +39,8 @@ import com.smartgwt.client.widgets.events.CloseClickHandler;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.fields.TextItem;
import com.smartgwt.client.widgets.grid.ListGridRecord;
-import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.toolbar.ToolStrip;
import org.rhq.core.domain.criteria.AgentCriteria;
import org.rhq.core.domain.resource.Agent;
@@ -165,10 +164,9 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
layout = new VLayout();
layout.setWidth100();
layout.setHeight100();
- layout.setPadding(10);
- layout.setLayoutMargin(10);
final AffinityGroupAgentsSelector selector = new AffinityGroupAgentsSelector("assignAgents", affinityGroupId);
+ selector.setMargin(10);
layout.addMember(selector);
IButton cancel = new LocatableIButton(selector.extendLocatorId("Cancel"), MSG.common_button_cancel());
@@ -222,14 +220,13 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
}
}
});
-
- HLayout buttons = new HLayout(10);
- buttons.setHeight(20);
- buttons.setLayoutAlign(Alignment.CENTER);
- buttons.setLayoutBottomMargin(0);
- buttons.addMember(save);
- buttons.addMember(cancel);
- layout.addMember(buttons);
+ ToolStrip buttonBar = new ToolStrip();
+ buttonBar.setPadding(5);
+ buttonBar.setWidth100();
+ buttonBar.setMembersMargin(15);
+ buttonBar.addMember(save);
+ buttonBar.addMember(cancel);
+ layout.addMember(buttonBar);
}
private static void closeAndRefresh(TableSection<?> parrent, boolean fullRefresh) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
index 803214c..b21b2a6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
@@ -29,7 +29,6 @@ import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
-import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.widgets.IButton;
import com.smartgwt.client.widgets.Window;
@@ -41,8 +40,8 @@ import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.fields.SelectItem;
import com.smartgwt.client.widgets.form.fields.TextItem;
import com.smartgwt.client.widgets.grid.ListGridRecord;
-import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.toolbar.ToolStrip;
import org.rhq.core.domain.cloud.Server;
import org.rhq.core.domain.cloud.Server.OperationMode;
@@ -188,10 +187,9 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
layout = new VLayout();
layout.setWidth100();
layout.setHeight100();
- layout.setPadding(10);
- layout.setLayoutMargin(10);
final AffinityGroupServersSelector selector = new AffinityGroupServersSelector("assignServers", affinityGroupId);
+ selector.setMargin(10);
layout.addMember(selector);
IButton cancel = new LocatableIButton(selector.extendLocatorId("Cancel"), MSG.common_button_cancel());
@@ -243,14 +241,13 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
}
}
});
-
- HLayout buttons = new HLayout(10);
- buttons.setHeight(20);
- buttons.setLayoutAlign(Alignment.CENTER);
- buttons.setLayoutBottomMargin(0);
- buttons.addMember(save);
- buttons.addMember(cancel);
- layout.addMember(buttons);
+ ToolStrip buttonBar = new ToolStrip();
+ buttonBar.setPadding(5);
+ buttonBar.setWidth100();
+ buttonBar.setMembersMargin(15);
+ buttonBar.addMember(save);
+ buttonBar.addMember(cancel);
+ layout.addMember(buttonBar);
}
private static void closeAndRefresh(TableSection<?> parrent, boolean fullRefresh) {
1
0
19 Dec '12
.classpath | 11
etc/agent-versioning/build.xml | 2
etc/apt/pom.xml | 2
etc/classloaders-test/plugin1/pom.xml | 2
etc/classloaders-test/plugin2/pom.xml | 2
etc/eclipse-tools/RHQ | 42
etc/samples/skeleton-plugin/pom.xml | 2
modules/common/drift/pom.xml | 2
modules/common/jboss-as-dmr-client/pom.xml | 2
modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/CoreJBossASClient.java | 79
modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java | 40
modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DeploymentJBossASClient.java | 32
modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/JBossASClient.java | 8
modules/core/arquillian-integration/container/src/test/resources/arquillian.xml | 9
modules/core/client-api/pom.xml | 2
modules/core/comm-api/pom.xml | 2
modules/core/dbutils/pom.xml | 2
modules/core/dbutils/src/main/scripts/dbsetup/2.3.1/db-data-combined-2.3.1.xml | 663
modules/core/dbutils/src/main/scripts/dbsetup/2.3.1/db-schema-combined-2.3.1.xml | 1916 --
modules/core/dbutils/src/main/scripts/dbsetup/2.4.0/db-data-combined-2.4.0.xml | 669
modules/core/dbutils/src/main/scripts/dbsetup/2.4.0/db-schema-combined-2.4.0.xml | 2494 ++
modules/core/domain/intentional-api-changes-since-4.5.1.xml | 21
modules/core/domain/pom.xml | 190
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AgentCriteria.java | 107
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ServerCriteria.java | 125
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Agent.java | 3
modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceSyncResultsTest.java | 8
modules/core/domain/src/test/java/org/rhq/core/domain/content/test/ContentSourceTest.java | 13
modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftDataAccessTest.java | 9
modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftDefinitionTemplateTest.java | 13
modules/core/domain/src/test/java/org/rhq/core/domain/drift/JPADriftChangeSetTest.java | 23
modules/core/domain/src/test/java/org/rhq/core/domain/operation/OperationHistoryTest.java | 81
modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ProblemResourceTest.java | 1
modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceErrorTest.java | 37
modules/core/domain/src/test/java/org/rhq/core/domain/resource/test/ResourceGroupTest.java | 17
modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java | 44
modules/core/domain/src/test/resources/arquillian.xml | 5
modules/core/domain/src/test/resources/jbossas-oracle-ds.xml | 36
modules/core/domain/src/test/resources/jbossas-postgres-ds.xml | 40
modules/core/gui/pom.xml | 2
modules/core/plugin-container-itest/src/test/resources/arquillian.xml | 8
modules/core/util/pom.xml | 2
modules/enterprise/agent/ant-run.xml | 21
modules/enterprise/agent/src/etc/rhq-agent-env.sh | 4
modules/enterprise/agentupdate/pom.xml | 2
modules/enterprise/binding/pom.xml | 2
modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java | 17
modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java | 10
modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java | 2
modules/enterprise/comm/pom.xml | 2
modules/enterprise/gui/content_http-war/pom.xml | 2
modules/enterprise/gui/coregui/pom.xml | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java | 265
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java | 55
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java | 127
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java | 72
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupWithCountsDatasource.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java | 178
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasourceField.java | 84
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java | 46
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentNodeDatasource.java | 188
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentNodeDatasourceField.java | 83
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java | 39
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/FailoverListItemDatasource.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDatasource.java | 80
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java | 65
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java | 259
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java | 66
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasourceField.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java | 58
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java | 145
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java | 32
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/CloudGWTService.java | 192
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryConfigurationStep.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java | 94
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java | 56
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 39
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 39
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 39
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 39
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 39
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 39
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 39
modules/enterprise/gui/installer/pom.xml | 413
modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/Installer.java | 771
modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/ServerPropertyRecordList.java | 62
modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/gwt/InstallerGWTService.java | 132
modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerDetails.java | 109
modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/client/shared/ServerProperties.java | 174
modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/service/ManagementService.java | 105
modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/InstallerGWTServiceImpl.java | 782
modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/LoggerAntBuildListener.java | 103
modules/enterprise/gui/installer/src/main/java/org/rhq/enterprise/gui/installer/server/servlet/ServerInstallUtil.java | 1303 -
modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/Installer.gwt.xml | 35
modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/Messages.properties | 40
modules/enterprise/gui/installer/src/main/resources/org/rhq/enterprise/gui/installer/client/ServerPropertiesMessages.properties | 23
modules/enterprise/gui/installer/src/main/webapp/WEB-INF/classes/META-INF/services/org.jboss.msc.service.ServiceActivator | 1
modules/enterprise/gui/installer/src/main/webapp/WEB-INF/web.xml | 9
modules/enterprise/gui/installer/src/main/webapp/index.html | 45
modules/enterprise/gui/installer/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java | 225
modules/enterprise/gui/installer/src/test/java/org/rhq/enterprise/installer/client/controller/DatasourceJBossASClientTest.java | 118
modules/enterprise/gui/installer/src/test/resources/org/rhq/enterprise/installer/db-data-combined-2.4.0.xml | 669
modules/enterprise/gui/installer/src/test/resources/org/rhq/enterprise/installer/db-data-combined-3.0.0.xml | 690
modules/enterprise/gui/installer/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.2.0.xml | 396
modules/enterprise/gui/installer/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.3.0.xml | 398
modules/enterprise/gui/installer/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.4.0.xml | 398
modules/enterprise/gui/installer/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-2.4.0.xml | 2494 --
modules/enterprise/gui/installer/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-3.0.0.xml | 2649 --
modules/enterprise/gui/installer/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.2.0.xml | 2642 --
modules/enterprise/gui/installer/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.3.0.xml | 2649 --
modules/enterprise/gui/installer/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.4.0.xml | 2649 --
modules/enterprise/gui/pom.xml | 2
modules/enterprise/gui/portal-war/pom.xml | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/admin/DownloadsUIBean.java | 21
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/client/RemoteClientServlet.java | 85
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/download/DownloadServlet.java | 122
modules/enterprise/gui/rest-examples-war/pom.xml | 133
modules/enterprise/gui/rest-examples-war/src/main/webapp/WEB-INF/jboss-web.xml | 5
modules/enterprise/gui/rest-examples-war/src/main/webapp/WEB-INF/web.xml | 27
modules/enterprise/gui/rest-examples-war/src/main/webapp/bars_simple.html | 131
modules/enterprise/gui/rest-examples-war/src/main/webapp/index.html | 40
modules/enterprise/gui/rest-examples-war/src/main/webapp/js/d3.behavior.js | 198
modules/enterprise/gui/rest-examples-war/src/main/webapp/js/d3.chart.js | 984 +
modules/enterprise/gui/rest-examples-war/src/main/webapp/js/d3.csv.js | 92
modules/enterprise/gui/rest-examples-war/src/main/webapp/js/d3.geo.js | 938 +
modules/enterprise/gui/rest-examples-war/src/main/webapp/js/d3.geom.js | 835
modules/enterprise/gui/rest-examples-war/src/main/webapp/js/d3.js | 4695 +++++
modules/enterprise/gui/rest-examples-war/src/main/webapp/js/d3.layout.js | 1889 ++
modules/enterprise/gui/rest-examples-war/src/main/webapp/js/d3.time.js | 687
modules/enterprise/gui/rest-examples-war/src/main/webapp/js/jquery.js | 9266 ++++++++++
modules/enterprise/gui/rest-examples-war/src/main/webapp/js/resource_tree.js | 65
modules/enterprise/gui/rest-examples-war/src/main/webapp/js/rhq.js | 120
modules/enterprise/gui/rest-examples-war/src/main/webapp/raw_graph.html | 184
modules/enterprise/gui/rest-examples-war/src/main/webapp/raw_graph7.html | 225
modules/enterprise/gui/rest-examples-war/src/main/webapp/stacked1.html | 145
modules/enterprise/gui/rest-examples-war/src/main/webapp/stacked2.html | 139
modules/enterprise/gui/rest-examples-war/src/main/webapp/stacked3.html | 95
modules/enterprise/gui/rest-examples-war/src/main/webapp/tree.html | 44
modules/enterprise/gui/rest-examples-war/src/main/webapp/whisker.html | 53
modules/enterprise/gui/rest-examples-war/src/main/webapp/whisker2.html | 35
modules/enterprise/gui/rest-war/pom.xml | 7
modules/enterprise/gui/rest-war/src/main/java/org/rhq/enterprise/rest/RHQApplication.java | 41
modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml | 7
modules/enterprise/gui/rest-war/src/main/webapp/bars_simple.html | 131
modules/enterprise/gui/rest-war/src/main/webapp/index.html | 40
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.behavior.js | 198
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.chart.js | 984 -
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.csv.js | 92
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geo.js | 938 -
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.geom.js | 835
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.js | 4695 -----
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.layout.js | 1889 --
modules/enterprise/gui/rest-war/src/main/webapp/js/d3.time.js | 687
modules/enterprise/gui/rest-war/src/main/webapp/js/jquery.js | 9266 ----------
modules/enterprise/gui/rest-war/src/main/webapp/js/resource_tree.js | 65
modules/enterprise/gui/rest-war/src/main/webapp/js/rhq.js | 120
modules/enterprise/gui/rest-war/src/main/webapp/raw_graph.html | 184
modules/enterprise/gui/rest-war/src/main/webapp/raw_graph7.html | 225
modules/enterprise/gui/rest-war/src/main/webapp/stacked1.html | 145
modules/enterprise/gui/rest-war/src/main/webapp/stacked2.html | 139
modules/enterprise/gui/rest-war/src/main/webapp/stacked3.html | 95
modules/enterprise/gui/rest-war/src/main/webapp/tree.html | 44
modules/enterprise/gui/rest-war/src/main/webapp/whisker.html | 53
modules/enterprise/gui/rest-war/src/main/webapp/whisker2.html | 35
modules/enterprise/pom.xml | 4
modules/enterprise/remoting/cli/pom.xml | 2
modules/enterprise/remoting/cli/src/main/samples/measurement_utils.js | 4
modules/enterprise/scripting/api/pom.xml | 2
modules/enterprise/scripting/javascript/pom.xml | 2
modules/enterprise/scripting/python/pom.xml | 2
modules/enterprise/server/appserver/pom.xml | 12
modules/enterprise/server/appserver/src/main/bin-resources/bin/generate-db-password.bat | 115
modules/enterprise/server/appserver/src/main/bin-resources/bin/generate-db-password.sh | 159
modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.bat | 161
modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.sh | 243
modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.bat | 1
modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server.sh | 106
modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.bat | 41
modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.sh | 29
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 242
modules/enterprise/server/client-api/pom.xml | 9
modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java | 32
modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/RhqDownloadsScriptSourceProviderTest.java | 20
modules/enterprise/server/container-lib/pom.xml | 107
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AccessCheckingInitialContextFactoryBuilder.java | 250
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/AllowRhqServerInternalsAccessPermission.java | 36
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/DecoratingInitialContextFactory.java | 110
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecorator.java | 264
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingContextDecoratorSetContext.java | 75
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingDirContextDecorator.java | 187
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventContextDecorator.java | 69
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingEventDirContextDecorator.java | 96
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/AccessCheckingLdapContextDecorator.java | 85
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/ContextDecorator.java | 33
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecorator.java | 222
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorHelper.java | 76
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringContextDecoratorSetContext.java | 71
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringDirContextDecorator.java | 185
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventContextDecorator.java | 81
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringEventDirContextDecorator.java | 104
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/context/URLPreferringLdapContextDecorator.java | 94
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstaller.java | 45
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/mbean/AccessCheckingInitialContextFactoryBuilderInstallerMBean.java | 32
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratingInvocationHandler.java | 55
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorPicker.java | 195
modules/enterprise/server/container-lib/src/main/java/org/rhq/jndi/util/DecoratorSetContext.java | 59
modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratingInvocationHandlerTest.java | 145
modules/enterprise/server/container-lib/src/test/java/org/rhq/jndi/context/DecoratorPickerTest.java | 180
modules/enterprise/server/ear/pom.xml | 77
modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml | 3
modules/enterprise/server/installer/pom.xml | 250
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java | 252
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerConfiguration.java | 62
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerService.java | 196
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 989 +
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/LoggerAntBuildListener.java | 103
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ManagementService.java | 40
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerDetails.java | 105
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java | 1259 +
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java | 174
modules/enterprise/server/installer/src/main/resources/logging.properties | 27
modules/enterprise/server/installer/src/main/resources/module/main/module.xml | 35
modules/enterprise/server/installer/src/main/scripts/module-assembly.xml | 37
modules/enterprise/server/installer/src/test/java/org/rhq/enterprise/server/installer/DBInstallationTest.java | 213
modules/enterprise/server/installer/src/test/java/org/rhq/enterprise/server/installer/client/DatasourceJBossASClientTest.java | 119
modules/enterprise/server/installer/src/test/resources/org/rhq/enterprise/server/installer/db-data-combined-2.4.0.xml | 669
modules/enterprise/server/installer/src/test/resources/org/rhq/enterprise/server/installer/db-data-combined-3.0.0.xml | 690
modules/enterprise/server/installer/src/test/resources/org/rhq/enterprise/server/installer/db-data-combined-rhq-4.2.0.xml | 396
modules/enterprise/server/installer/src/test/resources/org/rhq/enterprise/server/installer/db-data-combined-rhq-4.3.0.xml | 398
modules/enterprise/server/installer/src/test/resources/org/rhq/enterprise/server/installer/db-data-combined-rhq-4.4.0.xml | 398
modules/enterprise/server/installer/src/test/resources/org/rhq/enterprise/server/installer/db-schema-combined-2.4.0.xml | 2494 ++
modules/enterprise/server/installer/src/test/resources/org/rhq/enterprise/server/installer/db-schema-combined-3.0.0.xml | 2649 ++
modules/enterprise/server/installer/src/test/resources/org/rhq/enterprise/server/installer/db-schema-combined-rhq-4.2.0.xml | 2642 ++
modules/enterprise/server/installer/src/test/resources/org/rhq/enterprise/server/installer/db-schema-combined-rhq-4.3.0.xml | 2649 ++
modules/enterprise/server/installer/src/test/resources/org/rhq/enterprise/server/installer/db-schema-combined-rhq-4.4.0.xml | 2649 ++
modules/enterprise/server/itests-2/pom.xml | 77
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java | 113
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/ContentUIManagerBeanTest.java | 11
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/content/test/RepoSyncingTest.java | 71
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java | 15
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java | 7
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/AbstractDriftServerTest.java | 36
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftManagerBeanTest.java | 7
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/DriftTemplateManagerBeanTest.java | 53
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/JPADriftServerBeanTest.java | 8
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageDriftDefinitionsTest.java | 16
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/drift/ManageSnapshotsTest.java | 16
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/inventory/UninventoryTest.java | 15
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java | 142
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementBaselineManagerTest.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/plugin/pc/generic/TestGenericServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/MetadataBeanTest.java | 36
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginManagerBeanTest.java | 10
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/PluginScanningExtensionMetadataTest.java | 12
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java | 46
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdatePluginMetadataTestBase.java | 11
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3Test.java | 85
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/OldAbstractEJB3Test.java | 445
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBean.java | 45
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/StrippedDownStartupBeanPreparation.java | 75
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/test/TestServerPluginService.java | 2
modules/enterprise/server/itests-2/src/test/resources/arquillian.xml | 5
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/dup_drift.xml | 2
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/plugin_v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest/remove_bundle_drift_config_v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/security.policy | 10
modules/enterprise/server/itests-2/src/test/resources/test/metadata/alerts/type-with-metric.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/BZ_573034_v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/addDeleteTemplate3.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraint.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/constraintMinMax.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupDeleted-v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v3.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropDeleted-v4.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/groupPropMoved-v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyChanging-v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-simple.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyList-v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/propertyMap-v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/update5-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/configuration/updateDefaultTemplate2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/events/event1-2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/measurementDeletion-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update6-2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/measurement/update7-2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/natives/update5-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/noTypes.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation1-2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation2-2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/operation3-2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/operation/update3-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/duplicateResourceType.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update2-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/update4-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource-type/updateResourceTypeBundleTarget-v2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/illegal-subcat-1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-2children.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-grandchild.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-services-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v1_1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/nested-subcat-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/no-subcat.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v1_1.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/one-subcat-v3_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v1_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/services-v2_0.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories2.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/test-subcategories3.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/two-subcat.xml | 2
modules/enterprise/server/itests-2/src/test/resources/test/metadata/resource/undefined-child-subcat-1.xml | 2
modules/enterprise/server/jar/intentional-api-changes-since-4.5.1.xml | 24
modules/enterprise/server/jar/pom.xml | 128
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/AllowRhqServerInternalsAccessPermission.java | 36
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java | 12
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerRemote.java | 90
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 72
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java | 44
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerLocal.java | 13
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java | 39
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerMBean.java | 12
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/RemoteClientManagerBean.java | 149
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/RemoteClientManagerLocal.java | 67
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/ShutdownListener.java | 59
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java | 76
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/PluginDeploymentScanner.java | 68
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/ProductPluginDeployer.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/AccessCheckingInitialContextFactoryBuilder.java | 320
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/DecoratingInitialContextFactory.java | 110
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/NamingHack.java | 103
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/context/AccessCheckingContextDecorator.java | 264
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/context/AccessCheckingContextDecoratorSetContext.java | 75
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/context/AccessCheckingDirContextDecorator.java | 187
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/context/AccessCheckingEventContextDecorator.java | 69
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/context/AccessCheckingEventDirContextDecorator.java | 96
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/context/AccessCheckingLdapContextDecorator.java | 85
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/context/ContextDecorator.java | 33
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/context/URLPreferringContextDecorator.java | 222
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/context/URLPreferringContextDecoratorHelper.java | 76
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/context/URLPreferringContextDecoratorSetContext.java | 71
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/context/URLPreferringDirContextDecorator.java | 185
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/context/URLPreferringEventContextDecorator.java | 81
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/context/URLPreferringEventDirContextDecorator.java | 104
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/context/URLPreferringLdapContextDecorator.java | 94
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/util/DecoratingInvocationHandler.java | 55
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/util/DecoratorPicker.java | 195
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/util/DecoratorSetContext.java | 59
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/ServerPluginService.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertHandlerBean.java | 117
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/AlertHandlerLocal.java | 140
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerBean.java | 85
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerLocal.java | 121
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerBean.java | 171
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/GroupHandlerLocal.java | 176
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java | 167
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerLocal.java | 254
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerBean.java | 100
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/OperationsHandlerLocal.java | 135
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RHQApplication.java | 44
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerBean.java | 173
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/ResourceHandlerLocal.java | 188
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/RootHandlerBean.java | 108
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StatusHandlerBean.java | 32
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/StatusHandlerLocal.java | 58
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/UserHandlerBean.java | 50
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/UserHandlerLocal.java | 79
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/support/SupportManagerBean.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/ExportingInputStream.java | 15
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java | 1
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 20
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/RemoteAPIValidator.java | 2
modules/enterprise/server/jar/src/main/resources/rest_templates/alert.ftl | 8
modules/enterprise/server/jar/src/main/resources/rest_templates/availability.ftl | 2
modules/enterprise/server/jar/src/main/resources/rest_templates/group.ftl | 6
modules/enterprise/server/jar/src/main/resources/rest_templates/groupDefinition.ftl | 2
modules/enterprise/server/jar/src/main/resources/rest_templates/index.ftl | 59
modules/enterprise/server/jar/src/main/resources/rest_templates/metricData.ftl | 2
modules/enterprise/server/jar/src/main/resources/rest_templates/resourceWithType.ftl | 16
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/naming/DecoratingInvocationHandlerTest.java | 144
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/naming/DecoratorPickerTest.java | 180
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/ExportingInputStreamTest.java | 260
modules/enterprise/server/plugins/alert-cli/pom.xml | 2
modules/enterprise/server/plugins/alert-email/pom.xml | 2
modules/enterprise/server/plugins/alert-irc/pom.xml | 2
modules/enterprise/server/plugins/alert-log4j/pom.xml | 2
modules/enterprise/server/plugins/alert-microblog/pom.xml | 2
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 2
modules/enterprise/server/plugins/alert-operations/pom.xml | 2
modules/enterprise/server/plugins/alert-roles/pom.xml | 2
modules/enterprise/server/plugins/alert-scriptlang/pom.xml | 2
modules/enterprise/server/plugins/alert-sms/pom.xml | 2
modules/enterprise/server/plugins/alert-snmp/pom.xml | 2
modules/enterprise/server/plugins/alert-subject/pom.xml | 2
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2
modules/enterprise/server/plugins/cloud/pom.xml | 2
modules/enterprise/server/plugins/cobbler/pom.xml | 2
modules/enterprise/server/plugins/disk/pom.xml | 2
modules/enterprise/server/plugins/drift-mongodb/pom.xml | 2
modules/enterprise/server/plugins/drift-rhq/pom.xml | 2
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2
modules/enterprise/server/plugins/groovy-script/pom.xml | 2
modules/enterprise/server/plugins/jboss-software/pom.xml | 2
modules/enterprise/server/plugins/packagetype-cli/pom.xml | 2
modules/enterprise/server/plugins/url/pom.xml | 2
modules/enterprise/server/plugins/yum/pom.xml | 2
modules/enterprise/server/pom.xml | 3
modules/enterprise/server/safe-invoker/pom.xml | 2
modules/enterprise/server/sars/agent-sar/src/main/resources/embedded-agent-configuration-overrides.properties | 2
modules/enterprise/server/sars/services-sar/pom.xml | 2
modules/enterprise/server/sars/services-sar/src/main/resources/META-INF/jboss-service.xml | 3
modules/enterprise/server/sars/services-sar/src/main/resources/server-comm-configuration-overrides.properties | 2
modules/enterprise/server/startup-subsystem/pom.xml | 61
modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupExtension.java | 24
modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupSubsystemAdd.java | 16
modules/enterprise/server/xml-schemas/pom.xml | 2
modules/helpers/rtfilter/pom.xml | 7
modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java | 7
modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/arquillian.xml | 6
modules/integration-tests/mod_cluster-plugin-test/pom.xml | 2
modules/integration-tests/pom.xml | 2
modules/integration-tests/rest-api/pom.xml | 4
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/GetStatusTest.java | 6
modules/integration-tests/rest-api/src/test/java/org/rhq/modules/integrationTests/restApi/ResourcesTest.java | 4
modules/plugins/aliases/pom.xml | 2
modules/plugins/ant-bundle/pom.xml | 2
modules/plugins/apache/pom.xml | 2
modules/plugins/augeas/pom.xml | 2
modules/plugins/augeas/src/main/java/org/rhq/augeas/tree/impl/DefaultAugeasTreeBuilder.java | 2
modules/plugins/byteman/pom.xml | 2
modules/plugins/cassandra/pom.xml | 307
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeComponent.java | 203
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/CassandraNodeDiscoveryComponent.java | 95
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ColumnFamilyComponent.java | 266
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ColumnFamilyDiscoveryComponent.java | 70
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ComplexConfigurationResourceComponent.java | 125
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/KeyspaceComponent.java | 262
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/KeyspaceDiscoveryComponent.java | 114
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/MetricsDiscoveryComponent.java | 61
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java | 124
modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml | 755
modules/plugins/cassandra/src/test/java/org/rhq/plugins/cassandra/itest/DiscoveryAndConfigurationTest.java | 268
modules/plugins/cobbler/pom.xml | 2
modules/plugins/cron/pom.xml | 2
modules/plugins/database/pom.xml | 2
modules/plugins/filetemplate-bundle/pom.xml | 2
modules/plugins/grub/pom.xml | 2
modules/plugins/hadoop/pom.xml | 2
modules/plugins/hardware/src/main/java/org/rhq/plugins/hardware/SmartDiskComponent.java | 4
modules/plugins/hibernate/pom.xml | 2
modules/plugins/hosts/pom.xml | 2
modules/plugins/iis/pom.xml | 2
modules/plugins/iptables/pom.xml | 2
modules/plugins/irc/pom.xml | 2
modules/plugins/jboss-as-5/pom.xml | 2
modules/plugins/jboss-as-5/src/test/resources/itest/arquillian.xml | 5
modules/plugins/jboss-as-7/pom.xml | 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/JBossProductType.java | 7
modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 4
modules/plugins/jboss-as-7/src/test/resources/itest/arquillian.xml | 5
modules/plugins/jboss-as/pom.xml | 2
modules/plugins/jboss-cache-v3/pom.xml | 2
modules/plugins/jboss-cache/pom.xml | 2
modules/plugins/jdbctrace/pom.xml | 2
modules/plugins/jira/pom.xml | 2
modules/plugins/jmx/pom.xml | 2
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXServerComponent.java | 46
modules/plugins/kickstart/pom.xml | 2
modules/plugins/lsof/pom.xml | 2
modules/plugins/mod-cluster/pom.xml | 4
modules/plugins/mysql/pom.xml | 2
modules/plugins/netservices/pom.xml | 2
modules/plugins/noop/pom.xml | 2
modules/plugins/nss/pom.xml | 2
modules/plugins/onewire/pom.xml | 2
modules/plugins/oracle/pom.xml | 2
modules/plugins/pattern-generator/pom.xml | 2
modules/plugins/perftest/pom.xml | 2
modules/plugins/platform/pom.xml | 2
modules/plugins/pom.xml | 1
modules/plugins/postfix/pom.xml | 2
modules/plugins/postgres/pom.xml | 2
modules/plugins/raw-config-test/pom.xml | 2
modules/plugins/rhq-agent/pom.xml | 2
modules/plugins/rhq-server/pom.xml | 2
modules/plugins/samba/pom.xml | 2
modules/plugins/script/pom.xml | 2
modules/plugins/script2/pom.xml | 2
modules/plugins/services/pom.xml | 2
modules/plugins/snmptrapd/pom.xml | 2
modules/plugins/sshd/pom.xml | 2
modules/plugins/sudoers/pom.xml | 2
modules/plugins/tomcat/pom.xml | 2
modules/plugins/twitter/pom.xml | 2
modules/plugins/virt/pom.xml | 2
modules/pom.xml | 1
pom.xml | 44
543 files changed, 55208 insertions(+), 50955 deletions(-)
New commits:
commit 49c19bafe83b2b2f55f514c51d34eb88fe960304
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Dec 19 21:10:31 2012 +0100
the rest of l10n for error and other messages, some javadoc
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java
index 5515e18..b1a1a6c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java
@@ -22,7 +22,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.admin.topology;
-import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.NAME;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_NAME;
import java.util.ArrayList;
import java.util.List;
@@ -31,7 +31,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.Overflow;
-import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.IButton;
import com.smartgwt.client.widgets.Window;
import com.smartgwt.client.widgets.events.ClickEvent;
@@ -47,6 +46,7 @@ import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.criteria.AgentCriteria;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.IconEnum;
import org.rhq.enterprise.gui.coregui.client.components.selector.AbstractSelector;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
@@ -64,6 +64,7 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
private static RPCDataSource<Agent, AgentCriteria> datasource = null;
+ private static final int MAX_AVAIL_AGENTS = 3000;
private static Window modalWindow;
private static boolean shouldBeClosed;
private static VLayout layout;
@@ -79,13 +80,13 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
this.affinityGroupId = affinityGroupId;
prepareMembers(this);
}
-
+
@Override
protected DynamicForm getAvailableFilterForm() {
if (availableFilterForm == null) {
- availableFilterForm = new LocatableDynamicForm(extendLocatorId("AgeSelectAvailFilterForm"));
+ availableFilterForm = new LocatableDynamicForm(extendLocatorId("AgentSelectAvailFilterForm"));
availableFilterForm.setWidth("75%");
- final TextItem search = new TextItem(NAME.propertyName(), MSG.common_title_search());
+ final TextItem search = new TextItem(FIELD_NAME.propertyName(), MSG.common_title_search());
availableFilterForm.setItems(search);
}
return availableFilterForm;
@@ -95,21 +96,21 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
AgentCriteria criteria = new AgentCriteria();
criteria.addFilterAffinityGroupId(affinityGroupId);
GWTServiceLookup.getCloudService().findAgentsByCriteria(criteria, new AsyncCallback<PageList<Agent>>() {
- public void onSuccess(PageList<Agent> result) {
- ListGridRecord[] records = getDataSource().buildRecords(result);
- originallyAssignedIds = getIdList(records);
- setAssigned(records);
- modalWindow.addItem(layout);
- modalWindow.show();
- selector.reset();
- }
-
- @Override
- public void onFailure(Throwable t) {
- //todo: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), t);
- }
- });
+ public void onSuccess(PageList<Agent> result) {
+ ListGridRecord[] records = getDataSource().buildRecords(result);
+ originallyAssignedIds = getIdList(records);
+ setAssigned(records);
+ modalWindow.addItem(layout);
+ modalWindow.show();
+ selector.reset();
+ }
+ @Override
+ public void onFailure(Throwable t) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_fetchAgentsFail(String.valueOf(affinityGroupId)), t);
+ }
+ });
}
@Override
@@ -122,15 +123,15 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
@Override
protected int getMaxAvailableRecords() {
- return 3000;
+ return MAX_AVAIL_AGENTS;
}
@Override
protected Criteria getLatestCriteria(DynamicForm availableFilterForm) {
- String search = (String) availableFilterForm.getValue(NAME.propertyName());
+ String search = (String) availableFilterForm.getValue(FIELD_NAME.propertyName());
Criteria criteria = new Criteria();
if (null != search) {
- criteria.addCriteria(NAME.propertyName(), search);
+ criteria.addCriteria(FIELD_NAME.propertyName(), search);
}
return criteria;
}
@@ -145,15 +146,15 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
return IconEnum.AGENT.getIcon16x16Path();
}
- public static void show(Integer affinityGroupId, final TableSection parrent) {
+ public static void show(final Integer affinityGroupId, final TableSection<?> parrent) {
modalWindow = new Window();
modalWindow.addCloseClickHandler(new CloseClickHandler() {
public void onCloseClick(CloseClickEvent event) {
closeAndRefresh(parrent, false);
}
});
- modalWindow.setTitle(MSG.view_adminTopology_agents() + ": "
- + MSG.view_adminTopology_affinityGroups_createNew());
+ modalWindow
+ .setTitle(MSG.view_adminTopology_agents() + ": " + MSG.view_adminTopology_affinityGroups_createNew());
modalWindow.setOverflow(Overflow.VISIBLE);
modalWindow.setWidth(800);
modalWindow.setHeight(400);
@@ -167,7 +168,7 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
layout.setPadding(10);
layout.setLayoutMargin(10);
- final AffinityGroupAgentsSelector selector = new AffinityGroupAgentsSelector("foo", affinityGroupId);
+ final AffinityGroupAgentsSelector selector = new AffinityGroupAgentsSelector("assignAgents", affinityGroupId);
layout.addMember(selector);
IButton cancel = new LocatableIButton(selector.extendLocatorId("Cancel"), MSG.common_button_cancel());
@@ -193,9 +194,10 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
closeAndRefresh(parrent, true);
}
- public void onFailure(Throwable caught) {
- //todo: error handling
- SC.say("errX");
+ public void onFailure(Throwable t) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_agroupAssingAgentsFail(String
+ .valueOf(affinityGroupId)), t);
}
});
}
@@ -208,17 +210,16 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
closeAndRefresh(parrent, true);
}
- public void onFailure(Throwable caught) {
- //todo: error handling
- SC.say("errX");
+ public void onFailure(Throwable t) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_agroupRemovingAgentsFail(String
+ .valueOf(affinityGroupId)), t);
}
});
}
if (shouldBeClosed) {
closeAndRefresh(parrent, false);
}
- // SC.say("To del: " + originallySelected + "\n\nTo add: " + actuallySelected);
-
}
});
@@ -231,7 +232,7 @@ public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCr
layout.addMember(buttons);
}
- private static void closeAndRefresh(TableSection parrent, boolean fullRefresh) {
+ private static void closeAndRefresh(TableSection<?> parrent, boolean fullRefresh) {
if (modalWindow != null) {
modalWindow.destroy();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
index 4355814..fbd832e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
@@ -25,7 +25,6 @@ import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.VisibilityMode;
-import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.IButton;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
@@ -35,9 +34,11 @@ import com.smartgwt.client.widgets.layout.SectionStackSection;
import org.rhq.core.domain.cloud.AffinityGroup;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.Log;
+import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip;
@@ -50,7 +51,6 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
*/
public class AffinityGroupDetailView extends LocatableVLayout implements BookmarkableView {
- // private final CloudGWTServiceAsync cloudManager = GWTServiceLookup.getCloudService();
private final int affinityGroupId;
private static final int SECTION_COUNT = 3;
@@ -79,28 +79,18 @@ public class AffinityGroupDetailView extends LocatableVLayout implements Bookmar
@Override
protected void onInit() {
super.onInit();
- GWTServiceLookup.getCloudService().getAffinityGroupById(this.affinityGroupId,
- new AsyncCallback<AffinityGroup>() {
- public void onSuccess(final AffinityGroup affinityGroup) {
- prepareDetailsSection(sectionStack, affinityGroup);
-
- // GWTServiceLookup.getCloudService().getAgentsByServerName(server.getName(),
- // new AsyncCallback<List<Agent>>() {
- // public void onSuccess(List<Agent> agents) {
- // prepareAgentSection(sectionStack, server, agents);
- // };
- //
- // public void onFailure(Throwable caught) {
- // //TODO: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), caught);
- // }
- // });
- }
+ GWTServiceLookup.getCloudService().getAffinityGroupById(affinityGroupId, new AsyncCallback<AffinityGroup>() {
+ public void onSuccess(final AffinityGroup affinityGroup) {
+ prepareDetailsSection(sectionStack, affinityGroup);
+ }
- public void onFailure(Throwable caught) {
- SC.say("er1:" + caught);
- //TODO: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), caught);
- }
- });
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_fetchAgroupFail(String.valueOf(affinityGroupId)), caught);
+ initSectionCount = SECTION_COUNT;
+ return;
+ }
+ });
prepareAgentSection(sectionStack);
prepareServerSection(sectionStack);
}
@@ -178,7 +168,7 @@ public class AffinityGroupDetailView extends LocatableVLayout implements Bookmar
final TextItem nameItem = new TextItem(FIELD_NAME.propertyName(), FIELD_NAME.title());
nameItem.setValue(affinityGroup.getName());
-
+
LocatableToolStrip footer = new LocatableToolStrip(extendLocatorId("detailsFooter"));
footer.setPadding(5);
footer.setWidth100();
@@ -187,25 +177,27 @@ public class AffinityGroupDetailView extends LocatableVLayout implements Bookmar
IButton saveButton = new IButton();
saveButton.setOverflow(Overflow.VISIBLE);
saveButton.setTitle(MSG.common_button_save());
-// saveButton.setWidth(70);
saveButton.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent event) {
affinityGroup.setName(nameItem.getValueAsString());
GWTServiceLookup.getCloudService().updateAffinityGroup(affinityGroup, new AsyncCallback<Void>() {
public void onSuccess(Void result) {
- // todo: notify
+ Message msg = new Message(MSG.view_adminTopology_message_agroupRenamed(
+ String.valueOf(affinityGroupId), affinityGroup.getName(), nameItem.getValueAsString()),
+ Message.Severity.Info);
+ CoreGUI.getMessageCenter().notify(msg);
}
public void onFailure(Throwable caught) {
- // todo: handle
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_agroupRenamingFail(String.valueOf(affinityGroupId),
+ affinityGroup.getName()) + " " + caught.getMessage(), caught);
}
});
}
});
footer.addMember(saveButton);
-
form.setItems(nameItem);
-
SectionStackSection section = new SectionStackSection(MSG.common_title_details());
section.setExpanded(true);
section.setItems(form, footer);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
index 13b1559..803214c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
@@ -22,7 +22,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.admin.topology;
-import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.NAME;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_NAME;
import java.util.ArrayList;
import java.util.List;
@@ -31,7 +31,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.Overflow;
-import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.IButton;
import com.smartgwt.client.widgets.Window;
import com.smartgwt.client.widgets.events.ClickEvent;
@@ -49,6 +48,7 @@ import org.rhq.core.domain.cloud.Server;
import org.rhq.core.domain.cloud.Server.OperationMode;
import org.rhq.core.domain.criteria.ServerCriteria;
import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.IconEnum;
import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem;
import org.rhq.enterprise.gui.coregui.client.components.selector.AbstractSelector;
@@ -82,27 +82,24 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
this.affinityGroupId = affinityGroupId;
prepareMembers(this);
}
-
+
@Override
protected DynamicForm getAvailableFilterForm() {
if (availableFilterForm == null) {
availableFilterForm = new LocatableDynamicForm(extendLocatorId("SerSelectAvailFilterForm"));
availableFilterForm.setNumCols(4);
availableFilterForm.setWidth("75%");
- final TextItem search = new TextItem(NAME.propertyName(), MSG.common_title_search());
- final SelectItem operationModeSelect = new SortedSelectItem(ServerDatasource.FILTER_OPERATION_MODE, MSG.view_adminTopology_serverDetail_operationMode());
+ final TextItem search = new TextItem(FIELD_NAME.propertyName(), MSG.common_title_search());
+ final SelectItem operationModeSelect = new SortedSelectItem(ServerDatasource.FILTER_OPERATION_MODE,
+ MSG.view_adminTopology_serverDetail_operationMode());
operationModeSelect.setValueMap(buildOperationModeOptions());
operationModeSelect.setValue("ALL");
-//
-// final EnumSelectItem operationModeFilter = new EnumSelectItem(ServerDatasource.FILTER_OPERATION_MODE,
-// MSG.view_adminTopology_serverDetail_operationMode(), OperationMode.class, null, null);
-
availableFilterForm.setItems(search, operationModeSelect);
}
return availableFilterForm;
}
-
+
private String[] buildOperationModeOptions() {
OperationMode[] modes = OperationMode.values();
String[] options = new String[modes.length + 1];
@@ -117,27 +114,28 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
ServerCriteria criteria = new ServerCriteria();
criteria.addFilterAffinityGroupId(affinityGroupId);
GWTServiceLookup.getCloudService().findServersByCriteria(criteria, new AsyncCallback<PageList<Server>>() {
- public void onSuccess(PageList<Server> result) {
- ListGridRecord[] records = getDataSource().buildRecords(result);
- originallyAssignedIds = getIdList(records);
- setAssigned(records);
- modalWindow.addItem(layout);
- modalWindow.show();
- selector.reset();
- }
+ public void onSuccess(PageList<Server> result) {
+ ListGridRecord[] records = getDataSource().buildRecords(result);
+ originallyAssignedIds = getIdList(records);
+ setAssigned(records);
+ modalWindow.addItem(layout);
+ modalWindow.show();
+ selector.reset();
+ }
- @Override
- public void onFailure(Throwable t) {
- //todo: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), t);
- }
- });
+ @Override
+ public void onFailure(Throwable t) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_fetchServersFail(String.valueOf(affinityGroupId)), t);
+ }
+ });
}
@Override
protected RPCDataSource<Server, ServerCriteria> getDataSource() {
if (datasource == null) {
- datasource = new ServerDatasource(affinityGroupId, false);
+ datasource = new ServerDatasource(null);
}
return datasource;
}
@@ -149,11 +147,11 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
@Override
protected Criteria getLatestCriteria(DynamicForm availableFilterForm) {
- String search = (String) availableFilterForm.getValue(NAME.propertyName());
+ String search = (String) availableFilterForm.getValue(FIELD_NAME.propertyName());
String operationMode = (String) availableFilterForm.getValue(ServerDatasource.FILTER_OPERATION_MODE);
Criteria criteria = new Criteria();
if (null != search) {
- criteria.addCriteria(NAME.propertyName(), search);
+ criteria.addCriteria(FIELD_NAME.propertyName(), search);
}
if (operationMode != null && !"ALL".equals(operationMode)) {
criteria.addCriteria(ServerDatasource.FILTER_OPERATION_MODE, operationMode);
@@ -171,7 +169,7 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
return IconEnum.SERVERS.getIcon16x16Path();
}
- public static void show(Integer affinityGroupId, final TableSection parrent) {
+ public static void show(final Integer affinityGroupId, final TableSection<?> parrent) {
modalWindow = new Window();
modalWindow.addCloseClickHandler(new CloseClickHandler() {
public void onCloseClick(CloseClickEvent event) {
@@ -193,7 +191,7 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
layout.setPadding(10);
layout.setLayoutMargin(10);
- final AffinityGroupServersSelector selector = new AffinityGroupServersSelector("foo", affinityGroupId);
+ final AffinityGroupServersSelector selector = new AffinityGroupServersSelector("assignServers", affinityGroupId);
layout.addMember(selector);
IButton cancel = new LocatableIButton(selector.extendLocatorId("Cancel"), MSG.common_button_cancel());
@@ -214,14 +212,14 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
shouldBeClosed = false;
GWTServiceLookup.getCloudService().removeServersFromGroup(
originallySelected.toArray(new Integer[originallySelected.size()]), new AsyncCallback<Void>() {
-
public void onSuccess(Void result) {
closeAndRefresh(parrent, true);
}
- public void onFailure(Throwable caught) {
- //todo: error handling
- SC.say("errX");
+ public void onFailure(Throwable t) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_agroupAssingServersFail(String
+ .valueOf(affinityGroupId)), t);
}
});
}
@@ -229,22 +227,20 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
shouldBeClosed = false;
GWTServiceLookup.getCloudService().addServersToGroup(selector.getAffinityGroupId(),
actuallySelected.toArray(new Integer[actuallySelected.size()]), new AsyncCallback<Void>() {
-
public void onSuccess(Void result) {
closeAndRefresh(parrent, true);
}
- public void onFailure(Throwable caught) {
- //todo: error handling
- SC.say("errX");
+ public void onFailure(Throwable t) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_agroupRemovingServersFail(String
+ .valueOf(affinityGroupId)), t);
}
});
}
if (shouldBeClosed) {
closeAndRefresh(parrent, false);
}
- // SC.say("To del: " + originallySelected + "\n\nTo add: " + actuallySelected);
-
}
});
@@ -257,7 +253,7 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
layout.addMember(buttons);
}
- private static void closeAndRefresh(TableSection parrent, boolean fullRefresh) {
+ private static void closeAndRefresh(TableSection<?> parrent, boolean fullRefresh) {
if (modalWindow != null) {
modalWindow.destroy();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java
index ac44d44..dbe8d0f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupTableView.java
@@ -36,6 +36,8 @@ import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.fields.TextItem;
+import com.smartgwt.client.widgets.form.fields.events.KeyUpEvent;
+import com.smartgwt.client.widgets.form.fields.events.KeyUpHandler;
import com.smartgwt.client.widgets.form.validator.LengthRangeValidator;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
@@ -98,32 +100,29 @@ public class AffinityGroupTableView extends TableSection<AffinityGroupWithCounts
}
});
- addTableAction(extendLocatorId("removeSelected"), MSG.view_adminTopology_server_removeSelected(),
- MSG.common_msg_areYouSure(), new AuthorizedTableAction(this, TableActionEnablement.ANY,
- Permission.MANAGE_SETTINGS) {
+ addTableAction(extendLocatorId("removeSelected"), MSG.view_adminTopology_server_removeSelected(), null,
+ new AuthorizedTableAction(this, TableActionEnablement.ANY, Permission.MANAGE_SETTINGS) {
public void executeAction(final ListGridRecord[] selections, Object actionValue) {
- List<String> selectedNames = getSelectedNames(selections);
- String message = "Really? Delete? For all I've done for you? " + selectedNames;
+ final List<String> selectedNames = getSelectedNames(selections);
+ String message = MSG.view_adminTopology_message_removeAGroupsConfirm(selectedNames.toString());
SC.ask(message, new BooleanCallback() {
public void execute(Boolean confirmed) {
if (confirmed) {
int[] selectedIds = getSelectedIds(selections);
- SC.say("setting servers to maintenance mode, ids: " + selectedIds);
GWTServiceLookup.getCloudService().deleteAffinityGroups(selectedIds,
new AsyncCallback<Integer>() {
public void onSuccess(Integer count) {
- // TODO: msg with count
Message msg = new Message(MSG
- .view_admin_plugins_disabledServerPlugins("sdf"), Message.Severity.Info);
+ .view_adminTopology_message_removedAGroups(String.valueOf(count)),
+ Message.Severity.Info);
CoreGUI.getMessageCenter().notify(msg);
refresh();
}
public void onFailure(Throwable caught) {
- // TODO: msg
CoreGUI.getErrorHandler().handleError(
- MSG.view_admin_plugins_disabledServerPluginsFailure() + " "
- + caught.getMessage(), caught);
+ MSG.view_adminTopology_message_removeAGroupsFail(selectedNames
+ .toString()) + " " + caught.getMessage(), caught);
refreshTableInfo();
}
@@ -190,9 +189,16 @@ public class AffinityGroupTableView extends TableSection<AffinityGroupWithCounts
nameLengthValidator.setMin(3);
nameLengthValidator.setMax(100);
name.setValidators(nameLengthValidator);
+ name.addKeyUpHandler(new KeyUpHandler() {
+ public void onKeyUp(KeyUpEvent event) {
+ if ("Enter".equals(event.getKeyName())) {
+ createNewGroup(modalWindow, form);
+ }
+ }
+ });
+
form.setFields(name);
layout.addMember(form);
-
VLayout spacer = new VLayout();
spacer.setHeight(10);
layout.addMember(spacer);
@@ -203,32 +209,17 @@ public class AffinityGroupTableView extends TableSection<AffinityGroupWithCounts
modalWindow.destroy();
}
});
- IButton save = new LocatableIButton(this.extendLocatorId("Create"),
+ final IButton create = new LocatableIButton(this.extendLocatorId("Create"),
MSG.view_adminTopology_affinityGroups_createNew());
- save.addClickHandler(new ClickHandler() {
+ create.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
- if (form.validate()) {
- String name = form.getValueAsString(FIELD_NAME);
- AffinityGroup affinityGroup = new AffinityGroup(name);
- GWTServiceLookup.getCloudService().createAffinityGroup(affinityGroup, new AsyncCallback<Integer>() {
- public void onSuccess(Integer affinityGroupId) {
- modalWindow.destroy();
- CoreGUI.goToView(VIEW_PATH + "/" + affinityGroupId);
- }
-
- public void onFailure(Throwable caught) {
- Map<String, String> errors = new HashMap<String, String>();
- errors.put(FIELD_NAME, caught.getMessage());
- form.setErrors(errors, true);
- }
- });
- }
+ createNewGroup(modalWindow, form);
}
});
HLayout buttons = new HLayout(10);
buttons.setLayoutAlign(Alignment.CENTER);
- buttons.addMember(save);
+ buttons.addMember(create);
buttons.addMember(cancel);
layout.addMember(buttons);
modalWindow.addItem(layout);
@@ -236,6 +227,25 @@ public class AffinityGroupTableView extends TableSection<AffinityGroupWithCounts
name.focusInItem();
}
+ private void createNewGroup(final Window modalWindow, final DynamicForm form) {
+ if (form.validate()) {
+ String name = form.getValueAsString(FIELD_NAME);
+ AffinityGroup affinityGroup = new AffinityGroup(name);
+ GWTServiceLookup.getCloudService().createAffinityGroup(affinityGroup, new AsyncCallback<Integer>() {
+ public void onSuccess(Integer affinityGroupId) {
+ modalWindow.destroy();
+ CoreGUI.goToView(VIEW_PATH + "/" + affinityGroupId);
+ }
+
+ public void onFailure(Throwable caught) {
+ Map<String, String> errors = new HashMap<String, String>();
+ errors.put(FIELD_NAME, caught.getMessage());
+ form.setErrors(errors, true);
+ }
+ });
+ }
+ }
+
@Override
public ViewName getViewName() {
return VIEW_ID;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupWithCountsDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupWithCountsDatasource.java
index e08a88e..bd8b6b3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupWithCountsDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupWithCountsDatasource.java
@@ -55,14 +55,7 @@ public class AffinityGroupWithCountsDatasource extends RPCDataSource<AffinityGro
FIELD_SERVER_COUNT("serverCount", CoreGUI.getMessages().view_adminTopology_affinityGroups_serverCount());
- /**
- * Corresponds to a property name of Server (e.g. operationMode).
- */
private String propertyName;
-
- /**
- * The table header for the field or property (e.g. Mode).
- */
private String title;
private Fields(String propertyName, String title) {
@@ -131,8 +124,8 @@ public class AffinityGroupWithCountsDatasource extends RPCDataSource<AffinityGro
processResponse(request.getRequestId(), response);
}
- public void onFailure(Throwable caught) {
- //todo: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), t);
+ public void onFailure(Throwable t) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_adminTopology_message_fetchAgroupsFail(), t);
response.setStatus(DSResponse.STATUS_FAILURE);
processResponse(request.getRequestId(), response);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java
index ac1d26b..dd596e9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java
@@ -42,9 +42,8 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.criteria.AgentCriteria;
import org.rhq.core.domain.resource.Agent;
-import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
-import org.rhq.core.domain.util.PageOrdering;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.Log;
@@ -61,7 +60,6 @@ public class AgentDatasource extends RPCDataSource<Agent, AgentCriteria> {
public static final String FILTER_PORT = FIELD_PORT.propertyName();
public static final String FILTER_SERVER_ID = "serverId";
public static final String FILTER_AFFINITY_GROUP_ID = "affinityGroupId";
-
private final Integer id;
private final boolean isAffinityGroupId;
@@ -115,31 +113,10 @@ public class AgentDatasource extends RPCDataSource<Agent, AgentCriteria> {
@Override
protected void executeFetch(final DSRequest request, final DSResponse response, AgentCriteria criteria) {
-// final PageControl pc = getPageControl(request);
-
-// AsyncCallback<PageList<Agent>> callback = new AsyncCallback<PageList<Agent>>() {
-// public void onSuccess(PageList<Agent> result) {
-// response.setData(buildRecords(result));
-// response.setTotalRows(result.size());
-// processResponse(request.getRequestId(), response);
-// }
-//
-// @Override
-// public void onFailure(Throwable t) {
-// //todo: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), t);
-// response.setStatus(DSResponse.STATUS_FAILURE);
-// processResponse(request.getRequestId(), response);
-// }
-// };
-//
-//
if (isAffinityGroupId) {
-// GWTServiceLookup.getCloudService().getAgentMembersByAffinityGroupId(id, pc, callback);
criteria.addFilterAffinityGroupId(id);
- } else if (id != null) {
- // if id == null all agent are returned
+ } else {
criteria.addFilterServerId(id);
-// GWTServiceLookup.getAgentService().getAgentsByServer(id, pc, callback);
}
GWTServiceLookup.getCloudService().findAgentsByCriteria(criteria, new AsyncCallback<PageList<Agent>>() {
@@ -151,38 +128,13 @@ public class AgentDatasource extends RPCDataSource<Agent, AgentCriteria> {
@Override
public void onFailure(Throwable t) {
- //todo: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), t);
+ CoreGUI.getErrorHandler().handleError(MSG.view_adminTopology_message_fetchAgents2Fail(), t);
response.setStatus(DSResponse.STATUS_FAILURE);
processResponse(request.getRequestId(), response);
}
});
}
- /**
- * Returns a prepopulated PageControl based on the provided DSRequest. This will set sort fields,
- * pagination, but *not* filter fields.
- *
- * @param request the request to turn into a page control
- * @return the page control for passing to criteria and other queries
- */
- protected PageControl getPageControl(DSRequest request) {
- // Initialize paging.
- PageControl pageControl = new PageControl(0, getDataPageSize());
-
- // Initialize sorting.
- String sortBy = request.getAttribute("sortBy");
- if (sortBy != null) {
- String[] sorts = sortBy.split(",");
- for (String sort : sorts) {
- PageOrdering ordering = (sort.startsWith("-")) ? PageOrdering.DESC : PageOrdering.ASC;
- String columnName = (ordering == PageOrdering.DESC) ? sort.substring(1) : sort;
- pageControl.addDefaultOrderingField(columnName, ordering);
- }
- }
-
- return pageControl;
- }
-
@Override
public Agent copyValues(Record from) {
throw new UnsupportedOperationException("AgentNodeDatasource.copyValues(Record from)");
@@ -216,7 +168,6 @@ public class AgentDatasource extends RPCDataSource<Agent, AgentCriteria> {
criteria.addFilterPort(getFilter(request, FILTER_PORT, Integer.class));
criteria.addFilterServerId(getFilter(request, FILTER_SERVER_ID, Integer.class));
criteria.addFilterAffinityGroupId(getFilter(request, FILTER_AFFINITY_GROUP_ID, Integer.class));
-
//@todo: Remove me when finished debugging search expression
Log.debug(" *** AgentCriteria Search String: " + getFilter(request, "search", String.class));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasourceField.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasourceField.java
index 26792d4..7935446 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasourceField.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasourceField.java
@@ -33,19 +33,20 @@ public enum AgentDatasourceField {
FIELD_NAME("name", CoreGUI.getMessages().common_title_name()),
FIELD_SERVER("server", CoreGUI.getMessages().view_adminTopology_agent_connectedServer()),
-
+
FIELD_SERVER_ID("serverId", "serverId"),
FIELD_ADDRESS("address", CoreGUI.getMessages().view_adminTopology_agent_agentBindAddress()),
FIELD_PORT("port", CoreGUI.getMessages().view_adminTopology_agent_agentBindPort()),
- FIELD_LAST_AVAILABILITY_REPORT("lastAvailabilityReport", CoreGUI.getMessages().view_adminTopology_agent_lastAvailabilityReport()),
+ FIELD_LAST_AVAILABILITY_REPORT("lastAvailabilityReport", CoreGUI.getMessages()
+ .view_adminTopology_agent_lastAvailabilityReport()),
FIELD_AGENT_TOKEN("agentToken", CoreGUI.getMessages().view_adminTopology_agentDetail_token()),
FIELD_AFFINITY_GROUP("affinityGroup", CoreGUI.getMessages().view_adminTopology_server_affinityGroup()),
-
+
FIELD_AFFINITY_GROUP_ID("affinityGroupId", "affinityGroupId");
/**
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
index f48e7b7..7e5c3ac 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
@@ -31,7 +31,6 @@ import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.VisibilityMode;
-import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.layout.SectionStack;
import com.smartgwt.client.widgets.layout.SectionStackSection;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
index dc34602..8c47813 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
@@ -55,7 +55,7 @@ public class AgentTableView extends TableSection<AgentDatasource> implements Has
+ AdministrationView.SECTION_TOPOLOGY_VIEW_ID + "/" + VIEW_ID;
private final boolean isAffinityGroupId;
-
+
private final Integer id;
public AgentTableView(String locatorId, Integer id, boolean isAffinityGroupId) {
@@ -91,7 +91,7 @@ public class AgentTableView extends TableSection<AgentDatasource> implements Has
}
});
} else if (field.getName() == FIELD_SERVER.propertyName()) {
- // adding the cell formatter for server field (clickable link)
+ // adding the cell formatter for server field (clickable link)
field.setCellFormatter(new CellFormatter() {
@Override
public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
@@ -105,7 +105,7 @@ public class AgentTableView extends TableSection<AgentDatasource> implements Has
}
});
} else if (field.getName() == FIELD_AFFINITY_GROUP.propertyName()) {
- // adding the cell formatter for affinity group field (clickable link)
+ // adding the cell formatter for affinity group field (clickable link)
field.setCellFormatter(new CellFormatter() {
@Override
public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/FailoverListItemDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/FailoverListItemDatasource.java
index 6dd2430..6bfa378 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/FailoverListItemDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/FailoverListItemDatasource.java
@@ -43,6 +43,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.cloud.FailoverListDetails;
import org.rhq.core.domain.criteria.Criteria;
import org.rhq.core.domain.util.PageControl;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
@@ -53,14 +54,14 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
public class FailoverListItemDatasource extends AbstractServerNodeDatasource<FailoverListDetails, Criteria> {
private final int agentId;
-
+
// this delegate is there to not repeat the copyValues code
private final ServerDatasource serverDatasource;
public FailoverListItemDatasource(int agentId) {
super();
this.agentId = agentId;
- this.serverDatasource = new ServerDatasource(null, false);
+ this.serverDatasource = new ServerDatasource(null);
List<DataSourceField> fields = addDataSourceFields();
addFields(fields);
}
@@ -111,13 +112,14 @@ public class FailoverListItemDatasource extends AbstractServerNodeDatasource<Fai
@Override
public void onFailure(Throwable t) {
- //todo: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), t);
+ CoreGUI.getErrorHandler().handleError(MSG.view_adminTopology_message_fetchFailOverLists(), t);
response.setStatus(DSResponse.STATUS_FAILURE);
processResponse(request.getRequestId(), response);
}
});
}
+ @Override
protected PageControl getPageControl(DSRequest request) {
return serverDatasource.getPageControl(request);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDatasource.java
index f77a843..c3d103b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDatasource.java
@@ -27,7 +27,6 @@ import static org.rhq.enterprise.gui.coregui.client.admin.topology.PartitionEven
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
@@ -42,11 +41,11 @@ import org.rhq.core.domain.cloud.PartitionEvent;
import org.rhq.core.domain.cloud.PartitionEvent.ExecutionStatus;
import org.rhq.core.domain.cloud.PartitionEventType;
import org.rhq.core.domain.criteria.PartitionEventCriteria;
-import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
-import org.rhq.core.domain.util.PageOrdering;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
/**
@@ -95,8 +94,6 @@ public class PartitionEventDatasource extends RPCDataSource<PartitionEvent, Part
@Override
protected void executeFetch(final DSRequest request, final DSResponse response, PartitionEventCriteria criteria) {
- // final PageControl pc = getPageControl(request);
-
GWTServiceLookup.getCloudService().findPartitionEventsByCriteria(criteria,
new AsyncCallback<PageList<PartitionEvent>>() {
public void onSuccess(PageList<PartitionEvent> result) {
@@ -107,38 +104,13 @@ public class PartitionEventDatasource extends RPCDataSource<PartitionEvent, Part
@Override
public void onFailure(Throwable t) {
- //todo: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), t);
+ CoreGUI.getErrorHandler().handleError(MSG.view_adminTopology_message_fetchPEventFail(), t);
response.setStatus(DSResponse.STATUS_FAILURE);
processResponse(request.getRequestId(), response);
}
});
}
- /**
- * Returns a prepopulated PageControl based on the provided DSRequest. This will set sort fields,
- * pagination, but *not* filter fields.
- *
- * @param request the request to turn into a page control
- * @return the page control for passing to criteria and other queries
- */
- protected PageControl getPageControl(DSRequest request) {
- // Initialize paging.
- PageControl pageControl = new PageControl(0, getDataPageSize());
-
- // Initialize sorting.
- String sortBy = request.getAttribute("sortBy");
- if (sortBy != null) {
- String[] sorts = sortBy.split(",");
- for (String sort : sorts) {
- PageOrdering ordering = (sort.startsWith("-")) ? PageOrdering.DESC : PageOrdering.ASC;
- String columnName = (ordering == PageOrdering.DESC) ? sort.substring(1) : sort;
- pageControl.addDefaultOrderingField(columnName, ordering);
- }
- }
-
- return pageControl;
- }
-
@Override
public PartitionEvent copyValues(Record from) {
throw new UnsupportedOperationException("PartitionEventDatasource.copyValues(Record from)");
@@ -150,46 +122,27 @@ public class PartitionEventDatasource extends RPCDataSource<PartitionEvent, Part
record.setAttribute(FIELD_ID.propertyName(), from.getId());
record.setAttribute(FIELD_CTIME.propertyName(), from.getCtime());
record.setAttribute(FIELD_EVENT_TYPE.propertyName(), from.getEventType() == null ? "" : from.getEventType());
- record.setAttribute(FIELD_EVENT_DETAIL.propertyName(), from.getEventDetail() == null ? "" : from.getEventDetail());
- record.setAttribute(FIELD_SUBJECT_NAME.propertyName(), from.getSubjectName() == null ? "" : from.getSubjectName());
- record.setAttribute(FIELD_EXECUTION_STATUS.propertyName(), from.getExecutionStatus() == null ? "" : from.getExecutionStatus());
+ record.setAttribute(FIELD_EVENT_DETAIL.propertyName(),
+ from.getEventDetail() == null ? "" : from.getEventDetail());
+ record.setAttribute(FIELD_SUBJECT_NAME.propertyName(),
+ from.getSubjectName() == null ? "" : from.getSubjectName());
+ record.setAttribute(FIELD_EXECUTION_STATUS.propertyName(),
+ from.getExecutionStatus() == null ? "" : from.getExecutionStatus());
return record;
}
@Override
protected PartitionEventCriteria getFetchCriteria(DSRequest request) {
- //todo: do it like in ResourceDatasource.class
-
-
- ExecutionStatus[] statuses = getArrayFilter(request, FILTER_EXECUTION_STATUS, ExecutionStatus.class);
- PartitionEventType[] types = getArrayFilter(request, FILTER_EVENT_TYPE, PartitionEventType.class);
- if (types == null || types.length == 0 || statuses == null || statuses.length == 0) {
- return null; // user didn't select any type or status - return null to indicate no data should be displayed
- }
-
PartitionEventCriteria criteria = new PartitionEventCriteria();
- // This code is unlikely to be necessary as the encompassing view should be using an initial
- // sort specifier. But just in case, make sure we set the initial sort. Note that we have to
- // manipulate the PageControl directly as per the restrictions on getFetchCriteria() (see jdoc).
- PageControl pageControl = getPageControl(request);
- if (pageControl.getOrderingFields().isEmpty()) {
- pageControl.initDefaultOrderingField(FIELD_CTIME.propertyName(), PageOrdering.DESC);
- }
-
- // TODO: This call is broken in 2.2, http://code.google.com/p/smartgwt/issues/detail?id=490
- // when using AdvancedCriteria
- Map<String, Object> criteriaMap = request.getCriteria().getValues();
- criteria.addFilterEventDetail((String) criteriaMap.get(FILTER_EVENT_DETAIL));
-
- // There's no need to add a exec. status filter to the criteria if the user specified all exec. statuses.
- if (statuses.length != ExecutionStatus.values().length) {
- criteria.addFilterExecutionStatus(statuses);
- }
-
- // There's no need to add a event type filter to the criteria if the user specified all event types.
- if (types.length != PartitionEventType.values().length) {
- criteria.addFilterEventType(types);
- }
+ // printRequestCriteria(request);
+ criteria.addFilterId(getFilter(request, FIELD_ID.propertyName(), Integer.class));
+ criteria.addFilterEventDetail(getFilter(request, FIELD_EVENT_DETAIL.propertyName(), String.class));
+ criteria.addFilterExecutionStatus(getArrayFilter(request, FILTER_EXECUTION_STATUS, ExecutionStatus.class));
+ criteria.addFilterEventType(getArrayFilter(request, FILTER_EVENT_TYPE, PartitionEventType.class));
+
+ //@todo: Remove me when finished debugging search expression
+ Log.debug(" *** PartitionEventCriteria Search String: " + getFilter(request, "search", String.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/admin/topology/PartitionEventDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java
index dc96374..4210202 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java
@@ -29,7 +29,6 @@ import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.VisibilityMode;
-import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.grid.ListGrid;
@@ -44,6 +43,7 @@ import org.rhq.core.domain.criteria.PartitionEventCriteria;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.CloudGWTServiceAsync;
@@ -90,32 +90,39 @@ public class PartitionEventDetailView extends LocatableVLayout implements Bookma
PartitionEventCriteria criteria = new PartitionEventCriteria();
criteria.addFilterId(partitionEventId);
final CloudGWTServiceAsync service = GWTServiceLookup.getCloudService();
- service.findPartitionEventsByCriteria(criteria,
- new AsyncCallback<PageList<PartitionEvent>>() {
- public void onSuccess(final PageList<PartitionEvent> events) {
- if (events == null || events.size() != 1) {
- //TODO: notify user in msg center
- return;
- }
- prepareDetailsSection(sectionStack, events.get(0));
- service.getPartitionEventDetails(partitionEventId,
- PageControl.getUnlimitedInstance(), new AsyncCallback<PageList<PartitionEventDetails>>() {
- public void onSuccess(PageList<PartitionEventDetails> result) {
- prepareAssignmentsSection(sectionStack, result);
- }
- public void onFailure(Throwable caught) {
- SC.say("er2:" + caught);
- //TODO: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), caught);
- }
- });
-
+ service.findPartitionEventsByCriteria(criteria, new AsyncCallback<PageList<PartitionEvent>>() {
+ public void onSuccess(final PageList<PartitionEvent> events) {
+ if (events == null || events.size() != 1) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_fetchPEventDetailsFail(String.valueOf(partitionEventId)));
+ initSectionCount = SECTION_COUNT;
+ return;
}
+ prepareDetailsSection(sectionStack, events.get(0));
+ service.getPartitionEventDetails(partitionEventId, PageControl.getUnlimitedInstance(),
+ new AsyncCallback<PageList<PartitionEventDetails>>() {
+ public void onSuccess(PageList<PartitionEventDetails> result) {
+ prepareAssignmentsSection(sectionStack, result);
+ }
+
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler()
+ .handleError(
+ MSG.view_adminTopology_message_fetchPEventDetailsFail(String
+ .valueOf(partitionEventId)));
+ initSectionCount = SECTION_COUNT;
+ return;
+ }
+ });
- public void onFailure(Throwable caught) {
- SC.say("er1:" + caught);
- //TODO: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), caught);
- }
- });
+ }
+
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_fetchPEventDetailsFail(String.valueOf(partitionEventId)));
+ initSectionCount = SECTION_COUNT;
+ }
+ });
}
public boolean isInitialized() {
@@ -165,7 +172,8 @@ public class PartitionEventDetailView extends LocatableVLayout implements Bookma
// there is no need for datasource, it is a simple table with two columns
ListGrid assignments = new ListGrid();
ListGridField agentName = new ListGridField("agentName", MSG.view_adminTopology_agent_agentName());
- ListGridField serverName = new ListGridField("serverName", MSG.view_admin_systemSettings_serverDetails_serverName());
+ ListGridField serverName = new ListGridField("serverName",
+ MSG.view_admin_systemSettings_serverDetails_serverName());
assignments.setFields(agentName, serverName);
ListGridRecord[] records = new ListGridRecord[eventDetails.size()];
for (int i = 0; i < eventDetails.size(); i++) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
index b25a4d3..7fa9a7c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
@@ -18,6 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.admin.topology;
+import java.util.ArrayList;
import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -63,18 +64,29 @@ public class PartitionEventTableView extends TableSection<PartitionEventDatasour
public static final String VIEW_PATH = AdministrationView.VIEW_ID + "/"
+ AdministrationView.SECTION_TOPOLOGY_VIEW_ID + "/" + VIEW_ID;
-
private static final Criteria INITIAL_CRITERIA = new Criteria();
- private static SortSpecifier DEFAULT_SORT_SPECIFIER = new SortSpecifier(PartitionEventCriteria.SORT_FIELD_CTIME,
- SortDirection.DESCENDING);
+ private static final SortSpecifier DEFAULT_SORT_SPECIFIER = new SortSpecifier(
+ PartitionEventCriteria.SORT_FIELD_CTIME, SortDirection.DESCENDING);
+
+ private enum TableAction {
+ REMOVE_SELECTED(MSG.view_adminTopology_server_removeSelected(), TableActionEnablement.ANY), PURGE_ALL(MSG
+ .view_adminTopology_partitionEvents_purgeAll(), TableActionEnablement.ALWAYS), FORCE_REPARTITION(MSG
+ .view_adminTopology_partitionEvents_forceRepartition(), TableActionEnablement.ALWAYS);
+
+ private String title;
+ private TableActionEnablement enablement;
+
+ private TableAction(String title, TableActionEnablement enablement) {
+ this.title = title;
+ this.enablement = enablement;
+ }
+ }
public PartitionEventTableView(String locatorId, String tableTitle) {
super(locatorId, tableTitle, INITIAL_CRITERIA, new SortSpecifier[] { DEFAULT_SORT_SPECIFIER });
-
setHeight100();
setWidth100();
-
setInitialCriteriaFixed(false);
setDataSource(new PartitionEventDatasource());
}
@@ -89,22 +101,6 @@ public class PartitionEventTableView extends TableSection<PartitionEventDatasour
final TextItem detail = new TextItem(PartitionEventDatasource.FILTER_EVENT_DETAIL,
MSG.view_adminTopology_partitionEvents_detailsFilter());
- // detail.setValue("");
-
- // startDateFilter = new DateFilterItem(DateFilterItem.START_DATE_FILTER, MSG.filter_from_date());
- // endDateFilter = new DateFilterItem(DateFilterItem.END_DATE_FILTER, MSG.filter_to_date());
-
-// SpacerItem spacerItem = new SpacerItem();
-// spacerItem.setColSpan(1);
-// final ButtonItem showAll = new ButtonItem("showAll", "Show All");
-// showAll.addClickHandler(new ClickHandler() {
-// public void onClick(ClickEvent event) {
-// statusFilter.init(ExecutionStatus.class, null, null);
-// typeFilter.init(PartitionEventType.class, null, null);
-// detail.setValue("");
-// refresh();
-// }
-// });
if (isShowFilterForm()) {
setFilterFormItems(statusFilter, detail, typeFilter);
@@ -118,7 +114,7 @@ public class PartitionEventTableView extends TableSection<PartitionEventDatasour
ListGrid listGrid = getListGrid();
listGrid.setFields(fields.toArray(new ListGridField[fields.size()]));
showActions();
-
+
for (ListGridField field : fields) {
// adding the cell formatter for name field (clickable link)
if (field.getName() == PartitionEventDatasourceField.FIELD_EVENT_TYPE.propertyName()) {
@@ -137,140 +133,97 @@ public class PartitionEventTableView extends TableSection<PartitionEventDatasour
}
}
- // @Override
- // protected String getDetailsLinkColumnName() {
- // return PartitionEventDatasourceField.FIELD_EVENT_TYPE.propertyName();
- // }
- //
- // @Override
- // protected CellFormatter getDetailsLinkColumnCellFormatter() {
- // return new CellFormatter() {
- // public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
- // Integer recordId = getId(record);
- // String detailsUrl = "#" + VIEW_PATH + "/" + recordId;
- // return SeleniumUtility.getLocatableHref(detailsUrl, detailsUrl, null);
- // }
- // };
- // }
-
@Override
public Canvas getDetailsView(Integer id) {
return new PartitionEventDetailView(extendLocatorId("detailsView"), id);
}
private void showActions() {
- addTableAction(extendLocatorId("removeSelected"), MSG.view_adminTopology_server_removeSelected(),
- MSG.common_msg_areYouSure(), new AuthorizedTableAction(this, TableActionEnablement.ANY,
- Permission.MANAGE_SETTINGS) {
- public void executeAction(final ListGridRecord[] selections, Object actionValue) {
- String message = "Really? Delete? For all I've done for you? ";
- SC.ask(message, new BooleanCallback() {
- public void execute(Boolean confirmed) {
- if (confirmed) {
- int[] selectedIds = getSelectedIds(selections);
- SC.say("setting servers to maintenance mode, ids: " + selectedIds);
- GWTServiceLookup.getCloudService().deletePartitionEvents(selectedIds,
- new AsyncCallback<Void>() {
- public void onSuccess(Void arg0) {
- // TODO: msg
- Message msg = new Message(MSG
- .view_admin_plugins_disabledServerPlugins("sdf"), Message.Severity.Info);
- CoreGUI.getMessageCenter().notify(msg);
- refresh();
- }
-
- public void onFailure(Throwable caught) {
- // TODO: msg
- CoreGUI.getErrorHandler().handleError(
- MSG.view_admin_plugins_disabledServerPluginsFailure() + " "
- + caught.getMessage(), caught);
- refreshTableInfo();
- }
+ addTableAction(TableAction.REMOVE_SELECTED);
+ addTableAction(TableAction.PURGE_ALL);
+ addTableAction(TableAction.FORCE_REPARTITION);
+ }
- });
- } else {
- refreshTableInfo();
- }
- }
- });
+ private void addTableAction(final TableAction action) {
+ addTableAction(extendLocatorId(action.toString()), action.title, null, new AuthorizedTableAction(this,
+ action.enablement, Permission.MANAGE_SETTINGS) {
+ public void executeAction(final ListGridRecord[] selections, Object actionValue) {
+ String eventTypes = getSelectedEventTypes(selections).toString();
+ String message = null;
+ switch (action) {
+ case REMOVE_SELECTED:
+ message = MSG.view_adminTopology_message_removePEventConfirm(eventTypes);
+ break;
+ case PURGE_ALL:
+ message = MSG.view_adminTopology_message_removeAllPEventConfirm();
+ break;
+ case FORCE_REPARTITION:
+ message = MSG.view_adminTopology_message_forceRepartition();
+ break;
+ default:
+ throw new IllegalArgumentException("unknown table action type");
}
- });
-
- addTableAction(extendLocatorId("purgeAll"), MSG.view_adminTopology_partitionEvents_purgeAll(),
- MSG.common_msg_areYouSure(), new AuthorizedTableAction(this, TableActionEnablement.ALWAYS,
- Permission.MANAGE_SETTINGS) {
- public void executeAction(final ListGridRecord[] selections, Object actionValue) {
- // TODO: msg
- // String message = MSG.view_admin_plugins_serverDisableConfirm(selectedNames.toString());
- String message = "Really? Normal? For all I've done for you? ";
- SC.ask(message, new BooleanCallback() {
- public void execute(Boolean confirmed) {
- if (confirmed) {
- int[] selectedIds = getSelectedIds(selections);
- SC.say("setting servers to maintenance mode, ids: " + selectedIds);
- GWTServiceLookup.getCloudService().purgeAllEvents(new AsyncCallback<Void>() {
- public void onSuccess(Void arg0) {
- // TODO: msg
- Message msg = new Message(MSG.view_admin_plugins_disabledServerPlugins("sdf"),
- Message.Severity.Info);
- CoreGUI.getMessageCenter().notify(msg);
- refresh();
+ SC.ask(message, new BooleanCallback() {
+ public void execute(Boolean confirmed) {
+ if (confirmed) {
+ int[] selectedIds = getSelectedIds(selections);
+
+ AsyncCallback<Void> callback = new AsyncCallback<Void>() {
+ public void onSuccess(Void arg0) {
+ String msgString = null;
+ switch (action) {
+ case REMOVE_SELECTED:
+ msgString = MSG.view_adminTopology_message_removedPEvent(String
+ .valueOf(selections.length));
+ break;
+ case PURGE_ALL:
+ msgString = MSG.view_adminTopology_message_removedAllPEvent();
+ break;
+ case FORCE_REPARTITION:
+ msgString = MSG.view_adminTopology_message_repartitioned();
}
-
- public void onFailure(Throwable caught) {
- // TODO: msg
- CoreGUI.getErrorHandler().handleError(
- MSG.view_admin_plugins_disabledServerPluginsFailure() + " "
- + caught.getMessage(), caught);
- refreshTableInfo();
+ Message msg = new Message(msgString, Message.Severity.Info);
+ CoreGUI.getMessageCenter().notify(msg);
+ refresh();
+ }
+
+ public void onFailure(Throwable caught) {
+ String msgString = null;
+ switch (action) {
+ case REMOVE_SELECTED:
+ msgString = MSG.view_adminTopology_message_removePEventFail(String
+ .valueOf(selections.length));
+ break;
+ case PURGE_ALL:
+ msgString = MSG.view_adminTopology_message_removedAllPEventFail();
+ break;
+ case FORCE_REPARTITION:
+ msgString = MSG.view_adminTopology_message_forceRepartitionFail();
}
-
- });
- } else {
- refreshTableInfo();
+ CoreGUI.getErrorHandler()
+ .handleError(msgString + " " + caught.getMessage(), caught);
+ refreshTableInfo();
+ }
+
+ };
+ switch (action) {
+ case REMOVE_SELECTED:
+ GWTServiceLookup.getCloudService().deletePartitionEvents(selectedIds, callback);
+ break;
+ case PURGE_ALL:
+ GWTServiceLookup.getCloudService().purgeAllEvents(callback);
+ break;
+ case FORCE_REPARTITION:
+ GWTServiceLookup.getCloudService().cloudPartitionEventRequest(callback);
}
- }
- });
- }
- });
-
- addTableAction(extendLocatorId("forceRepartition"), MSG.view_adminTopology_partitionEvents_forceRepartition(),
- new AuthorizedTableAction(this, TableActionEnablement.ALWAYS, Permission.MANAGE_SETTINGS) {
- public void executeAction(final ListGridRecord[] selections, Object actionValue) {
- // List<String> selectedNames = getSelectedNames(selections);
- // TODO: msg
- // String message = MSG.view_admin_plugins_serverDisableConfirm(selectedNames.toString());
- String message = "Really? Repartition? For all I've done for you? ";// + selectedNames;
- SC.ask(message, new BooleanCallback() {
- public void execute(Boolean confirmed) {
- if (confirmed) {
- SC.say("repartition is now forced");
- GWTServiceLookup.getCloudService().cloudPartitionEventRequest(
- new AsyncCallback<Void>() {
- public void onSuccess(Void arg0) {
- // TODO: msg
- Message msg = new Message(MSG
- .view_admin_plugins_disabledServerPlugins("sdf"), Message.Severity.Info);
- CoreGUI.getMessageCenter().notify(msg);
- refresh();
- }
- public void onFailure(Throwable caught) {
- // TODO: msg
- CoreGUI.getErrorHandler().handleError(
- MSG.view_admin_plugins_disabledServerPluginsFailure() + " "
- + caught.getMessage(), caught);
- refreshTableInfo();
- }
-
- });
- } else {
- refreshTableInfo();
- }
+ } else {
+ refreshTableInfo();
}
- });
- }
- });
+ }
+ });
+ }
+ });
}
private int[] getSelectedIds(ListGridRecord[] selections) {
@@ -285,16 +238,16 @@ public class PartitionEventTableView extends TableSection<PartitionEventDatasour
return ids;
}
- // private List<String> getSelectedNames(ListGridRecord[] selections) {
- // if (selections == null) {
- // return new ArrayList<String>(0);
- // }
- // List<String> ids = new ArrayList<String>(selections.length);
- // for (ListGridRecord selection : selections) {
- // ids.add(selection.getAttributeAsString(FIELD_NAME));
- // }
- // return ids;
- // }
+ private List<String> getSelectedEventTypes(ListGridRecord[] selections) {
+ if (selections == null) {
+ return new ArrayList<String>(0);
+ }
+ List<String> ids = new ArrayList<String>(selections.length);
+ for (ListGridRecord selection : selections) {
+ ids.add(selection.getAttributeAsString(PartitionEventDatasourceField.FIELD_EVENT_TYPE.propertyName()));
+ }
+ return ids;
+ }
@Override
public ViewName getViewName() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java
index 2d1a75e..0e7fd48 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java
@@ -21,7 +21,6 @@ package org.rhq.enterprise.gui.coregui.client.admin.topology;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_ADDRESS;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_AFFINITY_GROUP;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_AFFINITY_GROUP_ID;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_AGENT_COUNT;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_ID;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_MTIME;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_NAME;
@@ -47,6 +46,7 @@ import org.rhq.core.domain.criteria.ServerCriteria;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.Log;
@@ -56,7 +56,7 @@ import org.rhq.enterprise.gui.coregui.client.util.Log;
*
*/
public class ServerDatasource extends AbstractServerNodeDatasource<Server, ServerCriteria> {
-
+
// filters
public static final String FILTER_ADDRESS = FIELD_ADDRESS.propertyName();
public static final String FILTER_PORT = FIELD_PORT.propertyName();
@@ -66,13 +66,10 @@ public class ServerDatasource extends AbstractServerNodeDatasource<Server, Serve
public static final String FILTER_AFFINITY_GROUP_ID = "affinityGroupId";
private final Integer affinityGroupId;
-
- private final boolean fetchMembers;
- public ServerDatasource(Integer affinityGroupId, boolean fetchMembers) {
+ public ServerDatasource(Integer affinityGroupId) {
super();
this.affinityGroupId = affinityGroupId;
- this.fetchMembers = fetchMembers;
List<DataSourceField> fields = addDataSourceFields();
addFields(fields);
}
@@ -107,36 +104,28 @@ public class ServerDatasource extends AbstractServerNodeDatasource<Server, Serve
ListGridField affinityGroupIdField = FIELD_AFFINITY_GROUP_ID.getListGridField();
affinityGroupIdField.setHidden(true);
fields.add(affinityGroupIdField);
- fields.add(FIELD_AGENT_COUNT.getListGridField("75"));
return fields;
}
@Override
protected void executeFetch(final DSRequest request, final DSResponse response, ServerCriteria criteria) {
- if (affinityGroupId == null) {
- return;
+ if (affinityGroupId != null) {
+ criteria.addFilterAffinityGroupId(affinityGroupId);
}
- final PageControl pc = getPageControl(request);
- AsyncCallback<PageList<Server>> callback = new AsyncCallback<PageList<Server>>() {
+ GWTServiceLookup.getCloudService().findServersByCriteria(criteria, new AsyncCallback<PageList<Server>>() {
public void onSuccess(PageList<Server> result) {
response.setData(buildRecords(result));
response.setTotalRows(result.size());
processResponse(request.getRequestId(), response);
}
- @Override
public void onFailure(Throwable t) {
- //todo: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), t);
+ CoreGUI.getErrorHandler().handleError(MSG.view_adminTopology_message_fetchServers2Fail(), t);
response.setStatus(DSResponse.STATUS_FAILURE);
processResponse(request.getRequestId(), response);
}
- };
-
- if(fetchMembers) {
- criteria.addFilterAffinityGroupId(affinityGroupId);
- }
- GWTServiceLookup.getCloudService().findServersByCriteria(criteria, callback);
+ });
}
/**
@@ -146,6 +135,7 @@ public class ServerDatasource extends AbstractServerNodeDatasource<Server, Serve
* @param request the request to turn into a page control
* @return the page control for passing to criteria and other queries
*/
+ @Override
protected PageControl getPageControl(DSRequest request) {
// Initialize paging.
PageControl pageControl = new PageControl(0, getDataPageSize());
@@ -167,10 +157,6 @@ public class ServerDatasource extends AbstractServerNodeDatasource<Server, Serve
@Override
public Server copyValues(Record from) {
throw new UnsupportedOperationException("ServerDatasource.copyValues(Record from)");
-// Server server = new Server();
-// server.setId(from.getAttributeAsInt(FIELD_ID.propertyName()));
-// server.setName(from.getAttributeAsString(FIELD_NAME.propertyName()));
-// return server;
}
@Override
@@ -193,7 +179,7 @@ public class ServerDatasource extends AbstractServerNodeDatasource<Server, Serve
@Override
protected ServerCriteria getFetchCriteria(DSRequest request) {
ServerCriteria criteria = new ServerCriteria();
-// printRequestCriteria(request);
+ // printRequestCriteria(request);
criteria.addFilterId(getFilter(request, FIELD_ID.propertyName(), Integer.class));
criteria.addFilterName(getFilter(request, FIELD_NAME.propertyName(), String.class));
criteria.addFilterAddress(getFilter(request, FILTER_ADDRESS, String.class));
@@ -202,7 +188,7 @@ public class ServerDatasource extends AbstractServerNodeDatasource<Server, Serve
criteria.addFilterOperationMode(getFilter(request, FILTER_OPERATION_MODE, OperationMode.class));
criteria.addFilterComputePower(getFilter(request, FILTER_COMPUTE_POWER, Integer.class));
criteria.addFilterAffinityGroupId(getFilter(request, FILTER_AFFINITY_GROUP_ID, Integer.class));
-
+
//@todo: Remove me when finished debugging search expression
Log.debug(" *** ServerCriteria Search String: " + getFilter(request, "search", String.class));
criteria.setSearchExpression(getFilter(request, "search", String.class));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasourceField.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasourceField.java
index 09577d8..6dbcee3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasourceField.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasourceField.java
@@ -29,9 +29,8 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
public enum ServerDatasourceField {
FIELD_ID("id", CoreGUI.getMessages().common_title_id()),
-
- // todo: i18n
- FIELD_ORDINAL("ordinal", "Order"),
+
+ FIELD_ORDINAL("ordinal", CoreGUI.getMessages().view_adminTopology_message_order()),
FIELD_NAME("name", CoreGUI.getMessages().common_title_name()),
@@ -42,13 +41,13 @@ public enum ServerDatasourceField {
FIELD_PORT("port", CoreGUI.getMessages().view_adminTopology_server_nonSecurePort()),
FIELD_SECURE_PORT("securePort", CoreGUI.getMessages().view_adminTopology_server_securePort()),
-
+
FIELD_CTIME("ctime", CoreGUI.getMessages().view_adminTopology_serverDetail_installationDate()),
FIELD_MTIME("mtime", CoreGUI.getMessages().view_adminTopology_server_lastUpdateTime()),
FIELD_AFFINITY_GROUP("affinityGroup", CoreGUI.getMessages().view_adminTopology_server_affinityGroup()),
-
+
FIELD_AFFINITY_GROUP_ID("affinityGroupId", "affinityGroupId"),
FIELD_AGENT_COUNT("agentCount", CoreGUI.getMessages().view_adminTopology_server_agentCount());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
index b50e18c..d38d95d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
@@ -79,7 +79,7 @@ public class ServerTableView extends
setHeight100();
setWidth100();
if (isAffinityGroupId) {
- setDataSource(new ServerDatasource(id, true));
+ setDataSource(new ServerDatasource(id));
} else {
setDataSource(showActions ? new ServerWithAgentCountDatasource() : new FailoverListItemDatasource(id));
}
@@ -96,6 +96,7 @@ public class ServerTableView extends
listGrid.sort(FIELD_NAME, SortDirection.ASCENDING);
showCommonActions();
} else if (isAffinityGroupId) {
+ listGrid.sort(FIELD_NAME, SortDirection.ASCENDING);
// displayed from AffinityGroupDetailView
showUpdateMembersAction();
} else {
@@ -141,7 +142,7 @@ public class ServerTableView extends
}
private void showCommonActions() {
- addChangeOperationModeAction(OperationMode.NORMAL, MSG.view_adminTopology_server_setMaintenance());
+ addChangeOperationModeAction(OperationMode.NORMAL, MSG.view_adminTopology_server_setNormal());
addChangeOperationModeAction(OperationMode.MAINTENANCE, MSG.view_adminTopology_server_setMaintenance());
addTableAction(extendLocatorId("removeSelected"), MSG.view_adminTopology_server_removeSelected(), null,
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java
index af52e7a..1b6609b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerWithAgentCountDatasource.java
@@ -27,25 +27,28 @@ import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
import com.smartgwt.client.data.DataSourceField;
import com.smartgwt.client.data.Record;
+import com.smartgwt.client.widgets.grid.HoverCustomizer;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.cloud.composite.ServerWithAgentCountComposite;
import org.rhq.core.domain.criteria.Criteria;
import org.rhq.core.domain.util.PageControl;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
/**
* @author Jirka Kremser
*
*/
-public class ServerWithAgentCountDatasource extends AbstractServerNodeDatasource<ServerWithAgentCountComposite, Criteria> {
-
+public class ServerWithAgentCountDatasource extends
+ AbstractServerNodeDatasource<ServerWithAgentCountComposite, Criteria> {
+
private final ServerDatasource serverDatasource;
public ServerWithAgentCountDatasource() {
super();
- serverDatasource = new ServerDatasource(null, false);
+ serverDatasource = new ServerDatasource(null);
List<DataSourceField> fields = addDataSourceFields();
addFields(fields);
}
@@ -56,7 +59,18 @@ public class ServerWithAgentCountDatasource extends AbstractServerNodeDatasource
}
public List<ListGridField> getListGridFields() {
- return serverDatasource.getListGridFields();
+ List<ListGridField> fields = serverDatasource.getListGridFields();
+ ListGridField agentCountField = FIELD_AGENT_COUNT.getListGridField("75");
+ agentCountField.setHoverCustomizer(new HoverCustomizer() {
+ public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) {
+ return MSG.view_adminTopology_message_agentsCount(FIELD_AGENT_COUNT.propertyName());
+ // "There are " + record.getAttributeAsInt(FIELD_AGENT_COUNT.propertyName())
+ // + " agents registered to this server.";
+ }
+ });
+ agentCountField.setShowHover(true);
+ fields.add(agentCountField);
+ return fields;
}
@Override
@@ -72,20 +86,14 @@ public class ServerWithAgentCountDatasource extends AbstractServerNodeDatasource
@Override
public void onFailure(Throwable t) {
- //todo: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), t);
+ CoreGUI.getErrorHandler().handleError(MSG.view_adminTopology_message_fetchServers2Fail(), t);
response.setStatus(DSResponse.STATUS_FAILURE);
processResponse(request.getRequestId(), response);
}
});
}
- /**
- * Returns a prepopulated PageControl based on the provided DSRequest. This will set sort fields,
- * pagination, but *not* filter fields.
- *
- * @param request the request to turn into a page control
- * @return the page control for passing to criteria and other queries
- */
+ @Override
protected PageControl getPageControl(DSRequest request) {
return serverDatasource.getPageControl(request);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/CloudGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/CloudGWTService.java
index df83ba8..4b92d6f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/CloudGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/CloudGWTService.java
@@ -41,72 +41,197 @@ import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
/**
+ * API for HAAC console, mostly CRUD operations for entities <code>Server</code>, <code>Agent</code>,
+ * <code>PartitionEvent</code> and <code>AffinityGroup</code>.
+ *
* @author Jiri Kremser
*/
public interface CloudGWTService extends RemoteService {
/**
+ * Returns all the servers with agent count.
*
- * @return a list of all available servers (the servers in MAINTENANCE mode are included as well)
+ * @param pageControl the page control instance
+ * @return a list of all available servers (the servers in <code>MAINTENANCE</code> or <code>DOWN</code> mode are included as well)
* @throws RuntimeException
*/
- List<ServerWithAgentCountComposite> getServers(PageControl pc) throws RuntimeException;
-
- Server getServerById(int serverId) throws RuntimeException;
-
- List<Agent> getAgentsByServerName(String serverName) throws RuntimeException;
+ List<ServerWithAgentCountComposite> getServers(PageControl pageControl) throws RuntimeException;
+ /**
+ * Deletes the servers with provided ids.
+ *
+ * @param serverIds array of server ids
+ * @throws RuntimeException
+ */
void deleteServers(int[] serverIds) throws RuntimeException;
+ /**
+ * Updates the server mode to particular servers.
+ *
+ * @param serverIds the array of ids of the servers whose modes are object of update
+ * @param mode the new operation mode
+ * @throws RuntimeException
+ */
void updateServerMode(int[] serverIds, Server.OperationMode mode) throws RuntimeException;
+ /**
+ * Updates the server.
+ *
+ * @param server instance of Server
+ * @throws RuntimeException
+ */
void updateServer(Server server) throws RuntimeException;
- List<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc) throws RuntimeException;;
+ /**
+ * Returns the list of <code>FailoverListDetails</code> for a particular agent.
+ *
+ * @param agentId the id the agent
+ * @param pageControl the page control instance
+ * @return a list of <code>FailoverListDetails</code> instances
+ * @throws RuntimeException
+ */
+ List<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pageControl) throws RuntimeException;;
+ /**
+ * Finder for <code>PartitionEvent</code> instances
+ *
+ * @param criteria the criteria for finding partition events
+ * @return a list of <code>codePartitionEvent</code> instances
+ * @throws RuntimeException
+ */
PageList<PartitionEvent> findPartitionEventsByCriteria(PartitionEventCriteria criteria) throws RuntimeException;
+ /**
+ * Finder for <code>Server</code> instances
+ *
+ * @param criteria the criteria for finding servers
+ * @return a list of <code>Server</code> instances
+ * @throws RuntimeException
+ */
PageList<Server> findServersByCriteria(ServerCriteria criteria) throws RuntimeException;
+ /**
+ * Finder for <code>Agent</code> instances
+ *
+ * @param criteria the criteria for finding agents
+ * @return a list of <code>Agent</code> instances
+ * @throws RuntimeException
+ */
PageList<Agent> findAgentsByCriteria(AgentCriteria criteria) throws RuntimeException;
+ /**
+ * Request forcing the repartition of the cluster. All agents should eventually reconnects to its most preferred server
+ * (The first one in their failover list.)
+ *
+ * @throws RuntimeException
+ */
void cloudPartitionEventRequest() throws RuntimeException;
+ /**
+ * Deletes all the partition events.
+ *
+ * @throws RuntimeException
+ */
void purgeAllEvents() throws RuntimeException;
+ /**
+ * Deletes some partition events.
+ *
+ * @param eventIds the list of ids of partition events to delete
+ * @throws RuntimeException
+ */
void deletePartitionEvents(int[] eventIds) throws RuntimeException;
+ /**
+ * Returns the list of <code>PartitionEventDetails</code> instances.
+ *
+ * @param partitionEventId
+ * @param pageControl the page control instance
+ * @return list of <code>PartitionEventDetails</code> instances
+ * @throws RuntimeException
+ */
PageList<PartitionEventDetails> getPartitionEventDetails(int partitionEventId, PageControl pageControl)
throws RuntimeException;
+ /**
+ * Returns the list with <code>AffinityGroupCountComposite</code> instances, i.e. affinity groups with agent and server
+ * counts.
+ *
+ * @param pageControl the page control instance
+ * @return list with <code>AffinityGroupCountComposite</code> instances
+ * @throws RuntimeException
+ */
PageList<AffinityGroupCountComposite> getAffinityGroupCountComposites(PageControl pageControl)
throws RuntimeException;
+ /**
+ * Deletes some affinity groups.
+ *
+ * @param affinityGroupIds array of ids of affinity group to delete
+ * @return the number of deleted affinity groups
+ * @throws RuntimeException
+ */
int deleteAffinityGroups(int[] affinityGroupIds) throws RuntimeException;
+ /**
+ * Creates new affinity group.
+ *
+ * @param affinityGroup instance of <code>AffinityGroup</code> to create
+ * @return the new id of the affinity group
+ * @throws RuntimeException
+ */
int createAffinityGroup(AffinityGroup affinityGroup) throws RuntimeException;
+ /**
+ * Updates existing affinity group.
+ *
+ * @param affinityGroup instance of <code>AffinityGroup</code>
+ * @throws RuntimeException
+ */
void updateAffinityGroup(AffinityGroup affinityGroup) throws RuntimeException;
- PageList<Server> getServerMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl)
- throws RuntimeException;
-
- PageList<Server> getServerNonMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl)
- throws RuntimeException;
-
- PageList<Agent> getAgentMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl)
- throws RuntimeException;
-
- PageList<Agent> getAgentNonMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl)
- throws RuntimeException;
-
+ /**
+ * Returns the affinity group based on the provided id.
+ *
+ * @param affinityGroupId the id of an affinity group
+ * @return the instance of <code>AffinityGroup</code>
+ * @throws RuntimeException
+ */
AffinityGroup getAffinityGroupById(int affinityGroupId) throws RuntimeException;
+ /**
+ * Add servers to an existing affinity group.
+ *
+ * @param affinityGroupId id of the affinity group into which the servers should be added
+ * @param serverIds array of ids of servers to be added
+ * @throws RuntimeException
+ */
void addServersToGroup(int affinityGroupId, Integer[] serverIds) throws RuntimeException;
+ /**
+ * Removes the servers from the affinity group. There is no need to provide the id of affinity group,
+ * because it is part of the server data.
+ *
+ * @param serverIds array of ids of servers to be removed
+ * @throws RuntimeException
+ */
void removeServersFromGroup(Integer[] serverIds) throws RuntimeException;
+ /**
+ * Add agents to an existing affinity group.
+ *
+ * @param affinityGroupId id of the affinity group into which the agents should be added
+ * @param agentIds array of ids of agents to be added
+ * @throws RuntimeException
+ */
void addAgentsToGroup(int affinityGroupId, Integer[] agentIds) throws RuntimeException;
+ /**
+ * Removes the agents from the affinity group. There is no need to provide the id of affinity group,
+ * because it is part of the agent data.
+ *
+ * @param agentIds array of ids of agents to be removed
+ * @throws RuntimeException
+ */
void removeAgentsFromGroup(Integer[] agentIds) throws RuntimeException;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java
index db7ec3c..dd63fa0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java
@@ -22,7 +22,6 @@
*/
package org.rhq.enterprise.gui.coregui.server.gwt;
-import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.ArrayUtils;
@@ -58,7 +57,7 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud
private static final long serialVersionUID = 1L;
private CloudManagerLocal cloudManager = LookupUtil.getCloudManager();
-
+
private AgentManagerLocal agentManager = LookupUtil.getAgentManager();
private PartitionEventManagerLocal partitionEventManager = LookupUtil.getPartitionEventManager();
@@ -76,26 +75,6 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud
}
@Override
- public Server getServerById(int serverId) throws RuntimeException {
- try {
- return SerialUtility.prepare(cloudManager.getServerById(serverId), "CloudGWTServiceImpl.getServerById");
- } catch (Throwable t) {
- throw getExceptionToThrowToClient(t);
- }
- }
-
- @Override
- public List<Agent> getAgentsByServerName(String serverName) throws RuntimeException {
- try {
- List<Agent> persistentBag = SerialUtility.prepare(cloudManager.getAgentsByServerName(serverName),
- "CloudGWTServiceImpl.getAgentsByServerName");
- return new ArrayList<Agent>(persistentBag);
- } catch (Throwable t) {
- throw getExceptionToThrowToClient(t);
- }
- }
-
- @Override
public void deleteServers(int[] serverIds) throws RuntimeException {
try {
cloudManager.deleteServers(ArrayUtils.toObject(serverIds));
@@ -135,24 +114,21 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud
throw getExceptionToThrowToClient(t);
}
}
-
+
@Override
- public PageList<Server> findServersByCriteria(ServerCriteria criteria)
- throws RuntimeException {
+ public PageList<Server> findServersByCriteria(ServerCriteria criteria) throws RuntimeException {
try {
- return SerialUtility.prepare(
- cloudManager.findServersByCriteria(getSessionSubject(), criteria),
+ return SerialUtility.prepare(cloudManager.findServersByCriteria(getSessionSubject(), criteria),
"CloudGWTServiceImpl.findServersByCriteria");
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
}
}
-
+
@Override
public PageList<Agent> findAgentsByCriteria(AgentCriteria criteria) throws RuntimeException {
try {
- return SerialUtility.prepare(
- agentManager.findAgentsByCriteria(getSessionSubject(), criteria),
+ return SerialUtility.prepare(agentManager.findAgentsByCriteria(getSessionSubject(), criteria),
"CloudGWTServiceImpl.findAgentsByCriteria");
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
@@ -229,54 +205,6 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud
}
@Override
- public PageList<Server> getServerMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl)
- throws RuntimeException {
- try {
- return SerialUtility.prepare(
- affinityGroupManager.getServerMembers(getSessionSubject(), affinityGroupId, pageControl),
- "CloudGWTServiceImpl.getServerMembersByAffinityGroupId");
- } catch (Throwable t) {
- throw getExceptionToThrowToClient(t);
- }
- }
-
- @Override
- public PageList<Server> getServerNonMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl)
- throws RuntimeException {
- try {
- return SerialUtility.prepare(
- affinityGroupManager.getServerNonMembers(getSessionSubject(), affinityGroupId, pageControl),
- "CloudGWTServiceImpl.getServerNonMembersByAffinityGroupId");
- } catch (Throwable t) {
- throw getExceptionToThrowToClient(t);
- }
- }
-
- @Override
- public PageList<Agent> getAgentMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl)
- throws RuntimeException {
- try {
- return SerialUtility.prepare(
- affinityGroupManager.getAgentMembers(getSessionSubject(), affinityGroupId, pageControl),
- "CloudGWTServiceImpl.getAgentMembersByAffinityGroupId");
- } catch (Throwable t) {
- throw getExceptionToThrowToClient(t);
- }
- }
-
- @Override
- public PageList<Agent> getAgentNonMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl)
- throws RuntimeException {
- try {
- return SerialUtility.prepare(
- affinityGroupManager.getAgentNonMembers(getSessionSubject(), affinityGroupId, pageControl),
- "CloudGWTServiceImpl.getAgentNonMembersByAffinityGroupId");
- } catch (Throwable t) {
- throw getExceptionToThrowToClient(t);
- }
- }
-
- @Override
public AffinityGroup getAffinityGroupById(int affinityGroupId) throws RuntimeException {
try {
return SerialUtility.prepare(affinityGroupManager.getById(getSessionSubject(), affinityGroupId),
@@ -322,7 +250,6 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud
}
}
-
@Override
public void updateServer(Server server) throws RuntimeException {
try {
@@ -332,7 +259,6 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud
}
}
-
@Override
public void updateAffinityGroup(AffinityGroup affinityGroup) throws RuntimeException {
try {
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index ceaad0d..56ed2ac 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -552,16 +552,45 @@ view_adminTopology_agentDetail_address = Address
view_adminTopology_agentDetail_agentFailoverList = Agent Failover List
view_adminTopology_agentDetail_currentServer = Current Server
view_adminTopology_agentDetail_token = Token
-view_adminTopology_message_fetchServerFail=Unable to fetch server details for server with id {0}.
-view_adminTopology_message_fetchAgentFail=Unable to fetch agent details for agent with id {0}.
-view_adminTopology_message_removeServerConfirm=Do you really want to remove servers [{0}]?
-view_adminTopology_message_removeServerFail=Unable to remove {0} server(s).
-view_adminTopology_message_removedServer=Removed {0} server(s).
-view_adminTopology_message_serverUpdated=The server {0} was successfully updated.
-view_adminTopology_message_serverUpdateFail=Unable to update server {0}.
-view_adminTopology_message_setMode=Set {0} server(s) to {1} mode.
-view_adminTopology_message_setModeConfirm=Do you really want to set servers [{0}] to {1} mode?
-view_adminTopology_message_setModeFail=Unable to set {0} server(s) to {1} mode.
+view_adminTopology_message_agentsCount = There are {0} agents registered to this server. This number does not correspond to the number of currently connected agents.
+view_adminTopology_message_agroupAssingAgentsFail = Unable to assign agents to the affinity group with id {0}.
+view_adminTopology_message_agroupAssingServersFail = Unable to assign servers to the affinity group with id {0}.
+view_adminTopology_message_agroupRemovingAgentsFail = Unable to remove agents from the affinity group with id {0}.
+view_adminTopology_message_agroupRemovingServersFail = Unable to remove servers from the affinity group with id {0}.
+view_adminTopology_message_agroupRenamed = Affinity group with id {0} and name {1} was renamed to {2}.
+view_adminTopology_message_agroupRenamingFail = Unable to rename affinity group with id {0} and name {1}.
+view_adminTopology_message_fetchAgentFail = Unable to fetch agent details for agent with id {0}.
+view_adminTopology_message_fetchAgentsFail = Unable to fetch agent(s) for affinity group with id {0}.
+view_adminTopology_message_fetchAgents2Fail = Unable to fetch agents.
+view_adminTopology_message_fetchAgroupFail = Unable to fetch affinity group details for group with id {0}.
+view_adminTopology_message_fetchAgroupsFail = Unable to fetch affinity group(s).
+view_adminTopology_message_fetchFailOverLists = Unable to fetch fail over list details.
+view_adminTopology_message_fetchPEventDetailsFail = Unable to fetch partition event details for event with id {0}.
+view_adminTopology_message_fetchPEventFail = Unable to fetch partition events.
+view_adminTopology_message_fetchServerFail = Unable to fetch server details for server with id {0}.
+view_adminTopology_message_fetchServersFail = Unable to fetch server(s) for affinity group with id {0}.
+view_adminTopology_message_fetchServers2Fail = Unable to fetch servers.
+view_adminTopology_message_forceRepartition = Do you really want to force a repartition of whole cluster? It will force all the agents to connect to its most preferred server.
+view_adminTopology_message_forceRepartitionFail = Unable to run repartition.
+view_adminTopology_message_order = Order
+view_adminTopology_message_removeAGroupsFail = Unable to remove following affinity groups(s) {0}.
+view_adminTopology_message_removeAGroupsConfirm = Do you really want to remove following affinity groups {0}?
+view_adminTopology_message_removeAllPEventConfirm = Do you really want to purge all partition events?
+view_adminTopology_message_removePEventConfirm = Do you really want to remove following partition events {0}?
+view_adminTopology_message_removePEventFail = Unable to remove {0} partition events(s).
+view_adminTopology_message_removeServerConfirm = Do you really want to remove servers {0}?
+view_adminTopology_message_removeServerFail = Unable to remove {0} server(s).
+view_adminTopology_message_removedAGroups = Removed {0} affinity group(s).
+view_adminTopology_message_removedAllPEvent = All partition events have been purged.
+view_adminTopology_message_removedAllPEventFail = Unable to purge all partition events.
+view_adminTopology_message_removedPEvent = Removed {0} partition events(s).
+view_adminTopology_message_removedServer = Removed {0} server(s).
+view_adminTopology_message_repartitioned = The cluster repartitioning was successfully invoked.
+view_adminTopology_message_serverUpdated = The server {0} was successfully updated.
+view_adminTopology_message_serverUpdateFail = Unable to update server {0}.
+view_adminTopology_message_setMode = Set {0} server(s) to {1} mode.
+view_adminTopology_message_setModeConfirm = Do you really want to set servers {0} to {1} mode?
+view_adminTopology_message_setModeFail = Unable to set {0} server(s) to {1} mode.
view_adminTopology_partitionEvents = Partition Events
view_adminTopology_partitionEvents_details = Details
view_adminTopology_partitionEvents_detailsFilter = Details Filter
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
index 35b7b46..0775491 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties
@@ -571,6 +571,45 @@ view_adminTopology_agentDetail_address = Adresa
view_adminTopology_agentDetail_agentFailoverList = Agentův failover list
view_adminTopology_agentDetail_currentServer = Současný server
view_adminTopology_agentDetail_token = Token
+view_adminTopology_message_agentsCount = K serveru je zaregistrováno {0} agentů. Toto číslo neznamená počet aktuálně připojených agentů.
+view_adminTopology_message_agroupAssingAgentsFail = Nepodařilo se přiřadit agenty do afinitní skupiny s id {0}.
+view_adminTopology_message_agroupAssingServersFail = Nepodařilo se přiřadit servery do afinitní skupiny s id {0}.
+view_adminTopology_message_agroupRemovingAgentsFail = Nepodařilo se odstranit agenty z afinitní skupiny s id {0}.
+view_adminTopology_message_agroupRemovingServersFail = Nepodařilo se odstranit servery z afinitní skupiny s id {0}.
+view_adminTopology_message_agroupRenamed = Afinitní skupina s id {0} a jménem {1} byla přejmenována na {2}.
+view_adminTopology_message_agroupRenamingFail = Nepodařilo se přejmenovat afinitní skupinu s id {0} a jménem {1}.
+view_adminTopology_message_fetchAgentFail = Nepodařilo se získat detaily o agentovi s id {0}.
+view_adminTopology_message_fetchAgentsFail = Nepodařilo se agenty pro afinitní skupinu s id {0}.
+view_adminTopology_message_fetchAgents2Fail = Nepodařilo se získat agenty.
+view_adminTopology_message_fetchAgroupFail = Nepodařilo se získat detaily o afinitní skupině s id {0}.
+view_adminTopology_message_fetchAgroupsFail = Nepodařilo se získat afinitní skupiny.
+view_adminTopology_message_fetchFailOverLists = Nepodařilo se získat dataily failover listu.
+view_adminTopology_message_fetchPEventDetailsFail = Nepodařilo se získat detaily události clusteru s id {0}.
+view_adminTopology_message_fetchPEventFail = Nepodařilo se získat události clusteru.
+view_adminTopology_message_fetchServerFail = Nepodařilo se získat detaily o serveru s id {0}.
+view_adminTopology_message_fetchServersFail = Nepodařilo se získat servery pro afinitní skupinu s id {0}.
+view_adminTopology_message_fetchServers2Fail = Nepodařilo se získat servery.
+view_adminTopology_message_forceRepartition = Přejete si opravdu vynutit přerozdělení celého clusteru? Přiměje to každého z agentů připojit se na svůj preferovaný server tzn. první ve failover listu.
+view_adminTopology_message_forceRepartitionFail = Nepodařilo se spustit přerozdělení.
+view_adminTopology_message_order = Pořadí
+view_adminTopology_message_removeAGroupsFail = Nepodařilo se odstranit následující afinitní skupiny {0}.
+view_adminTopology_message_removeAGroupsConfirm = Přejete si opravdu odstanit následující afinitní skupiny {0}?
+view_adminTopology_message_removeAllPEventConfirm = Přejete si opravdu odstranit všechny události clusteru?
+view_adminTopology_message_removePEventConfirm = Chcete opravdu odstranit následující události clusteru {0}?
+view_adminTopology_message_removePEventFail = Nepodařilo se odstranit {0} události clusteru.
+view_adminTopology_message_removeServerConfirm = Chcete opravdu odstranit následující servery {0}?
+view_adminTopology_message_removeServerFail = Nepodařilo se odstranit {0} serverů.
+view_adminTopology_message_removedAGroups = Odstraněno {0} afinitních skupin.
+view_adminTopology_message_removedAllPEvent = Všechnz události clusteru byly smazány.
+view_adminTopology_message_removedAllPEventFail = Nepodařilo se odstranit všechny události clusteru.
+view_adminTopology_message_removedPEvent = Odstraněno {0} událostí clusteru.
+view_adminTopology_message_removedServer =Odstraněno {0} serverů.
+view_adminTopology_message_repartitioned = Operace přerozdělení clusteru byla úspěšně spuštěna.
+view_adminTopology_message_serverUpdated = Server {0} byl úspěšně změněn.
+view_adminTopology_message_serverUpdateFail = Nepodařilo se změnit server {0}.
+view_adminTopology_message_setMode =Nastaveno {0} serverů do {1} módu.
+view_adminTopology_message_setModeConfirm = Přejete si opravdu nastavit servery {0} do {1} módu?
+view_adminTopology_message_setModeFail = Nepodařilo se nastavit {0} serverů do {1} módu.
view_adminTopology_partitionEvents = Události o clusteru
view_adminTopology_partitionEvents_details = Detaily
view_adminTopology_partitionEvents_detailsFilter = Filtrovat podle detailu
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 6c2cc91..f9876c3 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -519,6 +519,45 @@ view_adminTopology_agents = Agenten
##view_adminTopology_agentDetail_agentFailoverList = Agent Failover List
##view_adminTopology_agentDetail_currentServer = Current Server
##view_adminTopology_agentDetail_token = Token
+##view_adminTopology_message_agentsCount = There are {0} agents registered to this server. This number doesn't correspond to the number of currently connected agents.
+##view_adminTopology_message_agroupAssingAgentsFail = Unable to assign agents to the affinity group with id {0}.
+##view_adminTopology_message_agroupAssingServersFail = Unable to assign servers to the affinity group with id {0}.
+##view_adminTopology_message_agroupRemovingAgentsFail = Unable to remove agents from the affinity group with id {0}.
+##view_adminTopology_message_agroupRemovingServersFail = Unable to remove servers from the affinity group with id {0}.
+##view_adminTopology_message_agroupRenamed = Affinity group with id {0} and name {1} was renamed to {2}.
+##view_adminTopology_message_agroupRenamingFail = Unable to rename affinity group with id {0} and name {1}.
+##view_adminTopology_message_fetchAgentFail = Unable to fetch agent details for agent with id {0}.
+##view_adminTopology_message_fetchAgentsFail = Unable to fetch agent(s) for affinity group with id {0}.
+##view_adminTopology_message_fetchAgents2Fail = Unable to fetch agents.
+##view_adminTopology_message_fetchAgroupFail = Unable to fetch affinity group details for group with id {0}.
+##view_adminTopology_message_fetchAgroupsFail = Unable to fetch affinity group(s).
+##view_adminTopology_message_fetchFailOverLists = Unable to fetch fail over list details.
+##view_adminTopology_message_fetchPEventDetailsFail = Unable to fetch partition event details for event with id {0}.
+##view_adminTopology_message_fetchPEventFail = Unable to fetch partition events.
+##view_adminTopology_message_fetchServerFail = Unable to fetch server details for server with id {0}.
+##view_adminTopology_message_fetchServersFail = Unable to fetch server(s) for affinity group with id {0}.
+##view_adminTopology_message_fetchServers2Fail = Unable to fetch servers.
+##view_adminTopology_message_forceRepartition = Do you really want to force a repartition of whole cluster? It will force all the agents to connect to its most preferred server.
+##view_adminTopology_message_forceRepartitionFail = Unable to run repartition.
+##view_adminTopology_message_order = Order
+##view_adminTopology_message_removeAGroupsFail = Unable to remove following affinity groups(s) {0}.
+##view_adminTopology_message_removeAGroupsConfirm = Do you really want to remove following affinity groups {0}?
+##view_adminTopology_message_removeAllPEventConfirm = Do you really want to purge all partition events?
+##view_adminTopology_message_removePEventConfirm = Do you really want to remove following partition events {0}?
+##view_adminTopology_message_removePEventFail = Unable to remove {0} partition events(s).
+##view_adminTopology_message_removeServerConfirm = Do you really want to remove servers {0}?
+##view_adminTopology_message_removeServerFail = Unable to remove {0} server(s).
+##view_adminTopology_message_removedAGroups = Removed {0} affinity group(s).
+##view_adminTopology_message_removedAllPEvent = All partition events have been purged.
+##view_adminTopology_message_removedAllPEventFail = Unable to purge all partition events.
+##view_adminTopology_message_removedPEvent = Removed {0} partition events(s).
+##view_adminTopology_message_removedServer = Removed {0} server(s).
+##view_adminTopology_message_repartitioned = The cluster repartitioning was successfully invoked.
+##view_adminTopology_message_serverUpdated = The server {0} was successfully updated.
+##view_adminTopology_message_serverUpdateFail = Unable to update server {0}.
+##view_adminTopology_message_setMode = Set {0} server(s) to {1} mode.
+##view_adminTopology_message_setModeConfirm = Do you really want to set servers {0} to {1} mode?
+##view_adminTopology_message_setModeFail = Unable to set {0} server(s) to {1} mode.
view_adminTopology_partitionEvents = Partitionierungs-Ereignisse
##view_adminTopology_partitionEvents_details = Details
##view_adminTopology_partitionEvents_detailsFilter = Details Filter
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
index 2b74e1b..83b705b 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties
@@ -550,6 +550,45 @@ view_adminTopology_agents = エージェント
##view_adminTopology_agentDetail_agentFailoverList = Agent Failover List
##view_adminTopology_agentDetail_currentServer = Current Server
##view_adminTopology_agentDetail_token = Token
+##view_adminTopology_message_agentsCount = There are {0} agents registered to this server. This number doesn't correspond to the number of currently connected agents.
+##view_adminTopology_message_agroupAssingAgentsFail = Unable to assign agents to the affinity group with id {0}.
+##view_adminTopology_message_agroupAssingServersFail = Unable to assign servers to the affinity group with id {0}.
+##view_adminTopology_message_agroupRemovingAgentsFail = Unable to remove agents from the affinity group with id {0}.
+##view_adminTopology_message_agroupRemovingServersFail = Unable to remove servers from the affinity group with id {0}.
+##view_adminTopology_message_agroupRenamed = Affinity group with id {0} and name {1} was renamed to {2}.
+##view_adminTopology_message_agroupRenamingFail = Unable to rename affinity group with id {0} and name {1}.
+##view_adminTopology_message_fetchAgentFail = Unable to fetch agent details for agent with id {0}.
+##view_adminTopology_message_fetchAgentsFail = Unable to fetch agent(s) for affinity group with id {0}.
+##view_adminTopology_message_fetchAgents2Fail = Unable to fetch agents.
+##view_adminTopology_message_fetchAgroupFail = Unable to fetch affinity group details for group with id {0}.
+##view_adminTopology_message_fetchAgroupsFail = Unable to fetch affinity group(s).
+##view_adminTopology_message_fetchFailOverLists = Unable to fetch fail over list details.
+##view_adminTopology_message_fetchPEventDetailsFail = Unable to fetch partition event details for event with id {0}.
+##view_adminTopology_message_fetchPEventFail = Unable to fetch partition events.
+##view_adminTopology_message_fetchServerFail = Unable to fetch server details for server with id {0}.
+##view_adminTopology_message_fetchServersFail = Unable to fetch server(s) for affinity group with id {0}.
+##view_adminTopology_message_fetchServers2Fail = Unable to fetch servers.
+##view_adminTopology_message_forceRepartition = Do you really want to force a repartition of whole cluster? It will force all the agents to connect to its most preferred server.
+##view_adminTopology_message_forceRepartitionFail = Unable to run repartition.
+##view_adminTopology_message_order = Order
+##view_adminTopology_message_removeAGroupsFail = Unable to remove following affinity groups(s) {0}.
+##view_adminTopology_message_removeAGroupsConfirm = Do you really want to remove following affinity groups {0}?
+##view_adminTopology_message_removeAllPEventConfirm = Do you really want to purge all partition events?
+##view_adminTopology_message_removePEventConfirm = Do you really want to remove following partition events {0}?
+##view_adminTopology_message_removePEventFail = Unable to remove {0} partition events(s).
+##view_adminTopology_message_removeServerConfirm = Do you really want to remove servers {0}?
+##view_adminTopology_message_removeServerFail = Unable to remove {0} server(s).
+##view_adminTopology_message_removedAGroups = Removed {0} affinity group(s).
+##view_adminTopology_message_removedAllPEvent = All partition events have been purged.
+##view_adminTopology_message_removedAllPEventFail = Unable to purge all partition events.
+##view_adminTopology_message_removedPEvent = Removed {0} partition events(s).
+##view_adminTopology_message_removedServer = Removed {0} server(s).
+##view_adminTopology_message_repartitioned = The cluster repartitioning was successfully invoked.
+##view_adminTopology_message_serverUpdated = The server {0} was successfully updated.
+##view_adminTopology_message_serverUpdateFail = Unable to update server {0}.
+##view_adminTopology_message_setMode = Set {0} server(s) to {1} mode.
+##view_adminTopology_message_setModeConfirm = Do you really want to set servers {0} to {1} mode?
+##view_adminTopology_message_setModeFail = Unable to set {0} server(s) to {1} mode.
view_adminTopology_partitionEvents = イベントの分類
##view_adminTopology_partitionEvents_details = Details
##view_adminTopology_partitionEvents_detailsFilter = Details Filter
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
index ceb89bd..9f545fb 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties
@@ -555,6 +555,45 @@ view_adminTopology_agents = Agentes
##view_adminTopology_agentDetail_agentFailoverList = Agent Failover List
##view_adminTopology_agentDetail_currentServer = Current Server
##view_adminTopology_agentDetail_token = Token
+##view_adminTopology_message_agentsCount = There are {0} agents registered to this server. This number doesn't correspond to the number of currently connected agents.
+##view_adminTopology_message_agroupAssingAgentsFail = Unable to assign agents to the affinity group with id {0}.
+##view_adminTopology_message_agroupAssingServersFail = Unable to assign servers to the affinity group with id {0}.
+##view_adminTopology_message_agroupRemovingAgentsFail = Unable to remove agents from the affinity group with id {0}.
+##view_adminTopology_message_agroupRemovingServersFail = Unable to remove servers from the affinity group with id {0}.
+##view_adminTopology_message_agroupRenamed = Affinity group with id {0} and name {1} was renamed to {2}.
+##view_adminTopology_message_agroupRenamingFail = Unable to rename affinity group with id {0} and name {1}.
+##view_adminTopology_message_fetchAgentFail = Unable to fetch agent details for agent with id {0}.
+##view_adminTopology_message_fetchAgentsFail = Unable to fetch agent(s) for affinity group with id {0}.
+##view_adminTopology_message_fetchAgents2Fail = Unable to fetch agents.
+##view_adminTopology_message_fetchAgroupFail = Unable to fetch affinity group details for group with id {0}.
+##view_adminTopology_message_fetchAgroupsFail = Unable to fetch affinity group(s).
+##view_adminTopology_message_fetchFailOverLists = Unable to fetch fail over list details.
+##view_adminTopology_message_fetchPEventDetailsFail = Unable to fetch partition event details for event with id {0}.
+##view_adminTopology_message_fetchPEventFail = Unable to fetch partition events.
+##view_adminTopology_message_fetchServerFail = Unable to fetch server details for server with id {0}.
+##view_adminTopology_message_fetchServersFail = Unable to fetch server(s) for affinity group with id {0}.
+##view_adminTopology_message_fetchServers2Fail = Unable to fetch servers.
+##view_adminTopology_message_forceRepartition = Do you really want to force a repartition of whole cluster? It will force all the agents to connect to its most preferred server.
+##view_adminTopology_message_forceRepartitionFail = Unable to run repartition.
+##view_adminTopology_message_order = Order
+##view_adminTopology_message_removeAGroupsFail = Unable to remove following affinity groups(s) {0}.
+##view_adminTopology_message_removeAGroupsConfirm = Do you really want to remove following affinity groups {0}?
+##view_adminTopology_message_removeAllPEventConfirm = Do you really want to purge all partition events?
+##view_adminTopology_message_removePEventConfirm = Do you really want to remove following partition events {0}?
+##view_adminTopology_message_removePEventFail = Unable to remove {0} partition events(s).
+##view_adminTopology_message_removeServerConfirm = Do you really want to remove servers {0}?
+##view_adminTopology_message_removeServerFail = Unable to remove {0} server(s).
+##view_adminTopology_message_removedAGroups = Removed {0} affinity group(s).
+##view_adminTopology_message_removedAllPEvent = All partition events have been purged.
+##view_adminTopology_message_removedAllPEventFail = Unable to purge all partition events.
+##view_adminTopology_message_removedPEvent = Removed {0} partition events(s).
+##view_adminTopology_message_removedServer = Removed {0} server(s).
+##view_adminTopology_message_repartitioned = The cluster repartitioning was successfully invoked.
+##view_adminTopology_message_serverUpdated = The server {0} was successfully updated.
+##view_adminTopology_message_serverUpdateFail = Unable to update server {0}.
+##view_adminTopology_message_setMode = Set {0} server(s) to {1} mode.
+##view_adminTopology_message_setModeConfirm = Do you really want to set servers {0} to {1} mode?
+##view_adminTopology_message_setModeFail = Unable to set {0} server(s) to {1} mode.
view_adminTopology_partitionEvents = Eventos na Parti\u00E7\u00E3o
##view_adminTopology_partitionEvents_details = Details
##view_adminTopology_partitionEvents_detailsFilter = Details Filter
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
index 86c16cb..47025b7 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties
@@ -542,6 +542,45 @@
#view_adminTopology_agentDetail_agentFailoverList = Agent Failover List
#view_adminTopology_agentDetail_currentServer = Current Server
#view_adminTopology_agentDetail_token = Token
+##view_adminTopology_message_agentsCount = There are {0} agents registered to this server. This number doesn't correspond to the number of currently connected agents.
+##view_adminTopology_message_agroupAssingAgentsFail = Unable to assign agents to the affinity group with id {0}.
+##view_adminTopology_message_agroupAssingServersFail = Unable to assign servers to the affinity group with id {0}.
+##view_adminTopology_message_agroupRemovingAgentsFail = Unable to remove agents from the affinity group with id {0}.
+##view_adminTopology_message_agroupRemovingServersFail = Unable to remove servers from the affinity group with id {0}.
+##view_adminTopology_message_agroupRenamed = Affinity group with id {0} and name {1} was renamed to {2}.
+##view_adminTopology_message_agroupRenamingFail = Unable to rename affinity group with id {0} and name {1}.
+##view_adminTopology_message_fetchAgentFail = Unable to fetch agent details for agent with id {0}.
+##view_adminTopology_message_fetchAgentsFail = Unable to fetch agent(s) for affinity group with id {0}.
+##view_adminTopology_message_fetchAgents2Fail = Unable to fetch agents.
+##view_adminTopology_message_fetchAgroupFail = Unable to fetch affinity group details for group with id {0}.
+##view_adminTopology_message_fetchAgroupsFail = Unable to fetch affinity group(s).
+##view_adminTopology_message_fetchFailOverLists = Unable to fetch fail over list details.
+##view_adminTopology_message_fetchPEventDetailsFail = Unable to fetch partition event details for event with id {0}.
+##view_adminTopology_message_fetchPEventFail = Unable to fetch partition events.
+##view_adminTopology_message_fetchServerFail = Unable to fetch server details for server with id {0}.
+##view_adminTopology_message_fetchServersFail = Unable to fetch server(s) for affinity group with id {0}.
+##view_adminTopology_message_fetchServers2Fail = Unable to fetch servers.
+##view_adminTopology_message_forceRepartition = Do you really want to force a repartition of whole cluster? It will force all the agents to connect to its most preferred server.
+##view_adminTopology_message_forceRepartitionFail = Unable to run repartition.
+##view_adminTopology_message_order = Order
+##view_adminTopology_message_removeAGroupsFail = Unable to remove following affinity groups(s) {0}.
+##view_adminTopology_message_removeAGroupsConfirm = Do you really want to remove following affinity groups {0}?
+##view_adminTopology_message_removeAllPEventConfirm = Do you really want to purge all partition events?
+##view_adminTopology_message_removePEventConfirm = Do you really want to remove following partition events {0}?
+##view_adminTopology_message_removePEventFail = Unable to remove {0} partition events(s).
+##view_adminTopology_message_removeServerConfirm = Do you really want to remove servers {0}?
+##view_adminTopology_message_removeServerFail = Unable to remove {0} server(s).
+##view_adminTopology_message_removedAGroups = Removed {0} affinity group(s).
+##view_adminTopology_message_removedAllPEvent = All partition events have been purged.
+##view_adminTopology_message_removedAllPEventFail = Unable to purge all partition events.
+##view_adminTopology_message_removedPEvent = Removed {0} partition events(s).
+##view_adminTopology_message_removedServer = Removed {0} server(s).
+##view_adminTopology_message_repartitioned = The cluster repartitioning was successfully invoked.
+##view_adminTopology_message_serverUpdated = The server {0} was successfully updated.
+##view_adminTopology_message_serverUpdateFail = Unable to update server {0}.
+##view_adminTopology_message_setMode = Set {0} server(s) to {1} mode.
+##view_adminTopology_message_setModeConfirm = Do you really want to set servers {0} to {1} mode?
+##view_adminTopology_message_setModeFail = Unable to set {0} server(s) to {1} mode.
#view_adminTopology_partitionEvents = Partition Events
##view_adminTopology_partitionEvents_details = Details
##view_adminTopology_partitionEvents_detailsFilter = Details Filter
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
index 2c649de..b9941fc 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties
@@ -542,6 +542,45 @@ view_adminTopology_agents = \u4ee3\u7406
##view_adminTopology_agentDetail_agentFailoverList = Agent Failover List
##view_adminTopology_agentDetail_currentServer = Current Server
##view_adminTopology_agentDetail_token = Token
+##view_adminTopology_message_agentsCount = There are {0} agents registered to this server. This number doesn't correspond to the number of currently connected agents.
+##view_adminTopology_message_agroupAssingAgentsFail = Unable to assign agents to the affinity group with id {0}.
+##view_adminTopology_message_agroupAssingServersFail = Unable to assign servers to the affinity group with id {0}.
+##view_adminTopology_message_agroupRemovingAgentsFail = Unable to remove agents from the affinity group with id {0}.
+##view_adminTopology_message_agroupRemovingServersFail = Unable to remove servers from the affinity group with id {0}.
+##view_adminTopology_message_agroupRenamed = Affinity group with id {0} and name {1} was renamed to {2}.
+##view_adminTopology_message_agroupRenamingFail = Unable to rename affinity group with id {0} and name {1}.
+##view_adminTopology_message_fetchAgentFail = Unable to fetch agent details for agent with id {0}.
+##view_adminTopology_message_fetchAgentsFail = Unable to fetch agent(s) for affinity group with id {0}.
+##view_adminTopology_message_fetchAgents2Fail = Unable to fetch agents.
+##view_adminTopology_message_fetchAgroupFail = Unable to fetch affinity group details for group with id {0}.
+##view_adminTopology_message_fetchAgroupsFail = Unable to fetch affinity group(s).
+##view_adminTopology_message_fetchFailOverLists = Unable to fetch fail over list details.
+##view_adminTopology_message_fetchPEventDetailsFail = Unable to fetch partition event details for event with id {0}.
+##view_adminTopology_message_fetchPEventFail = Unable to fetch partition events.
+##view_adminTopology_message_fetchServerFail = Unable to fetch server details for server with id {0}.
+##view_adminTopology_message_fetchServersFail = Unable to fetch server(s) for affinity group with id {0}.
+##view_adminTopology_message_fetchServers2Fail = Unable to fetch servers.
+##view_adminTopology_message_forceRepartition = Do you really want to force a repartition of whole cluster? It will force all the agents to connect to its most preferred server.
+##view_adminTopology_message_forceRepartitionFail = Unable to run repartition.
+##view_adminTopology_message_order = Order
+##view_adminTopology_message_removeAGroupsFail = Unable to remove following affinity groups(s) {0}.
+##view_adminTopology_message_removeAGroupsConfirm = Do you really want to remove following affinity groups {0}?
+##view_adminTopology_message_removeAllPEventConfirm = Do you really want to purge all partition events?
+##view_adminTopology_message_removePEventConfirm = Do you really want to remove following partition events {0}?
+##view_adminTopology_message_removePEventFail = Unable to remove {0} partition events(s).
+##view_adminTopology_message_removeServerConfirm = Do you really want to remove servers {0}?
+##view_adminTopology_message_removeServerFail = Unable to remove {0} server(s).
+##view_adminTopology_message_removedAGroups = Removed {0} affinity group(s).
+##view_adminTopology_message_removedAllPEvent = All partition events have been purged.
+##view_adminTopology_message_removedAllPEventFail = Unable to purge all partition events.
+##view_adminTopology_message_removedPEvent = Removed {0} partition events(s).
+##view_adminTopology_message_removedServer = Removed {0} server(s).
+##view_adminTopology_message_repartitioned = The cluster repartitioning was successfully invoked.
+##view_adminTopology_message_serverUpdated = The server {0} was successfully updated.
+##view_adminTopology_message_serverUpdateFail = Unable to update server {0}.
+##view_adminTopology_message_setMode = Set {0} server(s) to {1} mode.
+##view_adminTopology_message_setModeConfirm = Do you really want to set servers {0} to {1} mode?
+##view_adminTopology_message_setModeFail = Unable to set {0} server(s) to {1} mode.
view_adminTopology_partitionEvents = Partition\u4e8b\u4ef6
##view_adminTopology_partitionEvents_details = Details
##view_adminTopology_partitionEvents_detailsFilter = Details Filter
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java
index 92b59d3..595ca8f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java
@@ -90,6 +90,13 @@ public interface CloudManagerLocal {
PageList<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc);
void markStaleServersDown(Subject subject);
-
+
+ /**
+ * Fetches the server based on provided criteria.
+ *
+ * @param subject caller
+ * @param criteria the criteria
+ * @return
+ */
PageList<Server> findServersByCriteria(Subject subject, ServerCriteria criteria);
}
commit caa81f6bf0a2e126896b8d40e5f066f39e88e013
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Dec 19 13:01:23 2012 +0100
i18n for error messages, exception handling for agent and server views
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
index 3005f7d..4355814 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupDetailView.java
@@ -53,6 +53,7 @@ public class AffinityGroupDetailView extends LocatableVLayout implements Bookmar
// private final CloudGWTServiceAsync cloudManager = GWTServiceLookup.getCloudService();
private final int affinityGroupId;
+ private static final int SECTION_COUNT = 3;
private final LocatableSectionStack sectionStack;
private SectionStackSection detailsSection = null;
private SectionStackSection agentSection = null;
@@ -105,7 +106,7 @@ public class AffinityGroupDetailView extends LocatableVLayout implements Bookmar
}
public boolean isInitialized() {
- return initSectionCount >= 3;
+ return initSectionCount >= SECTION_COUNT;
}
@Override
@@ -136,7 +137,7 @@ public class AffinityGroupDetailView extends LocatableVLayout implements Bookmar
// don't wait forever, give up after 20s and show what we have
long elapsedMillis = System.currentTimeMillis() - startTime;
if (elapsedMillis > 20000) {
- initSectionCount = 3;
+ initSectionCount = SECTION_COUNT;
}
schedule(100); // Reschedule the timer.
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
index 026a846..f48e7b7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
@@ -37,7 +37,10 @@ import com.smartgwt.client.widgets.layout.SectionStack;
import com.smartgwt.client.widgets.layout.SectionStackSection;
import org.rhq.core.domain.cloud.AffinityGroup;
+import org.rhq.core.domain.criteria.AgentCriteria;
import org.rhq.core.domain.resource.Agent;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
@@ -53,9 +56,9 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
*/
public class AgentDetailView extends LocatableVLayout {
- // private final CloudGWTServiceAsync cloudManager = GWTServiceLookup.getCloudService();
private final int agentId;
+ private static final int SECTION_COUNT = 2;
private final LocatableSectionStack sectionStack;
private SectionStackSection detailsSection = null;
private SectionStackSection failoverListSection = null;
@@ -80,21 +83,31 @@ public class AgentDetailView extends LocatableVLayout {
@Override
protected void onInit() {
super.onInit();
- GWTServiceLookup.getAgentService().getAgentByID(this.agentId, new AsyncCallback<Agent>() {
- public void onSuccess(final Agent agent) {
- prepareDetailsSection(sectionStack, agent);
- prepareFailoverListSection(sectionStack, agent);
+ AgentCriteria criteria = new AgentCriteria();
+ criteria.addFilterId(agentId);
+ GWTServiceLookup.getCloudService().findAgentsByCriteria(criteria, new AsyncCallback<PageList<Agent>>() {
+ public void onSuccess(final PageList<Agent> agents) {
+ if (agents == null || agents.isEmpty() || agents.size() != 1) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_fetchAgentFail(String.valueOf(agentId)));
+ initSectionCount = SECTION_COUNT;
+ return;
+ }
+ prepareDetailsSection(sectionStack, agents.get(0));
+ prepareFailoverListSection(sectionStack, agents.get(0));
}
public void onFailure(Throwable caught) {
- SC.say("er1:" + caught);
- //TODO: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), caught);
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_fetchAgentFail(String.valueOf(agentId)) + " " + caught.getMessage(),
+ caught);
+ initSectionCount = SECTION_COUNT;
}
});
}
public boolean isInitialized() {
- return initSectionCount >= 2;
+ return initSectionCount >= SECTION_COUNT;
}
@Override
@@ -122,7 +135,7 @@ public class AgentDetailView extends LocatableVLayout {
// don't wait forever, give up after 20s and show what we have
long elapsedMillis = System.currentTimeMillis() - startTime;
if (elapsedMillis > 20000) {
- initSectionCount = 2;
+ initSectionCount = SECTION_COUNT;
}
schedule(100); // Reschedule the timer.
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
index b50d852..dc34602 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
@@ -124,7 +124,7 @@ public class AgentTableView extends TableSection<AgentDatasource> implements Has
showUpdateMembersAction();
}
}
-
+
private void showUpdateMembersAction() {
addTableAction(extendLocatorId("editGroupAgents"), MSG.view_groupInventoryMembers_button_updateMembership(),
new AuthorizedTableAction(this, TableActionEnablement.ALWAYS, Permission.MANAGE_SETTINGS) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java
index f09a707..dc96374 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDetailView.java
@@ -62,6 +62,7 @@ public class PartitionEventDetailView extends LocatableVLayout implements Bookma
private final int partitionEventId;
+ private static final int SECTION_COUNT = 2;
private final LocatableSectionStack sectionStack;
private SectionStackSection detailsSection = null;
private SectionStackSection agentSection = null;
@@ -118,7 +119,7 @@ public class PartitionEventDetailView extends LocatableVLayout implements Bookma
}
public boolean isInitialized() {
- return initSectionCount >= 2;
+ return initSectionCount >= SECTION_COUNT;
}
@Override
@@ -146,7 +147,7 @@ public class PartitionEventDetailView extends LocatableVLayout implements Bookma
// don't wait forever, give up after 20s and show what we have
long elapsedMillis = System.currentTimeMillis() - startTime;
if (elapsedMillis > 20000) {
- initSectionCount = 2;
+ initSectionCount = SECTION_COUNT;
}
schedule(100); // Reschedule the timer.
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java
index f3dbd4d..ccc11aa 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java
@@ -32,7 +32,6 @@ import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.VisibilityMode;
-import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.IButton;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
@@ -46,12 +45,16 @@ import com.smartgwt.client.widgets.layout.SectionStackSection;
import org.rhq.core.domain.cloud.AffinityGroup;
import org.rhq.core.domain.cloud.Server;
import org.rhq.core.domain.cloud.Server.OperationMode;
+import org.rhq.core.domain.criteria.ServerCriteria;
+import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
+import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableToolStrip;
@@ -65,9 +68,9 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
*/
public class ServerDetailView extends LocatableVLayout implements BookmarkableView {
- // private final CloudGWTServiceAsync cloudManager = GWTServiceLookup.getCloudService();
private final int serverId;
+ private static final int SECTION_COUNT = 2;
private final LocatableSectionStack sectionStack;
private SectionStackSection detailsSection = null;
private SectionStackSection agentSection = null;
@@ -92,31 +95,31 @@ public class ServerDetailView extends LocatableVLayout implements BookmarkableVi
@Override
protected void onInit() {
super.onInit();
- GWTServiceLookup.getCloudService().getServerById(this.serverId, new AsyncCallback<Server>() {
- public void onSuccess(final Server server) {
- prepareDetailsSection(sectionStack, server);
- prepareAgentSection(sectionStack, server);
- // GWTServiceLookup.getCloudService().getAgentsByServerName(server.getName(),
- // new AsyncCallback<List<Agent>>() {
- // public void onSuccess(List<Agent> agents) {
- // prepareAgentSection(sectionStack, server, agents);
- // };
- //
- // public void onFailure(Throwable caught) {
- // //TODO: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), caught);
- // }
- // });
+ ServerCriteria criteria = new ServerCriteria();
+ criteria.addFilterId(serverId);
+ GWTServiceLookup.getCloudService().findServersByCriteria(criteria, new AsyncCallback<PageList<Server>>() {
+ public void onSuccess(final PageList<Server> servers) {
+ if (servers == null || servers.isEmpty() || servers.size() != 1) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_fetchServerFail(String.valueOf(serverId)));
+ initSectionCount = SECTION_COUNT;
+ return;
+ }
+ prepareDetailsSection(sectionStack, servers.get(0));
+ prepareAgentSection(sectionStack, servers.get(0));
}
public void onFailure(Throwable caught) {
- SC.say("er1:" + caught);
- //TODO: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), caught);
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_fetchServerFail(String.valueOf(serverId)) + " "
+ + caught.getMessage(), caught);
+ initSectionCount = SECTION_COUNT;
}
});
}
public boolean isInitialized() {
- return initSectionCount >= 2;
+ return initSectionCount >= SECTION_COUNT;
}
@Override
@@ -144,7 +147,7 @@ public class ServerDetailView extends LocatableVLayout implements BookmarkableVi
// don't wait forever, give up after 20s and show what we have
long elapsedMillis = System.currentTimeMillis() - startTime;
if (elapsedMillis > 20000) {
- initSectionCount = 2;
+ initSectionCount = SECTION_COUNT;
}
schedule(100); // Reschedule the timer.
}
@@ -228,20 +231,25 @@ public class ServerDetailView extends LocatableVLayout implements BookmarkableVi
server.setOperationMode(OperationMode.valueOf(operationModeItem.getValueAsString()));
GWTServiceLookup.getCloudService().updateServer(server, new AsyncCallback<Void>() {
public void onSuccess(Void result) {
- // todo: notify
+ Message msg = new Message(MSG.view_adminTopology_message_serverUpdated(server.getName()),
+ Message.Severity.Info);
+ CoreGUI.getMessageCenter().notify(msg);
+
}
public void onFailure(Throwable caught) {
- // todo: handle
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_serverUpdateFail(server.getName()) + " "
+ + caught.getMessage(), caught);
}
});
}
}
});
-
+
form.setItems(nameItem, addressItem, portItem, securePortItem, operationModeItem, affinityGroupItem,
installationDateItem, lastUpdatetem);
-
+
LocatableToolStrip footer = new LocatableToolStrip(extendLocatorId("detailsFooter"));
footer.setPadding(5);
footer.setWidth100();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
index 3c08618..b50e18c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
@@ -37,7 +37,7 @@ import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.authz.Permission;
-import org.rhq.core.domain.cloud.Server;
+import org.rhq.core.domain.cloud.Server.OperationMode;
import org.rhq.core.domain.criteria.BaseCriteria;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.IconEnum;
@@ -56,8 +56,8 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
* @author Jirka Kremser
*
*/
-public class ServerTableView extends TableSection<AbstractServerNodeDatasource<? extends Serializable, ? extends BaseCriteria>>
- implements HasViewName {
+public class ServerTableView extends
+ TableSection<AbstractServerNodeDatasource<? extends Serializable, ? extends BaseCriteria>> implements HasViewName {
public static final ViewName VIEW_ID = new ViewName("Servers(GWT)", MSG.view_adminTopology_servers() + "(GWT)",
IconEnum.SERVERS);
@@ -141,117 +141,36 @@ public class ServerTableView extends TableSection<AbstractServerNodeDatasource<?
}
private void showCommonActions() {
- addTableAction(extendLocatorId("setNormal"), MSG.view_adminTopology_server_setNormal(),
- MSG.common_msg_areYouSure(), new AuthorizedTableAction(this, TableActionEnablement.ANY,
- Permission.MANAGE_SETTINGS) {
- public void executeAction(final ListGridRecord[] selections, Object actionValue) {
- List<String> selectedNames = getSelectedNames(selections);
- // TODO: msg
- // String message = MSG.view_admin_plugins_serverDisableConfirm(selectedNames.toString());
- String message = "Really? Normal? For all I've done for you? " + selectedNames;
- SC.ask(message, new BooleanCallback() {
- public void execute(Boolean confirmed) {
- if (confirmed) {
- int[] selectedIds = getSelectedIds(selections);
- SC.say("setting servers to maintenance mode, ids: " + selectedIds);
- GWTServiceLookup.getCloudService().updateServerMode(selectedIds,
- Server.OperationMode.NORMAL, new AsyncCallback<Void>() {
- public void onSuccess(Void arg0) {
- // TODO: msg
- Message msg = new Message(MSG
- .view_admin_plugins_disabledServerPlugins("sdf"), Message.Severity.Info);
- CoreGUI.getMessageCenter().notify(msg);
- refresh();
- }
+ addChangeOperationModeAction(OperationMode.NORMAL, MSG.view_adminTopology_server_setMaintenance());
+ addChangeOperationModeAction(OperationMode.MAINTENANCE, MSG.view_adminTopology_server_setMaintenance());
- public void onFailure(Throwable caught) {
- // TODO: msg
- CoreGUI.getErrorHandler().handleError(
- MSG.view_admin_plugins_disabledServerPluginsFailure() + " "
- + caught.getMessage(), caught);
- refreshTableInfo();
- }
-
- });
- } else {
- refreshTableInfo();
- }
- }
- });
- }
- });
-
- addTableAction(extendLocatorId("setMaintenance"), MSG.view_adminTopology_server_setMaintenance(),
+ addTableAction(extendLocatorId("removeSelected"), MSG.view_adminTopology_server_removeSelected(), null,
new AuthorizedTableAction(this, TableActionEnablement.ANY, Permission.MANAGE_SETTINGS) {
public void executeAction(final ListGridRecord[] selections, Object actionValue) {
List<String> selectedNames = getSelectedNames(selections);
- // TODO: msg
- // String message = MSG.view_admin_plugins_serverDisableConfirm(selectedNames.toString());
- String message = "Really? Maitenance? For all I've done for you? " + selectedNames;
+ String message = MSG.view_adminTopology_message_removeServerConfirm(selectedNames.toString());
SC.ask(message, new BooleanCallback() {
public void execute(Boolean confirmed) {
if (confirmed) {
int[] selectedIds = getSelectedIds(selections);
- SC.say("setting servers to maintenance mode, ids: " + selectedIds);
- GWTServiceLookup.getCloudService().updateServerMode(selectedIds,
- Server.OperationMode.MAINTENANCE, new AsyncCallback<Void>() {
- public void onSuccess(Void arg0) {
- // TODO: msg
- Message msg = new Message(MSG
- .view_admin_plugins_disabledServerPlugins("sdf"), Message.Severity.Info);
- CoreGUI.getMessageCenter().notify(msg);
- refresh();
- }
-
- public void onFailure(Throwable caught) {
- // TODO: msg
- CoreGUI.getErrorHandler().handleError(
- MSG.view_admin_plugins_disabledServerPluginsFailure() + " "
- + caught.getMessage(), caught);
- refreshTableInfo();
- }
-
- });
- } else {
- refreshTableInfo();
- }
- }
- });
- }
- });
-
- addTableAction(extendLocatorId("removeSelected"), MSG.view_adminTopology_server_removeSelected(),
- MSG.common_msg_areYouSure(), new AuthorizedTableAction(this, TableActionEnablement.ANY,
- Permission.MANAGE_SETTINGS) {
- public void executeAction(final ListGridRecord[] selections, Object actionValue) {
- List<String> selectedNames = getSelectedNames(selections);
- String message = "Really? Delete? For all I've done for you? " + selectedNames;
- SC.ask(message, new BooleanCallback() {
- public void execute(Boolean confirmed) {
- if (confirmed) {
- int[] selectedIds = getSelectedIds(selections);
- SC.say("setting servers to maintenance mode, ids: " + selectedIds);
GWTServiceLookup.getCloudService().deleteServers(selectedIds,
new AsyncCallback<Void>() {
public void onSuccess(Void arg0) {
- // TODO: msg
Message msg = new Message(MSG
- .view_admin_plugins_disabledServerPlugins("sdf"), Message.Severity.Info);
+ .view_adminTopology_message_removedServer(String
+ .valueOf(selections.length)), Message.Severity.Info);
CoreGUI.getMessageCenter().notify(msg);
refresh();
}
public void onFailure(Throwable caught) {
- // TODO: msg
CoreGUI.getErrorHandler().handleError(
- MSG.view_admin_plugins_disabledServerPluginsFailure() + " "
- + caught.getMessage(), caught);
+ MSG.view_adminTopology_message_removeServerFail(String
+ .valueOf(selections.length)) + " " + caught.getMessage(), caught);
refreshTableInfo();
}
});
- } else {
- refreshTableInfo();
}
}
});
@@ -259,6 +178,43 @@ public class ServerTableView extends TableSection<AbstractServerNodeDatasource<?
});
}
+ private void addChangeOperationModeAction(final OperationMode mode, String label) {
+ addTableAction(extendLocatorId("set" + mode), label, null, new AuthorizedTableAction(this,
+ TableActionEnablement.ANY, Permission.MANAGE_SETTINGS) {
+ public void executeAction(final ListGridRecord[] selections, Object actionValue) {
+ List<String> selectedNames = getSelectedNames(selections);
+ String message = MSG.view_adminTopology_message_setModeConfirm(selectedNames.toString(), mode.name());
+ SC.ask(message, new BooleanCallback() {
+ public void execute(Boolean confirmed) {
+ if (confirmed) {
+ int[] selectedIds = getSelectedIds(selections);
+ GWTServiceLookup.getCloudService().updateServerMode(selectedIds, mode,
+ new AsyncCallback<Void>() {
+ public void onSuccess(Void result) {
+ Message msg = new Message(MSG.view_adminTopology_message_setMode(
+ String.valueOf(selections.length), mode.name()), Message.Severity.Info);
+ CoreGUI.getMessageCenter().notify(msg);
+ refresh();
+ }
+
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_adminTopology_message_setModeFail(
+ String.valueOf(selections.length), mode.name())
+ + " " + caught.getMessage(), caught);
+ refreshTableInfo();
+ }
+
+ });
+ } else {
+ refreshTableInfo();
+ }
+ }
+ });
+ }
+ });
+ }
+
private void showUpdateMembersAction() {
addTableAction(extendLocatorId("editGroupServers"), MSG.view_groupInventoryMembers_button_updateMembership(),
new AuthorizedTableAction(this, TableActionEnablement.ALWAYS, Permission.MANAGE_SETTINGS) {
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index 47611e8..ceaad0d 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -552,6 +552,16 @@ view_adminTopology_agentDetail_address = Address
view_adminTopology_agentDetail_agentFailoverList = Agent Failover List
view_adminTopology_agentDetail_currentServer = Current Server
view_adminTopology_agentDetail_token = Token
+view_adminTopology_message_fetchServerFail=Unable to fetch server details for server with id {0}.
+view_adminTopology_message_fetchAgentFail=Unable to fetch agent details for agent with id {0}.
+view_adminTopology_message_removeServerConfirm=Do you really want to remove servers [{0}]?
+view_adminTopology_message_removeServerFail=Unable to remove {0} server(s).
+view_adminTopology_message_removedServer=Removed {0} server(s).
+view_adminTopology_message_serverUpdated=The server {0} was successfully updated.
+view_adminTopology_message_serverUpdateFail=Unable to update server {0}.
+view_adminTopology_message_setMode=Set {0} server(s) to {1} mode.
+view_adminTopology_message_setModeConfirm=Do you really want to set servers [{0}] to {1} mode?
+view_adminTopology_message_setModeFail=Unable to set {0} server(s) to {1} mode.
view_adminTopology_partitionEvents = Partition Events
view_adminTopology_partitionEvents_details = Details
view_adminTopology_partitionEvents_detailsFilter = Details Filter
commit e3c531c1f52ef4298b0e5d29a044765cc97c8ac7
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Dec 18 17:12:46 2012 +0100
Assigning the agent to the affinity group; some refactoring (renaming AgentNodeDatasource -> AgentDatasource, AgentNodeDatasourceField -> AgentDatasourceField)
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Agent.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Agent.java
index 870cc8f..5948a7e 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Agent.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Agent.java
@@ -172,6 +172,9 @@ public class Agent implements Serializable {
public static final String QUERY_UPDATE_STATUS_BY_MEASUREMENT_BASELINE = "Agent.updateStatusByMeasurementBasleine";
public static final String QUERY_UPDATE_STATUS_BY_AGENT = "Agent.updateStatusByAgent";
public static final String QUERY_UPDATE_STATUS_FOR_ALL = "Agent.updateStatusForAll";
+
+ // this value is set, when authorized user wants to reset the token
+ public static final String SECURITY_TOKEN_RESET = "@#$reset$#@";
@Column(name = "ID", nullable = false)
@GeneratedValue(strategy = GenerationType.AUTO, generator = "id")
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java
new file mode 100644
index 0000000..5515e18
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupAgentsSelector.java
@@ -0,0 +1,264 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.admin.topology;
+
+import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.NAME;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.types.Alignment;
+import com.smartgwt.client.types.Overflow;
+import com.smartgwt.client.util.SC;
+import com.smartgwt.client.widgets.IButton;
+import com.smartgwt.client.widgets.Window;
+import com.smartgwt.client.widgets.events.ClickEvent;
+import com.smartgwt.client.widgets.events.ClickHandler;
+import com.smartgwt.client.widgets.events.CloseClickEvent;
+import com.smartgwt.client.widgets.events.CloseClickHandler;
+import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.fields.TextItem;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+import com.smartgwt.client.widgets.layout.HLayout;
+import com.smartgwt.client.widgets.layout.VLayout;
+
+import org.rhq.core.domain.criteria.AgentCriteria;
+import org.rhq.core.domain.resource.Agent;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.IconEnum;
+import org.rhq.enterprise.gui.coregui.client.components.selector.AbstractSelector;
+import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
+
+/**
+ * @author Jirka Kremser
+ */
+public class AffinityGroupAgentsSelector extends AbstractSelector<Agent, AgentCriteria> {
+
+ private final Integer affinityGroupId;
+
+ private static RPCDataSource<Agent, AgentCriteria> datasource = null;
+
+ private static Window modalWindow;
+ private static boolean shouldBeClosed;
+ private static VLayout layout;
+ private List<Integer> originallyAssignedIds;
+
+ private AffinityGroupAgentsSelector() {
+ super("");
+ affinityGroupId = -1;
+ }
+
+ private AffinityGroupAgentsSelector(String id, Integer affinityGroupId) {
+ super(id, false);
+ this.affinityGroupId = affinityGroupId;
+ prepareMembers(this);
+ }
+
+ @Override
+ protected DynamicForm getAvailableFilterForm() {
+ if (availableFilterForm == null) {
+ availableFilterForm = new LocatableDynamicForm(extendLocatorId("AgeSelectAvailFilterForm"));
+ availableFilterForm.setWidth("75%");
+ final TextItem search = new TextItem(NAME.propertyName(), MSG.common_title_search());
+ availableFilterForm.setItems(search);
+ }
+ return availableFilterForm;
+ }
+
+ private void prepareMembers(final AffinityGroupAgentsSelector selector) {
+ AgentCriteria criteria = new AgentCriteria();
+ criteria.addFilterAffinityGroupId(affinityGroupId);
+ GWTServiceLookup.getCloudService().findAgentsByCriteria(criteria, new AsyncCallback<PageList<Agent>>() {
+ public void onSuccess(PageList<Agent> result) {
+ ListGridRecord[] records = getDataSource().buildRecords(result);
+ originallyAssignedIds = getIdList(records);
+ setAssigned(records);
+ modalWindow.addItem(layout);
+ modalWindow.show();
+ selector.reset();
+ }
+
+ @Override
+ public void onFailure(Throwable t) {
+ //todo: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), t);
+ }
+ });
+
+ }
+
+ @Override
+ protected RPCDataSource<Agent, AgentCriteria> getDataSource() {
+ if (datasource == null) {
+ datasource = new AgentDatasource(affinityGroupId, false);
+ }
+ return datasource;
+ }
+
+ @Override
+ protected int getMaxAvailableRecords() {
+ return 3000;
+ }
+
+ @Override
+ protected Criteria getLatestCriteria(DynamicForm availableFilterForm) {
+ String search = (String) availableFilterForm.getValue(NAME.propertyName());
+ Criteria criteria = new Criteria();
+ if (null != search) {
+ criteria.addCriteria(NAME.propertyName(), search);
+ }
+ return criteria;
+ }
+
+ @Override
+ protected String getItemTitle() {
+ return MSG.view_adminTopology_agents();
+ }
+
+ @Override
+ protected String getItemIcon() {
+ return IconEnum.AGENT.getIcon16x16Path();
+ }
+
+ public static void show(Integer affinityGroupId, final TableSection parrent) {
+ modalWindow = new Window();
+ modalWindow.addCloseClickHandler(new CloseClickHandler() {
+ public void onCloseClick(CloseClickEvent event) {
+ closeAndRefresh(parrent, false);
+ }
+ });
+ modalWindow.setTitle(MSG.view_adminTopology_agents() + ": "
+ + MSG.view_adminTopology_affinityGroups_createNew());
+ modalWindow.setOverflow(Overflow.VISIBLE);
+ modalWindow.setWidth(800);
+ modalWindow.setHeight(400);
+ modalWindow.setAutoCenter(true);
+ modalWindow.setCanDragResize(true);
+ modalWindow.setCanDragReposition(true);
+
+ layout = new VLayout();
+ layout.setWidth100();
+ layout.setHeight100();
+ layout.setPadding(10);
+ layout.setLayoutMargin(10);
+
+ final AffinityGroupAgentsSelector selector = new AffinityGroupAgentsSelector("foo", affinityGroupId);
+ layout.addMember(selector);
+
+ IButton cancel = new LocatableIButton(selector.extendLocatorId("Cancel"), MSG.common_button_cancel());
+ cancel.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ closeAndRefresh(parrent, false);
+ }
+ });
+ IButton save = new LocatableIButton(selector.extendLocatorId("Save"), MSG.common_button_save());
+ save.addClickHandler(new ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ List<Integer> actuallySelected = getIdList(selector.getSelectedRecords());
+ List<Integer> originallySelected = selector.getOriginallyAssignedIds();
+ originallySelected.removeAll(actuallySelected);
+ actuallySelected.removeAll(selector.getOriginallyAssignedIds());
+ shouldBeClosed = true;
+ if (!originallySelected.isEmpty()) {
+ shouldBeClosed = false;
+ GWTServiceLookup.getCloudService().removeAgentsFromGroup(
+ originallySelected.toArray(new Integer[originallySelected.size()]), new AsyncCallback<Void>() {
+
+ public void onSuccess(Void result) {
+ closeAndRefresh(parrent, true);
+ }
+
+ public void onFailure(Throwable caught) {
+ //todo: error handling
+ SC.say("errX");
+ }
+ });
+ }
+ if (!actuallySelected.isEmpty()) {
+ shouldBeClosed = false;
+ GWTServiceLookup.getCloudService().addAgentsToGroup(selector.getAffinityGroupId(),
+ actuallySelected.toArray(new Integer[actuallySelected.size()]), new AsyncCallback<Void>() {
+
+ public void onSuccess(Void result) {
+ closeAndRefresh(parrent, true);
+ }
+
+ public void onFailure(Throwable caught) {
+ //todo: error handling
+ SC.say("errX");
+ }
+ });
+ }
+ if (shouldBeClosed) {
+ closeAndRefresh(parrent, false);
+ }
+ // SC.say("To del: " + originallySelected + "\n\nTo add: " + actuallySelected);
+
+ }
+ });
+
+ HLayout buttons = new HLayout(10);
+ buttons.setHeight(20);
+ buttons.setLayoutAlign(Alignment.CENTER);
+ buttons.setLayoutBottomMargin(0);
+ buttons.addMember(save);
+ buttons.addMember(cancel);
+ layout.addMember(buttons);
+ }
+
+ private static void closeAndRefresh(TableSection parrent, boolean fullRefresh) {
+ if (modalWindow != null) {
+ modalWindow.destroy();
+ }
+ if (fullRefresh) {
+ parrent.refresh();
+ } else {
+ parrent.refreshTableInfo();
+ }
+ }
+
+ private static List<Integer> getIdList(ListGridRecord[] records) {
+ if (records == null) {
+ return null;
+ }
+ List<Integer> ids = new ArrayList<Integer>(records.length);
+ for (ListGridRecord record : records) {
+ ids.add(record.getAttributeAsInt(AgentDatasourceField.FIELD_ID.propertyName()));
+ }
+ return ids;
+ }
+
+ public List<Integer> getOriginallyAssignedIds() {
+ return new ArrayList<Integer>(originallyAssignedIds);
+ }
+
+ public Integer getAffinityGroupId() {
+ return affinityGroupId;
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
index f104d6c..13b1559 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
@@ -22,6 +22,8 @@
*/
package org.rhq.enterprise.gui.coregui.client.admin.topology;
+import static org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField.NAME;
+
import java.util.ArrayList;
import java.util.List;
@@ -37,18 +39,23 @@ import com.smartgwt.client.widgets.events.ClickHandler;
import com.smartgwt.client.widgets.events.CloseClickEvent;
import com.smartgwt.client.widgets.events.CloseClickHandler;
import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.fields.SelectItem;
+import com.smartgwt.client.widgets.form.fields.TextItem;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.cloud.Server;
+import org.rhq.core.domain.cloud.Server.OperationMode;
import org.rhq.core.domain.criteria.ServerCriteria;
-import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.IconEnum;
+import org.rhq.enterprise.gui.coregui.client.components.form.SortedSelectItem;
import org.rhq.enterprise.gui.coregui.client.components.selector.AbstractSelector;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
/**
@@ -56,8 +63,6 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
*/
public class AffinityGroupServersSelector extends AbstractSelector<Server, ServerCriteria> {
- private static final String ITEM_ICON = "types/Server_up_16.png";
-
private final Integer affinityGroupId;
private static RPCDataSource<Server, ServerCriteria> datasource = null;
@@ -77,10 +82,41 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
this.affinityGroupId = affinityGroupId;
prepareMembers(this);
}
+
+ @Override
+ protected DynamicForm getAvailableFilterForm() {
+ if (availableFilterForm == null) {
+ availableFilterForm = new LocatableDynamicForm(extendLocatorId("SerSelectAvailFilterForm"));
+ availableFilterForm.setNumCols(4);
+ availableFilterForm.setWidth("75%");
+ final TextItem search = new TextItem(NAME.propertyName(), MSG.common_title_search());
+ final SelectItem operationModeSelect = new SortedSelectItem(ServerDatasource.FILTER_OPERATION_MODE, MSG.view_adminTopology_serverDetail_operationMode());
+ operationModeSelect.setValueMap(buildOperationModeOptions());
+ operationModeSelect.setValue("ALL");
+//
+// final EnumSelectItem operationModeFilter = new EnumSelectItem(ServerDatasource.FILTER_OPERATION_MODE,
+// MSG.view_adminTopology_serverDetail_operationMode(), OperationMode.class, null, null);
+
+
+ availableFilterForm.setItems(search, operationModeSelect);
+ }
+ return availableFilterForm;
+ }
+
+ private String[] buildOperationModeOptions() {
+ OperationMode[] modes = OperationMode.values();
+ String[] options = new String[modes.length + 1];
+ for (int i = 0; i < modes.length; i++) {
+ options[i] = modes[i].toString();
+ }
+ options[modes.length] = "ALL";
+ return options;
+ }
private void prepareMembers(final AffinityGroupServersSelector selector) {
- GWTServiceLookup.getCloudService().getServerMembersByAffinityGroupId(affinityGroupId,
- PageControl.getUnlimitedInstance(), new AsyncCallback<PageList<Server>>() {
+ ServerCriteria criteria = new ServerCriteria();
+ criteria.addFilterAffinityGroupId(affinityGroupId);
+ GWTServiceLookup.getCloudService().findServersByCriteria(criteria, new AsyncCallback<PageList<Server>>() {
public void onSuccess(PageList<Server> result) {
ListGridRecord[] records = getDataSource().buildRecords(result);
originallyAssignedIds = getIdList(records);
@@ -107,28 +143,32 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
}
@Override
- protected DynamicForm getAvailableFilterForm() {
- return null; // No Filters Currently
- }
-
- @Override
protected int getMaxAvailableRecords() {
return 500;
}
@Override
protected Criteria getLatestCriteria(DynamicForm availableFilterForm) {
- return null; // No Filters Currently
+ String search = (String) availableFilterForm.getValue(NAME.propertyName());
+ String operationMode = (String) availableFilterForm.getValue(ServerDatasource.FILTER_OPERATION_MODE);
+ Criteria criteria = new Criteria();
+ if (null != search) {
+ criteria.addCriteria(NAME.propertyName(), search);
+ }
+ if (operationMode != null && !"ALL".equals(operationMode)) {
+ criteria.addCriteria(ServerDatasource.FILTER_OPERATION_MODE, operationMode);
+ }
+ return criteria;
}
@Override
protected String getItemTitle() {
- return MSG.view_adminTopology_affinityGroups();
+ return MSG.view_adminTopology_servers();
}
@Override
protected String getItemIcon() {
- return ITEM_ICON;
+ return IconEnum.SERVERS.getIcon16x16Path();
}
public static void show(Integer affinityGroupId, final TableSection parrent) {
@@ -138,7 +178,7 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, Serve
closeAndRefresh(parrent, false);
}
});
- modalWindow.setTitle(MSG.view_adminTopology_affinityGroups() + ": "
+ modalWindow.setTitle(MSG.view_adminTopology_servers() + ": "
+ MSG.view_adminTopology_affinityGroups_createNew());
modalWindow.setOverflow(Overflow.VISIBLE);
modalWindow.setWidth(800);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java
new file mode 100644
index 0000000..ac1d26b
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasource.java
@@ -0,0 +1,227 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.admin.topology;
+
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_ADDRESS;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AFFINITY_GROUP;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AFFINITY_GROUP_ID;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_ID;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_LAST_AVAILABILITY_REPORT;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_NAME;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_PORT;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_SERVER;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_SERVER_ID;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
+import com.smartgwt.client.data.DataSourceField;
+import com.smartgwt.client.data.Record;
+import com.smartgwt.client.data.fields.DataSourceIntegerField;
+import com.smartgwt.client.widgets.grid.ListGridField;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+import org.rhq.core.domain.criteria.AgentCriteria;
+import org.rhq.core.domain.resource.Agent;
+import org.rhq.core.domain.util.PageControl;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.core.domain.util.PageOrdering;
+import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
+import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+
+/**
+ * @author Jirka Kremser
+ *
+ */
+public class AgentDatasource extends RPCDataSource<Agent, AgentCriteria> {
+
+ // filters
+ public static final String FILTER_ADDRESS = FIELD_ADDRESS.propertyName();
+ public static final String FILTER_PORT = FIELD_PORT.propertyName();
+ public static final String FILTER_SERVER_ID = "serverId";
+ public static final String FILTER_AFFINITY_GROUP_ID = "affinityGroupId";
+
+
+ private final Integer id;
+ private final boolean isAffinityGroupId;
+
+ public AgentDatasource(Integer id, boolean isAffinityGroupId) {
+ super();
+ this.id = id;
+ this.isAffinityGroupId = isAffinityGroupId;
+ List<DataSourceField> fields = addDataSourceFields();
+ addFields(fields);
+ }
+
+ @Override
+ protected List<DataSourceField> addDataSourceFields() {
+ List<DataSourceField> fields = super.addDataSourceFields();
+ DataSourceField idField = new DataSourceIntegerField(FIELD_ID.propertyName(), FIELD_ID.title(), 50);
+ idField.setPrimaryKey(true);
+ idField.setHidden(true);
+ fields.add(idField);
+ return fields;
+ }
+
+ public List<ListGridField> getListGridFields() {
+ List<ListGridField> fields = new ArrayList<ListGridField>();
+
+ ListGridField idField = FIELD_ID.getListGridField();
+ idField.setHidden(true);
+ fields.add(idField);
+ fields.add(FIELD_NAME.getListGridField("*"));
+ fields.add(FIELD_SERVER.getListGridField("120"));
+ fields.add(FIELD_ADDRESS.getListGridField("110"));
+
+ ListGridField serverIdField = FIELD_SERVER_ID.getListGridField();
+ serverIdField.setHidden(true);
+ fields.add(serverIdField);
+
+ fields.add(FIELD_PORT.getListGridField("90"));
+ ListGridField lastAvailabilityReportField = FIELD_LAST_AVAILABILITY_REPORT.getListGridField("120");
+ TimestampCellFormatter.prepareDateField(lastAvailabilityReportField);
+ fields.add(lastAvailabilityReportField);
+
+ if (!isAffinityGroupId) {
+ fields.add(FIELD_AFFINITY_GROUP.getListGridField("100"));
+ ListGridField affinityGroupIdField = FIELD_AFFINITY_GROUP_ID.getListGridField();
+ affinityGroupIdField.setHidden(true);
+ fields.add(affinityGroupIdField);
+ }
+
+ return fields;
+ }
+
+ @Override
+ protected void executeFetch(final DSRequest request, final DSResponse response, AgentCriteria criteria) {
+// final PageControl pc = getPageControl(request);
+
+// AsyncCallback<PageList<Agent>> callback = new AsyncCallback<PageList<Agent>>() {
+// public void onSuccess(PageList<Agent> result) {
+// response.setData(buildRecords(result));
+// response.setTotalRows(result.size());
+// processResponse(request.getRequestId(), response);
+// }
+//
+// @Override
+// public void onFailure(Throwable t) {
+// //todo: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), t);
+// response.setStatus(DSResponse.STATUS_FAILURE);
+// processResponse(request.getRequestId(), response);
+// }
+// };
+//
+//
+ if (isAffinityGroupId) {
+// GWTServiceLookup.getCloudService().getAgentMembersByAffinityGroupId(id, pc, callback);
+ criteria.addFilterAffinityGroupId(id);
+ } else if (id != null) {
+ // if id == null all agent are returned
+ criteria.addFilterServerId(id);
+// GWTServiceLookup.getAgentService().getAgentsByServer(id, pc, callback);
+ }
+
+ GWTServiceLookup.getCloudService().findAgentsByCriteria(criteria, new AsyncCallback<PageList<Agent>>() {
+ public void onSuccess(PageList<Agent> result) {
+ response.setData(buildRecords(result));
+ response.setTotalRows(result.size());
+ processResponse(request.getRequestId(), response);
+ }
+
+ @Override
+ public void onFailure(Throwable t) {
+ //todo: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), t);
+ response.setStatus(DSResponse.STATUS_FAILURE);
+ processResponse(request.getRequestId(), response);
+ }
+ });
+ }
+
+ /**
+ * Returns a prepopulated PageControl based on the provided DSRequest. This will set sort fields,
+ * pagination, but *not* filter fields.
+ *
+ * @param request the request to turn into a page control
+ * @return the page control for passing to criteria and other queries
+ */
+ protected PageControl getPageControl(DSRequest request) {
+ // Initialize paging.
+ PageControl pageControl = new PageControl(0, getDataPageSize());
+
+ // Initialize sorting.
+ String sortBy = request.getAttribute("sortBy");
+ if (sortBy != null) {
+ String[] sorts = sortBy.split(",");
+ for (String sort : sorts) {
+ PageOrdering ordering = (sort.startsWith("-")) ? PageOrdering.DESC : PageOrdering.ASC;
+ String columnName = (ordering == PageOrdering.DESC) ? sort.substring(1) : sort;
+ pageControl.addDefaultOrderingField(columnName, ordering);
+ }
+ }
+
+ return pageControl;
+ }
+
+ @Override
+ public Agent copyValues(Record from) {
+ throw new UnsupportedOperationException("AgentNodeDatasource.copyValues(Record from)");
+ }
+
+ @Override
+ public ListGridRecord copyValues(Agent from) {
+ ListGridRecord record = new ListGridRecord();
+ record.setAttribute(FIELD_ID.propertyName(), from.getId());
+ record.setAttribute(FIELD_NAME.propertyName(), from.getName());
+ record.setAttribute(FIELD_ADDRESS.propertyName(), from.getAddress());
+ record.setAttribute(FIELD_PORT.propertyName(), from.getPort());
+ record.setAttribute(FIELD_SERVER.propertyName(), from.getServer() == null ? "" : from.getServer().getName());
+ record.setAttribute(FIELD_SERVER_ID.propertyName(), from.getServer() == null ? "" : from.getServer().getId());
+ record.setAttribute(FIELD_LAST_AVAILABILITY_REPORT.propertyName(), from.getLastAvailabilityReport());
+ record.setAttribute(FIELD_AFFINITY_GROUP.propertyName(), from.getAffinityGroup() == null ? "" : from
+ .getAffinityGroup().getName());
+ record.setAttribute(FIELD_AFFINITY_GROUP_ID.propertyName(), from.getAffinityGroup() == null ? "" : from
+ .getAffinityGroup().getId());
+
+ return record;
+ }
+
+ @Override
+ protected AgentCriteria getFetchCriteria(DSRequest request) {
+ AgentCriteria criteria = new AgentCriteria();
+ // printRequestCriteria(request);
+ criteria.addFilterId(getFilter(request, FIELD_ID.propertyName(), Integer.class));
+ criteria.addFilterName(getFilter(request, FIELD_NAME.propertyName(), String.class));
+ criteria.addFilterAddress(getFilter(request, FILTER_ADDRESS, String.class));
+ criteria.addFilterPort(getFilter(request, FILTER_PORT, Integer.class));
+ criteria.addFilterServerId(getFilter(request, FILTER_SERVER_ID, Integer.class));
+ criteria.addFilterAffinityGroupId(getFilter(request, FILTER_AFFINITY_GROUP_ID, Integer.class));
+
+
+ //@todo: Remove me when finished debugging search expression
+ Log.debug(" *** AgentCriteria Search String: " + getFilter(request, "search", String.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/admin/topology/AgentDatasourceField.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasourceField.java
new file mode 100644
index 0000000..26792d4
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDatasourceField.java
@@ -0,0 +1,83 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.admin.topology;
+
+import com.smartgwt.client.widgets.grid.ListGridField;
+
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+
+/**
+ * @author Jirka Kremser
+ *
+ */
+public enum AgentDatasourceField {
+
+ FIELD_ID("id", CoreGUI.getMessages().common_title_id()),
+
+ FIELD_NAME("name", CoreGUI.getMessages().common_title_name()),
+
+ FIELD_SERVER("server", CoreGUI.getMessages().view_adminTopology_agent_connectedServer()),
+
+ FIELD_SERVER_ID("serverId", "serverId"),
+
+ FIELD_ADDRESS("address", CoreGUI.getMessages().view_adminTopology_agent_agentBindAddress()),
+
+ FIELD_PORT("port", CoreGUI.getMessages().view_adminTopology_agent_agentBindPort()),
+
+ FIELD_LAST_AVAILABILITY_REPORT("lastAvailabilityReport", CoreGUI.getMessages().view_adminTopology_agent_lastAvailabilityReport()),
+
+ FIELD_AGENT_TOKEN("agentToken", CoreGUI.getMessages().view_adminTopology_agentDetail_token()),
+
+ FIELD_AFFINITY_GROUP("affinityGroup", CoreGUI.getMessages().view_adminTopology_server_affinityGroup()),
+
+ FIELD_AFFINITY_GROUP_ID("affinityGroupId", "affinityGroupId");
+
+ /**
+ * Corresponds to a property name of Server (e.g. operationMode).
+ */
+ private String propertyName;
+
+ /**
+ * The table header for the field or property (e.g. Mode).
+ */
+ private String title;
+
+ private AgentDatasourceField(String propertyName, String title) {
+ this.propertyName = propertyName;
+ this.title = title;
+ }
+
+ public String propertyName() {
+ return propertyName;
+ }
+
+ public String title() {
+ return title;
+ }
+
+ public ListGridField getListGridField() {
+ return new ListGridField(propertyName, title);
+ }
+
+ public ListGridField getListGridField(String width) {
+ ListGridField field = new ListGridField(propertyName, title);
+ field.setWidth(width);
+ return field;
+ }
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
index b91f71d..026a846 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
@@ -19,13 +19,13 @@
package org.rhq.enterprise.gui.coregui.client.admin.topology;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_ADDRESS;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_AFFINITY_GROUP;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_AGENT_TOKEN;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_LAST_AVAILABILITY_REPORT;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_NAME;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_PORT;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_SERVER;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_ADDRESS;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AFFINITY_GROUP;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AGENT_TOKEN;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_LAST_AVAILABILITY_REPORT;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_NAME;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_PORT;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_SERVER;
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.rpc.AsyncCallback;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentNodeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentNodeDatasource.java
deleted file mode 100644
index 8a9da96..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentNodeDatasource.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.admin.topology;
-
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_ADDRESS;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_AFFINITY_GROUP;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_AFFINITY_GROUP_ID;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_ID;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_LAST_AVAILABILITY_REPORT;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_NAME;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_PORT;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_SERVER;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_SERVER_ID;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.data.DSRequest;
-import com.smartgwt.client.data.DSResponse;
-import com.smartgwt.client.data.DataSourceField;
-import com.smartgwt.client.data.Record;
-import com.smartgwt.client.data.fields.DataSourceIntegerField;
-import com.smartgwt.client.widgets.grid.ListGridField;
-import com.smartgwt.client.widgets.grid.ListGridRecord;
-
-import org.rhq.core.domain.criteria.Criteria;
-import org.rhq.core.domain.resource.Agent;
-import org.rhq.core.domain.util.PageControl;
-import org.rhq.core.domain.util.PageList;
-import org.rhq.core.domain.util.PageOrdering;
-import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-
-/**
- * @author Jirka Kremser
- *
- */
-public class AgentNodeDatasource extends RPCDataSource<Agent, Criteria> {
-
- private final Integer id;
- private final boolean isAffinityGroupId;
-
- public AgentNodeDatasource(Integer id, boolean isAffinityGroupId) {
- super();
- this.id = id;
- this.isAffinityGroupId = isAffinityGroupId;
- List<DataSourceField> fields = addDataSourceFields();
- addFields(fields);
- }
-
- @Override
- protected List<DataSourceField> addDataSourceFields() {
- List<DataSourceField> fields = super.addDataSourceFields();
- DataSourceField idField = new DataSourceIntegerField(FIELD_ID.propertyName(), FIELD_ID.title(), 50);
- idField.setPrimaryKey(true);
- idField.setHidden(true);
- fields.add(idField);
- return fields;
- }
-
- public List<ListGridField> getListGridFields() {
- List<ListGridField> fields = new ArrayList<ListGridField>();
-
- ListGridField idField = FIELD_ID.getListGridField();
- idField.setHidden(true);
- fields.add(idField);
- fields.add(FIELD_NAME.getListGridField("*"));
- fields.add(FIELD_SERVER.getListGridField("120"));
- fields.add(FIELD_ADDRESS.getListGridField("110"));
-
- ListGridField serverIdField = FIELD_SERVER_ID.getListGridField();
- serverIdField.setHidden(true);
- fields.add(serverIdField);
-
- fields.add(FIELD_PORT.getListGridField("90"));
- ListGridField lastAvailabilityReportField = FIELD_LAST_AVAILABILITY_REPORT.getListGridField("120");
- TimestampCellFormatter.prepareDateField(lastAvailabilityReportField);
- fields.add(lastAvailabilityReportField);
-
- if (!isAffinityGroupId) {
- fields.add(FIELD_AFFINITY_GROUP.getListGridField("100"));
- ListGridField affinityGroupIdField = FIELD_AFFINITY_GROUP_ID.getListGridField();
- affinityGroupIdField.setHidden(true);
- fields.add(affinityGroupIdField);
- }
-
- return fields;
- }
-
- @Override
- protected void executeFetch(final DSRequest request, final DSResponse response, Criteria criteria) {
- final PageControl pc = getPageControl(request);
-
- AsyncCallback<PageList<Agent>> callback = new AsyncCallback<PageList<Agent>>() {
- public void onSuccess(PageList<Agent> result) {
- response.setData(buildRecords(result));
- response.setTotalRows(result.size());
- processResponse(request.getRequestId(), response);
- }
-
- @Override
- public void onFailure(Throwable t) {
- //todo: CoreGUI.getErrorHandler().handleError(MSG.view_admin_plugins_loadFailure(), t);
- response.setStatus(DSResponse.STATUS_FAILURE);
- processResponse(request.getRequestId(), response);
- }
- };
-
- if (isAffinityGroupId) {
- GWTServiceLookup.getCloudService().getAgentMembersByAffinityGroupId(id, pc, callback);
- } else {
- // if id == null all agent are returned
- GWTServiceLookup.getAgentService().getAgentsByServer(id, pc, callback);
- }
- }
-
- /**
- * Returns a prepopulated PageControl based on the provided DSRequest. This will set sort fields,
- * pagination, but *not* filter fields.
- *
- * @param request the request to turn into a page control
- * @return the page control for passing to criteria and other queries
- */
- protected PageControl getPageControl(DSRequest request) {
- // Initialize paging.
- PageControl pageControl = new PageControl(0, getDataPageSize());
-
- // Initialize sorting.
- String sortBy = request.getAttribute("sortBy");
- if (sortBy != null) {
- String[] sorts = sortBy.split(",");
- for (String sort : sorts) {
- PageOrdering ordering = (sort.startsWith("-")) ? PageOrdering.DESC : PageOrdering.ASC;
- String columnName = (ordering == PageOrdering.DESC) ? sort.substring(1) : sort;
- pageControl.addDefaultOrderingField(columnName, ordering);
- }
- }
-
- return pageControl;
- }
-
- @Override
- public Agent copyValues(Record from) {
- throw new UnsupportedOperationException("AgentNodeDatasource.copyValues(Record from)");
- }
-
- @Override
- public ListGridRecord copyValues(Agent from) {
- ListGridRecord record = new ListGridRecord();
- record.setAttribute(FIELD_ID.propertyName(), from.getId());
- record.setAttribute(FIELD_NAME.propertyName(), from.getName());
- record.setAttribute(FIELD_ADDRESS.propertyName(), from.getAddress());
- record.setAttribute(FIELD_PORT.propertyName(), from.getPort());
- record.setAttribute(FIELD_SERVER.propertyName(), from.getServer() == null ? "" : from.getServer().getName());
- record.setAttribute(FIELD_SERVER_ID.propertyName(), from.getServer() == null ? "" : from.getServer().getId());
- record.setAttribute(FIELD_LAST_AVAILABILITY_REPORT.propertyName(), from.getLastAvailabilityReport());
- record.setAttribute(FIELD_AFFINITY_GROUP.propertyName(), from.getAffinityGroup() == null ? "" : from
- .getAffinityGroup().getName());
- record.setAttribute(FIELD_AFFINITY_GROUP_ID.propertyName(), from.getAffinityGroup() == null ? "" : from
- .getAffinityGroup().getId());
-
- return record;
- }
-
- @Override
- protected Criteria getFetchCriteria(DSRequest request) {
- // we don't use criteria for this datasource, just return null
- return null;
- }
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentNodeDatasourceField.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentNodeDatasourceField.java
deleted file mode 100644
index dc82130..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentNodeDatasourceField.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.admin.topology;
-
-import com.smartgwt.client.widgets.grid.ListGridField;
-
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-
-/**
- * @author Jirka Kremser
- *
- */
-public enum AgentNodeDatasourceField {
-
- FIELD_ID("id", CoreGUI.getMessages().common_title_id()),
-
- FIELD_NAME("name", CoreGUI.getMessages().common_title_name()),
-
- FIELD_SERVER("server", CoreGUI.getMessages().view_adminTopology_agent_connectedServer()),
-
- FIELD_SERVER_ID("serverId", "serverId"),
-
- FIELD_ADDRESS("address", CoreGUI.getMessages().view_adminTopology_agent_agentBindAddress()),
-
- FIELD_PORT("port", CoreGUI.getMessages().view_adminTopology_agent_agentBindPort()),
-
- FIELD_LAST_AVAILABILITY_REPORT("lastAvailabilityReport", CoreGUI.getMessages().view_adminTopology_agent_lastAvailabilityReport()),
-
- FIELD_AGENT_TOKEN("agentToken", CoreGUI.getMessages().view_adminTopology_agentDetail_token()),
-
- FIELD_AFFINITY_GROUP("affinityGroup", CoreGUI.getMessages().view_adminTopology_server_affinityGroup()),
-
- FIELD_AFFINITY_GROUP_ID("affinityGroupId", "affinityGroupId");
-
- /**
- * Corresponds to a property name of Server (e.g. operationMode).
- */
- private String propertyName;
-
- /**
- * The table header for the field or property (e.g. Mode).
- */
- private String title;
-
- private AgentNodeDatasourceField(String propertyName, String title) {
- this.propertyName = propertyName;
- this.title = title;
- }
-
- public String propertyName() {
- return propertyName;
- }
-
- public String title() {
- return title;
- }
-
- public ListGridField getListGridField() {
- return new ListGridField(propertyName, title);
- }
-
- public ListGridField getListGridField(String width) {
- ListGridField field = new ListGridField(propertyName, title);
- field.setWidth(width);
- return field;
- }
-}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
index d3b8761..b50d852 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
@@ -18,15 +18,14 @@
*/
package org.rhq.enterprise.gui.coregui.client.admin.topology;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_AFFINITY_GROUP;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_AFFINITY_GROUP_ID;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_SERVER;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_SERVER_ID;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AFFINITY_GROUP;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AFFINITY_GROUP_ID;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_SERVER;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_SERVER_ID;
import java.util.List;
import com.smartgwt.client.types.SortDirection;
-import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGrid;
@@ -47,7 +46,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Jirka Kremser
*/
-public class AgentTableView extends TableSection<AgentNodeDatasource> implements HasViewName {
+public class AgentTableView extends TableSection<AgentDatasource> implements HasViewName {
public static final ViewName VIEW_ID = new ViewName("Agents(GWT)", MSG.view_adminTopology_agents() + "(GWT)",
IconEnum.AGENT);
@@ -56,13 +55,16 @@ public class AgentTableView extends TableSection<AgentNodeDatasource> implements
+ AdministrationView.SECTION_TOPOLOGY_VIEW_ID + "/" + VIEW_ID;
private final boolean isAffinityGroupId;
+
+ private final Integer id;
public AgentTableView(String locatorId, Integer id, boolean isAffinityGroupId) {
super(locatorId, null);
this.isAffinityGroupId = isAffinityGroupId;
+ this.id = id;
setHeight100();
setWidth100();
- setDataSource(new AgentNodeDatasource(id, isAffinityGroupId));
+ setDataSource(new AgentDatasource(id, isAffinityGroupId));
}
@Override
@@ -118,15 +120,18 @@ public class AgentTableView extends TableSection<AgentNodeDatasource> implements
});
}
}
-
- if (isAffinityGroupId)
- addTableAction(extendLocatorId("editGroupAgents"), MSG.view_groupInventoryMembers_button_updateMembership(),
- new AuthorizedTableAction(this, TableActionEnablement.ALWAYS, Permission.MANAGE_SETTINGS) {
- public void executeAction(final ListGridRecord[] selections, Object actionValue) {
- SC.say("working..");
- // todo: open editor for agent members
- }
- });
+ if (isAffinityGroupId) {
+ showUpdateMembersAction();
+ }
+ }
+
+ private void showUpdateMembersAction() {
+ addTableAction(extendLocatorId("editGroupAgents"), MSG.view_groupInventoryMembers_button_updateMembership(),
+ new AuthorizedTableAction(this, TableActionEnablement.ALWAYS, Permission.MANAGE_SETTINGS) {
+ public void executeAction(final ListGridRecord[] selections, Object actionValue) {
+ AffinityGroupAgentsSelector.show(id, AgentTableView.this);
+ }
+ });
}
@Override
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java
index 0f76f74..2d1a75e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java
@@ -135,10 +135,8 @@ public class ServerDatasource extends AbstractServerNodeDatasource<Server, Serve
if(fetchMembers) {
criteria.addFilterAffinityGroupId(affinityGroupId);
- GWTServiceLookup.getCloudService().findServersByCriteria(criteria, callback);
- } else {
- GWTServiceLookup.getCloudService().getServerNonMembersByAffinityGroupId(affinityGroupId, pc, callback);
}
+ GWTServiceLookup.getCloudService().findServersByCriteria(criteria, callback);
}
/**
@@ -195,7 +193,7 @@ public class ServerDatasource extends AbstractServerNodeDatasource<Server, Serve
@Override
protected ServerCriteria getFetchCriteria(DSRequest request) {
ServerCriteria criteria = new ServerCriteria();
- printRequestCriteria(request);
+// printRequestCriteria(request);
criteria.addFilterId(getFilter(request, FIELD_ID.propertyName(), Integer.class));
criteria.addFilterName(getFilter(request, FIELD_NAME.propertyName(), String.class));
criteria.addFilterAddress(getFilter(request, FILTER_ADDRESS, String.class));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java
index 7165390..f3dbd4d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java
@@ -19,7 +19,7 @@
package org.rhq.enterprise.gui.coregui.client.admin.topology;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_AFFINITY_GROUP;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AFFINITY_GROUP;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_ADDRESS;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_CTIME;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_MTIME;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
index 79be297..3c08618 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
@@ -18,8 +18,8 @@
*/
package org.rhq.enterprise.gui.coregui.client.admin.topology;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_AFFINITY_GROUP;
-import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentNodeDatasourceField.FIELD_AFFINITY_GROUP_ID;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AFFINITY_GROUP;
+import static org.rhq.enterprise.gui.coregui.client.admin.topology.AgentDatasourceField.FIELD_AFFINITY_GROUP_ID;
import static org.rhq.enterprise.gui.coregui.client.admin.topology.ServerDatasourceField.FIELD_ORDINAL;
import java.io.Serializable;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
index bd9e88b..f51b246 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
@@ -296,7 +296,7 @@ public class CloudManagerBean implements CloudManagerLocal {
partitionEventManager.processRequestedPartitionEvents();
}
- @RequiredPermission(Permission.MANAGE_INVENTORY)
+ @RequiredPermission(Permission.MANAGE_SETTINGS)
public PageList<Server> findServersByCriteria(Subject subject, ServerCriteria criteria) {
CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
CriteriaQueryRunner<Server> runner = new CriteriaQueryRunner<Server>(criteria, generator, entityManager);
commit 9c52b1e5e5e75f65acad0fcd250da92914d7435c
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Dec 18 17:10:43 2012 +0100
AgentCriteria and Agent finder have been added
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AgentCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AgentCriteria.java
new file mode 100644
index 0000000..b18b5d6
--- /dev/null
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AgentCriteria.java
@@ -0,0 +1,107 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.core.domain.criteria;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+
+import org.rhq.core.domain.cloud.Server;
+import org.rhq.core.domain.resource.Agent;
+import org.rhq.core.domain.util.PageOrdering;
+
+/**
+ * Criteria object for querying {@link Server}s.
+ *
+ * @author Jiri Kremser
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@SuppressWarnings("unused")
+public class AgentCriteria extends Criteria {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String SORT_FIELD_CTIME = "ctime";
+
+ public static final String SORT_FIELD_NAME = "name";
+
+ private Integer filterId;
+ private String filterName;
+ private String filterAddress;
+ private Integer filterPort;
+ private Integer filterServerId; // requires override
+ private Integer filterAffinityGroupId; // requires override
+
+ private boolean fetchServer;
+ private boolean fetchAffinityGroup;
+
+ private PageOrdering sortCtime;
+ private PageOrdering sortName;
+
+ public AgentCriteria() {
+ filterOverrides.put("serverId", "server.id = ?");
+ filterOverrides.put("affinityGroupId", "affinityGroup.id = ?");
+ }
+
+ public Class<?> getPersistentClass() {
+ return Agent.class;
+ }
+
+ public void addFilterId(Integer filterId) {
+ this.filterId = filterId;
+ }
+
+ public void addFilterName(String filterName) {
+ this.filterName = filterName;
+ }
+
+ public void addFilterAffinityGroupId(Integer filterAffinityGroupId) {
+ this.filterAffinityGroupId = filterAffinityGroupId;
+ }
+
+ public void addFilterAddress(String filterAddress) {
+ this.filterAddress = filterAddress;
+ }
+
+ public void addFilterPort(Integer filterPort) {
+ this.filterPort = filterPort;
+ }
+
+ public void addFilterServerId(Integer filterServerId) {
+ this.filterServerId = filterServerId;
+ }
+
+ public void fetchAffinityGroup(boolean fetchAffinityGroup) {
+ this.fetchAffinityGroup = fetchAffinityGroup;
+ }
+
+ public void fetchServer(boolean fetchServer) {
+ this.fetchServer = fetchServer;
+ }
+
+ public void addSortCtime(PageOrdering sort) {
+ addSortField(SORT_FIELD_CTIME);
+ this.sortCtime = sort;
+ }
+
+ public void addSortName(PageOrdering sort) {
+ addSortField(SORT_FIELD_NAME);
+ this.sortName = sort;
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/CloudGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/CloudGWTService.java
index 3e64318..df83ba8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/CloudGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/CloudGWTService.java
@@ -33,6 +33,7 @@ import org.rhq.core.domain.cloud.PartitionEventDetails;
import org.rhq.core.domain.cloud.Server;
import org.rhq.core.domain.cloud.composite.AffinityGroupCountComposite;
import org.rhq.core.domain.cloud.composite.ServerWithAgentCountComposite;
+import org.rhq.core.domain.criteria.AgentCriteria;
import org.rhq.core.domain.criteria.PartitionEventCriteria;
import org.rhq.core.domain.criteria.ServerCriteria;
import org.rhq.core.domain.resource.Agent;
@@ -58,47 +59,54 @@ public interface CloudGWTService extends RemoteService {
void deleteServers(int[] serverIds) throws RuntimeException;
void updateServerMode(int[] serverIds, Server.OperationMode mode) throws RuntimeException;
-
+
void updateServer(Server server) throws RuntimeException;
List<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc) throws RuntimeException;;
PageList<PartitionEvent> findPartitionEventsByCriteria(PartitionEventCriteria criteria) throws RuntimeException;
-
+
PageList<Server> findServersByCriteria(ServerCriteria criteria) throws RuntimeException;
+ PageList<Agent> findAgentsByCriteria(AgentCriteria criteria) throws RuntimeException;
+
void cloudPartitionEventRequest() throws RuntimeException;
void purgeAllEvents() throws RuntimeException;
void deletePartitionEvents(int[] eventIds) throws RuntimeException;
- PageList<PartitionEventDetails> getPartitionEventDetails(int partitionEventId,
- PageControl pageControl) throws RuntimeException;
-
- PageList<AffinityGroupCountComposite> getAffinityGroupCountComposites(PageControl pageControl) throws RuntimeException;
-
+ PageList<PartitionEventDetails> getPartitionEventDetails(int partitionEventId, PageControl pageControl)
+ throws RuntimeException;
+
+ PageList<AffinityGroupCountComposite> getAffinityGroupCountComposites(PageControl pageControl)
+ throws RuntimeException;
+
int deleteAffinityGroups(int[] affinityGroupIds) throws RuntimeException;
-
+
int createAffinityGroup(AffinityGroup affinityGroup) throws RuntimeException;
-
+
void updateAffinityGroup(AffinityGroup affinityGroup) throws RuntimeException;
-
- PageList<Server> getServerMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl) throws RuntimeException;
-
- PageList<Server> getServerNonMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl) throws RuntimeException;
-
- PageList<Agent> getAgentMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl) throws RuntimeException;
-
- PageList<Agent> getAgentNonMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl) throws RuntimeException;
-
+
+ PageList<Server> getServerMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl)
+ throws RuntimeException;
+
+ PageList<Server> getServerNonMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl)
+ throws RuntimeException;
+
+ PageList<Agent> getAgentMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl)
+ throws RuntimeException;
+
+ PageList<Agent> getAgentNonMembersByAffinityGroupId(int affinityGroupId, PageControl pageControl)
+ throws RuntimeException;
+
AffinityGroup getAffinityGroupById(int affinityGroupId) throws RuntimeException;
-
+
void addServersToGroup(int affinityGroupId, Integer[] serverIds) throws RuntimeException;
-
+
void removeServersFromGroup(Integer[] serverIds) throws RuntimeException;
-
+
void addAgentsToGroup(int affinityGroupId, Integer[] agentIds) throws RuntimeException;
-
+
void removeAgentsFromGroup(Integer[] agentIds) throws RuntimeException;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java
index 1daa1df..db7ec3c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java
@@ -36,6 +36,7 @@ import org.rhq.core.domain.cloud.Server;
import org.rhq.core.domain.cloud.Server.OperationMode;
import org.rhq.core.domain.cloud.composite.AffinityGroupCountComposite;
import org.rhq.core.domain.cloud.composite.ServerWithAgentCountComposite;
+import org.rhq.core.domain.criteria.AgentCriteria;
import org.rhq.core.domain.criteria.PartitionEventCriteria;
import org.rhq.core.domain.criteria.ServerCriteria;
import org.rhq.core.domain.resource.Agent;
@@ -46,6 +47,7 @@ import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
import org.rhq.enterprise.server.cloud.AffinityGroupManagerLocal;
import org.rhq.enterprise.server.cloud.CloudManagerLocal;
import org.rhq.enterprise.server.cloud.PartitionEventManagerLocal;
+import org.rhq.enterprise.server.core.AgentManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
/**
@@ -56,6 +58,8 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud
private static final long serialVersionUID = 1L;
private CloudManagerLocal cloudManager = LookupUtil.getCloudManager();
+
+ private AgentManagerLocal agentManager = LookupUtil.getAgentManager();
private PartitionEventManagerLocal partitionEventManager = LookupUtil.getPartitionEventManager();
@@ -143,6 +147,17 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud
throw getExceptionToThrowToClient(t);
}
}
+
+ @Override
+ public PageList<Agent> findAgentsByCriteria(AgentCriteria criteria) throws RuntimeException {
+ try {
+ return SerialUtility.prepare(
+ agentManager.findAgentsByCriteria(getSessionSubject(), criteria),
+ "CloudGWTServiceImpl.findAgentsByCriteria");
+ } catch (Throwable t) {
+ throw getExceptionToThrowToClient(t);
+ }
+ }
@Override
public void cloudPartitionEventRequest() throws RuntimeException {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java
index 9cced72..42adb10 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java
@@ -48,6 +48,7 @@ import org.rhq.core.clientapi.server.core.PingRequest;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.common.composite.SystemSetting;
+import org.rhq.core.domain.criteria.AgentCriteria;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.domain.resource.composite.AgentLastAvailabilityPingComposite;
@@ -67,6 +68,8 @@ import org.rhq.enterprise.server.core.comm.ServerCommunicationsServiceMBean;
import org.rhq.enterprise.server.core.comm.ServerCommunicationsServiceUtil;
import org.rhq.enterprise.server.measurement.AvailabilityManagerLocal;
import org.rhq.enterprise.server.system.SystemManagerLocal;
+import org.rhq.enterprise.server.util.CriteriaQueryGenerator;
+import org.rhq.enterprise.server.util.CriteriaQueryRunner;
import org.rhq.enterprise.server.util.LookupUtil;
import org.rhq.enterprise.server.util.concurrent.AvailabilityReportSerializer;
@@ -654,5 +657,12 @@ public class AgentManagerBean implements AgentManagerLocal {
return pingResults;
}
+
+ @RequiredPermission(Permission.MANAGE_SETTINGS)
+ public PageList<Agent> findAgentsByCriteria(Subject subject, AgentCriteria criteria) {
+ CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
+ CriteriaQueryRunner<Agent> runner = new CriteriaQueryRunner<Agent>(criteria, generator, entityManager);
+ return runner.execute();
+ }
}
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerLocal.java
index e09cfaa..5494e4d 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerLocal.java
@@ -30,6 +30,7 @@ import org.rhq.core.clientapi.server.core.AgentVersion;
import org.rhq.core.clientapi.server.core.CoreServerService;
import org.rhq.core.clientapi.server.core.PingRequest;
import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.criteria.AgentCriteria;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
@@ -308,4 +309,6 @@ public interface AgentManagerLocal {
* @return The updated request object.
*/
public PingRequest handlePingRequest(PingRequest request);
+
+ PageList<Agent> findAgentsByCriteria(Subject subject, AgentCriteria criteria);
}
\ No newline at end of file
commit 6ad56994db007039324ad2d6462636546e4e1ce1
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Fri Dec 14 19:35:46 2012 +0100
ServerCriteria and Server finder have been added
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ServerCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ServerCriteria.java
new file mode 100644
index 0000000..b00b3d7
--- /dev/null
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ServerCriteria.java
@@ -0,0 +1,125 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.core.domain.criteria;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+
+import org.rhq.core.domain.cloud.Server;
+import org.rhq.core.domain.cloud.Server.OperationMode;
+import org.rhq.core.domain.util.PageOrdering;
+
+/**
+ * Criteria object for querying {@link Server}s.
+ *
+ * @author Jiri Kremser
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@SuppressWarnings("unused")
+public class ServerCriteria extends Criteria {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String SORT_FIELD_CTIME = "ctime";
+
+ public static final String SORT_FIELD_NAME = "name";
+
+ public static final String SORT_FIELD_COMPUTE_POWER = "computePower";
+
+ private Integer filterId;
+ private String filterName;
+ private String filterAddress;
+ private Integer filterPort;
+ private Integer filterSecurePort;
+ private OperationMode filterOperationMode; // requires override
+ private Integer filterComputePower;
+ private Integer filterAffinityGroupId; // requires override
+
+ private boolean fetchAgents;
+ private boolean fetchAffinityGroup;
+
+ private PageOrdering sortCtime;
+ private PageOrdering sortName;
+ private PageOrdering sortComputePower;
+
+ public ServerCriteria() {
+ // filterOverrides.put("operationMode", "operationMode IN ( ? )");
+ filterOverrides.put("affinityGroupId", "affinityGroup.id = ?");
+ }
+
+ public Class<?> getPersistentClass() {
+ return Server.class;
+ }
+
+ public void addFilterId(Integer filterId) {
+ this.filterId = filterId;
+ }
+
+ public void addFilterName(String filterName) {
+ this.filterName = filterName;
+ }
+
+ public void addFilterAddress(String filterAddress) {
+ this.filterAddress = filterAddress;
+ }
+
+ public void addFilterPort(Integer filterPort) {
+ this.filterPort = filterPort;
+ }
+
+ public void addFilterSecurePort(Integer filterSecurePort) {
+ this.filterSecurePort = filterSecurePort;
+ }
+
+ public void addFilterOperationMode(OperationMode operationMode) {
+ this.filterOperationMode = operationMode;
+ }
+
+ public void addFilterComputePower(Integer filterComputePower) {
+ this.filterComputePower = filterComputePower;
+ }
+
+ public void addFilterAffinityGroupId(Integer filterAffinityGroupId) {
+ this.filterAffinityGroupId = filterAffinityGroupId;
+ }
+
+ public void fetchAgents(boolean fetchAgents) {
+ this.fetchAgents = fetchAgents;
+ }
+
+ public void fetchAffinityGroup(boolean fetchAffinityGroup) {
+ this.fetchAffinityGroup = fetchAffinityGroup;
+ }
+
+ public void addSortCtime(PageOrdering sort) {
+ addSortField(SORT_FIELD_CTIME);
+ this.sortCtime = sort;
+ }
+
+ public void addSortName(PageOrdering sort) {
+ addSortField(SORT_FIELD_NAME);
+ this.sortName = sort;
+ }
+
+ public void addSortComputePower(PageOrdering sortComputePower) {
+ addSortField(SORT_FIELD_COMPUTE_POWER);
+ this.sortComputePower = sortComputePower;
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
index a1f5507..f104d6c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AffinityGroupServersSelector.java
@@ -42,6 +42,7 @@ import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.cloud.Server;
+import org.rhq.core.domain.criteria.ServerCriteria;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.components.selector.AbstractSelector;
@@ -53,13 +54,13 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIButton;
/**
* @author Jirka Kremser
*/
-public class AffinityGroupServersSelector extends AbstractSelector<Server, org.rhq.core.domain.criteria.Criteria> {
+public class AffinityGroupServersSelector extends AbstractSelector<Server, ServerCriteria> {
private static final String ITEM_ICON = "types/Server_up_16.png";
private final Integer affinityGroupId;
- private static RPCDataSource<Server, org.rhq.core.domain.criteria.Criteria> datasource = null;
+ private static RPCDataSource<Server, ServerCriteria> datasource = null;
private static Window modalWindow;
private static boolean shouldBeClosed;
@@ -98,7 +99,7 @@ public class AffinityGroupServersSelector extends AbstractSelector<Server, org.r
}
@Override
- protected RPCDataSource<Server, org.rhq.core.domain.criteria.Criteria> getDataSource() {
+ protected RPCDataSource<Server, ServerCriteria> getDataSource() {
if (datasource == null) {
datasource = new ServerDatasource(affinityGroupId, false);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDatasource.java
index 4a07853..f77a843 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventDatasource.java
@@ -158,6 +158,9 @@ public class PartitionEventDatasource extends RPCDataSource<PartitionEvent, Part
@Override
protected PartitionEventCriteria getFetchCriteria(DSRequest request) {
+ //todo: do it like in ResourceDatasource.class
+
+
ExecutionStatus[] statuses = getArrayFilter(request, FILTER_EXECUTION_STATUS, ExecutionStatus.class);
PartitionEventType[] types = getArrayFilter(request, FILTER_EVENT_TYPE, PartitionEventType.class);
if (types == null || types.length == 0 || statuses == null || statuses.length == 0) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java
index d942c44..0f76f74 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDatasource.java
@@ -42,18 +42,28 @@ import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.cloud.Server;
-import org.rhq.core.domain.criteria.Criteria;
+import org.rhq.core.domain.cloud.Server.OperationMode;
+import org.rhq.core.domain.criteria.ServerCriteria;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
/**
* @author Jirka Kremser
*
*/
-public class ServerDatasource extends AbstractServerNodeDatasource<Server, Criteria> {
+public class ServerDatasource extends AbstractServerNodeDatasource<Server, ServerCriteria> {
+
+ // filters
+ public static final String FILTER_ADDRESS = FIELD_ADDRESS.propertyName();
+ public static final String FILTER_PORT = FIELD_PORT.propertyName();
+ public static final String FILTER_SECURE_PORT = FIELD_SECURE_PORT.propertyName();
+ public static final String FILTER_OPERATION_MODE = FIELD_OPERATION_MODE.propertyName();
+ public static final String FILTER_COMPUTE_POWER = "computePower";
+ public static final String FILTER_AFFINITY_GROUP_ID = "affinityGroupId";
private final Integer affinityGroupId;
@@ -103,7 +113,7 @@ public class ServerDatasource extends AbstractServerNodeDatasource<Server, Crite
}
@Override
- protected void executeFetch(final DSRequest request, final DSResponse response, Criteria criteria) {
+ protected void executeFetch(final DSRequest request, final DSResponse response, ServerCriteria criteria) {
if (affinityGroupId == null) {
return;
}
@@ -122,8 +132,10 @@ public class ServerDatasource extends AbstractServerNodeDatasource<Server, Crite
processResponse(request.getRequestId(), response);
}
};
+
if(fetchMembers) {
- GWTServiceLookup.getCloudService().getServerMembersByAffinityGroupId(affinityGroupId, pc, callback);
+ criteria.addFilterAffinityGroupId(affinityGroupId);
+ GWTServiceLookup.getCloudService().findServersByCriteria(criteria, callback);
} else {
GWTServiceLookup.getCloudService().getServerNonMembersByAffinityGroupId(affinityGroupId, pc, callback);
}
@@ -181,8 +193,22 @@ public class ServerDatasource extends AbstractServerNodeDatasource<Server, Crite
}
@Override
- protected Criteria getFetchCriteria(DSRequest request) {
- // we don't use criteria for this datasource, just return null
- return null;
+ protected ServerCriteria getFetchCriteria(DSRequest request) {
+ ServerCriteria criteria = new ServerCriteria();
+ printRequestCriteria(request);
+ criteria.addFilterId(getFilter(request, FIELD_ID.propertyName(), Integer.class));
+ criteria.addFilterName(getFilter(request, FIELD_NAME.propertyName(), String.class));
+ criteria.addFilterAddress(getFilter(request, FILTER_ADDRESS, String.class));
+ criteria.addFilterPort(getFilter(request, FILTER_PORT, Integer.class));
+ criteria.addFilterSecurePort(getFilter(request, FILTER_SECURE_PORT, Integer.class));
+ criteria.addFilterOperationMode(getFilter(request, FILTER_OPERATION_MODE, OperationMode.class));
+ criteria.addFilterComputePower(getFilter(request, FILTER_COMPUTE_POWER, Integer.class));
+ criteria.addFilterAffinityGroupId(getFilter(request, FILTER_AFFINITY_GROUP_ID, Integer.class));
+
+ //@todo: Remove me when finished debugging search expression
+ Log.debug(" *** ServerCriteria Search String: " + getFilter(request, "search", String.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/admin/topology/ServerTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
index 24e2d9c..79be297 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
@@ -38,7 +38,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.cloud.Server;
-import org.rhq.core.domain.criteria.Criteria;
+import org.rhq.core.domain.criteria.BaseCriteria;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.IconEnum;
import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
@@ -56,7 +56,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
* @author Jirka Kremser
*
*/
-public class ServerTableView extends TableSection<AbstractServerNodeDatasource<? extends Serializable, Criteria>>
+public class ServerTableView extends TableSection<AbstractServerNodeDatasource<? extends Serializable, ? extends BaseCriteria>>
implements HasViewName {
public static final ViewName VIEW_ID = new ViewName("Servers(GWT)", MSG.view_adminTopology_servers() + "(GWT)",
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/CloudGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/CloudGWTService.java
index afaacb8..3e64318 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/CloudGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/CloudGWTService.java
@@ -34,6 +34,7 @@ import org.rhq.core.domain.cloud.Server;
import org.rhq.core.domain.cloud.composite.AffinityGroupCountComposite;
import org.rhq.core.domain.cloud.composite.ServerWithAgentCountComposite;
import org.rhq.core.domain.criteria.PartitionEventCriteria;
+import org.rhq.core.domain.criteria.ServerCriteria;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
@@ -63,6 +64,8 @@ public interface CloudGWTService extends RemoteService {
List<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc) throws RuntimeException;;
PageList<PartitionEvent> findPartitionEventsByCriteria(PartitionEventCriteria criteria) throws RuntimeException;
+
+ PageList<Server> findServersByCriteria(ServerCriteria criteria) throws RuntimeException;
void cloudPartitionEventRequest() throws RuntimeException;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java
index 32fadde..1daa1df 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/CloudGWTServiceImpl.java
@@ -37,6 +37,7 @@ import org.rhq.core.domain.cloud.Server.OperationMode;
import org.rhq.core.domain.cloud.composite.AffinityGroupCountComposite;
import org.rhq.core.domain.cloud.composite.ServerWithAgentCountComposite;
import org.rhq.core.domain.criteria.PartitionEventCriteria;
+import org.rhq.core.domain.criteria.ServerCriteria;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
@@ -130,6 +131,18 @@ public class CloudGWTServiceImpl extends AbstractGWTServiceImpl implements Cloud
throw getExceptionToThrowToClient(t);
}
}
+
+ @Override
+ public PageList<Server> findServersByCriteria(ServerCriteria criteria)
+ throws RuntimeException {
+ try {
+ return SerialUtility.prepare(
+ cloudManager.findServersByCriteria(getSessionSubject(), criteria),
+ "CloudGWTServiceImpl.findServersByCriteria");
+ } catch (Throwable t) {
+ throw getExceptionToThrowToClient(t);
+ }
+ }
@Override
public void cloudPartitionEventRequest() throws RuntimeException {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
index 4bfc1af..bd9e88b 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
@@ -36,6 +36,7 @@ import org.rhq.core.domain.cloud.FailoverListDetails;
import org.rhq.core.domain.cloud.PartitionEventType;
import org.rhq.core.domain.cloud.Server;
import org.rhq.core.domain.cloud.composite.ServerWithAgentCountComposite;
+import org.rhq.core.domain.criteria.ServerCriteria;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.domain.server.PersistenceUtility;
import org.rhq.core.domain.util.PageControl;
@@ -44,6 +45,8 @@ import org.rhq.enterprise.server.RHQConstants;
import org.rhq.enterprise.server.authz.AuthorizationManagerLocal;
import org.rhq.enterprise.server.authz.RequiredPermission;
import org.rhq.enterprise.server.cloud.instance.ServerManagerLocal;
+import org.rhq.enterprise.server.util.CriteriaQueryGenerator;
+import org.rhq.enterprise.server.util.CriteriaQueryRunner;
import org.rhq.enterprise.server.util.LookupUtil;
/**
@@ -292,4 +295,11 @@ public class CloudManagerBean implements CloudManagerLocal {
// regardless of the number of pending requests, as the work would be duplicated.
partitionEventManager.processRequestedPartitionEvents();
}
+
+ @RequiredPermission(Permission.MANAGE_INVENTORY)
+ public PageList<Server> findServersByCriteria(Subject subject, ServerCriteria criteria) {
+ CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
+ CriteriaQueryRunner<Server> runner = new CriteriaQueryRunner<Server>(criteria, generator, entityManager);
+ return runner.execute();
+ }
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java
index 212f835..92b59d3 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerLocal.java
@@ -26,6 +26,7 @@ import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.cloud.FailoverListDetails;
import org.rhq.core.domain.cloud.Server;
import org.rhq.core.domain.cloud.composite.ServerWithAgentCountComposite;
+import org.rhq.core.domain.criteria.ServerCriteria;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
@@ -89,4 +90,6 @@ public interface CloudManagerLocal {
PageList<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc);
void markStaleServersDown(Subject subject);
+
+ PageList<Server> findServersByCriteria(Subject subject, ServerCriteria criteria);
}
commit 134d6f6984e69dc06b105a3024f30f947c8f498a
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Fri Dec 14 15:21:53 2012 +0100
Revert "exposing the CloudManagerBean via CLI"
This reverts commit 60c1d42fa5750ef5d1829e97b6b15323501bc3f2.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java
index 151267f..d374324 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java
@@ -24,7 +24,6 @@ import org.rhq.enterprise.server.alert.AlertManagerRemote;
import org.rhq.enterprise.server.auth.SubjectManagerRemote;
import org.rhq.enterprise.server.authz.RoleManagerRemote;
import org.rhq.enterprise.server.bundle.BundleManagerRemote;
-import org.rhq.enterprise.server.cloud.CloudManagerRemote;
import org.rhq.enterprise.server.configuration.ConfigurationManagerRemote;
import org.rhq.enterprise.server.content.ContentManagerRemote;
import org.rhq.enterprise.server.content.RepoManagerRemote;
@@ -64,7 +63,6 @@ public enum RhqManager {
BundleManager(BundleManagerRemote.class, "${BundleManager}"), //
CallTimeDataManager(CallTimeDataManagerRemote.class, "${CallTimeDataManager}"), //
RepoManager(RepoManagerRemote.class, "${RepoManager}"), //
- CloudManager(CloudManagerRemote.class, "${CloudManager}"), //
ConfigurationManager(ConfigurationManagerRemote.class, "${ConfigurationManager}"), //
ContentManager(ContentManagerRemote.class, "${ContentManager}"), //
DataAccessManager(DataAccessManagerRemote.class, "${DataAccessManager}"), //
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
index 391b9e4..4bfc1af 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerBean.java
@@ -54,7 +54,7 @@ import org.rhq.enterprise.server.util.LookupUtil;
* @author Joseph Marques
*/
@Stateless
-public class CloudManagerBean implements CloudManagerLocal, CloudManagerRemote {
+public class CloudManagerBean implements CloudManagerLocal {
private final Log log = LogFactory.getLog(CloudManagerBean.class);
// A time sufficient to determine whether a server is down. Can be based on the initial delay set for the server instance
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerRemote.java
deleted file mode 100644
index 1f97b99..0000000
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/CloudManagerRemote.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2012 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.server.cloud;
-
-import java.util.List;
-
-import javax.ejb.Remote;
-
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.cloud.Server;
-import org.rhq.core.domain.cloud.composite.ServerWithAgentCountComposite;
-import org.rhq.core.domain.util.PageControl;
-import org.rhq.core.domain.util.PageList;
-
-/**
- * @author Jiri Kremser
- */
-@Remote
-public interface CloudManagerRemote {
-
-// void deleteServers(Integer[] serverIds) throws CloudManagerException;
-//
-// void deleteServer(Integer serverId) throws CloudManagerException;
-//
-// List<Agent> getAgentsByServerName(String serverName);
-//
-// Server getServerById(int serverId);
-//
-// Server getServerByName(String serverName);
-//
-// /**
-// * Return every server registered in the database considered part of the active cloud. This will exclude, for example,
-// * servers in INSTALLED mode or any other mode that should not be included when performing cloud operations such as partitioning.
-// * @return All servers available to the cloud.
-// */
-// List<Server> getAllCloudServers();
-//
- /**
- * Return every server registered in the database.
- * @return All servers, regardless of operation mode.
- */
- List<Server> getAllServers();
-
- PageList<ServerWithAgentCountComposite> getServerComposites(Subject subject, PageControl pc);
-//
-// /**
-// * Returns the number of servers that are part of the "server cloud", which excludes
-// * servers that have been installed but not associated with the cloud.
-// * The returned count will include those servers that are down or in maintenance mode,
-// * in addition to those servers that are currently running in a normal state.
-// *
-// * @return count of servers in the cloud
-// */
-// int getServerCount();
-//
-// /**
-// * Returns the number of servers that are part of the "server cloud" that are currently
-// * running in "normal" mode.
-// *
-// * This excludes all other servers such as those servers that have been installed but
-// * not associated with the cloud, servers that are down or in maintenance mode.
-// *
-// * @return count of servers in the cloud that are in a normal running state
-// */
-// int getNormalServerCount();
-//
-// void updateServerMode(Integer[] serverIds, Server.OperationMode mode);
-//
-// Server updateServer(Subject subject, Server server);
-//
-// PageList<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc);
-//
-// void markStaleServersDown(Subject subject);
-}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/RemoteAPIValidator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/RemoteAPIValidator.java
index 453e0a5..fddc6c6 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/RemoteAPIValidator.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/RemoteAPIValidator.java
@@ -34,7 +34,6 @@ import org.rhq.enterprise.server.alert.AlertDefinitionManagerBean;
import org.rhq.enterprise.server.alert.AlertManagerBean;
import org.rhq.enterprise.server.auth.SubjectManagerBean;
import org.rhq.enterprise.server.authz.RoleManagerBean;
-import org.rhq.enterprise.server.cloud.CloudManagerBean;
import org.rhq.enterprise.server.configuration.ConfigurationManagerBean;
import org.rhq.enterprise.server.content.AdvisoryManagerBean;
import org.rhq.enterprise.server.content.ContentManagerBean;
@@ -69,7 +68,6 @@ public class RemoteAPIValidator {
AvailabilityManagerBean.class,//
CallTimeDataManagerBean.class, //
RepoManagerBean.class,//
- CloudManagerBean.class,//
ConfigurationManagerBean.class, //
ContentManagerBean.class, //
//ContentSourceManagerBean.class, //
commit 756bac150c6f31e4dd5a60c9f519226fff7f28c1
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Fri Dec 14 14:43:33 2012 +0100
adding comment
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/FailoverListItemDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/FailoverListItemDatasource.java
index edce33a..6dd2430 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/FailoverListItemDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/FailoverListItemDatasource.java
@@ -53,6 +53,8 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
public class FailoverListItemDatasource extends AbstractServerNodeDatasource<FailoverListDetails, Criteria> {
private final int agentId;
+
+ // this delegate is there to not repeat the copyValues code
private final ServerDatasource serverDatasource;
public FailoverListItemDatasource(int agentId) {
commit 2ecf112a35453de2ab40aa4c091aff039c73f26c
Merge: 829bede e794a37
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Fri Dec 14 13:30:23 2012 +0100
Merge branch 'master' into jkremser/ha-jsf-to-gwt-rewrite
commit e794a376e030ff34e237afcb9b4994768e489cd8
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Dec 13 17:27:45 2012 +0100
Fixed the ExportingInputStream to correctly define the XML namespaces
(and thus work under woodstox, which is the XML streaming provider in AS7).
Re-enabled the SynchronizationManagerBeanTest.
diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
index f58396a..01b377f 100644
--- a/modules/enterprise/server/itests-2/pom.xml
+++ b/modules/enterprise/server/itests-2/pom.xml
@@ -656,7 +656,6 @@
<excludes>
<!-- NOTE: PERF GROUP AND SOME CLASSES EXCLUDED (SEE BZ 874696) -->
<exclude>**/LdapGroupManagerBeanTest.java</exclude>
- <exclude>**/SynchronizationManagerBeanTest.java</exclude>
<exclude>org/rhq/**/performance/**/*.java</exclude>
<!-- exclude the db tests which are not expected to run in this suite -->
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/ExportingInputStream.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/ExportingInputStream.java
index 19734f6..eae8d7d 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/ExportingInputStream.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/sync/ExportingInputStream.java
@@ -34,7 +34,6 @@ import java.util.zip.GZIPOutputStream;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
-import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
@@ -238,19 +237,15 @@ public class ExportingInputStream extends InputStream {
*/
private void exportPrologue(XMLStreamWriter wrt) throws XMLStreamException {
wrt.setDefaultNamespace(SynchronizationConstants.EXPORT_NAMESPACE);
- wrt.setPrefix(SynchronizationConstants.EXPORT_NAMESPACE_PREFIX, SynchronizationConstants.EXPORT_NAMESPACE);
- wrt.setPrefix(SynchronizationConstants.CONFIGURATION_INSTANCE_NAMESPACE_PREFIX, SynchronizationConstants.CONFIGURATION_INSTANCE_NAMESPACE);
- wrt.setPrefix(SynchronizationConstants.CONFIGURATION_NAMESPACE_PREFIX, SynchronizationConstants.CONFIGURATION_NAMESPACE);
-
- NamespaceContext nsContext = SynchronizationConstants.createConfigurationExportNamespaceContext();
-
- wrt.setNamespaceContext(nsContext);
wrt.writeStartDocument();
wrt.writeStartElement(SynchronizationConstants.EXPORT_NAMESPACE, SynchronizationConstants.CONFIGURATION_EXPORT_ELEMENT);
- wrt.writeNamespace(SynchronizationConstants.CONFIGURATION_INSTANCE_NAMESPACE_PREFIX, ConfigurationInstanceDescriptorUtil.NS_CONFIGURATION_INSTANCE);
- wrt.writeNamespace(SynchronizationConstants.CONFIGURATION_NAMESPACE_PREFIX, SynchronizationConstants.CONFIGURATION_NAMESPACE);
+ wrt.writeNamespace(SynchronizationConstants.CONFIGURATION_INSTANCE_NAMESPACE_PREFIX,
+ ConfigurationInstanceDescriptorUtil.NS_CONFIGURATION_INSTANCE);
+ wrt.writeNamespace(SynchronizationConstants.CONFIGURATION_NAMESPACE_PREFIX,
+ SynchronizationConstants.CONFIGURATION_NAMESPACE);
+
writeValidators(wrt);
}
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/ExportingInputStreamTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/ExportingInputStreamTest.java
index 6d56969..db6393e 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/ExportingInputStreamTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/sync/test/ExportingInputStreamTest.java
@@ -28,6 +28,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@ -36,9 +38,19 @@ import java.util.List;
import java.util.Set;
import javax.persistence.EntityManager;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -56,12 +68,14 @@ import org.rhq.core.domain.sync.ExporterMessages;
import org.rhq.enterprise.server.sync.ExportReader;
import org.rhq.enterprise.server.sync.ExportWriter;
import org.rhq.enterprise.server.sync.ExportingInputStream;
+import org.rhq.enterprise.server.sync.ImportException;
import org.rhq.enterprise.server.sync.NoSingleEntity;
import org.rhq.enterprise.server.sync.SynchronizationConstants;
import org.rhq.enterprise.server.sync.Synchronizer;
import org.rhq.enterprise.server.sync.exporters.AbstractDelegatingExportingIterator;
import org.rhq.enterprise.server.sync.exporters.Exporter;
import org.rhq.enterprise.server.sync.exporters.ExportingIterator;
+import org.rhq.enterprise.server.sync.exporters.JAXBExportingIterator;
import org.rhq.enterprise.server.sync.importers.ExportedEntityMatcher;
import org.rhq.enterprise.server.sync.importers.Importer;
import org.rhq.enterprise.server.sync.validators.ConsistencyValidator;
@@ -90,7 +104,9 @@ public class ExportingInputStreamTest extends JMockTest {
}
public void export(ExportWriter output) throws XMLStreamException {
- output.writeCData(getCurrent().toString());
+ output.writeStartElement("datum");
+ output.writeCharacters(getCurrent().toString());
+ output.writeEndElement();
}
public String getNotes() {
@@ -191,6 +207,140 @@ public class ExportingInputStreamTest extends JMockTest {
}
}
+ public static class Entity {
+ public int value;
+
+ public Entity(int value) {
+ this.value = value;
+ }
+ }
+
+ @XmlRootElement(name = "exported-entity")
+ @XmlAccessorType(XmlAccessType.FIELD)
+ public static class ExportedEntity {
+
+ @XmlAttribute
+ public int property;
+ }
+
+ public static class JAXBExporter implements Exporter<Entity, ExportedEntity> {
+
+ private static class JAXBIterator extends JAXBExportingIterator<ExportedEntity, Entity> {
+
+ public JAXBIterator(java.util.Iterator<Entity> sourceIterator) {
+ super(sourceIterator, ExportedEntity.class);
+ }
+
+ @Override
+ protected ExportedEntity convert(Entity object) {
+ ExportedEntity ret = new ExportedEntity();
+ ret.property = object.value;
+
+ return ret;
+ }
+
+ @Override
+ public String getNotes() {
+ return null;
+ }
+ }
+
+ @Override
+ public ExportingIterator<ExportedEntity> getExportingIterator() {
+ List<Entity> data = new ArrayList<Entity>();
+ for(int i = 0; i < 4; ++i) {
+ data.add(new Entity(i));
+ }
+
+ return new JAXBIterator(data.iterator());
+ }
+
+ @Override
+ public String getNotes() {
+ return null;
+ }
+
+ }
+
+ public static class JAXBImporter implements Importer<Entity, ExportedEntity> {
+
+ private Unmarshaller unmarshaller;
+ {
+ try {
+ JAXBContext context = JAXBContext.newInstance(ExportedEntity.class);
+ unmarshaller = context.createUnmarshaller();
+ } catch (JAXBException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
+ @Override
+ public ConfigurationDefinition getImportConfigurationDefinition() {
+ return null;
+ }
+
+ @Override
+ public void configure(Configuration importConfiguration) {
+ }
+
+ @Override
+ public ExportedEntityMatcher<Entity, ExportedEntity> getExportedEntityMatcher() {
+ return new ExportedEntityMatcher<Entity, ExportedEntity>() {
+ @Override
+ public Entity findMatch(ExportedEntity object) {
+ return new Entity(object.property);
+ }
+ };
+ }
+
+ @Override
+ public Set<EntityValidator<ExportedEntity>> getEntityValidators() {
+ return Collections.emptySet();
+ }
+
+ @Override
+ public void update(Entity entity, ExportedEntity exportedEntity) throws Exception {
+ entity.value = exportedEntity.property;
+ }
+
+ @Override
+ public ExportedEntity unmarshallExportedEntity(ExportReader reader) throws XMLStreamException {
+ try {
+ return (ExportedEntity) unmarshaller.unmarshal(reader);
+ } catch (JAXBException e) {
+ throw new XMLStreamException(e);
+ }
+ }
+
+ @Override
+ public String finishImport() throws Exception {
+ return null;
+ }
+
+ }
+
+ public static class JAXBSynchronizer implements Synchronizer<Entity, ExportedEntity> {
+
+ @Override
+ public void initialize(Subject subject, EntityManager entityManager) {
+ }
+
+ @Override
+ public Exporter<Entity, ExportedEntity> getExporter() {
+ return new JAXBExporter();
+ }
+
+ @Override
+ public Importer<Entity, ExportedEntity> getImporter() {
+ return new JAXBImporter();
+ }
+
+ @Override
+ public Set<ConsistencyValidator> getRequiredValidators() {
+ return Collections.emptySet();
+ }
+
+ }
public void testSucessfulExport() throws Exception {
List<String> list1 = Arrays.asList("a", "b", "c");
@@ -203,11 +353,11 @@ public class ExportingInputStreamTest extends JMockTest {
InputStream export = new ExportingInputStream(exporters, new HashMap<String, ExporterMessages>(), 1024, false);
-// String exportContents = readAll(new InputStreamReader(export, "UTF-8"));
-//
-// LOG.info("Export contents:\n" + exportContents);
-//
-// export = new ByteArrayInputStream(exportContents.getBytes("UTF-8"));
+ String exportContents = readAll(new InputStreamReader(export, "UTF-8"));
+
+ LOG.info("Export contents:\n" + exportContents);
+
+ export = new ByteArrayInputStream(exportContents.getBytes("UTF-8"));
DocumentBuilder bld = DocumentBuilderFactory.newInstance().newDocumentBuilder();
@@ -264,16 +414,108 @@ public class ExportingInputStreamTest extends JMockTest {
Node data = getDirectChildByTagName(entityElement, SynchronizationConstants.DATA_ELEMENT);
assertNotNull(data, "Could not find data element in the entity.");
- String dataText = ((Element)data).getTextContent();
+ Node datum = getDirectChildByTagName(data, "datum");
+ assertNotNull(datum, "Could not find the exported datum element containing the actual data.");
+
+ String datumText = ((Element) datum).getTextContent();
notesText = ((Element)note).getTextContent();
- assertEquals(notesText, ListToStringExporter.NOTE_PREFIX + dataText, "Unexpected discrepancy between data and notes in the export.");
+ assertEquals(notesText, ListToStringExporter.NOTE_PREFIX + datumText,
+ "Unexpected discrepancy between data and notes in the export.");
}
++elementIndex;
}
}
+ @Test
+ public void testJAXBHandled() throws Exception {
+ JAXBSynchronizer sync = new JAXBSynchronizer();
+
+ Set<Synchronizer<?, ?>>syncs = this.<Synchronizer<?, ?>> asSet(sync);
+
+ InputStream export = new ExportingInputStream(syncs, new HashMap<String, ExporterMessages>(), 1024, false);
+
+ String exportContents = readAll(new InputStreamReader(export, "UTF-8"));
+
+ XMLStreamReader rdr = XMLInputFactory.newInstance().createXMLStreamReader(
+ new ByteArrayInputStream(exportContents.getBytes(Charset.forName("UTF-8"))));
+
+ try {
+ while (rdr.hasNext()) {
+ switch (rdr.next()) {
+ case XMLStreamReader.START_ELEMENT:
+ String tagName = rdr.getName().getLocalPart();
+ if (SynchronizationConstants.ENTITIES_EXPORT_ELEMENT.equals(tagName)) {
+ try {
+ importSingle(rdr);
+ } catch (Exception e) {
+ //fail fast on the import errors... This runs in a single transaction
+ //so all imports done so far will get rolled-back.
+ //(Even if we change our minds later and run a transaction per importer
+ //we should fail fast to prevent further damage due to possible
+ //constraint violations in the db, etc.)
+ throw new ImportException("Import failed.", e);
+ }
+ }
+ break;
+ }
+ }
+ } finally {
+ rdr.close();
+ }
+ }
+
+ private <E, X> void importSingle(XMLStreamReader rdr)
+ throws Exception {
+ String synchronizerClassName = rdr.getAttributeValue(null, SynchronizationConstants.ID_ATTRIBUTE);
+
+ @SuppressWarnings("unchecked")
+ Synchronizer<E, X> synchronizer = instantiate(synchronizerClassName, Synchronizer.class,
+ "The synchronizer denoted in the export file ('%s') does not implement the importer interface. This should not happen.");
+
+ Importer<E, X> importer = synchronizer.getImporter();
+
+ ExportedEntityMatcher<E, X> matcher = importer.getExportedEntityMatcher();
+
+ //the passed in configuration has precedence over the default one inlined in
+ //the config file.
+ while (rdr.hasNext()) {
+ boolean bailout = false;
+ switch (rdr.next()) {
+ case XMLStreamConstants.START_ELEMENT:
+ if (SynchronizationConstants.DATA_ELEMENT.equals(rdr.getName().getLocalPart())) {
+
+ rdr.nextTag();
+ X exportedEntity = importer.unmarshallExportedEntity(new ExportReader(rdr));
+ E entity = matcher == null ? null : matcher.findMatch(exportedEntity);
+ importer.update(entity, exportedEntity);
+ }
+ break;
+ case XMLStreamConstants.END_ELEMENT:
+ if (SynchronizationConstants.ENTITIES_EXPORT_ELEMENT.equals(rdr.getName().getLocalPart())) {
+ bailout = true;
+ }
+ }
+
+ if (bailout) {
+ break;
+ }
+ }
+ }
+
+ private <T> T instantiate(String className, Class<T> desiredClass, String notAssignableErrorMessage)
+ throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+ Class<?> cls = Class.forName(className);
+ if (!desiredClass.isAssignableFrom(cls)) {
+ throw new IllegalStateException(String.format(notAssignableErrorMessage, className, desiredClass.getName()));
+ }
+
+ Object instance = cls.newInstance();
+
+ return desiredClass.cast(instance);
+ }
+
@Test(expectedExceptions = IOException.class)
public void testExceptionHandling_Exporter_getExportingIterator() throws Exception {
final Exporter<?, ?> failingExporter = context.mock(Exporter.class);
@@ -452,7 +694,7 @@ public class ExportingInputStreamTest extends JMockTest {
return n;
}
}
-
+
return null;
}
}
commit b62fb191a178d06fe48b47b2508fd4cb0aa039ca
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Dec 13 16:15:00 2012 +0100
Modified the access checking JNDI lookup wrappers to take into account
the slightly different behavior needed when there was originally no
initial context factory builder or if there originally was some.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/AccessCheckingInitialContextFactoryBuilder.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/AccessCheckingInitialContextFactoryBuilder.java
index 9681014..52addaa 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/AccessCheckingInitialContextFactoryBuilder.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/AccessCheckingInitialContextFactoryBuilder.java
@@ -32,6 +32,7 @@ import java.util.EnumMap;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Hashtable;
+import java.util.List;
import java.util.Set;
import javax.naming.Context;
@@ -138,7 +139,7 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
}
private enum FactoryType {
- ACCESS_CHECKING {
+ ACCESS_CHECKING_URL_PREFERRING {
@Override
public InitialContextFactory wrap(InitialContextFactory factory) {
@@ -158,15 +159,34 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
return new DecoratingInitialContextFactory(factory, pickers);
}
+ },
+ ACCESS_CHECKING {
+
+ @Override
+ public InitialContextFactory wrap(InitialContextFactory factory) {
+ ArrayList<DecoratorPicker<Context, ContextDecorator>> pickers = new ArrayList<DecoratorPicker<Context, ContextDecorator>>();
+ pickers.add(getAccessCheckingDecoratorPicker());
+
+ return new DecoratingInitialContextFactory(factory, pickers);
+ }
+ },
+ PASS_THROUGH {
+
+ @Override
+ public InitialContextFactory wrap(InitialContextFactory factory) {
+ List<DecoratorPicker<Context, ContextDecorator>> pickers = Collections.emptyList();
+
+ return new DecoratingInitialContextFactory(factory, pickers);
+ }
};
public abstract InitialContextFactory wrap(InitialContextFactory factory);
- public static FactoryType detect(Hashtable<?, ?> environment) {
+ public static FactoryType detect(Hashtable<?, ?> environment, boolean pretendNoFactoryBuilder) {
String providerUrl = (String) environment.get(Context.PROVIDER_URL);
if (providerUrl == null) {
- return ACCESS_CHECKING;
+ return pretendNoFactoryBuilder ? ACCESS_CHECKING_URL_PREFERRING : ACCESS_CHECKING;
} else {
try {
URI uri = new URI(providerUrl);
@@ -175,9 +195,9 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
//check if we are accessing the RHQ server through some remoting
//interface.
if (uri.getPort() == JNP_PORT && SERVER_BIND_IPS.contains(providerHost)) {
- return ACCESS_CHECKING;
+ return pretendNoFactoryBuilder ? ACCESS_CHECKING_URL_PREFERRING : ACCESS_CHECKING;
} else {
- return URL_PREFERRING;
+ return pretendNoFactoryBuilder ? URL_PREFERRING : PASS_THROUGH;
}
} catch (URISyntaxException e) {
if (LOG.isDebugEnabled()) {
@@ -185,7 +205,7 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
+ Context.PROVIDER_URL
+ " is not a valid URI. Falling back to using the access checking wrapper.", e);
}
- return ACCESS_CHECKING;
+ return pretendNoFactoryBuilder ? ACCESS_CHECKING_URL_PREFERRING : ACCESS_CHECKING;
} catch (UnknownHostException e) {
//let the factory deal with the unknown host...
//this most probably shouldn't be secured because localhost addresses
@@ -195,7 +215,7 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
+ Context.PROVIDER_URL
+ " is not resolvable. Falling back to using the URL preferring wrapper.", e);
}
- return URL_PREFERRING;
+ return pretendNoFactoryBuilder ? URL_PREFERRING : PASS_THROUGH;
}
}
}
@@ -219,15 +239,19 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
FactoryType.class);
private final String defaultFactoryClassName;
-
+ private final boolean pretendNoFactoryBuilder;
+
/**
* @param defaultFactory the default factory to use if none can be deduced from the environment. If null, an attempt
* is made to obtain the default InitialContextFactory of JBoss AS (which may fail depending on the classloading
* "situation").
+ * @param pretendNoFactoryBuilder true if the naming contexts should pretend as if there was no initial context
+ * factory builder installed. This is to support environments as AS4, where there really was no builder initially
+ * and the lookup relied on that fact.
*
* @throws NamingException
*/
- public AccessCheckingInitialContextFactoryBuilder(InitialContextFactory defaultFactory) throws NamingException {
+ public AccessCheckingInitialContextFactoryBuilder(InitialContextFactory defaultFactory, final boolean pretendNoFactoryBuilder) throws NamingException {
if (defaultFactory == null) {
defaultFactory = getJbossDefaultInitialContextFactory();
}
@@ -237,21 +261,22 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
for (FactoryType ft : FactoryType.values()) {
typeDefaults.put(ft, ft.wrap(defaultFactory));
}
+
+ this.pretendNoFactoryBuilder = pretendNoFactoryBuilder;
+
+ this.defaultFactory = new InitialContextFactory() {
+ public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
+ return typeDefaults.get(FactoryType.detect(environment, pretendNoFactoryBuilder)).getInitialContext(
+ environment);
+ }
+ };
}
/**
* This is the default initial context factory that is returned when no other is
* configured using the environment variables.
- * <p>
- * It uses {@link NamingContextFactory} as the underlying mechanism - the same
- * as the default configuration in JBoss 4.
*/
- private final InitialContextFactory defaultFactory = new InitialContextFactory() {
- public Context getInitialContext(Hashtable<?, ?> environment) throws NamingException {
- return typeDefaults.get(FactoryType.detect(environment)).getInitialContext(
- environment);
- }
- };
+ private final InitialContextFactory defaultFactory;
/**
* Create a InitialContext factory. If the environment does not override the factory class it will use the
@@ -273,7 +298,7 @@ public class AccessCheckingInitialContextFactoryBuilder implements InitialContex
try {
final Class<?> factoryClass = Class.forName(factoryClassName, true, classLoader);
InitialContextFactory configuredFactory = (InitialContextFactory) factoryClass.newInstance();
- return FactoryType.detect(environment).wrap(configuredFactory);
+ return FactoryType.detect(environment, pretendNoFactoryBuilder).wrap(configuredFactory);
} catch (Exception e) {
NamingException ne = new NamingException("Failed instantiate InitialContextFactory "
+ factoryClassName
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/NamingHack.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/NamingHack.java
index f21322f..a4173ca 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/NamingHack.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/naming/NamingHack.java
@@ -79,7 +79,7 @@ public class NamingHack {
}
NamingManager.setInitialContextFactoryBuilder(new AccessCheckingInitialContextFactoryBuilder(
- defaultFactory));
+ defaultFactory, originalBuilder == null));
} catch (Exception e) {
LOG.error("Failed to install a custom initial context factory builder. RHQ installation is unsecure!",
e);
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/naming/DecoratingInvocationHandlerTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/naming/DecoratingInvocationHandlerTest.java
index c92cc42..a5daa9f 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/naming/DecoratingInvocationHandlerTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/naming/DecoratingInvocationHandlerTest.java
@@ -106,7 +106,7 @@ public class DecoratingInvocationHandlerTest {
@BeforeClass
public void setBuilder() throws Exception {
NamingManager.setInitialContextFactoryBuilder(new AccessCheckingInitialContextFactoryBuilder(
- new org.jboss.as.naming.InitialContextFactory()));
+ new org.jboss.as.naming.InitialContextFactory(), false));
}
public void testSimpleDispatch() throws Exception {
commit 3f1149427123c1bbafdb8596e87b776f84b59d54
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Dec 12 16:59:22 2012 +0100
Recovering from the merge of commit 2ce8b7aa063a56840090ed553f47b6e3a0ba7845.
The SessionManager should do the security checks, we've got JNDI security
working.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
index ccffd37..c2b8270 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SessionManager.java
@@ -45,8 +45,7 @@ import org.rhq.enterprise.server.util.LookupUtil;
*/
public final class SessionManager {
- // TODO JNDI
- // private static final AllowRhqServerInternalsAccessPermission ACCESS_PERMISSION = new AllowRhqServerInternalsAccessPermission();
+ private static final AllowRhqServerInternalsAccessPermission ACCESS_PERMISSION = new AllowRhqServerInternalsAccessPermission();
/**
* Our source for random session IDs.
@@ -278,8 +277,7 @@ public final class SessionManager {
}
private static void checkPermission() {
- // TODO JNDI
- // SecurityManager sm = System.getSecurityManager();
- // if (sm != null) sm.checkPermission(ACCESS_PERMISSION);
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) sm.checkPermission(ACCESS_PERMISSION);
}
}
\ No newline at end of file
commit 2c9a8bd0e7b79dac706195f7a1a2474b1c39f631
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 13 10:02:55 2012 -0500
Replace more instances of straight division with approach that maintains precision.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
index 8861378..e87bff2 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
@@ -203,7 +203,8 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
MeasurementAggregate actual = dataManager.getAggregate(overlord, dynamicSchedule.getId(),
beginTime.getMillis(), endTime.getMillis());
- MeasurementAggregate expected = new MeasurementAggregate(1.1, (1.1 + 2.2 + 3.3 + 4.4 + 5.5 + 6.6) / 6, 6.6);
+ MeasurementAggregate expected = new MeasurementAggregate(1.1, divide((1.1 + 2.2 + 3.3 + 4.4 + 5.5 + 6.6), 6),
+ 6.6);
AssertUtils.assertPropertiesMatch(expected, actual, "Aggregate does not match");
}
@@ -236,9 +237,9 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
assertEquals("Expected to get back 60 data points.", buckets.getNumDataPoints(), actualData.size());
MeasurementDataNumericHighLowComposite expectedBucket0Data = new MeasurementDataNumericHighLowComposite(
- buckets.get(0), (2.0 + 5.0 + 3.0) / 3, 6.0, 1.0);
+ buckets.get(0), divide((2.0 + 5.0 + 3.0), 3), 6.0, 1.0);
MeasurementDataNumericHighLowComposite expectedBucket59Data = new MeasurementDataNumericHighLowComposite(
- buckets.get(59), (5.0 + 5.0 + 3.0) / 3, 9.0, 2.0);
+ buckets.get(59), divide((5.0 + 5.0 + 3.0), 3), 9.0, 2.0);
assertPropertiesMatch("The data for bucket 0 does not match the expected values.", expectedBucket0Data,
actualData.get(0));
commit 64b887e487f4bc90677148778e3316b4e975c9fb
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Dec 13 09:41:48 2012 -0500
remove recovery plugin from postgres XA test datasource, not needed since
the mem-leak issue is not relevant in a test run and the declaration of this
workaround class is problematic.
diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
index e1b466f..f58396a 100644
--- a/modules/enterprise/server/itests-2/pom.xml
+++ b/modules/enterprise/server/itests-2/pom.xml
@@ -520,9 +520,6 @@
<statement>
<prepared-statement-cache-size>75</prepared-statement-cache-size>
</statement>
- <recovery no-recovery="false">
- <recover-plugin class-name="org.jboss.jca.core.recovery.ValidatingManagedConnectionFactoryRecoveryPlugin"/>
- </recovery>
</xa-datasource>]]></replacevalue>
</replacefilter>
commit 866e7803407fe4fe18c6fdf54ca3344b70b02a25
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Dec 12 15:51:21 2012 -0500
installer work
- remove debugging system.out.println
- protect paths with quotes in rhq-installer.bat
- reduce dev installer retry from 5 to 3 if the remote admin endpoint in AS isn't ready
- not sure, this retry seems to do some wonky things on win
diff --git a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java
index 1b5b462..c3ceec2 100644
--- a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java
+++ b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java
@@ -307,8 +307,6 @@ public class DatasourceJBossASClient extends JBossASClient {
preparedStatementCacheSize, recoveryPluginClassName, securityDomain, staleConnectionCheckerClassName,
transactionIsolation, validConnectionCheckerClassName);
- System.out.println("**** \n" + dmr);
-
Address addr = Address.root().add(SUBSYSTEM, SUBSYSTEM_DATASOURCES, XA_DATA_SOURCE, name);
final ModelNode request1 = ModelNode.fromString(dmr);
request1.get(OPERATION).set(ADD);
diff --git a/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.sh b/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.sh
index e7cadef..5369ab2 100755
--- a/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.sh
+++ b/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.sh
@@ -11,7 +11,7 @@ _INSTALLER_SCRIPT="${RHQ_SERVER_HOME}/bin/rhq-installer.sh"
# we are normally executed just before the server starts, so give it time to initialize
sleep 5
-_TRIES="1 2 3"
+_TRIES="1 2"
for _TRY in $_TRIES
do
echo Running Installer Now...
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
index c65001d..5c0316d 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
@@ -522,13 +522,6 @@ public class ServerInstallUtil {
props.put("PortNumber", "${rhq.server.database.port:5432}");
props.put("DatabaseName", "${rhq.server.database.db-name:rhq}");
- /* TODO: Use this version which defines the recovery plugin
- xaDsRequest = client.createNewXADatasourceRequest(RHQ_DATASOURCE_NAME_XA, 30000, JDBC_DRIVER_POSTGRES,
- "org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter", 15, 5, 50, Boolean.FALSE,
- (Boolean) null, 75, "org.jboss.jca.core.recovery.ValidatingManagedConnectionFactoryRecoveryPlugin",
- RHQ_DS_SECURITY_DOMAIN, (String) null, "TRANSACTION_READ_COMMITTED",
- "org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLValidConnectionChecker", props);
- */
xaDsRequest = client.createNewXADatasourceRequest(RHQ_DATASOURCE_NAME_XA, 30000, JDBC_DRIVER_POSTGRES,
"org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter", 15, 5, 50, (Boolean) null,
(Boolean) null, 75, (String) null, RHQ_DS_SECURITY_DOMAIN, (String) null, "TRANSACTION_READ_COMMITTED",
commit 2f61a838d951ef6746eb0f2989ec3cf5a24a8b75
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: Wed Dec 12 14:47:54 2012 -0500
Update the zip and chmod processing filters for the agent to include all of the shared library file extensions.
diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml
index 4085efd..93ccd25 100644
--- a/modules/enterprise/agent/ant-run.xml
+++ b/modules/enterprise/agent/ant-run.xml
@@ -21,6 +21,7 @@ Ant Script that provides ways to package the Agent.
<property name="jaxb-api.version" value="2.1"/>
<property name="jaxb-impl.version" value="2.1"/>
<property name="log4j.version" value="1.2.16"/>
+ <property name="so.exts" value="*.so.*"/>
<!--
=======================================================================
@@ -129,6 +130,7 @@ Ant Script that provides ways to package the Agent.
<include name="**/lib/sigar.jar"/>
<include name="**/lib/bcel*.jar"/>
<include name="**/lib/*.so"/>
+ <include name="**/lib/${so.exts}"/>
<include name="**/lib/*.sl"/>
<include name="**/lib/*.dll"/>
<include name="**/lib/*.dylib"/>
@@ -139,21 +141,21 @@ Ant Script that provides ways to package the Agent.
<fileset refid="augeas.native.fileset" />
<patternset>
<include name="**/lib*/*.so"/>
- <include name="**/lib*/*.so.1"/>
+ <include name="**/lib*/${so.exts}"/>
</patternset>
</unzip>
<move todir="${agent.distro.dir}/lib/augeas/lib" flatten="true" overwrite="false">
<fileset dir="${agent.distro.dir}/lib/augeas-native-${augeas.zip.version}/lib">
<include name="*.so" />
- <include name="*.so.1" />
+ <include name="${so.exts}" />
</fileset>
</move>
<move todir="${agent.distro.dir}/lib/augeas/lib64" flatten="true" overwrite="false">
<fileset dir="${agent.distro.dir}/lib/augeas-native-${augeas.zip.version}/lib64">
<include name="*.so" />
- <include name="*.so.1" />
+ <include name="${so.exts}" />
</fileset>
</move>
@@ -172,9 +174,9 @@ Ant Script that provides ways to package the Agent.
<delete failonerror="false" includeEmptyDirs="true" verbose="true">
<fileset dir="${agent.distro.dir}/lib" includes="hyperic-sigar-*/"/>
</delete>
- <chmod dir="${agent.distro.dir}/lib" perm="ug+rx" includes="*.so,*.sl,*.dylib"/>
- <chmod dir="${agent.distro.dir}/lib/augeas/lib" perm="ug+rx" includes="*.so,*.so.1"/>
- <chmod dir="${agent.distro.dir}/lib/augeas/lib64" perm="ug+rx" includes="*.so,*.so.1"/>
+ <chmod dir="${agent.distro.dir}/lib" perm="ug+rx" includes="*.so,${so.exts},*.sl,*.dylib"/>
+ <chmod dir="${agent.distro.dir}/lib/augeas/lib" perm="ug+rx" includes="*.so,${so.exts}"/>
+ <chmod dir="${agent.distro.dir}/lib/augeas/lib64" perm="ug+rx" includes="*.so,${so.exts}"/>
<copy todir="${agent.distro.dir}/bin">
<fileset dir="${basedir}/src/etc"
@@ -217,7 +219,7 @@ Ant Script that provides ways to package the Agent.
<include name="rhq-agent/**"/>
<exclude name="rhq-agent/bin/*.sh"/>
<exclude name="rhq-agent/lib/*.so"/>
- <exclude name="rhq-agent/lib/*.so.1"/>
+ <exclude name="rhq-agent/lib/${so.exts}"/>
<exclude name="rhq-agent/lib/*.sl"/>
<exclude name="rhq-agent/lib/*.dylib"/>
<exclude name="rhq-agent/lib/augeas/**" />
@@ -225,12 +227,13 @@ Ant Script that provides ways to package the Agent.
<zipfileset dir="${basedir}/target" filemode="755" dirmode="755">
<include name="rhq-agent/bin/*.sh"/>
<include name="rhq-agent/lib/*.so"/>
+ <include name="rhq-agent/lib/${so.exts}"/>
<include name="rhq-agent/lib/*.sl"/>
<include name="rhq-agent/lib/*.dylib"/>
<include name="rhq-agent/lib/augeas/lib/*.so"/>
- <include name="rhq-agent/lib/augeas/lib/*.so.1"/>
+ <include name="rhq-agent/lib/augeas/lib/${so.exts}"/>
<include name="rhq-agent/lib/augeas/lib64/*.so"/>
- <include name="rhq-agent/lib/augeas/lib64/*.so.1"/>
+ <include name="rhq-agent/lib/augeas/lib64/${so.exts}"/>
</zipfileset>
</zip>
commit 685985600a5e0e9468b6e393c7fa09d5772b0afe
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Dec 12 12:37:13 2012 -0500
this is for unix developers - only retry 3 times - if the installer can't do its thing by then, something is probably wrong anyway.
this doesn't involve production functionality - rhq-autonistaller.sh is only for dev mode builds
diff --git a/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.sh b/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.sh
index f61a482..e7cadef 100755
--- a/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.sh
+++ b/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.sh
@@ -11,7 +11,7 @@ _INSTALLER_SCRIPT="${RHQ_SERVER_HOME}/bin/rhq-installer.sh"
# we are normally executed just before the server starts, so give it time to initialize
sleep 5
-_TRIES="1 2 3 4 5"
+_TRIES="1 2 3"
for _TRY in $_TRIES
do
echo Running Installer Now...
commit 7e1c0397aa94683d0efb35166c3970dae969ea46
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Dec 12 12:33:20 2012 -0500
only have it try 2 times (as opposed to 5). if the server isn't up in time for our installer to do its thing by then, something is probably wrong anyway
this is only for windows developers use (dev mode) so this isn't involving production functionality
diff --git a/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.bat b/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.bat
index b756b31..888d147 100644
--- a/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.bat
+++ b/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.bat
@@ -19,7 +19,7 @@ rem we are normally executed just before the server starts, so give it time to i
rem yes, this is a sleep of 5s, backwards compatible to XP
ping 127.0.0.1 -n 5 -w 1000 > nul
-for /L %%i in (1,1,5) do (
+for /L %%i in (1,1,2) do (
echo Running Installer Now...
CALL "%_INSTALLER_SCRIPT%"
if ERRORLEVEL 2 (
commit 5f3dbdeeb2e800f3b730dc0f3befad9b244e6615
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Dec 12 12:26:04 2012 -0500
fix windows script so dir names are quoted when starting the vm
diff --git a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.bat b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.bat
index 81d83ad..3140467 100644
--- a/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.bat
+++ b/modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-installer.bat
@@ -136,7 +136,7 @@ if defined RHQ_SERVER_DEBUG echo _JBOSS_MODULEPATH: %_JBOSS_MODULEPATH%
echo Starting RHQ Server installer ...
rem start the AS instance with our main installer module
-%RHQ_SERVER_JAVA_EXE_FILE_PATH% %RHQ_SERVER_INSTALLER_JAVA_OPTS% %RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS% -jar %RHQ_SERVER_HOME%\jbossas\jboss-modules.jar -mp %_JBOSS_MODULEPATH% org.rhq.rhq-installer-util %*
+"%RHQ_SERVER_JAVA_EXE_FILE_PATH%" %RHQ_SERVER_INSTALLER_JAVA_OPTS% %RHQ_SERVER_INSTALLER_ADDITIONAL_JAVA_OPTS% -jar "%RHQ_SERVER_HOME%\jbossas\jboss-modules.jar" -mp "%_JBOSS_MODULEPATH%" org.rhq.rhq-installer-util %*
goto :done
commit 946dee4b2e8c8ce275f069a3c79efedd3c7aaf74
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Wed Dec 12 09:12:47 2012 -0500
Oracle testing
- Add no-tx-separate=pools=true for ora XA datasource to avoid connection issues
- remove SetBigStringTryClob conn prop for oracle because we shouldn't need
it with the Ora11 driver and trying to set hits an AS bug
- apply necessary changes to installer as well as test code
- fix issues with aggressive and sometimes non-functioning cleanup code in MeasurementDataManagerBeanTest
- Add oracle driver jar to test deployment to support dbunit
Also
- Add support for recovery-plugin class for postgres to avoid mem leak in 7.1.1.Final.
(note - the actual use of that hook will be in a subsequent commit)
diff --git a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java
index ab44796..1b5b462 100644
--- a/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java
+++ b/modules/common/jboss-as-dmr-client/src/main/java/org/rhq/common/jbossas/client/controller/DatasourceJBossASClient.java
@@ -261,9 +261,12 @@ public class DatasourceJBossASClient extends JBossASClient {
* @param idleTimeoutMinutes
* @param minPoolSize
* @param maxPoolSize
+ * @param noRecovery optional, left unset if null
+ * @param noTxSeparatePools optional, left unset if null
* @param preparedStatementCacheSize
+ * @param recoveryPluginClassName optional, left unset if null
* @param securityDomain
- * @param staleConnectionCheckerClassName
+ * @param staleConnectionCheckerClassName optional, left unset if null
* @param transactionIsolation
* @param validConnectionCheckerClassName
* @param xaDatasourceProperties
@@ -271,9 +274,10 @@ public class DatasourceJBossASClient extends JBossASClient {
* @return the request that can be used to create the XA datasource
*/
public ModelNode createNewXADatasourceRequest(String name, int blockingTimeoutWaitMillis, String driverName,
- String exceptionSorterClassName, int idleTimeoutMinutes, int minPoolSize, int maxPoolSize,
- int preparedStatementCacheSize, String securityDomain, String staleConnectionCheckerClassName,
- String transactionIsolation, String validConnectionCheckerClassName, Map<String, String> xaDatasourceProperties) {
+ String exceptionSorterClassName, int idleTimeoutMinutes, int minPoolSize, int maxPoolSize, Boolean noRecovery,
+ Boolean noTxSeparatePools, int preparedStatementCacheSize, String recoveryPluginClassName,
+ String securityDomain, String staleConnectionCheckerClassName, String transactionIsolation,
+ String validConnectionCheckerClassName, Map<String, String> xaDatasourceProperties) {
String jndiName = "java:jboss/datasources/" + name;
@@ -286,8 +290,11 @@ public class DatasourceJBossASClient extends JBossASClient {
+ ", \"jndi-name\" => \"%s\" " //
+ ", \"jta\" => true " //
+ ", \"min-pool-size\" => %d " //
- + ", \"max-pool-size\" => %d " //
+ + ", \"max-pool-size\" => %d " //
+ + ", \"no-recovery\" => %b " //
+ + ", \"no-tx-separate-pools\" => %b " //
+ ", \"prepared-statements-cache-size\" => %dL " //
+ + ", \"recovery-plugin-class-name\" => \"%s\" " //
+ ", \"security-domain\" => \"%s\" " //
+ ", \"stale-connection-checker-class-name\" => \"%s\" " //
+ ", \"transaction-isolation\" => \"%s\" " //
@@ -296,8 +303,11 @@ public class DatasourceJBossASClient extends JBossASClient {
+ "}";
String dmr = String.format(dmrTemplate, blockingTimeoutWaitMillis, driverName, exceptionSorterClassName,
- idleTimeoutMinutes, jndiName, minPoolSize, maxPoolSize, preparedStatementCacheSize, securityDomain,
- staleConnectionCheckerClassName, transactionIsolation, validConnectionCheckerClassName);
+ idleTimeoutMinutes, jndiName, minPoolSize, maxPoolSize, noRecovery, noTxSeparatePools,
+ preparedStatementCacheSize, recoveryPluginClassName, securityDomain, staleConnectionCheckerClassName,
+ transactionIsolation, validConnectionCheckerClassName);
+
+ System.out.println("**** \n" + dmr);
Address addr = Address.root().add(SUBSYSTEM, SUBSYSTEM_DATASOURCES, XA_DATA_SOURCE, name);
final ModelNode request1 = ModelNode.fromString(dmr);
@@ -327,6 +337,22 @@ public class DatasourceJBossASClient extends JBossASClient {
batch[n++] = requestN;
}
- return createBatchRequest(batch);
+ ModelNode result = createBatchRequest(batch);
+
+ // remove unset args
+ if (null == noRecovery) {
+ result.get("steps").get(0).remove("no-recovery");
+ }
+ if (null == noTxSeparatePools) {
+ result.get("steps").get(0).remove("no-tx-separate-pools");
+ }
+ if (null == recoveryPluginClassName) {
+ result.get("steps").get(0).remove("recovery-plugin-class-name");
+ }
+ if (null == staleConnectionCheckerClassName) {
+ result.get("steps").get(0).remove("stale-connection-checker-class-name");
+ }
+
+ return result;
}
}
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index e874c08..cb7699b 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -381,7 +381,7 @@
</timeout>
<statement>
<prepared-statement-cache-size>75</prepared-statement-cache-size>
- </statement>
+ </statement>
</xa-datasource>]]></replacevalue>
</replacefilter>
@@ -441,6 +441,11 @@
<xa-pool>
<min-pool-size>5</min-pool-size>
<max-pool-size>50</max-pool-size>
+ <!--
+ Oracle does not like XA connections getting used both inside and outside a JTA transaction.
+ To workaround the problem you can create separate sub-pools for the different contexts using <no-tx-separate-pools/>
+ -->
+ <no-tx-separate-pools>true</no-tx-separate-pools>
</xa-pool>
<security>
<security-domain>RHQDSSecurityDomain</security-domain>
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
index 516dca6..c65001d 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
@@ -511,7 +511,7 @@ public class ServerInstallUtil {
"org.jboss.jca.adapters.jdbc.extensions.postgres.PostgreSQLExceptionSorter", 15, false, 2, 5, 75,
RHQ_DS_SECURITY_DOMAIN, "-unused-stale-conn-checker-", "TRANSACTION_READ_COMMITTED",
"org.jbos