[rhq] Branch 'feature/cassandra-backend' - modules/enterprise
by John Sanda
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java | 29 +----
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 53 ++++++----
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java | 15 --
3 files changed, 48 insertions(+), 49 deletions(-)
New commits:
commit 8b54fa5399709c05c2d2e406f3fb3770fc50b881
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Nov 5 10:44:54 2012 -0500
refactoring code to update metrics index
Prior to this commit some of the logic for updating the metrics index was in
MetricsDAO while the rest of it was in MetricsServer. MetricsDAO is intended to
be singularly focused around data access. All of the logic for updating for
updating the metrics index is now in MetricsServer. This involves determining
which row to update and calculating the appropriate time slices.
For example, if we insert 1hr data at 05 hours (i.e., 5:00 am), the six hour
row in the index table should be updated with a timestamp of 00 hours
(i.e., 12:00 am) since 5:00 am falls into the 00 - 06 time slice.
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 8fa3513..3dd19e8 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
@@ -31,10 +31,10 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
import javax.sql.DataSource;
@@ -83,8 +83,8 @@ public class MetricsDAO {
this.dataSource = dataSource;
}
- public Map<Integer, DateTime> insertRawMetrics(Set<MeasurementDataNumeric> dataSet) {
- Map<Integer, DateTime> updates = new TreeMap<Integer, DateTime>();
+ public Set<MeasurementDataNumeric> insertRawMetrics(Set<MeasurementDataNumeric> dataSet) {
+ Set<MeasurementDataNumeric> insertedMetrics = new HashSet<MeasurementDataNumeric>();
Connection connection = null;
PreparedStatement statement = null;
try {
@@ -97,10 +97,9 @@ public class MetricsDAO {
statement.setDouble(3, data.getValue());
statement.executeUpdate();
- updates.put(data.getScheduleId(), new DateTime(data.getTimestamp()).hourOfDay().roundFloorCopy());
+ insertedMetrics.add(data);
}
-
- return updates;
+ return insertedMetrics;
} catch (SQLException e) {
throw new CQLException(e);
} finally {
@@ -109,8 +108,8 @@ public class MetricsDAO {
}
}
- public Map<Integer, DateTime> insertAggregates(String bucket, List<AggregatedNumericMetric> metrics) {
- Map<Integer, DateTime> updates = new TreeMap<Integer, DateTime>();
+ public List<AggregatedNumericMetric> insertAggregates(String bucket, List<AggregatedNumericMetric> metrics) {
+ List<AggregatedNumericMetric> updates = new ArrayList<AggregatedNumericMetric>();
Connection connection = null;
PreparedStatement statement = null;
String sql = "INSERT INTO " + bucket + " (schedule_id, time, type, value) VALUES (?, ?, ?, ?)";
@@ -137,9 +136,8 @@ public class MetricsDAO {
statement.setDouble(4, metric.getAvg());
statement.executeUpdate();
- updates.put(metric.getScheduleId(), new DateTime(metric.getTimestamp()));
+ updates.add(metric);
}
-
return updates;
} catch (SQLException e) {
throw new CQLException(e);
@@ -299,15 +297,4 @@ public class MetricsDAO {
}
}
- private void execute(ConnectionCallback callback) {
- Connection connection = null;
- try {
- connection = dataSource.getConnection();
- callback.invoke(connection);
- } catch(SQLException e) {
- throw new CQLException(e);
- } finally {
- JDBCUtil.safeClose(connection);
- }
- }
}
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 cd0538f..066079d 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
@@ -39,6 +39,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.TreeMap;
import javax.sql.DataSource;
@@ -273,20 +274,29 @@ public class MetricsServer {
public void addNumericData(Set<MeasurementDataNumeric> dataSet) {
MetricsDAO dao = new MetricsDAO(cassandraDS);
- Map<Integer, DateTime> updates = dao.insertRawMetrics(dataSet);
+ Set<MeasurementDataNumeric> updates = dao.insertRawMetrics(dataSet);
+ updateMetricsIndex(updates);
+ }
+
+ private void updateMetricsIndex(Set<MeasurementDataNumeric> rawMetrics) {
+ MetricsDAO dao = new MetricsDAO(cassandraDS);
+ Map<Integer, DateTime> updates = new TreeMap<Integer, DateTime>();
+ for (MeasurementDataNumeric rawMetric : rawMetrics) {
+ updates.put(rawMetric.getScheduleId(), new DateTime(rawMetric.getTimestamp()).hourOfDay().roundFloorCopy());
+ }
dao.updateMetricsIndex(ONE_HOUR_METRICS_TABLE, updates);
}
public void calculateAggregates() {
MetricsDAO dao = new MetricsDAO(cassandraDS);
- Map<Integer, DateTime> updatedSchedules = aggregateRawData();
- for (Integer scheduleId : updatedSchedules.keySet()) {
- DateTime dateTime = updatedSchedules.get(scheduleId);
- updatedSchedules.put(scheduleId, dateTimeService.getTimeSlice(dateTime, Minutes.minutes(60 * 6)));
- }
- dao.updateMetricsIndex(SIX_HOUR_METRICS_TABLE, updatedSchedules);
-// updateMetricsQueue(sixHourMetricsDataCF, updatedSchedules);
+ List<AggregatedNumericMetric> updatedSchedules = aggregateRawData();
+ updateMetricsIndex(SIX_HOUR_METRICS_TABLE, updatedSchedules, Minutes.minutes(60 * 6));
+// for (Integer scheduleId : updatedSchedules.keySet()) {
+// DateTime dateTime = updatedSchedules.get(scheduleId);
+// updatedSchedules.put(scheduleId, dateTimeService.getTimeSlice(dateTime, Minutes.minutes(60 * 6)));
+// }
+// dao.updateMetricsIndex(SIX_HOUR_METRICS_TABLE, updatedSchedules);
//
// updatedSchedules = calculateAggregates(oneHourMetricsDataCF, sixHourMetricsDataCF, Minutes.minutes(60 * 6),
// Hours.hours(24).toStandardMinutes(), DateTimeService.ONE_MONTH);
@@ -299,7 +309,17 @@ public class MetricsServer {
// Hours.hours(24).toStandardMinutes(), DateTimeService.ONE_YEAR);
}
- private Map<Integer, DateTime> aggregateRawData() {
+ private void updateMetricsIndex(String bucket, List<AggregatedNumericMetric> metrics, Minutes interval) {
+ MetricsDAO dao = new MetricsDAO(cassandraDS);
+ Map<Integer, DateTime> updates = new TreeMap<Integer, DateTime>();
+ for (AggregatedNumericMetric metric : metrics) {
+ updates.put(metric.getScheduleId(), dateTimeService.getTimeSlice(new DateTime(metric.getTimestamp()),
+ interval));
+ }
+ dao.updateMetricsIndex(bucket, updates);
+ }
+
+ private List<AggregatedNumericMetric> aggregateRawData() {
MetricsDAO dao = new MetricsDAO(cassandraDS);
List<MetricsIndexEntry> indexEntries = dao.findMetricsIndexEntries(ONE_HOUR_METRICS_TABLE);
List<AggregatedNumericMetric> oneHourMetrics = new ArrayList<AggregatedNumericMetric>();
@@ -335,12 +355,12 @@ public class MetricsServer {
startTime.getMillis()));
}
- Map<Integer, DateTime> updatedSchedules = dao.insertAggregates(ONE_HOUR_METRICS_TABLE,
+ List<AggregatedNumericMetric> updatedSchedules = dao.insertAggregates(ONE_HOUR_METRICS_TABLE,
oneHourMetrics);
return updatedSchedules;
}
- private Map<Integer, DateTime> calculateAggregates(String fromColumnFamily, String toColumnFamily,
+ private List<AggregatedNumericMetric> calculateAggregates(String fromColumnFamily, String toColumnFamily,
Minutes interval, Minutes nextInterval, int ttl) {
MetricsDAO dao = new MetricsDAO(cassandraDS);
@@ -384,12 +404,11 @@ public class MetricsServer {
startTime.getMillis()));
}
- Map<Integer, DateTime> updatedSchedules = dao.insertAggregates(toColumnFamily,
- toMetrics);
- for (Integer scheduleId : updatedSchedules.keySet()) {
- DateTime dateTime = updatedSchedules.get(scheduleId);
- updatedSchedules.put(scheduleId, dateTimeService.getTimeSlice(dateTime, nextInterval));
- }
+ List<AggregatedNumericMetric> updatedSchedules = dao.insertAggregates(toColumnFamily, toMetrics);
+// for (Integer scheduleId : updatedSchedules.keySet()) {
+// DateTime dateTime = updatedSchedules.get(scheduleId);
+// updatedSchedules.put(scheduleId, dateTimeService.getTimeSlice(dateTime, nextInterval));
+// }
return updatedSchedules;
// SliceQuery<String, Composite, Integer> queueQuery = HFactory.createSliceQuery(keyspace, StringSerializer.get(),
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 5b2d6ab..3074e64 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
@@ -40,7 +40,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
import org.joda.time.DateTime;
import org.testng.annotations.BeforeMethod;
@@ -92,12 +91,9 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
data.add(new MeasurementDataNumeric(oneMinuteAgo.getMillis(), request, 2.6));
MetricsDAO dao = new MetricsDAO(dataSource);
- Map<Integer, DateTime> actualUpdates = dao.insertRawMetrics(data);
+ Set<MeasurementDataNumeric> actualUpdates = dao.insertRawMetrics(data);
- Map<Integer, DateTime> expectedUpdates = new TreeMap<Integer, DateTime>();
- expectedUpdates.put(scheduleId, currentHour);
-
- assertEquals(actualUpdates, expectedUpdates, "The updates do not match expected value.");
+ assertEquals(actualUpdates, data, "The updates do not match expected value.");
List<RawNumericMetric> actualMetrics = dao.findRawMetrics(scheduleId, currentHour, currentHour.plusHours(1));
List<RawNumericMetric> expectedMetrics = asList(
@@ -121,11 +117,8 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
new AggregatedNumericMetric(456, 2.0, 2.0, 2.0, hour0.getMillis())
);
- Map<Integer, DateTime> actualUpdates = dao.insertAggregates(ONE_HOUR_METRICS_TABLE, metrics);
- Map<Integer, DateTime> expectedUpdates = new TreeMap<Integer, DateTime>();
- expectedUpdates.put(scheduleId, hour0);
- expectedUpdates.put(scheduleId, hour0.plusHours(1));
- expectedUpdates.put(456, hour0);
+ List<AggregatedNumericMetric> actualUpdates = dao.insertAggregates(ONE_HOUR_METRICS_TABLE, metrics);
+ List<AggregatedNumericMetric> expectedUpdates = metrics;
assertEquals(actualUpdates, expectedUpdates, "The updates do not match the expected values");
11 years, 7 months
- 1
- 0
[rhq] Branch 'feature/cassandra-backend' - modules/enterprise
by John Sanda
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DateTimeService.java | 6
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 224 ++++++----
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java | 9
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java | 20
4 files changed, 168 insertions(+), 91 deletions(-)
New commits:
commit 4f531a9f11b2267cf9fdcddc348503d38b638c80
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Nov 5 07:50:02 2012 -0500
(cql port) adding back support for producing 6 hr aggregates
MetricsServer.calculateAggregates has been refactored to use MetricsDAO in
place of the Hector APIs previously used. This commit also fixes a subtle bug
in test code for getting hour zero of the current day.
There are still some problems/inconsistencies with how timestamps for metrics
index entries are generated. That needs to be addressed in a subsequent commit.
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DateTimeService.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DateTimeService.java
index 78c5747..3dce23c 100644
--- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DateTimeService.java
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DateTimeService.java
@@ -75,4 +75,10 @@ public class DateTimeService {
return dateTimeComparator.compare(now().minusDays(365), dateTime) < 0;
}
+ public DateTime hour0() {
+ DateTime rightNow = now();
+ return rightNow.hourOfDay().roundFloorCopy().minusHours(
+ rightNow.hourOfDay().roundFloorCopy().hourOfDay().get());
+ }
+
}
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 9200c48..cd0538f 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
@@ -27,6 +27,8 @@ package org.rhq.server.metrics;
import static me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality.EQUAL;
import static me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality.LESS_THAN_EQUAL;
+import static org.rhq.server.metrics.MetricsDAO.ONE_HOUR_METRICS_TABLE;
+import static org.rhq.server.metrics.MetricsDAO.SIX_HOUR_METRICS_TABLE;
import java.math.BigDecimal;
import java.math.MathContext;
@@ -37,7 +39,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TreeMap;
import javax.sql.DataSource;
@@ -57,7 +58,6 @@ import me.prettyprint.cassandra.serializers.CompositeSerializer;
import me.prettyprint.cassandra.serializers.DoubleSerializer;
import me.prettyprint.cassandra.serializers.IntegerSerializer;
import me.prettyprint.cassandra.serializers.LongSerializer;
-import me.prettyprint.cassandra.serializers.StringSerializer;
import me.prettyprint.cassandra.service.ColumnSliceIterator;
import me.prettyprint.hector.api.Cluster;
import me.prettyprint.hector.api.Keyspace;
@@ -66,7 +66,6 @@ import me.prettyprint.hector.api.beans.HColumn;
import me.prettyprint.hector.api.ddl.ComparatorType;
import me.prettyprint.hector.api.factory.HFactory;
import me.prettyprint.hector.api.mutation.MutationResult;
-import me.prettyprint.hector.api.mutation.Mutator;
import me.prettyprint.hector.api.query.SliceQuery;
/**
@@ -275,15 +274,25 @@ public class MetricsServer {
public void addNumericData(Set<MeasurementDataNumeric> dataSet) {
MetricsDAO dao = new MetricsDAO(cassandraDS);
Map<Integer, DateTime> updates = dao.insertRawMetrics(dataSet);
- dao.updateMetricsIndex(MetricsDAO.ONE_HOUR_METRICS_TABLE, updates);
+ dao.updateMetricsIndex(ONE_HOUR_METRICS_TABLE, updates);
}
public void calculateAggregates() {
+ MetricsDAO dao = new MetricsDAO(cassandraDS);
+
Map<Integer, DateTime> updatedSchedules = aggregateRawData();
+ for (Integer scheduleId : updatedSchedules.keySet()) {
+ DateTime dateTime = updatedSchedules.get(scheduleId);
+ updatedSchedules.put(scheduleId, dateTimeService.getTimeSlice(dateTime, Minutes.minutes(60 * 6)));
+ }
+ dao.updateMetricsIndex(SIX_HOUR_METRICS_TABLE, updatedSchedules);
// updateMetricsQueue(sixHourMetricsDataCF, updatedSchedules);
//
// updatedSchedules = calculateAggregates(oneHourMetricsDataCF, sixHourMetricsDataCF, Minutes.minutes(60 * 6),
// Hours.hours(24).toStandardMinutes(), DateTimeService.ONE_MONTH);
+ updatedSchedules = calculateAggregates(oneHourMetricsDataCF, sixHourMetricsDataCF, Minutes.minutes(60),
+ Minutes.minutes(60 * 6), DateTimeService.ONE_MONTH);
+
// updateMetricsQueue(twentyFourHourMetricsDataCF, updatedSchedules);
//
// calculateAggregates(sixHourMetricsDataCF, twentyFourHourMetricsDataCF, Hours.hours(24).toStandardMinutes(),
@@ -292,7 +301,7 @@ public class MetricsServer {
private Map<Integer, DateTime> aggregateRawData() {
MetricsDAO dao = new MetricsDAO(cassandraDS);
- List<MetricsIndexEntry> indexEntries = dao.findMetricsIndexEntries(MetricsDAO.ONE_HOUR_METRICS_TABLE);
+ List<MetricsIndexEntry> indexEntries = dao.findMetricsIndexEntries(ONE_HOUR_METRICS_TABLE);
List<AggregatedNumericMetric> oneHourMetrics = new ArrayList<AggregatedNumericMetric>();
for (MetricsIndexEntry indexEntry : indexEntries) {
@@ -326,106 +335,151 @@ public class MetricsServer {
startTime.getMillis()));
}
- Map<Integer, DateTime> updatedSchedules = dao.insertAggregates(MetricsDAO.ONE_HOUR_METRICS_TABLE,
+ Map<Integer, DateTime> updatedSchedules = dao.insertAggregates(ONE_HOUR_METRICS_TABLE,
oneHourMetrics);
return updatedSchedules;
}
private Map<Integer, DateTime> calculateAggregates(String fromColumnFamily, String toColumnFamily,
Minutes interval, Minutes nextInterval, int ttl) {
- DateTime currentHour = getCurrentHour();
- DateTimeComparator dateTimeComparator = DateTimeComparator.getInstance();
-
- Map<Integer, DateTime> updatedSchedules = new TreeMap<Integer, DateTime>();
- SliceQuery<String, Composite, Integer> queueQuery = HFactory.createSliceQuery(keyspace, StringSerializer.get(),
- new CompositeSerializer().get(), IntegerSerializer.get());
- queueQuery.setColumnFamily(metricsIndex);
- queueQuery.setKey(toColumnFamily);
-
- ColumnSliceIterator<String, Composite, Integer> queueIterator = new ColumnSliceIterator<String, Composite, Integer>(
- queueQuery, (Composite) null, (Composite) null, false);
+ MetricsDAO dao = new MetricsDAO(cassandraDS);
+ List<MetricsIndexEntry> indexEntries = dao.findMetricsIndexEntries(toColumnFamily);
+ List<AggregatedNumericMetric> toMetrics = new ArrayList<AggregatedNumericMetric>();
- Mutator<Integer> mutator = HFactory.createMutator(keyspace, IntegerSerializer.get());
- Mutator<String> queueMutator = HFactory.createMutator(keyspace, StringSerializer.get());
+ DateTime currentHour = getCurrentHour();
+ DateTimeComparator dateTimeComparator = DateTimeComparator.getInstance();
- while (queueIterator.hasNext()) {
- HColumn<Composite, Integer> queueColumn = queueIterator.next();
- Integer scheduleId = queueColumn.getName().get(1, IntegerSerializer.get());
- Long timestamp = queueColumn.getName().get(0, LongSerializer.get());
- DateTime startTime = new DateTime(timestamp);
- DateTime endTime = new DateTime(timestamp).plus(interval);
+ for (MetricsIndexEntry indexEntry : indexEntries) {
+ DateTime startTime = indexEntry.getTime();
+ DateTime endTime = startTime.plus(nextInterval);
if (dateTimeComparator.compare(currentHour, endTime) < 0) {
continue;
}
- Composite startColKey = new Composite();
- startColKey.addComponent(startTime.getMillis(), LongSerializer.get());
-
- Composite endColKey = new Composite();
- endColKey.addComponent(endTime.getMillis(), LongSerializer.get());
-
- SliceQuery<Integer, Composite, Double> fromColumnFamilyQuery = HFactory.createSliceQuery(keyspace,
- IntegerSerializer.get(), CompositeSerializer.get(), DoubleSerializer.get());
- fromColumnFamilyQuery.setColumnFamily(fromColumnFamily);
- fromColumnFamilyQuery.setKey(scheduleId);
-
- ColumnSliceIterator<Integer, Composite, Double> fromColumnFamilyIterator = new ColumnSliceIterator<Integer, Composite, Double>(
- fromColumnFamilyQuery, startColKey, endColKey, false);
- fromColumnFamilyIterator.hasNext();
-
- HColumn<Composite, Double> fromColumn = null;
- double min = 0;
- double max = 0;
+ List<AggregatedNumericMetric> metrics = dao.findAggregateMetrics(fromColumnFamily,
+ indexEntry.getScheduleId(), startTime, endTime);
+ double min = Double.NaN;
+ double max = min;
double sum = 0;
- int avgCount = 0;
- int minCount = 0;
- int maxCount = 0;
-
- while (fromColumnFamilyIterator.hasNext()) {
- fromColumn = fromColumnFamilyIterator.next();
- AggregateType type = AggregateType.valueOf(fromColumn.getName().get(1, IntegerSerializer.get()));
-
- switch (type) {
- case AVG:
- sum += fromColumn.getValue();
- avgCount++;
- break;
- case MIN:
- if (minCount == 0) {
- min = fromColumn.getValue();
- } else if (fromColumn.getValue() < min) {
- min = fromColumn.getValue();
- }
- minCount++;
- break;
- case MAX:
- if (maxCount == 0) {
- max = fromColumn.getValue();
- } else if (fromColumn.getValue() > max) {
- max = fromColumn.getValue();
- }
- maxCount++;
- break;
+ int count = 0;
+ double value;
+
+ for (AggregatedNumericMetric metric : metrics) {
+ if (count == 0) {
+ min = metric.getMin();
+ max = metric.getMax();
}
+ if (metric.getMin() < min) {
+ min = metric.getMin();
+ } else if (metric.getMax() > max) {
+ max = metric.getMax();
+ }
+ sum += metric.getAvg();
+ ++count;
}
-
-// double avg = sum / avgCount;
- double avg = divide(sum, avgCount);
-
- mutator.addInsertion(scheduleId, toColumnFamily, createAvgColumn(startTime, avg, ttl));
- mutator.addInsertion(scheduleId, toColumnFamily, createMaxColumn(startTime, max, ttl));
- mutator.addInsertion(scheduleId, toColumnFamily, createMinColumn(startTime, min, ttl));
-
- updatedSchedules.put(scheduleId, dateTimeService.getTimeSlice(startTime, nextInterval));
-
- queueMutator.addDeletion(toColumnFamily, metricsIndex, queueColumn.getName(), CompositeSerializer.get());
+ double avg = divide(sum, count);
+ toMetrics.add(new AggregatedNumericMetric(indexEntry.getScheduleId(), avg, min, max,
+ startTime.getMillis()));
}
- mutator.execute();
- queueMutator.execute();
+ Map<Integer, DateTime> updatedSchedules = dao.insertAggregates(toColumnFamily,
+ toMetrics);
+ for (Integer scheduleId : updatedSchedules.keySet()) {
+ DateTime dateTime = updatedSchedules.get(scheduleId);
+ updatedSchedules.put(scheduleId, dateTimeService.getTimeSlice(dateTime, nextInterval));
+ }
return updatedSchedules;
+
+// SliceQuery<String, Composite, Integer> queueQuery = HFactory.createSliceQuery(keyspace, StringSerializer.get(),
+// new CompositeSerializer().get(), IntegerSerializer.get());
+// queueQuery.setColumnFamily(metricsIndex);
+// queueQuery.setKey(toColumnFamily);
+//
+// ColumnSliceIterator<String, Composite, Integer> queueIterator = new ColumnSliceIterator<String, Composite, Integer>(
+// queueQuery, (Composite) null, (Composite) null, false);
+//
+// Mutator<Integer> mutator = HFactory.createMutator(keyspace, IntegerSerializer.get());
+// Mutator<String> queueMutator = HFactory.createMutator(keyspace, StringSerializer.get());
+//
+// while (queueIterator.hasNext()) {
+// HColumn<Composite, Integer> queueColumn = queueIterator.next();
+// Integer scheduleId = queueColumn.getName().get(1, IntegerSerializer.get());
+// Long timestamp = queueColumn.getName().get(0, LongSerializer.get());
+// DateTime startTime = new DateTime(timestamp);
+// DateTime endTime = new DateTime(timestamp).plus(interval);
+//
+// if (dateTimeComparator.compare(currentHour, endTime) < 0) {
+// continue;
+// }
+//
+// Composite startColKey = new Composite();
+// startColKey.addComponent(startTime.getMillis(), LongSerializer.get());
+//
+// Composite endColKey = new Composite();
+// endColKey.addComponent(endTime.getMillis(), LongSerializer.get());
+//
+// SliceQuery<Integer, Composite, Double> fromColumnFamilyQuery = HFactory.createSliceQuery(keyspace,
+// IntegerSerializer.get(), CompositeSerializer.get(), DoubleSerializer.get());
+// fromColumnFamilyQuery.setColumnFamily(fromColumnFamily);
+// fromColumnFamilyQuery.setKey(scheduleId);
+//
+// ColumnSliceIterator<Integer, Composite, Double> fromColumnFamilyIterator = new ColumnSliceIterator<Integer, Composite, Double>(
+// fromColumnFamilyQuery, startColKey, endColKey, false);
+// fromColumnFamilyIterator.hasNext();
+//
+// HColumn<Composite, Double> fromColumn = null;
+// double min = 0;
+// double max = 0;
+// double sum = 0;
+// int avgCount = 0;
+// int minCount = 0;
+// int maxCount = 0;
+//
+// while (fromColumnFamilyIterator.hasNext()) {
+// fromColumn = fromColumnFamilyIterator.next();
+// AggregateType type = AggregateType.valueOf(fromColumn.getName().get(1, IntegerSerializer.get()));
+//
+// switch (type) {
+// case AVG:
+// sum += fromColumn.getValue();
+// avgCount++;
+// break;
+// case MIN:
+// if (minCount == 0) {
+// min = fromColumn.getValue();
+// } else if (fromColumn.getValue() < min) {
+// min = fromColumn.getValue();
+// }
+// minCount++;
+// break;
+// case MAX:
+// if (maxCount == 0) {
+// max = fromColumn.getValue();
+// } else if (fromColumn.getValue() > max) {
+// max = fromColumn.getValue();
+// }
+// maxCount++;
+// break;
+// }
+// }
+//
+//// double avg = sum / avgCount;
+// double avg = divide(sum, avgCount);
+//
+// mutator.addInsertion(scheduleId, toColumnFamily, createAvgColumn(startTime, avg, ttl));
+// mutator.addInsertion(scheduleId, toColumnFamily, createMaxColumn(startTime, max, ttl));
+// mutator.addInsertion(scheduleId, toColumnFamily, createMinColumn(startTime, min, ttl));
+//
+// updatedSchedules.put(scheduleId, dateTimeService.getTimeSlice(startTime, nextInterval));
+//
+// queueMutator.addDeletion(toColumnFamily, metricsIndex, queueColumn.getName(), CompositeSerializer.get());
+// }
+// mutator.execute();
+// queueMutator.execute();
+//
+// return updatedSchedules;
}
// public void addTraitData(Set<MeasurementDataTrait> dataSet) {
diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java
index a260000..ac4db0f 100644
--- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java
+++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java
@@ -32,6 +32,7 @@ import java.sql.SQLException;
import java.util.List;
import org.apache.cassandra.cql.jdbc.CassandraDataSource;
+import org.joda.time.DateTime;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Listeners;
@@ -54,9 +55,13 @@ public class CassandraIntegrationTest {
protected Connection connection;
+ private DateTimeService dateTimeService;
+
@BeforeClass
@DeployCluster
public void deployCluster() throws CassandraException {
+ dateTimeService = new DateTimeService();
+
List<CassandraHost> hosts = asList(new CassandraHost("127.0.0.1", 9160), new CassandraHost("127.0.0.2", 9160));
ClusterInitService initService = new ClusterInitService();
@@ -75,4 +80,8 @@ public class CassandraIntegrationTest {
@ShutdownCluster
public void shutdownCluster() throws Exception {
}
+
+ protected DateTime hour0() {
+ return dateTimeService.hour0();
+ }
}
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 65e6a4c..f9e4ec6 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
@@ -31,6 +31,8 @@ import static org.rhq.server.metrics.DateTimeService.ONE_MONTH;
import static org.rhq.server.metrics.DateTimeService.ONE_YEAR;
import static org.rhq.server.metrics.DateTimeService.SEVEN_DAYS;
import static org.rhq.server.metrics.DateTimeService.TWO_WEEKS;
+import static org.rhq.server.metrics.MetricsDAO.ONE_HOUR_METRICS_TABLE;
+import static org.rhq.server.metrics.MetricsDAO.SIX_HOUR_METRICS_TABLE;
import static org.rhq.server.metrics.MetricsServer.divide;
import static org.rhq.test.AssertUtils.assertCollectionMatchesNoOrder;
import static org.rhq.test.AssertUtils.assertPropertiesMatch;
@@ -164,7 +166,7 @@ public class MetricsServerTest extends CassandraIntegrationTest {
public void insertMultipleRawNumericDataForOneSchedule() throws Exception {
int scheduleId = 123;
- DateTime hour0 = now().hourOfDay().roundFloorCopy().minusHours(now().hourOfDay().get());
+ DateTime hour0 = hour0();
DateTime currentTime = hour0.plusHours(4).plusMinutes(44);
DateTime threeMinutesAgo = currentTime.minusMinutes(3);
DateTime twoMinutesAgo = currentTime.minusMinutes(2);
@@ -206,7 +208,7 @@ public class MetricsServerTest extends CassandraIntegrationTest {
public void calculateAggregatesForOneScheduleWhenDBIsEmpty() {
int scheduleId = 123;
- DateTime hour0 = now().hourOfDay().roundFloorCopy().minusHours(now().hourOfDay().get());
+ DateTime hour0 = hour0();
DateTime hour6 = hour0.plusHours(6);
DateTime lastHour = hour6.minusHours(1);
DateTime firstMetricTime = hour6.minusMinutes(3);
@@ -256,9 +258,15 @@ public class MetricsServerTest extends CassandraIntegrationTest {
// );
//
// assert6HourDataEquals(scheduleId, expected6HourData);
+
+ // verify that one hour metric data is updated
List<AggregatedNumericMetric> expected = asList(new AggregatedNumericMetric(scheduleId,
divide((3.9 + 3.2 + 2.6), 3), 2.6, 3.9, lastHour.getMillis()));
- assertMetricDataEquals(ONE_HOUR_METRIC_DATA_CF, scheduleId, expected);
+ assertMetricDataEquals(ONE_HOUR_METRICS_TABLE, scheduleId, expected);
+
+ // verify that 6 hour metric data is updated
+ assertMetricDataEquals(SIX_HOUR_METRICS_TABLE, scheduleId, asList(new AggregatedNumericMetric(scheduleId,
+ divide((3.9 + 3.2 + 2.6), 3), 2.6, 3.9, hour0.getMillis())));
}
@Test(enabled = ENABLED)
@@ -266,7 +274,7 @@ public class MetricsServerTest extends CassandraIntegrationTest {
int scheduleId = 123;
DateTime now = new DateTime();
- DateTime hour0 = now.hourOfDay().roundFloorCopy().minusHours(now.hourOfDay().get());
+ DateTime hour0 = hour0();
DateTime hour9 = hour0.plusHours(9);
DateTime hour8 = hour9.minusHours(1);
@@ -337,7 +345,7 @@ public class MetricsServerTest extends CassandraIntegrationTest {
int scheduleId = 123;
DateTime now = new DateTime();
- DateTime hour0 = now.hourOfDay().roundFloorCopy().minusHours(now.hourOfDay().get());
+ DateTime hour0 = hour0();
DateTime hour12 = hour0.plusHours(12);
DateTime hour6 = hour0.plusHours(6);
DateTime hour7 = hour0.plusHours(7);
@@ -406,7 +414,7 @@ public class MetricsServerTest extends CassandraIntegrationTest {
int scheduleId = 123;
DateTime now = new DateTime();
- DateTime hour0 = now.hourOfDay().roundFloorCopy().minusHours(now.hourOfDay().get());
+ DateTime hour0 = hour0();
DateTime hour12 = hour0.plusHours(12);
DateTime hour6 = hour0.plusHours(6);
DateTime hour24 = hour0.plusHours(24);
11 years, 7 months
- 1
- 0
[rhq] Branch 'feature/cassandra-backend' - modules/enterprise
by John Sanda
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java | 37 +++++
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java | 69 ++++++++++
2 files changed, 106 insertions(+)
New commits:
commit 56280545b2bdea4138dce471fba5075515a1af2b
Author: John Sanda <jsanda(a)redhat.com>
Date: Sun Nov 4 09:41:38 2012 -0500
Adding method to find aggregates by date range
Also adding tests to MetricsDAOTest to verify aggregate queries.
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 bb25f05..8fa3513 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
@@ -210,6 +210,43 @@ public class MetricsDAO {
}
}
+ public List<AggregatedNumericMetric> findAggregateMetrics(String bucket, int scheduleId, DateTime startTime,
+ DateTime endTime) {
+
+ Connection connection = null;
+ PreparedStatement statement = null;
+ ResultSet resultSet = null;
+
+ String sql =
+ "SELECT schedule_id, time, type, value " +
+ "FROM " + bucket + " " +
+ "WHERE schedule_id = " + scheduleId + " AND time >= ? AND TIME < ? " +
+ "ORDER BY time, type";
+
+ try {
+ connection = dataSource.getConnection();
+ statement = connection.prepareStatement(sql);
+ statement.setDate(1, new java.sql.Date(startTime.getMillis()));
+ statement.setDate(2, new java.sql.Date(endTime.getMillis()));
+ resultSet = statement.executeQuery();
+
+ List<AggregatedNumericMetric> metrics = new ArrayList<AggregatedNumericMetric>();
+ ResultSetMapper<AggregatedNumericMetric> resultSetMapper = new AggregateMetricMapper();
+
+ while (resultSet.next()) {
+ metrics.add(resultSetMapper.map(resultSet));
+ }
+
+ return metrics;
+ } catch (SQLException e) {
+ throw new CQLException(e);
+ } finally {
+ JDBCUtil.safeClose(resultSet);
+ JDBCUtil.safeClose(statement);
+ JDBCUtil.safeClose(connection);
+ }
+ }
+
public List<MetricsIndexEntry> findMetricsIndexEntries(String bucket) {
Connection connection = null;
PreparedStatement statement = null;
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 6640cdb..5b2d6ab 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
@@ -27,10 +27,14 @@ package org.rhq.server.metrics;
import static java.util.Arrays.asList;
import static org.joda.time.DateTime.now;
+import static org.rhq.server.metrics.MetricsDAO.METRICS_INDEX_TABLE;
import static org.rhq.server.metrics.MetricsDAO.ONE_HOUR_METRICS_TABLE;
+import static org.rhq.server.metrics.MetricsDAO.RAW_METRICS_TABLE;
+import static org.rhq.server.metrics.MetricsDAO.SIX_HOUR_METRICS_TABLE;
import static org.rhq.test.AssertUtils.assertCollectionMatchesNoOrder;
import static org.testng.Assert.assertEquals;
+import java.sql.Statement;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -39,6 +43,7 @@ import java.util.Set;
import java.util.TreeMap;
import org.joda.time.DateTime;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.core.domain.measurement.DataType;
@@ -54,6 +59,15 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
private final long MINUTE = 60 * SECOND;
+ @BeforeMethod
+ public void resetDB() throws Exception {
+ Statement statement = connection.createStatement();
+ statement.executeUpdate("TRUNCATE " + RAW_METRICS_TABLE);
+ statement.executeUpdate("TRUNCATE " + ONE_HOUR_METRICS_TABLE);
+ statement.executeUpdate("TRUNCATE " + METRICS_INDEX_TABLE);
+ statement.executeUpdate("TRUNCATE " + SIX_HOUR_METRICS_TABLE);
+ }
+
@Test
public void insertAndFindRawMetrics() {
int scheduleId = 123;
@@ -96,6 +110,61 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
}
@Test
+ public void insertAndFindAllOneHourMetrics() {
+ int scheduleId = 123;
+ DateTime hour0 = now().hourOfDay().roundFloorCopy().minusHours(now().hourOfDay().get());
+
+ MetricsDAO dao = new MetricsDAO(dataSource);
+ List<AggregatedNumericMetric> metrics = asList(
+ new AggregatedNumericMetric(scheduleId, 3.0, 1.0, 8.0, hour0.getMillis()),
+ new AggregatedNumericMetric(scheduleId, 4.0, 2.0, 10.0, hour0.plusHours(1).getMillis()),
+ new AggregatedNumericMetric(456, 2.0, 2.0, 2.0, hour0.getMillis())
+ );
+
+ Map<Integer, DateTime> actualUpdates = dao.insertAggregates(ONE_HOUR_METRICS_TABLE, metrics);
+ Map<Integer, DateTime> expectedUpdates = new TreeMap<Integer, DateTime>();
+ expectedUpdates.put(scheduleId, hour0);
+ expectedUpdates.put(scheduleId, hour0.plusHours(1));
+ expectedUpdates.put(456, hour0);
+
+ assertEquals(actualUpdates, expectedUpdates, "The updates do not match the expected values");
+
+ List<AggregatedNumericMetric> expected = asList(
+ new AggregatedNumericMetric(scheduleId, 3.0, 1.0, 8.0, hour0.getMillis()),
+ new AggregatedNumericMetric(scheduleId, 4.0, 2.0, 10.0, hour0.plusHours(1).getMillis())
+ );
+ List<AggregatedNumericMetric> actual = dao.findAggregateMetrics(ONE_HOUR_METRICS_TABLE, scheduleId);
+ assertEquals(actual, expected, "Failed to find one hour metrics");
+ }
+
+ @Test
+ public void findRangeOfOneHourMetrics() {
+ int scheduledId = 123;
+ DateTime hour0 = now().hourOfDay().roundFloorCopy().minusHours(now().hourOfDay().get());
+
+ MetricsDAO dao = new MetricsDAO(dataSource);
+ dao.insertAggregates(ONE_HOUR_METRICS_TABLE, asList(
+ new AggregatedNumericMetric(scheduledId, 2.0, 2.0, 2.0, hour0.getMillis()),
+ new AggregatedNumericMetric(scheduledId, 3.0, 3.0, 3.0, hour0.plusHours(1).getMillis()),
+ new AggregatedNumericMetric(scheduledId, 4.0, 4.0, 4.0, hour0.plusHours(2).getMillis()),
+ new AggregatedNumericMetric(scheduledId, 5.0, 5.0, 5.0, hour0.plusHours(3).getMillis()),
+ new AggregatedNumericMetric(456, 1.0, 1.0, 1.0, hour0.plusHours(1).getMillis())
+ ));
+
+ DateTime startTime = hour0.plusHours(1);
+ DateTime endTime = hour0.plusHours(3);
+ List<AggregatedNumericMetric> expected = asList(
+ new AggregatedNumericMetric(scheduledId, 3.0, 3.0, 3.0, hour0.plusHours(1).getMillis()),
+ new AggregatedNumericMetric(scheduledId, 4.0, 4.0, 4.0, hour0.plusHours(2).getMillis())
+ );
+
+ List<AggregatedNumericMetric> actual = dao.findAggregateMetrics(ONE_HOUR_METRICS_TABLE, scheduledId, startTime,
+ endTime);
+
+ assertEquals(actual, expected, "Failed to find one hour metrics for date range");
+ }
+
+ @Test
public void updateAndFindOneHourIndexEntries() {
DateTime hour0 = now().hourOfDay().roundFloorCopy().minusHours(now().hourOfDay().get());
11 years, 7 months
- 1
- 0
[rhq] Branch 'feature/cassandra-backend' - modules/common modules/enterprise
by John Sanda
modules/common/cassandra-common/src/main/cassandra/cql/dbsetup.cql | 8 ++++++++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java | 2 ++
2 files changed, 10 insertions(+)
New commits:
commit b915f121bab81bb35374b0fa7597a9067bbe5725
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Nov 3 21:55:11 2012 -0400
(cql port) adding 6 hour table back to schema
diff --git a/modules/common/cassandra-common/src/main/cassandra/cql/dbsetup.cql b/modules/common/cassandra-common/src/main/cassandra/cql/dbsetup.cql
index 8dcfd16..287f882 100644
--- a/modules/common/cassandra-common/src/main/cassandra/cql/dbsetup.cql
+++ b/modules/common/cassandra-common/src/main/cassandra/cql/dbsetup.cql
@@ -17,6 +17,14 @@ CREATE TABLE one_hour_metrics (
PRIMARY KEY (schedule_id, time, type)
);
+CREATE TABLE six_hour_metrics (
+ schedule_id int,
+ time timestamp,
+ type int,
+ value double,
+ PRIMARY KEY (schedule_id, time, type)
+);
+
CREATE TABLE metrics_index (
bucket varchar,
time timestamp,
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 5ba9c0b..bb25f05 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
@@ -54,6 +54,8 @@ public class MetricsDAO {
public static final String ONE_HOUR_METRICS_TABLE = "one_hour_metrics";
+ public static final String SIX_HOUR_METRICS_TABLE = "six_hour_metrics";
+
private static final String RAW_METRICS_QUERY =
"SELECT schedule_id, time, value " +
"FROM " + RAW_METRICS_TABLE + " " +
11 years, 7 months
- 1
- 0
[rhq] Branch 'feature/cassandra-backend' - 3 commits - modules/enterprise
by John Sanda
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateMetricMapper.java | 51 ++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java | 74 ++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 248 ++--------
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawNumericMetric.java | 113 ++++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawNumericMetricMapper.java | 40 +
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java | 88 ---
6 files changed, 337 insertions(+), 277 deletions(-)
New commits:
commit b3b281cc3c8df5d8b547b50ca9b375435f172f63
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Nov 3 21:34:58 2012 -0400
adding methods to MetricsDAO to insert and retrieve aggregates
Adding the methods insertAggregates and findAggregateMetrics to MetricsDAO.
This is also the initial commit for AggregateMetricMapper which is used by
findAggregateMetrics.
MetricsServer.aggregateRawData has been further refactored so that it is no
longer direct JDBC calls and is instead using the API provided by MetricsDAO.
More changes are forthcoming to address a number of things including:
* setting TTL on metrics getting inserted
* defining the consistency level for each read/write operation
* handling exceptions when/where it makes sense
Right now, every checked SQLException is wrapped in an unchecked CQLException
and nothing more is done. Unlike with the RDBMS, there will be times we want to
recover from such exceptions. For instance, if an exception is thrown because
the cassandra node is down, then we probably want to retry the operation with
another node.
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateMetricMapper.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateMetricMapper.java
new file mode 100644
index 0000000..5a446f0
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateMetricMapper.java
@@ -0,0 +1,51 @@
+/*
+ *
+ * * 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.server.metrics;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * @author John Sanda
+ */
+public class AggregateMetricMapper implements ResultSetMapper<AggregatedNumericMetric> {
+
+ @Override
+ public AggregatedNumericMetric map(ResultSet resultSet) throws SQLException {
+ AggregatedNumericMetric metric = new AggregatedNumericMetric();
+ metric.setScheduleId(resultSet.getInt(1));
+ metric.setTimestamp(resultSet.getDate(2).getTime());
+ metric.setMax(resultSet.getDouble(4));
+
+ resultSet.next();
+ metric.setMin(resultSet.getDouble(4));
+
+ resultSet.next();
+ metric.setAvg(resultSet.getDouble(4));
+
+ return metric;
+ }
+}
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 39b440b..5ba9c0b 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
@@ -29,6 +29,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -106,6 +107,46 @@ public class MetricsDAO {
}
}
+ public Map<Integer, DateTime> insertAggregates(String bucket, List<AggregatedNumericMetric> metrics) {
+ Map<Integer, DateTime> updates = new TreeMap<Integer, DateTime>();
+ Connection connection = null;
+ PreparedStatement statement = null;
+ String sql = "INSERT INTO " + bucket + " (schedule_id, time, type, value) VALUES (?, ?, ?, ?)";
+ try {
+ connection = dataSource.getConnection();
+ statement = connection.prepareStatement(sql);
+
+ for (AggregatedNumericMetric metric : metrics) {
+ statement.setInt(1, metric.getScheduleId());
+ statement.setDate(2, new java.sql.Date(metric.getTimestamp()));
+ statement.setInt(3, AggregateType.MIN.ordinal());
+ statement.setDouble(4, metric.getMin());
+ statement.executeUpdate();
+
+ statement.setInt(1, metric.getScheduleId());
+ statement.setDate(2, new java.sql.Date(metric.getTimestamp()));
+ statement.setInt(3, AggregateType.MAX.ordinal());
+ statement.setDouble(4, metric.getMax());
+ statement.executeUpdate();
+
+ statement.setInt(1, metric.getScheduleId());
+ statement.setDate(2, new java.sql.Date(metric.getTimestamp()));
+ statement.setInt(3, AggregateType.AVG.ordinal());
+ statement.setDouble(4, metric.getAvg());
+ statement.executeUpdate();
+
+ updates.put(metric.getScheduleId(), new DateTime(metric.getTimestamp()));
+ }
+
+ return updates;
+ } catch (SQLException e) {
+ throw new CQLException(e);
+ } finally {
+ JDBCUtil.safeClose(statement);
+ JDBCUtil.safeClose(connection);
+ }
+ }
+
public List<RawNumericMetric> findRawMetrics(int scheduleId, DateTime startTime, DateTime endTime) {
Connection connection = null;
PreparedStatement statement = null;
@@ -134,6 +175,39 @@ public class MetricsDAO {
}
}
+ public List<AggregatedNumericMetric> findAggregateMetrics(String bucket, int scheduleId) {
+ Connection connection = null;
+ Statement statement = null;
+ ResultSet resultSet = null;
+
+ String sql =
+ "SELECT schedule_id, time, type, value, ttl(value), writetime(value)" +
+ "FROM " + bucket + " " +
+ "WHERE schedule_id = " + scheduleId + " " +
+ "ORDER BY time, type";
+
+ try {
+ connection = dataSource.getConnection();
+ statement = connection.createStatement();
+ resultSet = statement.executeQuery(sql);
+
+ List<AggregatedNumericMetric> metrics = new ArrayList<AggregatedNumericMetric>();
+ ResultSetMapper<AggregatedNumericMetric> resultSetMapper = new AggregateMetricMapper();
+
+ while (resultSet.next()) {
+ metrics.add(resultSetMapper.map(resultSet));
+ }
+
+ return metrics;
+ } catch (SQLException e) {
+ throw new CQLException(e);
+ } finally {
+ JDBCUtil.safeClose(resultSet);
+ JDBCUtil.safeClose(statement);
+ JDBCUtil.safeClose(connection);
+ }
+ }
+
public List<MetricsIndexEntry> findMetricsIndexEntries(String bucket) {
Connection connection = null;
PreparedStatement statement = null;
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 f526949..9200c48 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
@@ -28,9 +28,10 @@ package org.rhq.server.metrics;
import static me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality.EQUAL;
import static me.prettyprint.hector.api.beans.AbstractComposite.ComponentEquality.LESS_THAN_EQUAL;
+import java.math.BigDecimal;
+import java.math.MathContext;
import java.sql.Connection;
import java.sql.PreparedStatement;
-import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@@ -51,7 +52,6 @@ import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
-import org.rhq.core.util.jdbc.JDBCUtil;
import me.prettyprint.cassandra.serializers.CompositeSerializer;
import me.prettyprint.cassandra.serializers.DoubleSerializer;
@@ -276,7 +276,6 @@ public class MetricsServer {
MetricsDAO dao = new MetricsDAO(cassandraDS);
Map<Integer, DateTime> updates = dao.insertRawMetrics(dataSet);
dao.updateMetricsIndex(MetricsDAO.ONE_HOUR_METRICS_TABLE, updates);
- updateMetricsQueue(MetricsDAO.ONE_HOUR_METRICS_TABLE, updates);
}
public void calculateAggregates() {
@@ -292,161 +291,43 @@ public class MetricsServer {
}
private Map<Integer, DateTime> aggregateRawData() {
- Map<Integer, DateTime> updatedSchedules = new TreeMap<Integer, DateTime>();
- Connection connection = null;
- PreparedStatement statement = null;
- PreparedStatement rawMetricsStatement = null;
- PreparedStatement insert1HourData = null;
+ MetricsDAO dao = new MetricsDAO(cassandraDS);
+ List<MetricsIndexEntry> indexEntries = dao.findMetricsIndexEntries(MetricsDAO.ONE_HOUR_METRICS_TABLE);
+ List<AggregatedNumericMetric> oneHourMetrics = new ArrayList<AggregatedNumericMetric>();
- try {
- connection = cassandraDS.getConnection();
+ for (MetricsIndexEntry indexEntry : indexEntries) {
+ DateTime startTime = indexEntry.getTime();
+ DateTime endTime = startTime.plusMinutes(60);
- String indexSQL =
- "SELECT time, schedule_id " +
- "FROM " + metricsIndex + " " +
- "WHERE bucket = '" + oneHourMetricsDataCF + "' " +
- "ORDER BY time";
-
- String rawMetricsSQL =
- "SELECT schedule_id, time, value " +
- "FROM " + rawMetricsDataCF + " " +
- "WHERE schedule_id = ? AND time >= ? AND time < ?";
-
- String insert1HourSQL =
- "INSERT INTO " + oneHourMetricsDataCF + " (schedule_id, time, type, value) " +
- "VALUES (?, ?, ?, ?)";
-
- statement = connection.prepareStatement(indexSQL);
- rawMetricsStatement = connection.prepareStatement(rawMetricsSQL);
- insert1HourData = connection.prepareStatement(insert1HourSQL);
- ResultSet indexResultSet = statement.executeQuery();
-
- MetricsIndexResultSetMapper indexResultSetMapper = new MetricsIndexResultSetMapper(oneHourMetricsDataCF);
-
- while (indexResultSet.next()) {
-// MetricsIndexEntry indexEntry = new MetricsIndexEntry(rawMetricsDataCF, indexResultSet.getDate(2),
-// indexResultSet.getInt(3));
- MetricsIndexEntry indexEntry = indexResultSetMapper.map(indexResultSet);
- DateTime startTime = indexEntry.getTime();
- DateTime endTime = startTime.plusMinutes(60);
-
- rawMetricsStatement.setInt(1, indexEntry.getScheduleId());
- rawMetricsStatement.setDate(2, new java.sql.Date(startTime.getMillis()));
- rawMetricsStatement.setDate(3, new java.sql.Date(endTime.getMillis()));
- ResultSet metricsResultSet = rawMetricsStatement.executeQuery();
-
- metricsResultSet.next();
-
- double min = metricsResultSet.getDouble(3);
- double max = min;
- double sum = max;
- int count = 1;
- double value;
-
- while (metricsResultSet.next()) {
- value = metricsResultSet.getDouble(3);
- if (value < min) {
- min = value;
- } else if (value > max) {
- max = value;
- }
- sum += value;
- ++count;
+ List<RawNumericMetric> rawMetrics = dao.findRawMetrics(indexEntry.getScheduleId(), startTime, endTime);
+
+ double min = Double.NaN;
+ double max = min;
+ double sum = 0;
+ int count = 0;
+ double value;
+
+ for (RawNumericMetric metric : rawMetrics) {
+ value = metric.getValue();
+ if (count == 0) {
+ min = value;
+ max = min;
}
- double avg = sum / count;
- metricsResultSet.close();
- metricsResultSet = null;
-
- insert1HourData.setInt(1, indexEntry.getScheduleId());
- insert1HourData.setDate(2, new java.sql.Date(startTime.getMillis()));
- insert1HourData.setInt(3, AggregateType.MIN.ordinal());
- insert1HourData.setDouble(4, min);
- insert1HourData.executeUpdate();
-
- insert1HourData.setInt(1, indexEntry.getScheduleId());
- insert1HourData.setDate(2, new java.sql.Date(startTime.getMillis()));
- insert1HourData.setInt(3, AggregateType.MAX.ordinal());
- insert1HourData.setDouble(4, max);
- insert1HourData.executeUpdate();
-
- insert1HourData.setInt(1, indexEntry.getScheduleId());
- insert1HourData.setDate(2, new java.sql.Date(startTime.getMillis()));
- insert1HourData.setInt(3, AggregateType.AVG.ordinal());
- insert1HourData.setDouble(4, avg);
- insert1HourData.executeUpdate();
-
- updatedSchedules.put(indexEntry.getScheduleId(), indexEntry.getTime());
+ if (value < min) {
+ min = value;
+ } else if (value > max) {
+ max = value;
+ }
+ sum += value;
+ ++count;
}
- } catch (SQLException e) {
- throw new RuntimeException(e);
- } finally {
- JDBCUtil.safeClose(insert1HourData);
- JDBCUtil.safeClose(rawMetricsStatement);
- JDBCUtil.safeClose(statement);
- JDBCUtil.safeClose(connection);
+ double avg = divide(sum, count);
+ oneHourMetrics.add(new AggregatedNumericMetric(indexEntry.getScheduleId(), avg, min, max,
+ startTime.getMillis()));
}
-// SliceQuery<String, Composite, Integer> queueQuery = HFactory.createSliceQuery(keyspace, StringSerializer.get(),
-// new CompositeSerializer().get(), IntegerSerializer.get());
-// queueQuery.setColumnFamily(metricsIndex);
-// queueQuery.setKey(oneHourMetricsDataCF);
-//
-// ColumnSliceIterator<String, Composite, Integer> queueIterator = new ColumnSliceIterator<String, Composite, Integer>(
-// queueQuery, (Composite) null, (Composite) null, false);
-//
-// Mutator<Integer> mutator = HFactory.createMutator(keyspace, IntegerSerializer.get());
-// Mutator<String> queueMutator = HFactory.createMutator(keyspace, StringSerializer.get());
-//
-// while (queueIterator.hasNext()) {
-// HColumn<Composite, Integer> queueColumn = queueIterator.next();
-// Integer scheduleId = queueColumn.getName().get(1, IntegerSerializer.get());
-// Long timestamp = queueColumn.getName().get(0, LongSerializer.get());
-// DateTime startTime = new DateTime(timestamp);
-// DateTime endTime = new DateTime(timestamp).plus(Minutes.minutes(60));
-//
-// SliceQuery<Integer, Long, Double> rawDataQuery = HFactory.createSliceQuery(keyspace,
-// IntegerSerializer.get(), LongSerializer.get(), DoubleSerializer.get());
-// rawDataQuery.setColumnFamily(rawMetricsDataCF);
-// rawDataQuery.setKey(scheduleId);
-//
-// ColumnSliceIterator<Integer, Long, Double> rawDataIterator = new ColumnSliceIterator<Integer, Long, Double>(
-// rawDataQuery, startTime.getMillis(), endTime.getMillis(), false);
-// rawDataIterator.hasNext();
-//
-// HColumn<Long, Double> rawDataColumn = rawDataIterator.next();
-// double min = rawDataColumn.getValue();
-// double max = min;
-// double sum = max;
-// int count = 1;
-//
-// while (rawDataIterator.hasNext()) {
-// rawDataColumn = rawDataIterator.next();
-// if (rawDataColumn.getValue() < min) {
-// min = rawDataColumn.getValue();
-// } else if (rawDataColumn.getValue() > max) {
-// max = rawDataColumn.getValue();
-// }
-// sum += rawDataColumn.getValue();
-// ++count;
-// }
-//
-// double avg = sum / count;
-//
-// mutator.addInsertion(scheduleId, oneHourMetricsDataCF,
-// createAvgColumn(startTime, avg, DateTimeService.TWO_WEEKS));
-// mutator.addInsertion(scheduleId, oneHourMetricsDataCF,
-// createMaxColumn(startTime, max, DateTimeService.TWO_WEEKS));
-// mutator.addInsertion(scheduleId, oneHourMetricsDataCF,
-// createMinColumn(startTime, min, DateTimeService.TWO_WEEKS));
-//
-// updatedSchedules.put(scheduleId, dateTimeService.getTimeSlice(startTime, Minutes.minutes(60 * 6)));
-//
-// queueMutator.addDeletion(oneHourMetricsDataCF, metricsIndex, queueColumn.getName(),
-// CompositeSerializer.get());
-// }
-// mutator.execute();
-// queueMutator.execute();
-
+ Map<Integer, DateTime> updatedSchedules = dao.insertAggregates(MetricsDAO.ONE_HOUR_METRICS_TABLE,
+ oneHourMetrics);
return updatedSchedules;
}
@@ -530,7 +411,8 @@ public class MetricsServer {
}
}
- double avg = sum / avgCount;
+// double avg = sum / avgCount;
+ double avg = divide(sum, avgCount);
mutator.addInsertion(scheduleId, toColumnFamily, createAvgColumn(startTime, avg, ttl));
mutator.addInsertion(scheduleId, toColumnFamily, createMaxColumn(startTime, max, ttl));
@@ -623,6 +505,20 @@ public class MetricsServer {
return null;
}
+ static double divide(double dividend, int divisor) {
+ return new BigDecimal(Double.toString(dividend)).divide(new BigDecimal(Integer.toString(divisor)),
+ MathContext.DECIMAL64).doubleValue();
+ }
+
+ double avg(double... values) {
+ BigDecimal sum = new BigDecimal("0.00");
+ for (double value : values) {
+ sum = sum.add(new BigDecimal(Double.toString(value)));
+ }
+ BigDecimal avg = sum.divide(new BigDecimal(Integer.toString(values.length), MathContext.DECIMAL64));
+ return avg.doubleValue();
+ }
+
protected DateTime getCurrentHour() {
DateTime now = new DateTime();
return now.hourOfDay().roundFloorCopy();
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 d15fff8..65e6a4c 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
@@ -31,6 +31,7 @@ import static org.rhq.server.metrics.DateTimeService.ONE_MONTH;
import static org.rhq.server.metrics.DateTimeService.ONE_YEAR;
import static org.rhq.server.metrics.DateTimeService.SEVEN_DAYS;
import static org.rhq.server.metrics.DateTimeService.TWO_WEEKS;
+import static org.rhq.server.metrics.MetricsServer.divide;
import static org.rhq.test.AssertUtils.assertCollectionMatchesNoOrder;
import static org.rhq.test.AssertUtils.assertPropertiesMatch;
import static org.testng.Assert.assertEquals;
@@ -39,11 +40,8 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.apache.commons.logging.Log;
@@ -186,37 +184,6 @@ public class MetricsServerTest extends CassandraIntegrationTest {
metricsServer.addNumericData(data);
-// SliceQuery<Integer, Long, Double> query = HFactory.createSliceQuery(keyspace, IntegerSerializer.get(),
-// LongSerializer.get(), DoubleSerializer.get());
-// query.setColumnFamily(RAW_METRIC_DATA_CF);
-// query.setKey(scheduleId);
-// query.setRange(null, null, false, 10);
-//
-// QueryResult<ColumnSlice<Long, Double>> queryResult = query.execute();
-// List<HColumn<Long, Double>> actual = queryResult.get().getColumns();
-//
-// List<HColumn<Long, Double>> expected = asList(
-// HFactory.createColumn(threeMinutesAgo.getMillis(), 3.2, sevenDays, LongSerializer.get(),
-// DoubleSerializer.get()),
-// HFactory.createColumn(twoMinutesAgo.getMillis(), 3.9, sevenDays, LongSerializer.get(),
-// DoubleSerializer.get()),
-// HFactory.createColumn(oneMinuteAgo.getMillis(), 2.6, sevenDays, LongSerializer.get(),
-// DoubleSerializer.get())
-// );
-//
-// for (int i = 0; i < expected.size(); ++i) {
-// assertPropertiesMatch("The returned columns do not match", expected.get(i), actual.get(i),
-// "clock");
-// }
-//
-// DateTime theHour = now().hourOfDay().roundFloorCopy();
-// Composite expectedComposite = new Composite();
-// expectedComposite.addComponent(theHour.getMillis(), LongSerializer.get());
-// expectedComposite.addComponent(scheduleId, IntegerSerializer.get());
-//
-// assert1HourMetricsQueueEquals(asList(HFactory.createColumn(expectedComposite, 0, CompositeSerializer.get(),
-// IntegerSerializer.get())));
-
Statement statement = connection.createStatement();
ResultSet resultSet = statement.executeQuery("SELECT * FROM raw_metrics WHERE schedule_id = " + scheduleId);
@@ -289,8 +256,8 @@ public class MetricsServerTest extends CassandraIntegrationTest {
// );
//
// assert6HourDataEquals(scheduleId, expected6HourData);
- List<AggregatedNumericMetric> expected = asList(new AggregatedNumericMetric(scheduleId, (3.9 + 3.2 + 2.6) / 3,
- 2.6, 3.9, lastHour.getMillis()));
+ List<AggregatedNumericMetric> expected = asList(new AggregatedNumericMetric(scheduleId,
+ divide((3.9 + 3.2 + 2.6), 3), 2.6, 3.9, lastHour.getMillis()));
assertMetricDataEquals(ONE_HOUR_METRIC_DATA_CF, scheduleId, expected);
}
@@ -831,52 +798,11 @@ public class MetricsServerTest extends CassandraIntegrationTest {
}
private void assertMetricDataEquals(String columnFamily, int scheduleId, List<AggregatedNumericMetric> expected) {
- Statement statement = null;
- try {
- statement = connection.createStatement();
- String sql =
- "SELECT schedule_id, time, type, value, ttl(value), writetime(value)" +
- "FROM " + columnFamily + " " +
- "WHERE schedule_id = " + scheduleId + " " +
- "ORDER BY time, type";
- Map<Long, AggregatedNumericMetric> metrics = new HashMap<Long, AggregatedNumericMetric>();
- ResultSet resultSet = statement.executeQuery(sql);
+ MetricsDAO dao = new MetricsDAO(dataSource);
+ List<AggregatedNumericMetric> actual = dao.findAggregateMetrics(columnFamily, scheduleId);
- while (resultSet.next()) {
- long timestamp = resultSet.getDate(2).getTime();
- AggregatedNumericMetric metric = metrics.get(timestamp);
- if (metric == null) {
- metric = new AggregatedNumericMetric();
- metric.setScheduleId(scheduleId);
- metric.setTimestamp(timestamp);
- }
- AggregateType aggregateType = AggregateType.valueOf(resultSet.getInt(3));
- switch (aggregateType) {
- case MAX:
- metric.setMax(resultSet.getDouble(4));
- break;
- case MIN:
- metric.setMin(resultSet.getDouble(4));
- break;
- default: // AVG
- metric.setAvg(resultSet.getDouble(4));
- break;
- }
- metrics.put(timestamp, metric);
- }
- Collection<AggregatedNumericMetric> actual = metrics.values();
-
- assertCollectionMatchesNoOrder(expected, actual, "Metric data for schedule id " + scheduleId +
- " in table " + columnFamily + " does not match expected values");
- } catch (SQLException e) {
- } finally {
- if (statement != null) {
- try {
- statement.close();
- } catch (SQLException e) {
- }
- }
- }
+ assertCollectionMatchesNoOrder(expected, actual, "Metric data for schedule id " + scheduleId +
+ " in table " + columnFamily + " does not match expected values");
}
private void assert6HourDataEmpty(int scheduleId) {
commit 7825a777071108d61d1bc4ca5249e6b4f17d2188
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Nov 3 09:53:22 2012 -0400
delegate to MetricsDAO to update metrics index
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 2e8b038..f526949 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
@@ -275,6 +275,7 @@ public class MetricsServer {
public void addNumericData(Set<MeasurementDataNumeric> dataSet) {
MetricsDAO dao = new MetricsDAO(cassandraDS);
Map<Integer, DateTime> updates = dao.insertRawMetrics(dataSet);
+ dao.updateMetricsIndex(MetricsDAO.ONE_HOUR_METRICS_TABLE, updates);
updateMetricsQueue(MetricsDAO.ONE_HOUR_METRICS_TABLE, updates);
}
commit c0ca8814ca369dfd064b718a32d1e94b7e9e4935
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Nov 3 09:49:37 2012 -0400
refactoring MetricsServer.addNumericData to use MetricsDAO
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 0951637..2e8b038 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
@@ -273,50 +273,9 @@ public class MetricsServer {
}
public void addNumericData(Set<MeasurementDataNumeric> dataSet) {
- Map<Integer, DateTime> updates = new TreeMap<Integer, DateTime>();
- Mutator<Integer> mutator = HFactory.createMutator(keyspace, IntegerSerializer.get());
- Connection connection = null;
- PreparedStatement statement = null;
-
- try {
- connection = cassandraDS.getConnection();
- String sql = "INSERT INTO raw_metrics (schedule_id, time, value) VALUES (?, ?, ?)";
- statement = connection.prepareStatement(sql);
-
- for (MeasurementDataNumeric data : dataSet) {
- statement.setInt(1, data.getScheduleId());
- statement.setDate(2, new java.sql.Date(data.getTimestamp()));
- statement.setDouble(3, data.getValue());
-
- statement.executeUpdate();
- updates.put(data.getScheduleId(), new DateTime(data.getTimestamp()).hourOfDay().roundFloorCopy());
- //statement.addBatch();
- }
-// statement.executeUpdate();
- updateMetricsQueue(oneHourMetricsDataCF, updates);
- } catch (SQLException e) {
- throw new RuntimeException(e);
- } finally {
- if (statement != null) {
- try {
- statement.close();
- } catch (SQLException e) {
- }
- }
- }
-
-// for (MeasurementDataNumeric data : dataSet) {
-// updates.put(data.getScheduleId(), new DateTime(data.getTimestamp()).hourOfDay().roundFloorCopy());
-// mutator.addInsertion(
-// data.getScheduleId(),
-// rawMetricsDataCF,
-// HFactory.createColumn(data.getTimestamp(), data.getValue(), DateTimeService.SEVEN_DAYS,
-// LongSerializer.get(), DoubleSerializer.get()));
-// }
-//
-// mutator.execute();
-//
-// updateMetricsQueue(oneHourMetricsDataCF, updates);
+ MetricsDAO dao = new MetricsDAO(cassandraDS);
+ Map<Integer, DateTime> updates = dao.insertRawMetrics(dataSet);
+ updateMetricsQueue(MetricsDAO.ONE_HOUR_METRICS_TABLE, updates);
}
public void calculateAggregates() {
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawNumericMetric.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawNumericMetric.java
new file mode 100644
index 0000000..7d3142e
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawNumericMetric.java
@@ -0,0 +1,113 @@
+/*
+ *
+ * * 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.server.metrics;
+
+/**
+ * @author John Sanda
+ */
+public class RawNumericMetric {
+
+ private int scheduleId;
+
+ private Double value = Double.NaN;
+
+ private long timestamp;
+
+ private ColumnMetadata columnMetadata;
+
+ public RawNumericMetric() {
+ }
+
+ public RawNumericMetric(int scheduleId, long timestamp, double value) {
+ this.scheduleId = scheduleId;
+ this.value = value;
+ this.timestamp = timestamp;
+ }
+
+ public int getScheduleId() {
+ return scheduleId;
+ }
+
+ public void setScheduleId(int scheduleId) {
+ this.scheduleId = scheduleId;
+ }
+
+ public Double getValue() {
+ return value;
+ }
+
+ public void setValue(Double value) {
+ this.value = value;
+ }
+
+ public long getTimestamp() {
+ return timestamp;
+ }
+
+ public void setTimestamp(long timestamp) {
+ this.timestamp = timestamp;
+ }
+
+ public ColumnMetadata getColumnMetadata() {
+ return columnMetadata;
+ }
+
+ public void setColumnMetadata(ColumnMetadata columnMetadata) {
+ this.columnMetadata = columnMetadata;
+ }
+
+ @Override
+ public String toString() {
+ if (columnMetadata == null) {
+ return "RawNumericMetric[scheduleId=" + scheduleId + ", value=" + value + ", timestamp=" + timestamp + "]";
+ } else {
+ return "RawNumericMetric[scheduleId=" + scheduleId + ", value=" + value + ", timestamp=" + timestamp +
+ " columnMetadata=" + columnMetadata + "]";
+ }
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ RawNumericMetric that = (RawNumericMetric) o;
+
+ if (scheduleId != that.scheduleId) return false;
+ if (timestamp != that.timestamp) return false;
+ if (!value.equals(that.value)) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = scheduleId;
+ result = 31 * result + value.hashCode();
+ result = 31 * result + (int) (timestamp ^ (timestamp >>> 32));
+ return result;
+ }
+}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawNumericMetricMapper.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawNumericMetricMapper.java
new file mode 100644
index 0000000..cb81503
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/RawNumericMetricMapper.java
@@ -0,0 +1,40 @@
+/*
+ *
+ * * 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.server.metrics;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * @author John Sanda
+ */
+public class RawNumericMetricMapper implements ResultSetMapper<RawNumericMetric> {
+
+ @Override
+ public RawNumericMetric map(ResultSet resultSet) throws SQLException {
+ return new RawNumericMetric(resultSet.getInt(1), resultSet.getDate(2).getTime(), resultSet.getDouble(3));
+ }
+}
11 years, 7 months
- 1
- 0
[rhq] Branch 'feature/cassandra-backend' - 4 commits - modules/enterprise
by John Sanda
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/CQLException.java | 49 ++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java | 200 ++++++++++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsIndexResultSetMapper.java | 46 ++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 9
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Query.java | 69 +++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/QueryCallback.java | 35 +
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/ResultSetMapper.java | 38 +
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java | 78 +++
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java | 115 +++++
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java | 40 --
10 files changed, 637 insertions(+), 42 deletions(-)
New commits:
commit 29e3705d1155caadb0baf982ea3ca20c73ef8b9b
Author: John Sanda <jsanda(a)redhat.com>
Date: Sat Nov 3 08:15:47 2012 -0400
adding method in MetricsDAO to insert and retrieve raw metrics
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 4f99e8a..39b440b 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
@@ -32,11 +32,14 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
import javax.sql.DataSource;
import org.joda.time.DateTime;
+import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.util.jdbc.JDBCUtil;
/**
@@ -46,8 +49,18 @@ public class MetricsDAO {
public static final String METRICS_INDEX_TABLE = "metrics_index";
+ public static final String RAW_METRICS_TABLE = "raw_metrics";
+
public static final String ONE_HOUR_METRICS_TABLE = "one_hour_metrics";
+ private static final String RAW_METRICS_QUERY =
+ "SELECT schedule_id, time, value " +
+ "FROM " + RAW_METRICS_TABLE + " " +
+ "WHERE schedule_id = ? AND time >= ? AND time < ?";
+
+ private static final String INSERT_RAW_METRICS =
+ "INSERT INTO raw_metrics (schedule_id, time, value) VALUES (?, ?, ?)";
+
private static final String METRICS_INDEX_QUERY =
"SELECT time, schedule_id " +
"FROM " + METRICS_INDEX_TABLE + " " +
@@ -67,6 +80,60 @@ public class MetricsDAO {
this.dataSource = dataSource;
}
+ public Map<Integer, DateTime> insertRawMetrics(Set<MeasurementDataNumeric> dataSet) {
+ Map<Integer, DateTime> updates = new TreeMap<Integer, DateTime>();
+ Connection connection = null;
+ PreparedStatement statement = null;
+ try {
+ connection = dataSource.getConnection();
+ statement = connection.prepareStatement(INSERT_RAW_METRICS);
+
+ for (MeasurementDataNumeric data : dataSet) {
+ statement.setInt(1, data.getScheduleId());
+ statement.setDate(2, new java.sql.Date(data.getTimestamp()));
+ statement.setDouble(3, data.getValue());
+ statement.executeUpdate();
+
+ updates.put(data.getScheduleId(), new DateTime(data.getTimestamp()).hourOfDay().roundFloorCopy());
+ }
+
+ return updates;
+ } catch (SQLException e) {
+ throw new CQLException(e);
+ } finally {
+ JDBCUtil.safeClose(statement);
+ JDBCUtil.safeClose(connection);
+ }
+ }
+
+ public List<RawNumericMetric> findRawMetrics(int scheduleId, DateTime startTime, DateTime endTime) {
+ Connection connection = null;
+ PreparedStatement statement = null;
+ ResultSet resultSet = null;
+ try {
+ connection = dataSource.getConnection();
+ statement = connection.prepareStatement(RAW_METRICS_QUERY);
+ statement.setInt(1, scheduleId);
+ statement.setDate(2, new java.sql.Date(startTime.getMillis()));
+ statement.setDate(3, new java.sql.Date(endTime.getMillis()));
+
+ resultSet = statement.executeQuery();
+ List<RawNumericMetric> metrics = new ArrayList<RawNumericMetric>();
+ ResultSetMapper<RawNumericMetric> resultSetMapper = new RawNumericMetricMapper();
+
+ while (resultSet.next()) {
+ metrics.add(resultSetMapper.map(resultSet));
+ }
+ return metrics;
+ } catch (SQLException e) {
+ throw new CQLException(e);
+ } finally {
+ JDBCUtil.safeClose(resultSet);
+ JDBCUtil.safeClose(statement);
+ JDBCUtil.safeClose(connection);
+ }
+ }
+
public List<MetricsIndexEntry> findMetricsIndexEntries(String bucket) {
Connection connection = null;
PreparedStatement statement = null;
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 58ed1dc..6640cdb 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
@@ -29,19 +29,72 @@ import static java.util.Arrays.asList;
import static org.joda.time.DateTime.now;
import static org.rhq.server.metrics.MetricsDAO.ONE_HOUR_METRICS_TABLE;
import static org.rhq.test.AssertUtils.assertCollectionMatchesNoOrder;
+import static org.testng.Assert.assertEquals;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
import org.joda.time.DateTime;
import org.testng.annotations.Test;
+import org.rhq.core.domain.measurement.DataType;
+import org.rhq.core.domain.measurement.MeasurementDataNumeric;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
+
/**
* @author John Sanda
*/
public class MetricsDAOTest extends CassandraIntegrationTest {
+ private final long SECOND = 1000;
+
+ private final long MINUTE = 60 * SECOND;
+
+ @Test
+ public void insertAndFindRawMetrics() {
+ int scheduleId = 123;
+
+ DateTime hour0 = now().hourOfDay().roundFloorCopy().minusHours(now().hourOfDay().get());
+ DateTime currentTime = hour0.plusHours(4).plusMinutes(44);
+ DateTime currentHour = currentTime.hourOfDay().roundFloorCopy();
+ DateTime threeMinutesAgo = currentTime.minusMinutes(3);
+ DateTime twoMinutesAgo = currentTime.minusMinutes(2);
+ DateTime oneMinuteAgo = currentTime.minusMinutes(1);
+
+ String scheduleName = getClass().getName() + "_SCHEDULE";
+ long interval = MINUTE * 10;
+ boolean enabled = true;
+ DataType dataType = DataType.MEASUREMENT;
+ MeasurementScheduleRequest request = new MeasurementScheduleRequest(scheduleId, scheduleName, interval,
+ enabled, dataType);
+
+ Set<MeasurementDataNumeric> data = new HashSet<MeasurementDataNumeric>();
+ data.add(new MeasurementDataNumeric(threeMinutesAgo.getMillis(), request, 3.2));
+ data.add(new MeasurementDataNumeric(twoMinutesAgo.getMillis(), request, 3.9));
+ data.add(new MeasurementDataNumeric(oneMinuteAgo.getMillis(), request, 2.6));
+
+ MetricsDAO dao = new MetricsDAO(dataSource);
+ Map<Integer, DateTime> actualUpdates = dao.insertRawMetrics(data);
+
+ Map<Integer, DateTime> expectedUpdates = new TreeMap<Integer, DateTime>();
+ expectedUpdates.put(scheduleId, currentHour);
+
+ assertEquals(actualUpdates, expectedUpdates, "The updates do not match expected value.");
+
+ List<RawNumericMetric> actualMetrics = dao.findRawMetrics(scheduleId, currentHour, currentHour.plusHours(1));
+ List<RawNumericMetric> expectedMetrics = asList(
+ new RawNumericMetric(scheduleId, threeMinutesAgo.getMillis(), 3.2),
+ new RawNumericMetric(scheduleId, twoMinutesAgo.getMillis(), 3.9),
+ new RawNumericMetric(scheduleId, oneMinuteAgo.getMillis(), 2.6)
+ );
+
+ assertEquals(actualMetrics, expectedMetrics, "Failed to find raw metrics");
+ }
+
@Test
public void updateAndFindOneHourIndexEntries() {
DateTime hour0 = now().hourOfDay().roundFloorCopy().minusHours(now().hourOfDay().get());
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 dbe6c1b..d15fff8 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
@@ -52,7 +52,6 @@ import org.joda.time.Chronology;
import org.joda.time.DateTime;
import org.joda.time.DateTimeField;
import org.joda.time.DateTimeFieldType;
-import org.joda.time.Duration;
import org.joda.time.chrono.GregorianChronology;
import org.joda.time.field.DividedDateTimeField;
import org.testng.annotations.BeforeMethod;
@@ -173,8 +172,6 @@ public class MetricsServerTest extends CassandraIntegrationTest {
DateTime twoMinutesAgo = currentTime.minusMinutes(2);
DateTime oneMinuteAgo = currentTime.minusMinutes(1);
- int sevenDays = Duration.standardDays(7).toStandardSeconds().getSeconds();
-
String scheduleName = getClass().getName() + "_SCHEDULE";
long interval = MINUTE * 10;
boolean enabled = true;
commit c8816ba1c31676b7be1846f4ac4ad286187069e3
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Nov 2 19:49:53 2012 -0400
adding method to update metrics index
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 5e496b1..4f99e8a 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
@@ -31,9 +31,12 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import javax.sql.DataSource;
+import org.joda.time.DateTime;
+
import org.rhq.core.util.jdbc.JDBCUtil;
/**
@@ -51,6 +54,9 @@ public class MetricsDAO {
"WHERE bucket = ? " +
"ORDER BY time";
+ private static final String UPDATE_METRICS_INDEX =
+ "INSERT INTO " + METRICS_INDEX_TABLE + " (bucket, time, schedule_id, null_col) VALUES (?, ?, ?, ?)";
+
private static interface ConnectionCallback {
void invoke(Connection connection);
}
@@ -61,7 +67,7 @@ public class MetricsDAO {
this.dataSource = dataSource;
}
- public List<MetricsIndexEntry> findMetricsIndexEntries(final String bucket) {
+ public List<MetricsIndexEntry> findMetricsIndexEntries(String bucket) {
Connection connection = null;
PreparedStatement statement = null;
ResultSet resultSet = null;
@@ -86,6 +92,33 @@ public class MetricsDAO {
}
}
+ public void updateMetricsIndex(String bucket, Map<Integer, DateTime> updates) {
+ Connection connection = null;
+ PreparedStatement statement = null;
+ try {
+ connection = dataSource.getConnection();
+ statement = connection.prepareStatement(UPDATE_METRICS_INDEX);
+ for (Integer scheduleId : updates.keySet()) {
+ try {
+ statement.setString(1, bucket);
+ statement.setDate(2, new java.sql.Date(updates.get(scheduleId).getMillis()));
+ statement.setInt(3, scheduleId);
+ statement.setBoolean(4, false);
+
+ statement.executeUpdate();
+ } catch (SQLException e) {
+// log.warn("Failed to update " + columnFamily + " index for " + scheduleId + " at time slice " +
+// updates.get(scheduleId));
+ }
+ }
+ } catch (SQLException e) {
+ throw new CQLException(e);
+ } finally {
+ JDBCUtil.safeClose(statement);
+ JDBCUtil.safeClose(connection);
+ }
+ }
+
private void execute(ConnectionCallback callback) {
Connection connection = null;
try {
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 38daced..58ed1dc 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
@@ -25,13 +25,14 @@
package org.rhq.server.metrics;
+import static java.util.Arrays.asList;
import static org.joda.time.DateTime.now;
-import static org.testng.Assert.assertEquals;
+import static org.rhq.server.metrics.MetricsDAO.ONE_HOUR_METRICS_TABLE;
+import static org.rhq.test.AssertUtils.assertCollectionMatchesNoOrder;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.joda.time.DateTime;
import org.testng.annotations.Test;
@@ -42,37 +43,20 @@ import org.testng.annotations.Test;
public class MetricsDAOTest extends CassandraIntegrationTest {
@Test
- public void findOneHourIndexEntries() {
- Connection connection = null;
- PreparedStatement statement = null;
-
- String sql = "INSERT INTO " + MetricsDAO.METRICS_INDEX_TABLE +
- " (bucket, time, schedule_id, null_col) VALUES (?, ?, ?, ?)";
-
+ public void updateAndFindOneHourIndexEntries() {
DateTime hour0 = now().hourOfDay().roundFloorCopy().minusHours(now().hourOfDay().get());
- int numSchedules = 2;
- try {
- connection = dataSource.getConnection();
- statement = connection.prepareStatement(sql);
-
- for (int i = 0; i < 2; ++i) {
- for (int j = 0; j < numSchedules; ++j) {
- statement.setString(1, MetricsDAO.ONE_HOUR_METRICS_TABLE);
- statement.setDate(2, new java.sql.Date(hour0.plusHours(i + j).getMillis()));
- statement.setInt(3, 100 + j);
- statement.setBoolean(4, false);
- statement.executeUpdate();
- }
- }
- } catch (SQLException e) {
- throw new CQLException(e);
- }
+ Map<Integer, DateTime> updates = new HashMap<Integer, DateTime>();
+ updates.put(100, hour0);
+ updates.put(101, hour0);
MetricsDAO dao = new MetricsDAO(dataSource);
- List<MetricsIndexEntry> actualEntries = dao.findMetricsIndexEntries(MetricsDAO.ONE_HOUR_METRICS_TABLE);
+ dao.updateMetricsIndex(ONE_HOUR_METRICS_TABLE, updates);
+ List<MetricsIndexEntry> actual = dao.findMetricsIndexEntries(ONE_HOUR_METRICS_TABLE);
- assertEquals(actualEntries.size(), 4, "Expected to get 4 entries but got " + actualEntries);
+ List<MetricsIndexEntry> expected = asList(new MetricsIndexEntry(ONE_HOUR_METRICS_TABLE, hour0, 100),
+ new MetricsIndexEntry(ONE_HOUR_METRICS_TABLE, hour0, 101));
+ assertCollectionMatchesNoOrder(expected, actual, "Failed to update or retrieve metrics index entries");
}
}
commit 404911b1eaa377f8c4548c7b9e04c671dc7f029b
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Nov 2 18:31:00 2012 -0400
simplifying the findMetricsIndexEntries method
MetricsDAO.findMetricsIndexEntries now just returns a list instead of a Query
object.
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 7471515..5e496b1 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
@@ -27,7 +27,10 @@ package org.rhq.server.metrics;
import java.sql.Connection;
import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
import javax.sql.DataSource;
@@ -58,28 +61,28 @@ public class MetricsDAO {
this.dataSource = dataSource;
}
- public Query<MetricsIndexEntry> findMetricsIndexEntries(final String bucket) {
-// execute(new ConnectionCallback() {
-// @Override
-// public void invoke(Connection connection) {
-// try {
-// PreparedStatement statement = connection.prepareStatement(METRICS_INDEX_QUERY);
-// statement.setString(1, bucket);
-//
-// return new Query<MetricsIndexEntry>(statement,
-// new MetricsIndexResultSetMapper(bucket));
-// } catch (SQLException e) {
-// throw new CQLException(e);
-// }
-// }
-// });
+ public List<MetricsIndexEntry> findMetricsIndexEntries(final String bucket) {
+ Connection connection = null;
+ PreparedStatement statement = null;
+ ResultSet resultSet = null;
try {
- Connection connection = dataSource.getConnection();
- PreparedStatement statement = connection.prepareStatement(METRICS_INDEX_QUERY);
+ connection = dataSource.getConnection();
+ statement = connection.prepareStatement(METRICS_INDEX_QUERY);
statement.setString(1, bucket);
- return new Query<MetricsIndexEntry>(connection, statement, new MetricsIndexResultSetMapper(bucket));
+ resultSet = statement.executeQuery();
+ List<MetricsIndexEntry> indexEntries = new ArrayList<MetricsIndexEntry>();
+ ResultSetMapper<MetricsIndexEntry> resultSetMapper = new MetricsIndexResultSetMapper(bucket);
+
+ while (resultSet.next()) {
+ indexEntries.add(resultSetMapper.map(resultSet));
+ }
+ return indexEntries;
} catch (SQLException e) {
throw new CQLException(e);
+ } finally {
+ JDBCUtil.safeClose(resultSet);
+ JDBCUtil.safeClose(statement);
+ JDBCUtil.safeClose(connection);
}
}
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 e572348..38daced 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
@@ -31,7 +31,6 @@ import static org.testng.Assert.assertEquals;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
-import java.util.ArrayList;
import java.util.List;
import org.joda.time.DateTime;
@@ -71,13 +70,8 @@ public class MetricsDAOTest extends CassandraIntegrationTest {
}
MetricsDAO dao = new MetricsDAO(dataSource);
- final List<MetricsIndexEntry> actualEntries = new ArrayList<MetricsIndexEntry>();
- dao.findMetricsIndexEntries(MetricsDAO.ONE_HOUR_METRICS_TABLE).forEach(new QueryCallback<MetricsIndexEntry>() {
- @Override
- public void invoke(MetricsIndexEntry row) {
- actualEntries.add(row);
- }
- });
+ List<MetricsIndexEntry> actualEntries = dao.findMetricsIndexEntries(MetricsDAO.ONE_HOUR_METRICS_TABLE);
+
assertEquals(actualEntries.size(), 4, "Expected to get 4 entries but got " + actualEntries);
}
commit ff22c799cf3b0c068f5af5fc7599d1378dec1d6a
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Nov 2 16:50:44 2012 -0400
initial commit for MetricDAO and MetricDAOTest
I am attempting to put in place a data access layer to address a few things.
First, I want to keep resource management (i.e., closing connections and
statements) encapsulated and not spread out all over the place. Secondly, I
want to provide an abstraction for iterating over result sets in a strongly
typed way. Lastly, I do not want to have deal with the checked SQLException all
over the place.
CQLException is an unchecked wrapper for SQLException. Query, QueryCallback,
and ResultSetMapper are helper classes aimed at providing an abstraction for
iterating over query results.
Cluster setup/tear down logic has been moved into a new base test class,
CassandraIntegrationTest.
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/CQLException.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/CQLException.java
new file mode 100644
index 0000000..b2d0ca6
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/CQLException.java
@@ -0,0 +1,49 @@
+/*
+ *
+ * * 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.server.metrics;
+
+/**
+ * @author John Sanda
+ */
+public class CQLException extends RuntimeException {
+
+ public CQLException() {
+ super();
+ }
+
+ public CQLException(String message) {
+ super(message);
+ }
+
+ public CQLException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public CQLException(Throwable cause) {
+ super(cause);
+ }
+
+}
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
new file mode 100644
index 0000000..7471515
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java
@@ -0,0 +1,97 @@
+/*
+ *
+ * * 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.server.metrics;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+
+import javax.sql.DataSource;
+
+import org.rhq.core.util.jdbc.JDBCUtil;
+
+/**
+ * @author John Sanda
+ */
+public class MetricsDAO {
+
+ public static final String METRICS_INDEX_TABLE = "metrics_index";
+
+ public static final String ONE_HOUR_METRICS_TABLE = "one_hour_metrics";
+
+ private static final String METRICS_INDEX_QUERY =
+ "SELECT time, schedule_id " +
+ "FROM " + METRICS_INDEX_TABLE + " " +
+ "WHERE bucket = ? " +
+ "ORDER BY time";
+
+ private static interface ConnectionCallback {
+ void invoke(Connection connection);
+ }
+
+ private DataSource dataSource;
+
+ public MetricsDAO(DataSource dataSource) {
+ this.dataSource = dataSource;
+ }
+
+ public Query<MetricsIndexEntry> findMetricsIndexEntries(final String bucket) {
+// execute(new ConnectionCallback() {
+// @Override
+// public void invoke(Connection connection) {
+// try {
+// PreparedStatement statement = connection.prepareStatement(METRICS_INDEX_QUERY);
+// statement.setString(1, bucket);
+//
+// return new Query<MetricsIndexEntry>(statement,
+// new MetricsIndexResultSetMapper(bucket));
+// } catch (SQLException e) {
+// throw new CQLException(e);
+// }
+// }
+// });
+ try {
+ Connection connection = dataSource.getConnection();
+ PreparedStatement statement = connection.prepareStatement(METRICS_INDEX_QUERY);
+ statement.setString(1, bucket);
+ return new Query<MetricsIndexEntry>(connection, statement, new MetricsIndexResultSetMapper(bucket));
+ } catch (SQLException e) {
+ throw new CQLException(e);
+ }
+ }
+
+ private void execute(ConnectionCallback callback) {
+ Connection connection = null;
+ try {
+ connection = dataSource.getConnection();
+ callback.invoke(connection);
+ } catch(SQLException e) {
+ throw new CQLException(e);
+ } finally {
+ JDBCUtil.safeClose(connection);
+ }
+ }
+}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsIndexResultSetMapper.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsIndexResultSetMapper.java
new file mode 100644
index 0000000..261c752
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsIndexResultSetMapper.java
@@ -0,0 +1,46 @@
+/*
+ *
+ * * 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.server.metrics;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * @author John Sanda
+ */
+public class MetricsIndexResultSetMapper implements ResultSetMapper<MetricsIndexEntry> {
+
+ private String bucket;
+
+ public MetricsIndexResultSetMapper(String bucket) {
+ this.bucket = bucket;
+ }
+
+ @Override
+ public MetricsIndexEntry map(ResultSet resultSet) throws SQLException {
+ return new MetricsIndexEntry(bucket, resultSet.getDate(1), resultSet.getInt(2));
+ }
+}
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 8ed96f4..0951637 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
@@ -342,7 +342,7 @@ public class MetricsServer {
connection = cassandraDS.getConnection();
String indexSQL =
- "SELECT bucket, time, schedule_id " +
+ "SELECT time, schedule_id " +
"FROM " + metricsIndex + " " +
"WHERE bucket = '" + oneHourMetricsDataCF + "' " +
"ORDER BY time";
@@ -361,9 +361,12 @@ public class MetricsServer {
insert1HourData = connection.prepareStatement(insert1HourSQL);
ResultSet indexResultSet = statement.executeQuery();
+ MetricsIndexResultSetMapper indexResultSetMapper = new MetricsIndexResultSetMapper(oneHourMetricsDataCF);
+
while (indexResultSet.next()) {
- MetricsIndexEntry indexEntry = new MetricsIndexEntry(rawMetricsDataCF, indexResultSet.getDate(2),
- indexResultSet.getInt(3));
+// MetricsIndexEntry indexEntry = new MetricsIndexEntry(rawMetricsDataCF, indexResultSet.getDate(2),
+// indexResultSet.getInt(3));
+ MetricsIndexEntry indexEntry = indexResultSetMapper.map(indexResultSet);
DateTime startTime = indexEntry.getTime();
DateTime endTime = startTime.plusMinutes(60);
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Query.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Query.java
new file mode 100644
index 0000000..938feea
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/Query.java
@@ -0,0 +1,69 @@
+/*
+ *
+ * * 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.server.metrics;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.rhq.core.util.jdbc.JDBCUtil;
+
+/**
+ * @author John Sanda
+ */
+public class Query<T> {
+
+ private PreparedStatement statement;
+
+ private Connection connection;
+
+ private ResultSetMapper<T> resultSetMapper;
+
+ public Query(Connection connection, PreparedStatement statement, ResultSetMapper<T> resultSetMapper) {
+ this.connection = connection;
+ this.statement = statement;
+ this.resultSetMapper = resultSetMapper;
+ }
+
+ public void forEach(QueryCallback<T> callback) {
+ ResultSet resultSet = null;
+ try {
+ resultSet = statement.executeQuery();
+ while (resultSet.next()) {
+ T row = resultSetMapper.map(resultSet);
+ callback.invoke(row);
+ }
+ } catch(SQLException e) {
+ throw new CQLException(e);
+ } finally {
+ JDBCUtil.safeClose(resultSet);
+ JDBCUtil.safeClose(statement);
+ JDBCUtil.safeClose(connection);
+ }
+ }
+
+}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/QueryCallback.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/QueryCallback.java
new file mode 100644
index 0000000..dcb8ee6
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/QueryCallback.java
@@ -0,0 +1,35 @@
+/*
+ *
+ * * 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.server.metrics;
+
+/**
+ * @author John Sanda
+ */
+public interface QueryCallback<T> {
+
+ void invoke(T row);
+
+}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/ResultSetMapper.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/ResultSetMapper.java
new file mode 100644
index 0000000..6c1aae8
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/ResultSetMapper.java
@@ -0,0 +1,38 @@
+/*
+ *
+ * * 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.server.metrics;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ * @author John Sanda
+ */
+public interface ResultSetMapper<T> {
+
+ T map(ResultSet resultSet) throws SQLException;
+
+}
diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java
new file mode 100644
index 0000000..a260000
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/CassandraIntegrationTest.java
@@ -0,0 +1,78 @@
+/*
+ *
+ * * 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.server.metrics;
+
+import static java.util.Arrays.asList;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.List;
+
+import org.apache.cassandra.cql.jdbc.CassandraDataSource;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Listeners;
+
+import org.rhq.cassandra.CassandraClusterManager;
+import org.rhq.cassandra.CassandraException;
+import org.rhq.cassandra.ClusterInitService;
+import org.rhq.cassandra.DeployCluster;
+import org.rhq.cassandra.ShutdownCluster;
+
+import me.prettyprint.cassandra.service.CassandraHost;
+
+/**
+ * @author John Sanda
+ */
+(a)Listeners({CassandraClusterManager.class})
+public class CassandraIntegrationTest {
+
+ protected CassandraDataSource dataSource;
+
+ protected Connection connection;
+
+ @BeforeClass
+ @DeployCluster
+ public void deployCluster() throws CassandraException {
+ List<CassandraHost> hosts = asList(new CassandraHost("127.0.0.1", 9160), new CassandraHost("127.0.0.2", 9160));
+ ClusterInitService initService = new ClusterInitService();
+
+ initService.waitForClusterToStart(hosts);
+ initService.waitForSchemaAgreement("rhq", hosts);
+
+ dataSource = new CassandraDataSource("127.0.0.1", 9160, "rhq", null, null, "3.0.0");
+ try {
+ connection = dataSource.getConnection();
+ } catch (SQLException e) {
+ throw new CassandraException("Unable to get JDBC connection.", e);
+ }
+ }
+
+ @AfterClass
+ @ShutdownCluster
+ public void shutdownCluster() throws Exception {
+ }
+}
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
new file mode 100644
index 0000000..e572348
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java
@@ -0,0 +1,84 @@
+/*
+ *
+ * * 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.server.metrics;
+
+import static org.joda.time.DateTime.now;
+import static org.testng.Assert.assertEquals;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.joda.time.DateTime;
+import org.testng.annotations.Test;
+
+/**
+ * @author John Sanda
+ */
+public class MetricsDAOTest extends CassandraIntegrationTest {
+
+ @Test
+ public void findOneHourIndexEntries() {
+ Connection connection = null;
+ PreparedStatement statement = null;
+
+ String sql = "INSERT INTO " + MetricsDAO.METRICS_INDEX_TABLE +
+ " (bucket, time, schedule_id, null_col) VALUES (?, ?, ?, ?)";
+
+ DateTime hour0 = now().hourOfDay().roundFloorCopy().minusHours(now().hourOfDay().get());
+ int numSchedules = 2;
+ try {
+ connection = dataSource.getConnection();
+ statement = connection.prepareStatement(sql);
+
+ for (int i = 0; i < 2; ++i) {
+ for (int j = 0; j < numSchedules; ++j) {
+ statement.setString(1, MetricsDAO.ONE_HOUR_METRICS_TABLE);
+ statement.setDate(2, new java.sql.Date(hour0.plusHours(i + j).getMillis()));
+ statement.setInt(3, 100 + j);
+ statement.setBoolean(4, false);
+
+ statement.executeUpdate();
+ }
+ }
+ } catch (SQLException e) {
+ throw new CQLException(e);
+ }
+
+ MetricsDAO dao = new MetricsDAO(dataSource);
+ final List<MetricsIndexEntry> actualEntries = new ArrayList<MetricsIndexEntry>();
+ dao.findMetricsIndexEntries(MetricsDAO.ONE_HOUR_METRICS_TABLE).forEach(new QueryCallback<MetricsIndexEntry>() {
+ @Override
+ public void invoke(MetricsIndexEntry row) {
+ actualEntries.add(row);
+ }
+ });
+ assertEquals(actualEntries.size(), 4, "Expected to get 4 entries but got " + actualEntries);
+ }
+
+}
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 77d02eb..dbe6c1b 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
@@ -35,7 +35,6 @@ import static org.rhq.test.AssertUtils.assertCollectionMatchesNoOrder;
import static org.rhq.test.AssertUtils.assertPropertiesMatch;
import static org.testng.Assert.assertEquals;
-import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
@@ -47,7 +46,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.cassandra.cql.jdbc.CassandraDataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.joda.time.Chronology;
@@ -57,17 +55,11 @@ import org.joda.time.DateTimeFieldType;
import org.joda.time.Duration;
import org.joda.time.chrono.GregorianChronology;
import org.joda.time.field.DividedDateTimeField;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Listeners;
import org.testng.annotations.Test;
import org.rhq.cassandra.CassandraClusterManager;
-import org.rhq.cassandra.CassandraException;
-import org.rhq.cassandra.ClusterInitService;
-import org.rhq.cassandra.DeployCluster;
-import org.rhq.cassandra.ShutdownCluster;
import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.MeasurementSchedule;
@@ -79,7 +71,6 @@ import me.prettyprint.cassandra.serializers.DoubleSerializer;
import me.prettyprint.cassandra.serializers.IntegerSerializer;
import me.prettyprint.cassandra.serializers.LongSerializer;
import me.prettyprint.cassandra.serializers.StringSerializer;
-import me.prettyprint.cassandra.service.CassandraHost;
import me.prettyprint.cassandra.service.ColumnSliceIterator;
import me.prettyprint.hector.api.Cluster;
import me.prettyprint.hector.api.Keyspace;
@@ -93,7 +84,7 @@ import me.prettyprint.hector.api.query.SliceQuery;
* @author John Sanda
*/
@Listeners({CassandraClusterManager.class})
-public class MetricsServerTest {
+public class MetricsServerTest extends CassandraIntegrationTest {
private static final boolean ENABLED = false;
@@ -121,10 +112,6 @@ public class MetricsServerTest {
private Keyspace keyspace;
- private CassandraDataSource dataSource;
-
- private Connection connection;
-
private static class MetricsServerStub extends MetricsServer {
private DateTime currentHour;
@@ -141,28 +128,6 @@ public class MetricsServerTest {
}
}
- @BeforeClass
- @DeployCluster
- public void deployCluster() throws CassandraException {
- List<CassandraHost> hosts = asList(new CassandraHost("127.0.0.1", 9160), new CassandraHost("127.0.0.2", 9160));
- ClusterInitService initService = new ClusterInitService();
-
- initService.waitForClusterToStart(hosts);
- initService.waitForSchemaAgreement("rhq", hosts);
-
- dataSource = new CassandraDataSource("127.0.0.1", 9160, "rhq", null, null, "3.0.0");
- try {
- connection = dataSource.getConnection();
- } catch (SQLException e) {
- throw new CassandraException("Unable to get JDBC connection.", e);
- }
- }
-
- @AfterClass
- @ShutdownCluster
- public void shutdownCluster() throws Exception {
- }
-
@BeforeMethod
public void initServer() throws Exception {
Cluster cluster = HFactory.getOrCreateCluster("rhq", "127.0.0.1:9160");
11 years, 7 months
- 1
- 0
[rhq] Branch 'release/jon3.1.x' - 7 commits - modules/enterprise
by Jiri Kremser
modules/enterprise/gui/coregui/pom.xml | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 45
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java | 20
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java | 310 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java | 17
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java | 4
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 8
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 1
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 1
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 1
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 1
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 1
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 16
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 1
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 4
modules/enterprise/gui/coregui/src/main/webapp/js/jquery-1.7.2.min.js | 4
modules/enterprise/gui/coregui/src/main/webapp/js/jquery.sparkline-1.6.js | 1271 ----------
modules/enterprise/gui/coregui/src/main/webapp/js/jquery.sparkline-2.0.min.js | 5
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java | 39
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java | 34
24 files changed, 427 insertions(+), 1403 deletions(-)
New commits:
commit 9a1f79fe28c4da127b36864bbd7e3a1a9f38adde
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Sep 12 13:52:08 2012 +0200
[BZ 708929 - Creating a compatible group with no members will create a
mixed group] If the other type of a group is created the user is
navigated to the right list and there is also notification if an empty
compatible group (=mixed) is created. (cherry picked from commit
b54ce46d2f1bcfbb8e7f5e996521592f008e3f24)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
index 15f8331..6f99d10 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
@@ -334,11 +334,11 @@ public class LinkManager {
}
public static String getHubCompatibleGroupsLink() {
- return "/rhq/inventory/browseGroups.xhtml?subtab=compatible";
+ return "#Inventory/Groups/CompatibleGroups";
}
public static String getHubMixedGroupsLink() {
- return "/rhq/inventory/browseGroups.xhtml?subtab=mixed";
+ return "#Inventory/Groups/MixedGroups";
}
public static String getHubGroupDefinitionsLink() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java
index 462b636..85d8c99 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java
@@ -22,7 +22,12 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.groups.wizard;
+import com.smartgwt.client.util.SC;
+
+import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.core.domain.resource.group.ResourceGroup;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupListView;
/**
@@ -33,13 +38,24 @@ import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupListV
*/
public class GroupCreateWizard extends AbstractGroupCreateWizard {
private ResourceGroupListView resourceGroupListView;
+ private GroupCategory category;
- public GroupCreateWizard(ResourceGroupListView resourceGroupListView) {
- super();
+ public GroupCreateWizard(ResourceGroupListView resourceGroupListView, GroupCategory category) {
this.resourceGroupListView = resourceGroupListView;
+ this.category = category;
}
public void groupCreateCallback(ResourceGroup group) {
resourceGroupListView.refresh();
+ if (category != null && category != group.getGroupCategory()) {
+ if (category == GroupCategory.COMPATIBLE && group.getExplicitResources().isEmpty()) {
+ SC.say(MSG.view_group_common_emptyGroup());
+ }
+ // if null, it was invoked from all groups list
+ // the other type of group has been created
+ // navigate user to the right category
+ CoreGUI.goToView(GroupCategory.COMPATIBLE == group.getGroupCategory() ? LinkManager
+ .getHubCompatibleGroupsLink() : LinkManager.getHubMixedGroupsLink());
+ }
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java
index 8c5c54d..f426ed1 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java
@@ -21,6 +21,7 @@ package org.rhq.enterprise.gui.coregui.server.gwt;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.criteria.ResourceGroupCriteria;
import org.rhq.core.domain.criteria.ResourceGroupDefinitionCriteria;
+import org.rhq.core.domain.resource.group.DuplicateExpressionTypeException;
import org.rhq.core.domain.resource.group.GroupDefinition;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
@@ -29,7 +30,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTService;
import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
import org.rhq.enterprise.server.resource.group.ResourceGroupManagerLocal;
import org.rhq.enterprise.server.resource.group.definition.GroupDefinitionManagerLocal;
-import org.rhq.core.domain.resource.group.DuplicateExpressionTypeException;
import org.rhq.enterprise.server.util.LookupUtil;
/**
@@ -107,6 +107,8 @@ public class ResourceGroupGWTServiceImpl extends AbstractGWTServiceImpl implemen
Subject user = getSessionSubject();
group = groupManager.createResourceGroup(user, group);
groupManager.setAssignedResources(user, group.getId(), resourceIds, true);
+ // we need the group.groupCategory to be set
+ group = groupManager.getResourceGroup(user, group.getId());
return SerialUtility.prepare(group, "ResourceGroupService.createResourceGroup");
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
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 ee01a5a..35675b2 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
@@ -1424,6 +1424,7 @@ view_groupCreateWizard_title = Create Group
view_groupCreateWizard_windowTitle = Create Group
view_groupInventoryMembers_button_updateMembership = Update Membership...
view_groupInventoryMembers_title_updateMembership = Update Membership
+view_group_common_emptyGroup = An empty group is always considered as mixed.
view_group_detail_failLoad = Failed to load group for group with ID [{0}]
view_group_detail_failLoadComp = Group with id [{0}] does not exist or is not accessible
view_group_detail_failRecursiveChange = Failed to update the recursive setting for group [{0}]
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 d02259b..5d02e9c 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
@@ -1429,6 +1429,7 @@ view_groupCreateWizard_createSuccessful_full = Vytvořili jste novou [{0}] skupi
view_groupCreateWizard_membersStepName = Vybrat členy
view_groupCreateWizard_title = Vytvořit skupinu
view_groupCreateWizard_windowTitle = Vytvořit skupinu
+view_group_common_emptyGroup = Prázndá skupina je vždy považována jako smíšená.
view_groupInventoryMembers_button_updateMembership = Upravit členství...
view_groupInventoryMembers_title_updateMembership = Upravit členství
view_group_detail_failLoad = Nepodařilo se načíst skupinu s ID [{0}]
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 3287cce..eb541fd 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
@@ -1259,6 +1259,7 @@ view_groupCreateWizard_title = Gruppe anlegen
view_groupCreateWizard_windowTitle = Gruppe anlegen
view_groupInventoryMembers_button_updateMembership = Mitgliedschaft aktualisieren...
view_groupInventoryMembers_title_updateMembership = Mitgliedschaft aktualisieren
+##view_group_common_emptyGroup = An empty group is always considered as mixed.
view_group_detail_failLoad = Konnte die Gruppe mit der ID [{0}] nicht laden
view_group_detail_failLoadComp = Group with id [{0}] does not exist or is not accessible
view_group_detail_failRecursiveChange = Konnte die Einstellung ''Rekursiv'' für die Gruppe [{0}] nicht aktualisieren
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 cdf298e..d97d3e7 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
@@ -1411,6 +1411,7 @@ view_groupCreateWizard_createSuccessful_full = [{2}] メンバーリソースを
view_groupCreateWizard_membersStepName = メンバーの選択
view_groupCreateWizard_title = グループ作成
view_groupCreateWizard_windowTitle = グループ作成
+##view_group_common_emptyGroup = An empty group is always considered as mixed.
view_groupInventoryMembers_button_updateMembership = メンバーシップの更新...
view_groupInventoryMembers_title_updateMembership = メンバーシップの更新
view_group_detail_failLoad = ID [{0}] の付いたグループのロードに失敗しました
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 3291f58..546c0d0 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
@@ -1436,6 +1436,7 @@ view_groupCreateWizard_title = Criar Grupo
view_groupCreateWizard_windowTitle = Criar Novo Grupo
view_groupInventoryMembers_button_updateMembership = Atualizar Membros do Grupo...
view_groupInventoryMembers_title_updateMembership = Atualizar Membros
+##view_group_common_emptyGroup = An empty group is always considered as mixed.
view_group_detail_failLoad = Falha ao carregar o grupo com ID [{0}]
view_group_detail_failLoadComp = Falha ao carregar a composi��o do grupo com ID [{0}]
view_group_detail_failRecursiveChange = Falha ao alterar a recursividade do grupo [{0}]
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 af09c0b..2a4de54 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
@@ -2453,3 +2453,19 @@ view_admin_downloads_cli_version = Версия CLI
##view_alert_details_field_resource_ancestry = Resource Ancestry
##view_alert_details_field_watched_resource = Watched Resource
##view_bundle_revertWizard_getInfoStep_revertDeployDescFull = [REVERT From] {0} [REVERT To] {1}
+##view_configEdit_property = Property
+##view_configEdit_unset = Unset?
+##view_group_common_emptyGroup = An empty group is always considered as mixed.
+##view_inventory_resources_disableSuccessful = You have successfully disabled the selected resources and their children, [{0}] resources.
+##view_messageCenter_messageRootCause = Root Cause
+##view_operationHistoryList_cancelConfirm = Are you sure you want to cancel the selected operations? NOTE: Only those selected operations that are currently "in progress" will be attempted to be canceled.
+##view_operationHistoryList_cancelFailure = The cancel request failed for the operation with the history ID of [{0}].
+##view_operationHistoryList_cancelSubmitted = Requests to cancel [{0}] "in progress" operations have been submitted.
+##view_operationHistoryList_cancelSuccess = The cancel request has been successfully submitted for the operation with the history ID of [{0}].
+##view_operationHistoryList_deleteFailure = Failed to delete operation history [{0}].
+##view_operationHistoryList_deletePartialSuccess = Deleted [{0}] operation history items, but failed to delete the items with the following IDs: {1}
+##view_operationHistoryList_deleteSuccess = Deleted [{0}] operation history items.
+##widget_recordEditor_info_recordCreatedConcise = {0} created.
+##widget_recordEditor_info_recordCreatedDetailed = {0} [{1}] created.
+##widget_recordEditor_info_recordUpdatedConcise = {0} updated.
+##widget_recordEditor_info_recordUpdatedDetailed = {0} [{1}] updated.
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 a7c74cd..7958241 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
@@ -1400,6 +1400,7 @@ view_groupCreateWizard_title = \u521b\u5efa\u7ec4
view_groupCreateWizard_windowTitle = \u521b\u5efa\u7ec4
view_groupInventoryMembers_button_updateMembership = \u66f4\u65b0\u6210\u5458\u5173\u7cfb\u4e2d...
view_groupInventoryMembers_title_updateMembership = \u66f4\u65b0\u6210\u5458\u5173\u7cfb
+##view_group_common_emptyGroup = An empty group is always considered as mixed.
view_group_detail_failLoad = \u52a0\u8f7d\u7ec4ID\u4e3a[{0}]\u7684\u7ec4\u4fe1\u606f\u5931\u8d25
view_group_detail_failLoadComp = Group with id [{0}] does not exist or is not accessible
view_group_detail_failRecursiveChange = \u4fee\u6539\u7ec4[{0}]\u7684\u9012\u5f52\u8bbe\u7f6e\u5931\u8d25
commit 52a7224733c48bfae991271a198395ab6704298e
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Aug 29 14:15:26 2012 +0200
[BZ 826736 - Dealing with singletons in inventory] Refresh button now
takes into consideration the already created singletons and they are not
populated in the create/import child combobox. (cherry picked from
commit 74704eda37bce26278fa089437d98bcd590b4317)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
index 70e29d4..849f4c3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java
@@ -597,7 +597,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
} else {
// menu action
LocatableMenu menu = new LocatableMenu(tableAction.getLocatorId() + "Menu");
- final Map<String, ? extends Object> menuEntries = tableAction.getValueMap();
+ final Map<String, Object> menuEntries = tableAction.getValueMap();
for (final String key : menuEntries.keySet()) {
MenuItem item = new MenuItem(key);
item.addClickHandler(new com.smartgwt.client.widgets.menu.events.ClickHandler() {
@@ -983,7 +983,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
* completion. Failure to do so may leave the widgets disabled.
*/
public void addTableAction(String locatorId, String title, String confirmation,
- LinkedHashMap<String, ? extends Object> valueMap, TableAction tableAction) {
+ Map<String, Object> valueMap, TableAction tableAction) {
// If the specified locator ID is qualified, strip off the ancestry prefix, so we can make sure its locator ID
// extends the footer's locator ID as it should.
int underscoreIndex = locatorId.lastIndexOf('_');
@@ -998,6 +998,37 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
tableActions.add(info);
}
+ /**
+ * Updates the list of table's associated actions <code>tableActions</code>.
+ * It automatically updates the gui by calling <code>drawFooter()</code> provided the table has been initialized.
+ *
+ * Note: To prevent user action while a current action completes, all widgets on the footer are disabled
+ * when footer actions take place, typically a button click. It is up to the action to ensure the page
+ * (via refresh() or CoreGUI.refresh()) or footer (via refreshTableActions) are refreshed as needed at action
+ * completion. Failure to do so may leave the widgets disabled.
+ *
+ * @param title the title of a modified action
+ * @param valueMap the map containing the tuples with name of a select item and <code>actionValue</code> which is
+ * then passed to <code>tableAction.executeAction()</code>; use the <code>LinkedHashMap</code> if you want to
+ * preserve the order of map items
+ * @param tableAction the tableAction object (on this object the <code>executeAction()</code> is actually invoked)
+ */
+ public void updateTableAction(String title, Map<String, Object> valueMap,
+ TableAction tableAction) {
+ if (title == null) {
+ return;
+ }
+ for (TableActionInfo info : tableActions) {
+ if (title.equals(info.getTitle())) {
+ if (valueMap != null) info.setValueMap(valueMap);
+ if (tableAction != null) info.setAction(tableAction);
+ // the action listeners have to be re-added
+ if (isInitialized()) drawFooter();
+ break;
+ }
+ }
+ }
+
public void setListGridDoubleClickHandler(DoubleClickHandler handler) {
doubleClickHandler = handler;
}
@@ -1251,12 +1282,12 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
private String locatorId;
private String title;
private String confirmMessage;
- private LinkedHashMap<String, ? extends Object> valueMap;
+ private Map<String, Object> valueMap;
private TableAction action;
private Canvas actionCanvas;
protected TableActionInfo(String locatorId, String title, String confirmMessage,
- LinkedHashMap<String, ? extends Object> valueMap, TableAction action) {
+ Map<String, Object> valueMap, TableAction action) {
this.locatorId = locatorId;
this.title = title;
this.confirmMessage = confirmMessage;
@@ -1276,9 +1307,13 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements
return confirmMessage;
}
- public LinkedHashMap<String, ? extends Object> getValueMap() {
+ public Map<String, Object> getValueMap() {
return valueMap;
}
+
+ public void setValueMap(Map<String, Object> valueMap) {
+ this.valueMap = valueMap;
+ }
public Canvas getActionCanvas() {
return actionCanvas;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
index 001eb3c..36e0939 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
@@ -22,6 +22,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.inventory.resource;
+import java.util.ArrayList;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
@@ -35,12 +36,14 @@ import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.data.SortSpecifier;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import org.rhq.core.domain.criteria.ResourceCriteria;
import org.rhq.core.domain.resource.CannotConnectToAgentException;
import org.rhq.core.domain.resource.DeleteResourceHistory;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.resource.composite.ResourcePermission;
+import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
@@ -48,6 +51,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.factory.ResourceFactoryCreateWizard;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.factory.ResourceFactoryImportWizard;
+import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.TableUtility;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
@@ -59,11 +63,19 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
public class ResourceCompositeSearchView extends ResourceSearchView {
private final ResourceComposite parentResourceComposite;
+ private boolean initialized;
+ private List<Resource> singletonChildren;
+ private Set<ResourceType> creatableChildTypes;
+ private Set<ResourceType> importableChildTypes;
+ private boolean hasCreatableTypes;
+ private boolean hasImportableTypes;
+ private boolean canCreate;
public ResourceCompositeSearchView(String locatorId, ResourceComposite parentResourceComposite, Criteria criteria,
String title, SortSpecifier[] sortSpecifier, String[] excludeFields, String... headerIcons) {
super(locatorId, criteria, title, sortSpecifier, excludeFields, headerIcons);
this.parentResourceComposite = parentResourceComposite;
+ this.canCreate = this.parentResourceComposite.getResourcePermission().isCreateChildResources();
setInitialCriteriaFixed(true);
}
@@ -72,8 +84,77 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
this(locatorId, parentResourceComposite, criteria, title, null, null, headerIcons);
}
+ @Override
+ protected void onInit() {
+
+ // To properly filter Create Child and Import menus we need existing singleton child resources. If the
+ // user has create permission and the parent type has singleton child types and creatable or importable child
+ // types, perform an async call to fetch the singleton children. If we make the async call don't declare this
+ // instance initialized until after it completes as we must have the children before the menu buttons can be drawn.
+
+ final Resource parentResource = parentResourceComposite.getResource();
+ ResourceType parentType = parentResource.getResourceType();
+ creatableChildTypes = getCreatableChildTypes(parentType);
+ importableChildTypes = getImportableChildTypes(parentType);
+ hasCreatableTypes = !creatableChildTypes.isEmpty();
+ hasImportableTypes = !importableChildTypes.isEmpty();
+ refreshSingletons(parentResource, new AsyncCallback<PageList<Resource>>() {
+
+ public void onFailure(Throwable caught) {
+ ResourceCompositeSearchView.super.onInit();
+ initialized = true;
+ }
+
+ public void onSuccess(PageList<Resource> result) {
+ ResourceCompositeSearchView.super.onInit();
+ initialized = true;
+ }
+
+ });
+
+ }
+
+ private void refreshSingletons(final Resource parentResource, final AsyncCallback<PageList<Resource>> callback) {
+ singletonChildren = new ArrayList<Resource>(); // initialize to non-null
+
+ Integer[] singletonChildTypes = getSingletonChildTypes(parentResource.getResourceType());
+
+ if (canCreate && singletonChildTypes.length > 0 && (hasCreatableTypes || hasImportableTypes)) {
+ ResourceCriteria criteria = new ResourceCriteria();
+ criteria.addFilterParentResourceId(parentResource.getId());
+ criteria.addFilterResourceTypeIds(singletonChildTypes);
+ GWTServiceLookup.getResourceService().findResourcesByCriteria(criteria, new AsyncCallback<PageList<Resource>>() {
+
+ @Override
+ public void onSuccess(PageList<Resource> result) {
+ singletonChildren = result;
+ if (callback != null) {
+ callback.onSuccess(result);
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ Log.error("Failed to load child resources for [" + parentResource + "]", caught);
+ if (callback != null) {
+ callback.onFailure(caught);
+ }
+ }
+ });
+ } else {
+ if (callback != null) {
+ callback.onSuccess(new PageList<Resource>());
+ }
+ }
+ }
+
+ @Override
+ public boolean isInitialized() {
+ return super.isInitialized() && this.initialized;
+ }
+
// suppress unchecked warnings because the superclass has different generic types for the datasource
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
protected RPCDataSource getDataSourceInstance() {
return ResourceCompositeDataSource.getInstance();
@@ -81,106 +162,169 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
@Override
protected void configureTable() {
- addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(), MSG
- .view_inventory_resources_deleteConfirm(), new AbstractTableAction(TableActionEnablement.ANY) {
-
- // only enabled if all selected are a deletable type and if the user has delete permission
- // on the resources.
- public boolean isEnabled(ListGridRecord[] selection) {
- boolean isEnabled = super.isEnabled(selection);
-
- if (isEnabled) {
- for (ListGridRecord record : selection) {
- ResourceComposite resComposite = (ResourceComposite) record
- .getAttributeAsObject("resourceComposite");
- Resource res = resComposite.getResource();
- if (!(isEnabled = res.getResourceType().isDeletable())) {
- break;
- }
- ResourcePermission resPermission = resComposite.getResourcePermission();
- if (!(isEnabled = resPermission.isDeleteResource())) {
- break;
+ addTableAction(extendLocatorId("Delete"), MSG.common_button_delete(),
+ MSG.view_inventory_resources_deleteConfirm(), new AbstractTableAction(TableActionEnablement.ANY) {
+
+ // only enabled if all selected are a deletable type and if the user has delete permission
+ // on the resources.
+ public boolean isEnabled(ListGridRecord[] selection) {
+ boolean isEnabled = super.isEnabled(selection);
+
+ if (isEnabled) {
+ for (ListGridRecord record : selection) {
+ ResourceComposite resComposite = (ResourceComposite) record
+ .getAttributeAsObject("resourceComposite");
+ Resource res = resComposite.getResource();
+ if (!(isEnabled = res.getResourceType().isDeletable())) {
+ break;
+ }
+ ResourcePermission resPermission = resComposite.getResourcePermission();
+ if (!(isEnabled = resPermission.isDeleteResource())) {
+ break;
+ }
}
}
+ return isEnabled;
}
- return isEnabled;
- }
- public void executeAction(ListGridRecord[] selection, Object actionValue) {
- int[] resourceIds = TableUtility.getIds(selection);
- ResourceGWTServiceAsync resourceManager = GWTServiceLookup.getResourceService();
-
- resourceManager.deleteResources(resourceIds, new AsyncCallback<List<DeleteResourceHistory>>() {
- public void onFailure(Throwable caught) {
- if (caught instanceof CannotConnectToAgentException) {
- CoreGUI.getMessageCenter().notify(new Message(MSG.view_inventory_resources_deleteFailed2(),
- Severity.Warning));
- } else {
- CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_deleteFailed(), caught);
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ int[] resourceIds = TableUtility.getIds(selection);
+ ResourceGWTServiceAsync resourceManager = GWTServiceLookup.getResourceService();
+
+ resourceManager.deleteResources(resourceIds, new AsyncCallback<List<DeleteResourceHistory>>() {
+ public void onFailure(Throwable caught) {
+ if (caught instanceof CannotConnectToAgentException) {
+ CoreGUI.getMessageCenter().notify(
+ new Message(MSG.view_inventory_resources_deleteFailed2(), Severity.Warning));
+ } else {
+ CoreGUI.getErrorHandler().handleError(MSG.view_inventory_resources_deleteFailed(),
+ caught);
+ }
}
- }
- public void onSuccess(List<DeleteResourceHistory> result) {
- CoreGUI.getMessageCenter().notify(
- new Message(MSG.view_inventory_resources_deleteSuccessful(), Severity.Info));
+ public void onSuccess(List<DeleteResourceHistory> result) {
+ CoreGUI.getMessageCenter().notify(
+ new Message(MSG.view_inventory_resources_deleteSuccessful(), Severity.Info));
- refresh(true);
- // refresh the entire gui so it encompasses any relevant tree view. Don't just call this.refresh(),
- // because CoreGUI.refresh is more comprehensive.
- CoreGUI.refresh();
- }
- });
- }
- });
+ refresh(true);
+ // refresh the entire gui so it encompasses any relevant tree view. Don't just call this.refresh(),
+ // because CoreGUI.refresh is more comprehensive.
+ CoreGUI.refresh();
+ }
+ });
+ }
+ });
- if (this.parentResourceComposite.getResourcePermission().isCreateChildResources()) {
- addImportButton();
- }
+ addImportAndCreateButtons(false);
super.configureTable();
}
@SuppressWarnings("unchecked")
- private void addImportButton() {
- ResourceType parentType = parentResourceComposite.getResource().getResourceType();
+ private void addImportAndCreateButtons(boolean override) {
- // manual import type menu
- Set<ResourceType> importableChildTypes = getImportableChildTypes(parentType);
- if (!importableChildTypes.isEmpty()) {
- Map<String, ResourceType> displayNames = getDisplayNames(importableChildTypes);
- LinkedHashMap<String, ResourceType> importTypeValueMap = new LinkedHashMap<String, ResourceType>(displayNames);
+ final Resource parentResource = parentResourceComposite.getResource();
- addTableAction(extendLocatorId("Import"), MSG.common_button_import(), null, importTypeValueMap,
- new AbstractTableAction(TableActionEnablement.ALWAYS) {
+ // Create Child Menu and Manual Import Menu
+ if (canCreate && (hasCreatableTypes || hasImportableTypes)) {
+ if (hasCreatableTypes) {
+ Map<String, ResourceType> displayNameMap = getDisplayNames(creatableChildTypes);
+ LinkedHashMap<String, ResourceType> createTypeValueMap = new LinkedHashMap<String, ResourceType>(
+ displayNameMap);
+ removeExistingSingletons(singletonChildren, createTypeValueMap);
+ AbstractTableAction createAction = new AbstractTableAction(TableActionEnablement.ALWAYS) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
- ResourceFactoryImportWizard.showImportWizard(parentResourceComposite.getResource(),
- (ResourceType) actionValue);
+ ResourceFactoryCreateWizard.showCreateWizard(parentResource, (ResourceType) actionValue);
// we can refresh the table buttons immediately since the wizard is a dialog, the
// user can't access enabled buttons anyway.
ResourceCompositeSearchView.this.refreshTableInfo();
}
- });
- }
-
- // creatable child type menu
- Set<ResourceType> creatableChildTypes = getCreatableChildTypes(parentType);
- if (!creatableChildTypes.isEmpty()) {
- Map<String, ResourceType> displayNames = getDisplayNames(creatableChildTypes);
- LinkedHashMap<String, ResourceType> createTypeValueMap = new LinkedHashMap<String, ResourceType>(displayNames);
-
- addTableAction(extendLocatorId("CreateChild"), MSG.common_button_create_child(), null, createTypeValueMap,
- new AbstractTableAction(TableActionEnablement.ALWAYS) {
+ };
+ if (override) {
+ updateTableAction(MSG.common_button_create_child(), createTypeValueMap, createAction);
+ } else {
+ addTableAction(extendLocatorId("CreateChild"), MSG.common_button_create_child(), null,
+ createTypeValueMap, createAction);
+ }
+ }
+ if (hasImportableTypes) {
+ Map<String, ResourceType> displayNameMap = getDisplayNames(importableChildTypes);
+ LinkedHashMap<String, ResourceType> importTypeValueMap = new LinkedHashMap<String, ResourceType>(
+ displayNameMap);
+ removeExistingSingletons(singletonChildren, importTypeValueMap);
+ AbstractTableAction importAction = new AbstractTableAction(TableActionEnablement.ALWAYS) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
- ResourceFactoryCreateWizard.showCreateWizard(parentResourceComposite.getResource(),
- (ResourceType) actionValue);
+ ResourceFactoryImportWizard.showImportWizard(parentResource, (ResourceType) actionValue);
// we can refresh the table buttons immediately since the wizard is a dialog, the
// user can't access enabled buttons anyway.
ResourceCompositeSearchView.this.refreshTableInfo();
}
+ };
+ if (override) {
+ updateTableAction(MSG.common_button_import(), importTypeValueMap, importAction);
+ } else {
+ addTableAction(extendLocatorId("Import"), MSG.common_button_import(), null, importTypeValueMap,
+ importAction);
+ }
+ }
+
+ } else if (!override) {
+ if (!canCreate && hasCreatableTypes) {
+ addTableAction(extendLocatorId("CreateChild"), MSG.common_button_create_child(),
+ new AbstractTableAction(TableActionEnablement.NEVER) {
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ // never called
+ }
+ });
+ }
+ if (!canCreate && hasImportableTypes) {
+ addTableAction(extendLocatorId("Import"), MSG.common_button_import(), new AbstractTableAction(
+ TableActionEnablement.NEVER) {
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ // never called
+ }
});
+ }
}
}
+
+
+ private void removeExistingSingletons(List<Resource> singletonChildren, Map<String, ResourceType> displayNameMap) {
+
+ List<String> existingSingletons = new ArrayList<String>();
+
+ Set<String> displayNames = displayNameMap.keySet();
+ for (final String displayName : displayNames) {
+ final ResourceType type = displayNameMap.get(displayName);
+ boolean exists = false;
+
+ if (type.isSingleton()) {
+ for (Resource child : singletonChildren) {
+ exists = child.getResourceType().equals(displayNameMap.get(displayName));
+ if (exists) {
+ existingSingletons.add(displayName);
+ break;
+ }
+ }
+ }
+ }
+ for (String existing : existingSingletons) {
+ displayNameMap.remove(existing);
+ }
+ }
+
+ private static Integer[] getSingletonChildTypes(ResourceType type) {
+ Set<Integer> results = new TreeSet<Integer>();
+ Set<ResourceType> childTypes = type.getChildResourceTypes();
+ for (ResourceType childType : childTypes) {
+ if (childType.isSingleton()) {
+ results.add(childType.getId());
+ }
+ }
+
+ return results.toArray(new Integer[results.size()]);
+ }
private static Set<ResourceType> getImportableChildTypes(ResourceType type) {
Set<ResourceType> results = new TreeSet<ResourceType>();
@@ -240,8 +384,26 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
// -------- Static Utility loaders ------------
public static ResourceCompositeSearchView getChildrenOf(String locatorId, ResourceComposite parentResourceComposite) {
- return new ResourceCompositeSearchView(locatorId, parentResourceComposite, new Criteria("parentId", String
- .valueOf(parentResourceComposite.getResource().getId())), MSG.view_tabs_common_child_resources());
+ return new ResourceCompositeSearchView(locatorId, parentResourceComposite, new Criteria("parentId",
+ String.valueOf(parentResourceComposite.getResource().getId())), MSG.view_tabs_common_child_resources());
+ }
+
+ @Override
+ public void refresh() {
+ refreshSingletons(parentResourceComposite.getResource(), new AsyncCallback<PageList<Resource>>() {
+
+ @Override
+ public void onSuccess(PageList<Resource> result) {
+ addImportAndCreateButtons(true);
+ ResourceCompositeSearchView.super.refresh();
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ ResourceCompositeSearchView.super.refresh();
+ }
+ });
+
}
}
commit b9d4a5f99ebc403ad169f7da26a04a6877c95dfa
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Fri Nov 2 15:50:33 2012 +0100
[BZ 845277 - JBoss ON dashboard shows messed metric graph on IE 8/9] Version of gflot upgraded to 2.4.2 (it contains the excanvas library for IE8/9 support of HTML canvas el.), version of sparkline upgraded to 2.0, version of jquery upgraded to 1.7.2; quick fix: removed the doctype declaration and removed overcasting to int (cherry-picked and merged into one commit from 5d243b3 and 8000e71)
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 5f5cc15..b9616ed 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -143,12 +143,12 @@
to provide jquery explcitly for jquery.sparkline support. See CoreGUI.gwt.xml for the jquery.sparkline
declaration and coregui/webapp/js for the lib inclusion.) -->
<dependency>
- <groupId>ca.nanometrics</groupId>
+ <groupId>com.googlecode.gflot</groupId>
<artifactId>gflot</artifactId>
- <version>1.0.0</version>
+ <version>2.4.2</version>
+ <scope>provided</scope>
</dependency>
-
<!-- for file uploads -->
<dependency>
<groupId>commons-fileupload</groupId>
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
index 224125d..8445a46 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java
@@ -23,14 +23,15 @@ import java.util.List;
import ca.nanometrics.gflot.client.Axis;
import ca.nanometrics.gflot.client.DataPoint;
-import ca.nanometrics.gflot.client.PlotItem;
import ca.nanometrics.gflot.client.PlotModel;
-import ca.nanometrics.gflot.client.PlotPosition;
import ca.nanometrics.gflot.client.SeriesHandler;
import ca.nanometrics.gflot.client.SimplePlot;
import ca.nanometrics.gflot.client.event.PlotHoverListener;
+import ca.nanometrics.gflot.client.event.PlotItem;
+import ca.nanometrics.gflot.client.event.PlotPosition;
import ca.nanometrics.gflot.client.jsni.Plot;
import ca.nanometrics.gflot.client.options.AxisOptions;
+import ca.nanometrics.gflot.client.options.GlobalSeriesOptions;
import ca.nanometrics.gflot.client.options.GridOptions;
import ca.nanometrics.gflot.client.options.LineSeriesOptions;
import ca.nanometrics.gflot.client.options.PlotOptions;
@@ -201,9 +202,11 @@ public abstract class AbstractMetricGraphView extends LocatableVLayout {
PlotModel model = new PlotModel();
PlotOptions plotOptions = new PlotOptions();
- plotOptions.setDefaultLineSeriesOptions(new LineSeriesOptions().setLineWidth(1).setShow(true));
- plotOptions.setDefaultPointsOptions(new PointsSeriesOptions().setRadius(2).setShow(true));
- plotOptions.setDefaultShadowSize(0);
+ GlobalSeriesOptions globalSeriesOptions = new GlobalSeriesOptions();
+ globalSeriesOptions.setLineSeriesOptions(new LineSeriesOptions().setLineWidth(1).setShow(true));
+ globalSeriesOptions.setPointsOptions(new PointsSeriesOptions().setRadius(2).setShow(true));
+ globalSeriesOptions.setShadowSize(0);
+ plotOptions.setGlobalSeriesOptions(globalSeriesOptions);
// You need make the grid hoverable <<<<<<<<<
plotOptions
@@ -308,10 +311,12 @@ public abstract class AbstractMetricGraphView extends LocatableVLayout {
SeriesHandler handler = model.addSeries(definition.getDisplayName(), "#007f00");
for (MeasurementDataNumericHighLowComposite d : data) {
- handler.add(new DataPoint(d.getTimestamp(), d.getValue()));
+ if (!Double.isNaN(d.getValue())) {
+ handler.add(new DataPoint(d.getTimestamp(), d.getValue()));
+ }
}
- plotOptions.setYAxisOptions(new AxisOptions().setTicks(5).setLabelWidth(70)
+ plotOptions.addYAxisOptions(new AxisOptions().setTicks(5).setLabelWidth(70)
.setTickFormatter(new TickFormatter() {
public String formatTickValue(double v, Axis axis) {
return MeasurementConverterClient.format(v, definition.getUnits(), true);
@@ -323,7 +328,7 @@ public abstract class AbstractMetricGraphView extends LocatableVLayout {
int xTicks = getDefaultWidth() / 140;
- plotOptions.setXAxisOptions(new AxisOptions().setTicks(xTicks).setMinimum(min).setMaximum(max)
+ plotOptions.addXAxisOptions(new AxisOptions().setTicks(xTicks).setMinimum(min).setMaximum(max)
.setTickFormatter(new TickFormatter() {
public String formatTickValue(double tickValue, Axis axis) {
com.google.gwt.i18n.client.DateTimeFormat dateFormat = DateTimeFormat
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java
index edc1611..330eaf0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java
@@ -24,15 +24,16 @@ import java.util.Set;
import ca.nanometrics.gflot.client.Axis;
import ca.nanometrics.gflot.client.DataPoint;
-import ca.nanometrics.gflot.client.PlotItem;
import ca.nanometrics.gflot.client.PlotModel;
import ca.nanometrics.gflot.client.PlotModelStrategy;
-import ca.nanometrics.gflot.client.PlotPosition;
import ca.nanometrics.gflot.client.SeriesHandler;
import ca.nanometrics.gflot.client.SimplePlot;
import ca.nanometrics.gflot.client.event.PlotHoverListener;
+import ca.nanometrics.gflot.client.event.PlotItem;
+import ca.nanometrics.gflot.client.event.PlotPosition;
import ca.nanometrics.gflot.client.jsni.Plot;
import ca.nanometrics.gflot.client.options.AxisOptions;
+import ca.nanometrics.gflot.client.options.GlobalSeriesOptions;
import ca.nanometrics.gflot.client.options.GridOptions;
import ca.nanometrics.gflot.client.options.LineSeriesOptions;
import ca.nanometrics.gflot.client.options.PlotOptions;
@@ -133,9 +134,11 @@ public class LiveGraphView extends LocatableVLayout {
PlotModel model = new PlotModel();
PlotOptions plotOptions = new PlotOptions();
- plotOptions.setDefaultLineSeriesOptions(new LineSeriesOptions().setLineWidth(1).setShow(true));
- plotOptions.setDefaultPointsOptions(new PointsSeriesOptions().setRadius(2).setShow(true));
- plotOptions.setDefaultShadowSize(0);
+ GlobalSeriesOptions globalSeriesOptions = new GlobalSeriesOptions();
+ globalSeriesOptions.setLineSeriesOptions(new LineSeriesOptions().setLineWidth(1).setShow(true));
+ globalSeriesOptions.setPointsOptions(new PointsSeriesOptions().setRadius(2).setShow(true));
+ globalSeriesOptions.setShadowSize(0);
+ plotOptions.setGlobalSeriesOptions(globalSeriesOptions);
// You need make the grid hoverable <<<<<<<<<
plotOptions
@@ -258,7 +261,7 @@ public class LiveGraphView extends LocatableVLayout {
dataLoader.scheduleRepeating(1000);
- plotOptions.setYAxisOptions(new AxisOptions().setLabelWidth(70).setTicks(5)
+ plotOptions.addYAxisOptions(new AxisOptions().setLabelWidth(70).setTicks(5)
.setTickFormatter(new TickFormatter() {
public String formatTickValue(double v, Axis axis) {
return MeasurementConverterClient.format(v, definition.getUnits(), true);
@@ -268,7 +271,7 @@ public class LiveGraphView extends LocatableVLayout {
min = System.currentTimeMillis();
max = System.currentTimeMillis() + (1000L * 60);
- plotOptions.setXAxisOptions(new AxisOptions().setTicks(8).setTickFormatter(new TickFormatter() {
+ plotOptions.addXAxisOptions(new AxisOptions().setTicks(8).setTickFormatter(new TickFormatter() {
public String formatTickValue(double tickValue, Axis axis) {
DateTimeFormat dateFormat = DateTimeFormat.getFormat(PredefinedFormat.DATE_TIME_MEDIUM);
return dateFormat.format(new Date((long) tickValue));
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
index f79924b..f3409e0 100644
--- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
+++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
@@ -63,12 +63,10 @@
<!-- External javascript libraries -->
<!-- jquery.sparkline requires jquery. We don't explicitly provide jquery here because it is already
- embedded in the GFlot JAR (the charting lib used for GraphPortlet). Furthermore, GFlot 1.0.0 requires
- its older, embedded version of jquery (1.3.2). Fortunately, sparkline is compatible with this older version.
- We will need to provide jquery explicitly (like the commented version below) if we remove GFlot.
- <script src="/coregui/js/jquery-1.4.4.js"/>
+ embedded in the GFlot JAR (the charting lib used for GraphPortlet). Furthermore, GFlot 2.4.2 requires
+ the version of jquery (1.7.2).
-->
- <script src="/coregui/js/jquery.sparkline-1.6.js"/>
+ <script src="/coregui/js/jquery.sparkline-2.0.min.js"/>
<!--
Limit compilation to your preferred browser(s) to speed up compile time.
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
index 2c6e285..a0a4d2a 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<html>
<head>
<!-- this forces us to emulate IE8 "quirks" mode regardless of IE browser version. It:
@@ -21,7 +22,8 @@
document.write("<meta name='gwt:property' content='locale="+lang +"'>");
}
</script>
-
+ <script src="/coregui/js/jquery-1.7.2.min.js"/>
+
<title>RHQ</title>
<link rel="icon" type="image/png" href="/images/favicon.png" />
<link rel="apple-touch-icon" href="/images/favicon.png" />
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/jquery-1.7.2.min.js b/modules/enterprise/gui/coregui/src/main/webapp/js/jquery-1.7.2.min.js
new file mode 100644
index 0000000..16ad06c
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/webapp/js/jquery-1.7.2.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.7.2 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"<!doctype html>":"")+"<html><body>"),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;
for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function ca(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function b_(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bD.test(a)?d(a,e):b_(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&f.type(b)==="object")for(var e in b)b_(a+"["+e
+"]",b[e],c,d);else d(a,b)}function b$(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function bZ(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bS,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bZ(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bZ(a,c,d,e,"*",g));return l}function bY(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bO),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bB(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?1:0,g=4;if(d>0){if(c!=="border")for(;e<g;e+=2)c||(d-=parseFloat(f.css(a,"padding"+bx[e]))||0),c==="margin"?d+=parseFloat(f.css(a,c+bx[e]))||0:d-=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0;return d+"px"}d=by(a,b);if(d<0||d==null)d=a.style[b];
if(bt.test(d))return d;d=parseFloat(d)||0;if(c)for(;e<g;e+=2)d+=parseFloat(f.css(a,"padding"+bx[e]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+bx[e]))||0);return d+"px"}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;b.nodeType===1&&(b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?b.outerHTML=a.outerHTML:c!=="input"||a.type!=="checkbox"&&a.type!=="radio"?
c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text):(a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value)),b.removeAttribute(f.expando),b.removeAttribute("_submit_attached"),b.removeAttribute("_change_attached"))}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c,i[c][d])}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a
,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(
c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return th
is;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArra
y:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=a
rguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.a
ttachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(
q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:func
tion(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){v
ar d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h,i){var j,k=d==null,l=0,m=a.length;if(d&&typeof d=="object"){for(l in d)e.access(a,c,l,d[l],1,h,f);g=1}else if(f!==b){j=i===b&&e.isFunction(f),k&&(j?(j=c,c=function(a,b,c){return j.call(e(a),c)}):(c.call(a,f),c=null));if(c)for(;l<m;l++)c(a[l],d,j?f.call(a[l],l,c(a[l],d)):f,i);g=1}return g?a:k?c.call(a):m?c(a[0],d):h},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b
)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m,n=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?n(g):h==="function"&&(!a.unique||!p.has(g))&&c.push(g)},o=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,j=!0,m=k||0,k=0,l=c.length;for(;c&&m<l;m++)if(c[m].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}j=!1,c&&(a.once?e===!0?p.disable():c=[]:d&&d.length&&(e=d.s
hift(),p.fireWith(e[0],e[1])))},p={add:function(){if(c){var a=c.length;n(arguments),j?l=c.length:e&&e!==!0&&(k=a,o(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){j&&f<=l&&(l--,f<=m&&m--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&p.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(j?a.once||d.push([b,c]):(!a.once||!e)&&o(b,c));return this},fire:function(){p.fireWith(this,arguments);return this},fired:function(){return!!i}};return p};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progr
ess:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=ar
guments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p=c.createElement("div"),q=c.documentElement;p.setAttribute("className","t"),p.innerHTML=" <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.ge
tAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","
t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="<div "+n+"display:block;'><div style='"+t+"0;display:block;overflow:hidden;'></div></div>"+"<table "+n+"' cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="<table><tr><
td style='"+t+"0;display:none'></td><td>t</td></tr></table>",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="<div style='width:5px;'></div>",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.
style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].dat
a)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return
b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h,i,j=this[0],k=0,m=null;if(a===b){if(this.length){m=f.data(j);if(j.nodeType===1&&!f._data(j,"parsedAttrs")){g=j.attributes;for(i=g.length;k<i;k++)h=g[k].name,h.indexOf("data-")===0&&(h=f.camelCase(h.substring(5)),l(j,h,m[h]));f._data(j,"parsedAttrs",!0)}}return m}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!";return f.access(this,function(c){if(c===b){m=this.triggerHandler("getData"+e,[d[0]]),m===b&&j&&(m=f.data(j,a),m=l(j,a,m));return m===b&&d[1]?this.data(d[0]):m}d[1]=c,this.each(function(){var b=f(this);b.triggerHandler("setData"+e,d),f.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a
!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length<d)return f.queue(this[0],a);return c===b?this:this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(
){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise(c)}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,f.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.
each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.e
ach(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.val
Hooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!
==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i<g;i++)e=d[i],e&&(c=f.propFix[e]||e,h=u.test(e),h||f.attr(a,e,""),a.removeAttribute(v?e:c),h&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:fu
nction(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a
,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0,coords:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.op
tSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(
+a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,gu
id:d.guid,selector:g,quick:g&&G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p
.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArr
ay(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(ar
guments,0),h=!c.exclusive&&!c.namespace,i=f.event.special[c.type]||{},j=[],k,l,m,n,o,p,q,r,s,t,u;g[0]=c,c.delegateTarget=this;if(!i.preDispatch||i.preDispatch.call(this,c)!==!1){if(e&&(!c.button||c.type!=="click")){n=f(this),n.context=this.ownerDocument||this;for(m=c.target;m!=this;m=m.parentNode||this)if(m.disabled!==!0){p={},r=[],n[0]=m;for(k=0;k<e;k++)s=d[k],t=s.selector,p[t]===b&&(p[t]=s.quick?H(m,s.quick):n.is(t)),p[t]&&r.push(s);r.length&&j.push({elem:m,matches:r})}}d.length>e&&j.push({elem:this,matches:d.slice(e)});for(k=0;k<j.length&&!c.isPropagationStopped();k++){q=j[k],c.currentTarget=q.elem;for(l=0;l<q.matches.length&&!c.isImmediatePropagationStopped();l++){s=q.matches[l];if(h||!c.namespace&&!s.namespace||c.namespace_re&&c.namespace_re.test(s.namespace))c.data=s.data,c.handleObj=s,o=((f.event.special[s.origType]||{}).handle||s.handler).apply(q.elem,g),o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()))}}i.postDispatch&&i.postDispatch.call(this,c);
return c.result}},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var
d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(
!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.cont
ains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),d._submit_attached=!0)})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this.
_just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!
="string"&&(d=d||c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"
**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):thi
s.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[]
,d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]
!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=
o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9||d===11){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u
00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++)
{c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&
(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){re
turn a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toL
owerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,
j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f===
"$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compa
reDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.
ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagNam
e(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\
]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){va
r d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.globalPOS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.co
ntains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,t
his)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNode
s)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|me
ta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")[\\s/>]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a
))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&
this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f
+.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,"
"):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(f.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(g){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return
this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,function(a,b){b.src?f.ajax({type:"GET",global:!1,url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragm
ents[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e)
{var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1></$2>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]==="<table>"&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]
&&typeof (u=l.length)=="number")for(i=0;i<u;i++)bn(l[i]);else bn(l);l.nodeType?j.push(l):j=f.merge(j,l)}if(d){g=function(a){return!a.type||be.test(a.type)};for(k=0;j[k];k++){h=j[k];if(e&&f.nodeName(h,"script")&&(!h.type||be.test(h.type)))e.push(h.parentNode?h.parentNode.removeChild(h):h);else{if(h.nodeType===1){var v=f.grep(h.getElementsByTagName("script"),g);j.splice.apply(j,[k+1,0].concat(v))}d.appendChild(h)}}}return j},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bp=/alpha\([^)]*\)/i,bq=/opacity=([^)]*)/,br=/([A-Z]|^ms)/g,bs=/^[\-+]?(?:\d*\.)?\d+$/i,bt=/^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,bu=/^([\-+])=([\-+
.\de]+)/,bv=/^margin/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Top","Right","Bottom","Left"],by,bz,bA;f.fn.css=function(a,c){return f.access(this,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)},a,c,arguments.length>1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch
(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,
f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=fun
ction(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement
("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.na
me,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String
,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once mem
ory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d
.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error
:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var
g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.
async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-Wit
h"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3)
,a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),(e===""&&f.css(d,"display")==="none"||!f.contains(d.ownerDocument.documentElement,d))&&f._data(d,"olddisplay",cu(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(ct("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(ct("toggle",3),a,b,c);return this},fadeTo:functi
on(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o,p,q;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]);if((k=f.cssHooks[g])&&"expand"in k){l=k.expand(a[g]),delete a[g];for(i in l)i in a||(a[i]=l[i])}}for(g in a){h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cu(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidd
en");for(i in a)j=new f.fx(this,b,i),h=a[i],cm.test(h)?(q=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),q?(f._data(this,"toggle"+i,q==="show"?"hide":"show"),j[q]()):j[h]()):(m=cn.exec(h),n=j.cur(),m?(o=parseFloat(m[2]),p=m[3]||(f.cssNumber[i]?"":"px"),p!=="px"&&(f.style(this,i,(o||1)+p),n=(o||1)/j.cur()*n,f.style(this,i,n+p)),m[1]&&(o=(m[1]==="-="?-1:1)*o+n),j.custom(n,o,p)):j.custom(n,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue
===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:ct("show",1),slideUp:ct("hide",1),slideToggle:ct("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a){return a},swing:function(a){return-Math.cos(a*Math.PI)/2+.5}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.proto
type={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cq||cr(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){f._data(e.elem,"fxshow"+e.prop)===b&&(e.options.hide?f._data(e.elem,"fxshow"+e.prop,e.start):e.options.show&&f._data(e.elem,"fxshow"+e.prop,e.end))},h()&&f.timers.push(h)&&!co&&(co=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!=
=b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cq||cr(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this
.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(co),co=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(cp.concat.apply([],cp),function(a,b){b.indexOf("margin")&&(f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)})}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cv,cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?cv=function(a,b,c,d){try{d=a.getBoundingClientRect()}catch(e){}if(!d||!f.contains(c,a))return d?{top:d.top,l
eft:d.left}:{top:0,left:0};var g=b.body,h=cy(b),i=c.clientTop||g.clientTop||0,j=c.clientLeft||g.clientLeft||0,k=h.pageYOffset||f.support.boxModel&&c.scrollTop||g.scrollTop,l=h.pageXOffset||f.support.boxModel&&c.scrollLeft||g.scrollLeft,m=d.top+k-i,n=d.left+l-j;return{top:m,left:n}}:cv=function(a,b,c){var d,e=a.offsetParent,g=a,h=b.body,i=b.defaultView,j=i?i.getComputedStyle(a,null):a.currentStyle,k=a.offsetTop,l=a.offsetLeft;while((a=a.parentNode)&&a!==h&&a!==c){if(f.support.fixedPosition&&j.position==="fixed")break;d=i?i.getComputedStyle(a,null):a.currentStyle,k-=a.scrollTop,l-=a.scrollLeft,a===e&&(k+=a.offsetTop,l+=a.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(a.nodeName))&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),g=e,e=a.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),j=d}if(j.position
==="relative"||j.position==="static")k+=h.offsetTop,l+=h.offsetLeft;f.support.fixedPosition&&j.position==="fixed"&&(k+=Math.max(c.scrollTop,h.scrollTop),l+=Math.max(c.scrollLeft,h.scrollLeft));return{top:k,left:l}},f.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){f.offset.setOffset(this,a,b)});var c=this[0],d=c&&c.ownerDocument;if(!d)return null;if(c===d.body)return f.offset.bodyOffset(c);return cv(c,d,d.documentElement)},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFuncti
on(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(
d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/jquery.sparkline-1.6.js b/modules/enterprise/gui/coregui/src/main/webapp/js/jquery.sparkline-1.6.js
deleted file mode 100644
index d60cf18..0000000
--- a/modules/enterprise/gui/coregui/src/main/webapp/js/jquery.sparkline-1.6.js
+++ /dev/null
@@ -1,1271 +0,0 @@
-/**
-*
-* jquery.sparkline.js
-*
-* v1.6
-* (c) Splunk, Inc
-* Contact: Gareth Watts (gareth(a)splunk.com)
-* http://omnipotent.net/jquery.sparkline/
-*
-* Generates inline sparkline charts from data supplied either to the method
-* or inline in HTML
-*
-* Compatible with Internet Explorer 6.0+ and modern browsers equipped with the canvas tag
-* (Firefox 2.0+, Safari, Opera, etc)
-*
-* License: New BSD License
-*
-* Copyright (c) 2010, Splunk Inc.
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* * Redistributions of source code must retain the above copyright notice,
-* this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright notice,
-* this list of conditions and the following disclaimer in the documentation
-* and/or other materials provided with the distribution.
-* * Neither the name of Splunk Inc nor the names of its contributors may
-* be used to endorse or promote products derived from this software without
-* specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-* SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*
-* Usage:
-* $(selector).sparkline(values, options)
-*
-* If values is undefined or set to 'html' then the data values are read from the specified tag:
-* <p>Sparkline: <span class="sparkline">1,4,6,6,8,5,3,5</span></p>
-* $('.sparkline').sparkline();
-* There must be no spaces in the enclosed data set
-*
-* Otherwise values must be an array of numbers or null values
-* <p>Sparkline: <span id="sparkline1">This text replaced if the browser is compatible</span></p>
-* $('#sparkline1').sparkline([1,4,6,6,8,5,3,5])
-* $('#sparkline2').sparkline([1,4,6,null,null,5,3,5])
-*
-* Values can also be specified in an HTML comment, or as a values attribute:
-* <p>Sparkline: <span class="sparkline"><!--1,4,6,6,8,5,3,5 --></span></p>
-* <p>Sparkline: <span class="sparkline" values="1,4,6,6,8,5,3,5"></span></p>
-* $('.sparkline').sparkline();
-*
-* For line charts, x values can also be specified:
-* <p>Sparkline: <span class="sparkline">1:1,2.7:4,3.4:6,5:6,6:8,8.7:5,9:3,10:5</span></p>
-* $('#sparkline1').sparkline([ [1,1], [2.7,4], [3.4,6], [5,6], [6,8], [8.7,5], [9,3], [10,5] ])
-*
-* By default, options should be passed in as teh second argument to the sparkline function:
-* $('.sparkline').sparkline([1,2,3,4], {type: 'bar'})
-*
-* Options can also be set by passing them on the tag itself. This feature is disabled by default though
-* as there's a slight performance overhead:
-* $('.sparkline').sparkline([1,2,3,4], {enableTagOptions: true})
-* <p>Sparkline: <span class="sparkline" sparkType="bar" sparkBarColor="red">loading</span></p>
-* Prefix all options supplied as tag attribute with "spark" (configurable by setting tagOptionPrefix)
-*
-* Supported options:
-* lineColor - Color of the line used for the chart
-* fillColor - Color used to fill in the chart - Set to '' or false for a transparent chart
-* width - Width of the chart - Defaults to 3 times the number of values in pixels
-* height - Height of the chart - Defaults to the height of the containing element
-* chartRangeMin - Specify the minimum value to use for the Y range of the chart - Defaults to the minimum value supplied
-* chartRangeMax - Specify the maximum value to use for the Y range of the chart - Defaults to the maximum value supplied
-* chartRangeClip - Clip out of range values to the max/min specified by chartRangeMin and chartRangeMax
-* chartRangeMinX - Specify the minimum value to use for the X range of the chart - Defaults to the minimum value supplied
-* chartRangeMaxX - Specify the maximum value to use for the X range of the chart - Defaults to the maximum value supplied
-* composite - If true then don't erase any existing chart attached to the tag, but draw
-* another chart over the top - Note that width and height are ignored if an
-* existing chart is detected.
-* tagValuesAttribute - Name of tag attribute to check for data values - Defaults to 'values'
-* enableTagOptions - Whether to check tags for sparkline options
-* tagOptionPrefix - Prefix used for options supplied as tag attributes - Defaults to 'spark'
-*
-* There are 7 types of sparkline, selected by supplying a "type" option of 'line' (default),
-* 'bar', 'tristate', 'bullet', 'discrete', 'pie' or 'box'
-* line - Line chart. Options:
-* spotColor - Set to '' to not end each line in a circular spot
-* minSpotColor - If set, color of spot at minimum value
-* maxSpotColor - If set, color of spot at maximum value
-* spotRadius - Radius in pixels
-* lineWidth - Width of line in pixels
-* normalRangeMin
-* normalRangeMax - If set draws a filled horizontal bar between these two values marking the "normal"
-* or expected range of values
-* normalRangeColor - Color to use for the above bar
-* drawNormalOnTop - Draw the normal range above the chart fill color if true
-* defaultPixelsPerValue - Defaults to 3 pixels of width for each value in the chart
-*
-* bar - Bar chart. Options:
-* barColor - Color of bars for postive values
-* negBarColor - Color of bars for negative values
-* zeroColor - Color of bars with zero values
-* nullColor - Color of bars with null values - Defaults to omitting the bar entirely
-* barWidth - Width of bars in pixels
-* colorMap - Optional mappnig of values to colors to override the *BarColor values above
-* can be an Array of values to control the color of individual bars
-* barSpacing - Gap between bars in pixels
-* zeroAxis - Centers the y-axis around zero if true
-*
-* tristate - Charts values of win (>0), lose (<0) or draw (=0)
-* posBarColor - Color of win values
-* negBarColor - Color of lose values
-* zeroBarColor - Color of draw values
-* barWidth - Width of bars in pixels
-* barSpacing - Gap between bars in pixels
-* colorMap - Optional mappnig of values to colors to override the *BarColor values above
-* can be an Array of values to control the color of individual bars
-*
-* discrete - Options:
-* lineHeight - Height of each line in pixels - Defaults to 30% of the graph height
-* thesholdValue - Values less than this value will be drawn using thresholdColor instead of lineColor
-* thresholdColor
-*
-* bullet - Values for bullet graphs msut be in the order: target, performance, range1, range2, range3, ...
-* options:
-* targetColor - The color of the vertical target marker
-* targetWidth - The width of the target marker in pixels
-* performanceColor - The color of the performance measure horizontal bar
-* rangeColors - Colors to use for each qualitative range background color
-*
-* pie - Pie chart. Options:
-* sliceColors - An array of colors to use for pie slices
-* offset - Angle in degrees to offset the first slice - Try -90 or +90
-*
-* box - Box plot. Options:
-* raw - Set to true to supply pre-computed plot points as values
-* values should be: low_outlier, low_whisker, q1, median, q3, high_whisker, high_outlier
-* When set to false you can supply any number of values and the box plot will
-* be computed for you. Default is false.
-* showOutliers - Set to true (default) to display outliers as circles
-* outlierIRQ - Interquartile range used to determine outliers. Default 1.5
-* boxLineColor - Outline color of the box
-* boxFillColor - Fill color for the box
-* whiskerColor - Line color used for whiskers
-* outlierLineColor - Outline color of outlier circles
-* outlierFillColor - Fill color of the outlier circles
-* spotRadius - Radius of outlier circles
-* medianColor - Line color of the median line
-* target - Draw a target cross hair at the supplied value (default undefined)
-*
-*
-*
-* Examples:
-* $('#sparkline1').sparkline(myvalues, { lineColor: '#f00', fillColor: false });
-* $('.barsparks').sparkline('html', { type:'bar', height:'40px', barWidth:5 });
-* $('#tristate').sparkline([1,1,-1,1,0,0,-1], { type:'tristate' }):
-* $('#discrete').sparkline([1,3,4,5,5,3,4,5], { type:'discrete' });
-* $('#bullet').sparkline([10,12,12,9,7], { type:'bullet' });
-* $('#pie').sparkline([1,1,2], { type:'pie' });
-*/
-
-
-(function($) {
-
- /*
- * Default configuration settings
- */
- var defaults = {
- // Settings common to most/all chart types
- common: {
- type : 'line',
- lineColor : '#00f',
- fillColor : '#cdf',
- defaultPixelsPerValue : 3,
- width : 'auto',
- height : 'auto',
- composite : false,
- tagValuesAttribute: 'values',
- tagOptionsPrefix: 'spark',
- enableTagOptions: false
- },
- // Defaults for line charts
- line: {
- spotColor : '#f80',
- spotRadius : 1.5,
- minSpotColor : '#f80',
- maxSpotColor : '#f80',
- lineWidth: 1,
- normalRangeMin : undefined,
- normalRangeMax : undefined,
- normalRangeColor : '#ccc',
- drawNormalOnTop: false,
- chartRangeMin : undefined,
- chartRangeMax : undefined,
- chartRangeMinX : undefined,
- chartRangeMaxX : undefined
- },
- // Defaults for bar charts
- bar: {
- barColor : '#00f',
- negBarColor : '#f44',
- zeroColor: undefined,
- nullColor: undefined,
- zeroAxis : undefined,
- barWidth : 4,
- barSpacing : 1,
- chartRangeMax: undefined,
- chartRangeMin: undefined,
- chartRangeClip: false,
- colorMap : undefined
- },
- // Defaults for tristate charts
- tristate: {
- barWidth : 4,
- barSpacing : 1,
- posBarColor: '#6f6',
- negBarColor : '#f44',
- zeroBarColor : '#999',
- colorMap : {}
- },
- // Defaults for discrete charts
- discrete: {
- lineHeight: 'auto',
- thresholdColor: undefined,
- thresholdValue : 0,
- chartRangeMax: undefined,
- chartRangeMin: undefined,
- chartRangeClip: false
- },
- // Defaults for bullet charts
- bullet: {
- targetColor : 'red',
- targetWidth : 3, // width of the target bar in pixels
- performanceColor : 'blue',
- rangeColors : ['#D3DAFE', '#A8B6FF', '#7F94FF' ],
- base : undefined // set this to a number to change the base start number
- },
- // Defaults for pie charts
- pie: {
- sliceColors : ['#f00', '#0f0', '#00f']
- },
- // Defaults for box plots
- box: {
- raw: false,
- boxLineColor: 'black',
- boxFillColor: '#cdf',
- whiskerColor: 'black',
- outlierLineColor: '#333',
- outlierFillColor: 'white',
- medianColor: 'red',
- showOutliers: true,
- outlierIQR: 1.5,
- spotRadius: 1.5,
- target: undefined,
- targetColor: '#4a2',
- chartRangeMax: undefined,
- chartRangeMin: undefined
- }
- };
-
- // Provide a cross-browser interface to a few simple drawing primitives
- var VCanvas_base, VCanvas_canvas, VCanvas_vml;
- $.fn.simpledraw = function(width, height, use_existing) {
- if (use_existing && this[0].VCanvas) {
- return this[0].VCanvas;
- }
- if (width === undefined) {
- width=$(this).innerWidth();
- }
- if (height === undefined) {
- height=$(this).innerHeight();
- }
- if ($.browser.hasCanvas) {
- return new VCanvas_canvas(width, height, this);
- } else if ($.browser.msie) {
- return new VCanvas_vml(width, height, this);
- } else {
- return false;
- }
- };
-
- var pending = [];
-
-
- $.fn.sparkline = function(uservalues, userOptions) {
- return this.each(function() {
- var options = new $.fn.sparkline.options(this, userOptions);
- var render = function() {
- var values, width, height;
- if (uservalues==='html' || uservalues===undefined) {
- var vals = this.getAttribute(options.get('tagValuesAttribute'));
- if (vals===undefined || vals===null) {
- vals = $(this).html();
- }
- values = vals.replace(/(^\s*<!--)|(-->\s*$)|\s+/g, '').split(',');
- } else {
- values = uservalues;
- }
-
- width = options.get('width')=='auto' ? values.length*options.get('defaultPixelsPerValue') : options.get('width');
- if (options.get('height') == 'auto') {
- if (!options.get('composite') || !this.VCanvas) {
- // must be a better way to get the line height
- var tmp = document.createElement('span');
- tmp.innerHTML = 'a';
- $(this).html(tmp);
- height = $(tmp).innerHeight();
- $(tmp).remove();
- }
- } else {
- height = options.get('height');
- }
-
- $.fn.sparkline[options.get('type')].call(this, values, options, width, height);
- };
- // jQuery 1.3.0 completely changed the meaning of :hidden :-/
- if (($(this).html() && $(this).is(':hidden')) || ($.fn.jquery < "1.3.0" && $(this).parents().is(':hidden')) || !$(this).parents('body').length) {
- pending.push([this, render]);
- } else {
- render.call(this);
- }
- });
- };
-
- $.fn.sparkline.defaults = defaults;
-
-
- $.sparkline_display_visible = function() {
- for (var i=pending.length-1; i>=0; i--) {
- var el = pending[i][0];
- if ($(el).is(':visible') && !$(el).parents().is(':hidden')) {
- pending[i][1].call(el);
- pending.splice(i, 1);
- }
- }
- };
-
-
- /**
- * User option handler
- */
- var UNSET_OPTION = {};
- var normalizeValue = function(val) {
- switch(val) {
- case 'undefined':
- val = undefined;
- break;
- case 'null':
- val = null;
- break;
- case 'true':
- val = true;
- break;
- case 'false':
- val = false;
- break;
- default:
- var nf = parseFloat(val);
- if (val == nf) {
- val = nf;
- }
- }
- return val;
- };
- $.fn.sparkline.options = function(tag, userOptions) {
- var extendedOptions;
- this.userOptions = userOptions = userOptions || {};
- this.tag = tag;
- this.tagValCache = {};
- var defaults = $.fn.sparkline.defaults;
- var base = defaults.common;
- this.tagOptionsPrefix = userOptions.enableTagOptions && (userOptions.tagOptionsPrefix || base.tagOptionsPrefix);
-
- var tagOptionType = this.getTagSetting('type');
- if (tagOptionType === UNSET_OPTION) {
- extendedOptions = defaults[userOptions.type || base.type];
- } else {
- extendedOptions = defaults[tagOptionType];
- }
- this.mergedOptions = $.extend({}, base, extendedOptions, userOptions);
- };
-
-
- $.fn.sparkline.options.prototype.getTagSetting = function(key) {
- var val, i, prefix = this.tagOptionsPrefix;
- if (prefix === false || prefix === undefined) {
- return UNSET_OPTION;
- }
- if (this.tagValCache.hasOwnProperty(key)) {
- val = this.tagValCache.key;
- } else {
- val = this.tag.getAttribute(prefix + key);
- if (val === undefined || val === null) {
- val = UNSET_OPTION;
- } else if (val.substr(0, 1) == '[') {
- val = val.substr(1, val.length-2).split(',');
- for(i=val.length; i--;) {
- val[i] = normalizeValue(val[i].replace(/(^\s*)|(\s*$)/g, ''));
- }
- } else if (val.substr(0, 1) == '{') {
- var pairs= val.substr(1, val.length-2).split(',');
- val = {};
- for(i=pairs.length; i--;) {
- var keyval = pairs[i].split(':', 2);
- val[keyval[0].replace(/(^\s*)|(\s*$)/g, '')] = normalizeValue(keyval[1].replace(/(^\s*)|(\s*$)/g, ''));
- }
- } else {
- val = normalizeValue(val);
- }
- this.tagValCache.key = val;
- }
- return val;
- };
-
- $.fn.sparkline.options.prototype.get = function(key) {
- var tagOption = this.getTagSetting(key);
- if (tagOption !== UNSET_OPTION) {
- return tagOption;
- }
- return this.mergedOptions[key];
- };
-
-
- /**
- * Line charts
- */
- $.fn.sparkline.line = function(values, options, width, height) {
- var xvalues = [], yvalues = [], yminmax = [];
- for (var i=0; i<values.length; i++) {
- var val = values[i];
- var isstr = typeof(values[i])=='string';
- var isarray = typeof(values[i])=='object' && values[i] instanceof Array;
- var sp = isstr && values[i].split(':');
- if (isstr && sp.length == 2) { // x:y
- xvalues.push(Number(sp[0]));
- yvalues.push(Number(sp[1]));
- yminmax.push(Number(sp[1]));
- } else if (isarray) {
- xvalues.push(val[0]);
- yvalues.push(val[1]);
- yminmax.push(val[1]);
- } else {
- xvalues.push(i);
- if (values[i]===null || values[i]=='null') {
- yvalues.push(null);
- } else {
- yvalues.push(Number(val));
- yminmax.push(Number(val));
- }
- }
- }
- if (options.get('xvalues')) {
- xvalues = options.get('xvalues');
- }
-
- var maxy = Math.max.apply(Math, yminmax);
- var maxyval = maxy;
- var miny = Math.min.apply(Math, yminmax);
- var minyval = miny;
-
- var maxx = Math.max.apply(Math, xvalues);
- var minx = Math.min.apply(Math, xvalues);
-
- var normalRangeMin = options.get('normalRangeMin');
- var normalRangeMax = options.get('normalRangeMax');
-
- if (normalRangeMin!==undefined) {
- if (normalRangeMin<miny) {
- miny = normalRangeMin;
- }
- if (normalRangeMax>maxy) {
- maxy = normalRangeMax;
- }
- }
- if (options.get('chartRangeMin')!==undefined && (options.get('chartRangeClip') || options.get('chartRangeMin')<miny)) {
- miny = options.get('chartRangeMin');
- }
- if (options.get('chartRangeMax')!==undefined && (options.get('chartRangeClip') || options.get('chartRangeMax')>maxy)) {
- maxy = options.get('chartRangeMax');
- }
- if (options.get('chartRangeMinX')!==undefined && (options.get('chartRangeClipX') || options.get('chartRangeMinX')<minx)) {
- minx = options.get('chartRangeMinX');
- }
- if (options.get('chartRangeMaxX')!==undefined && (options.get('chartRangeClipX') || options.get('chartRangeMaxX')>maxx)) {
- maxx = options.get('chartRangeMaxX');
- }
- var rangex = maxx-minx === 0 ? 1 : maxx-minx;
- var rangey = maxy-miny === 0 ? 1 : maxy-miny;
- var vl = yvalues.length-1;
-
- if (vl<1) {
- this.innerHTML = '';
- return;
- }
-
- var target = $(this).simpledraw(width, height, options.get('composite'));
- if (target) {
- var canvas_width = target.pixel_width;
- var canvas_height = target.pixel_height;
- var canvas_top = 0;
- var canvas_left = 0;
-
- var spotRadius = options.get('spotRadius');
- if (spotRadius && (canvas_width < (spotRadius*4) || canvas_height < (spotRadius*4))) {
- spotRadius = 0;
- }
- if (spotRadius) {
- // adjust the canvas size as required so that spots will fit
- if (options.get('minSpotColor') || (options.get('spotColor') && yvalues[vl]==miny)) {
- canvas_height -= Math.ceil(spotRadius);
- }
- if (options.get('maxSpotColor') || (options.get('spotColor') && yvalues[vl]==maxy)) {
- canvas_height -= Math.ceil(spotRadius);
- canvas_top += Math.ceil(spotRadius);
- }
- if (options.get('minSpotColor') || options.get('maxSpotColor') && (yvalues[0]==miny || yvalues[0]==maxy)) {
- canvas_left += Math.ceil(spotRadius);
- canvas_width -= Math.ceil(spotRadius);
- }
- if (options.get('spotColor') || (options.get('minSpotColor') || options.get('maxSpotColor') && (yvalues[vl]==miny||yvalues[vl]==maxy))) {
- canvas_width -= Math.ceil(spotRadius);
- }
- }
-
-
- canvas_height--;
-
- var drawNormalRange = function() {
- if (normalRangeMin!==undefined) {
- var ytop = canvas_top+Math.round(canvas_height-(canvas_height*((normalRangeMax-miny)/rangey)));
- var height = Math.round((canvas_height*(normalRangeMax-normalRangeMin))/rangey);
- target.drawRect(canvas_left, ytop, canvas_width, height, undefined, options.get('normalRangeColor'));
- }
- };
-
- if (!options.get('drawNormalOnTop')) {
- drawNormalRange();
- }
-
- var path = [];
- var paths = [path];
- var x, y, vlen=yvalues.length;
- for(i=0; i<vlen; i++) {
- x=xvalues[i];
- y=yvalues[i];
- if (y===null) {
- if (i) {
- if (yvalues[i-1]!==null) {
- path = [];
- paths.push(path);
- }
- }
- } else {
- if (y < miny) {
- y=miny;
- }
- if (y > maxy) {
- y=maxy;
- }
- if (!path.length) {
- // previous value was null
- path.push([canvas_left+Math.round((x-minx)*(canvas_width/rangex)), canvas_top+canvas_height]);
- }
- path.push([canvas_left+Math.round((x-minx)*(canvas_width/rangex)), canvas_top+Math.round(canvas_height-(canvas_height*((y-miny)/rangey)))]);
- }
- }
- var lineshapes = [];
- var fillshapes = [];
- var plen=paths.length;
- for(i=0; i<plen; i++) {
- path = paths[i];
- if (!path.length) {
- continue; // last value was null
- }
- if (options.get('fillColor')) {
- path.push([path[path.length-1][0], canvas_top+canvas_height-1]);
- fillshapes.push(path.slice(0));
- path.pop();
- }
- // if there's only a single point in this path, then we want to display it as a vertical line
- // which means we keep path[0] as is
- if (path.length>2) {
- // else we want the first value
- path[0] = [ path[0][0], path[1][1] ];
- }
- lineshapes.push(path);
- }
-
- // draw the fill first, then optionally the normal range, then the line on top of that
- plen = fillshapes.length;
- for(i=0; i<plen; i++) {
- target.drawShape(fillshapes[i], undefined, options.get('fillColor'));
- }
-
- if (options.get('drawNormalOnTop')) {
- drawNormalRange();
- }
-
- plen = lineshapes.length;
- for(i=0; i<plen; i++) {
- target.drawShape(lineshapes[i], options.get('lineColor'), undefined, options.get('lineWidth'));
- }
-
- if (spotRadius && options.get('spotColor')) {
- target.drawCircle(canvas_left+Math.round(xvalues[xvalues.length-1]*(canvas_width/rangex)), canvas_top+Math.round(canvas_height-(canvas_height*((yvalues[vl]-miny)/rangey))), spotRadius, undefined, options.get('spotColor'));
- }
- if (maxy!=minyval) {
- if (spotRadius && options.get('minSpotColor')) {
- x = xvalues[$.inArray(minyval, yvalues)];
- target.drawCircle(canvas_left+Math.round((x-minx)*(canvas_width/rangex)), canvas_top+Math.round(canvas_height-(canvas_height*((minyval-miny)/rangey))), spotRadius, undefined, options.get('minSpotColor'));
- }
- if (spotRadius && options.get('maxSpotColor')) {
- x = xvalues[$.inArray(maxyval, yvalues)];
- target.drawCircle(canvas_left+Math.round((x-minx)*(canvas_width/rangex)), canvas_top+Math.round(canvas_height-(canvas_height*((maxyval-miny)/rangey))), spotRadius, undefined, options.get('maxSpotColor'));
- }
- }
-
- } else {
- // Remove the tag contents if sparklines aren't supported
- this.innerHTML = '';
- }
- };
-
-
- /**
- * Bar charts
- */
- $.fn.sparkline.bar = function(values, options, width, height) {
- width = (values.length * options.get('barWidth')) + ((values.length-1) * options.get('barSpacing'));
- var num_values = [];
- for(var i=0, vlen=values.length; i<vlen; i++) {
- if (values[i]=='null' || values[i]===null) {
- values[i] = null;
- } else {
- values[i] = Number(values[i]);
- num_values.push(Number(values[i]));
- }
- }
- var max = Math.max.apply(Math, num_values),
- min = Math.min.apply(Math, num_values);
- if (options.get('chartRangeMin')!==undefined && (options.get('chartRangeClip') || options.get('chartRangeMin')<min)) {
- min = options.get('chartRangeMin');
- }
- if (options.get('chartRangeMax')!==undefined && (options.get('chartRangeClip') || options.get('chartRangeMax')>max)) {
- max = options.get('chartRangeMax');
- }
- var zeroAxis = options.get('zeroAxis');
- if (zeroAxis === undefined) {
- zeroAxis = min<0;
- }
- var range = max-min === 0 ? 1 : max-min;
-
- var colorMapByIndex, colorMapByValue;
- if ($.isArray(options.get('colorMap'))) {
- colorMapByIndex = options.get('colorMap');
- colorMapByValue = null;
- } else {
- colorMapByIndex = null;
- colorMapByValue = options.get('colorMap');
- }
-
- var target = $(this).simpledraw(width, height, options.get('composite'));
- if (target) {
- var color,
- canvas_height = target.pixel_height,
- yzero = min<0 && zeroAxis ? canvas_height-Math.round(canvas_height * (Math.abs(min)/range))-1 : canvas_height-1;
-
- for(i=values.length; i--;) {
- var x = i*(options.get('barWidth')+options.get('barSpacing')),
- y,
- val = values[i];
- if (val===null) {
- if (options.get('nullColor')) {
- color = options.get('nullColor');
- val = (zeroAxis && min<0) ? 0 : min;
- height = 1;
- y = (zeroAxis && min<0) ? yzero : canvas_height - height;
- } else {
- continue;
- }
- } else {
- if (val < min) {
- val=min;
- }
- if (val > max) {
- val=max;
- }
- color = (val < 0) ? options.get('negBarColor') : options.get('barColor');
- if (zeroAxis && min<0) {
- height = Math.round(canvas_height*((Math.abs(val)/range)))+1;
- y = (val < 0) ? yzero : yzero-height;
- } else {
- height = Math.round(canvas_height*((val-min)/range))+1;
- y = canvas_height-height;
- }
- if (val===0 && options.get('zeroColor')!==undefined) {
- color = options.get('zeroColor');
- }
- if (colorMapByValue && colorMapByValue[val]) {
- color = colorMapByValue[val];
- } else if (colorMapByIndex && colorMapByIndex.length>i) {
- color = colorMapByIndex[i];
- }
- if (color===null) {
- continue;
- }
- }
- target.drawRect(x, y, options.get('barWidth')-1, height-1, color, color);
- }
- } else {
- // Remove the tag contents if sparklines aren't supported
- this.innerHTML = '';
- }
- };
-
-
- /**
- * Tristate charts
- */
- $.fn.sparkline.tristate = function(values, options, width, height) {
- values = $.map(values, Number);
- width = (values.length * options.get('barWidth')) + ((values.length-1) * options.get('barSpacing'));
-
- var colorMapByIndex, colorMapByValue;
- if ($.isArray(options.get('colorMap'))) {
- colorMapByIndex = options.get('colorMap');
- colorMapByValue = null;
- } else {
- colorMapByIndex = null;
- colorMapByValue = options.get('colorMap');
- }
-
- var target = $(this).simpledraw(width, height, options.get('composite'));
- if (target) {
- var canvas_height = target.pixel_height,
- half_height = Math.round(canvas_height/2);
-
- for(var i=values.length; i--;) {
- var x = i*(options.get('barWidth')+options.get('barSpacing')),
- y, color;
- if (values[i] < 0) {
- y = half_height;
- height = half_height-1;
- color = options.get('negBarColor');
- } else if (values[i] > 0) {
- y = 0;
- height = half_height-1;
- color = options.get('posBarColor');
- } else {
- y = half_height-1;
- height = 2;
- color = options.get('zeroBarColor');
- }
- if (colorMapByValue && colorMapByValue[values[i]]) {
- color = colorMapByValue[values[i]];
- } else if (colorMapByIndex && colorMapByIndex.length>i) {
- color = colorMapByIndex[i];
- }
- if (color===null) {
- continue;
- }
- target.drawRect(x, y, options.get('barWidth')-1, height-1, color, color);
- }
- } else {
- // Remove the tag contents if sparklines aren't supported
- this.innerHTML = '';
- }
- };
-
-
- /**
- * Discrete charts
- */
- $.fn.sparkline.discrete = function(values, options, width, height) {
- values = $.map(values, Number);
- width = options.get('width')=='auto' ? values.length*2 : width;
- var interval = Math.floor(width / values.length);
-
- var target = $(this).simpledraw(width, height, options.get('composite'));
- if (target) {
- var canvas_height = target.pixel_height,
- line_height = options.get('lineHeight') == 'auto' ? Math.round(canvas_height * 0.3) : options.get('lineHeight'),
- pheight = canvas_height - line_height,
- min = Math.min.apply(Math, values),
- max = Math.max.apply(Math, values);
- if (options.get('chartRangeMin')!==undefined && (options.get('chartRangeClip') || options.get('chartRangeMin')<min)) {
- min = options.get('chartRangeMin');
- }
- if (options.get('chartRangeMax')!==undefined && (options.get('chartRangeClip') || options.get('chartRangeMax')>max)) {
- max = options.get('chartRangeMax');
- }
- var range = max-min;
-
- for(var i=values.length; i--;) {
- var val = values[i];
- if (val < min) {
- val=min;
- }
- if (val > max) {
- val=max;
- }
- var x = (i*interval),
- ytop = Math.round(pheight-pheight*((val-min)/range));
- target.drawLine(x, ytop, x, ytop+line_height, (options.get('thresholdColor') && val < options.get('thresholdValue')) ? options.get('thresholdColor') : options.get('lineColor'));
- }
- } else {
- // Remove the tag contents if sparklines aren't supported
- this.innerHTML = '';
- }
-
- };
-
-
- /**
- * Bullet charts
- */
- $.fn.sparkline.bullet = function(values, options, width, height) {
- values = $.map(values, Number);
- // target, performance, range1, range2, range3
-
- width = options.get('width')=='auto' ? '4.0em' : width;
-
- var target = $(this).simpledraw(width, height, options.get('composite'));
- if (target && values.length>1) {
- var canvas_width = target.pixel_width-Math.ceil(options.get('targetWidth')/2),
- canvas_height = target.pixel_height,
- min = Math.min.apply(Math, values),
- max = Math.max.apply(Math, values);
-
- if (options.get('base') === undefined) {
- min = min < 0 ? min : 0;
- } else {
- min = options.get('base');
- }
- var range = max-min;
-
- // draw range values
- for(var i=2, vlen=values.length; i<vlen; i++) {
- var rangeval = values[i],
- rangewidth = Math.round(canvas_width*((rangeval-min)/range));
- target.drawRect(0, 0, rangewidth-1, canvas_height-1, options.get('rangeColors')[i-2], options.get('rangeColors')[i-2]);
- }
-
- // draw the performance bar
- var perfval = values[1],
- perfwidth = Math.round(canvas_width*((perfval-min)/range));
- target.drawRect(0, Math.round(canvas_height*0.3), perfwidth-1, Math.round(canvas_height*0.4)-1, options.get('performanceColor'), options.get('performanceColor'));
-
- // draw the target line
- var targetval = values[0],
- x = Math.round(canvas_width*((targetval-min)/range)-(options.get('targetWidth')/2)),
- targettop = Math.round(canvas_height*0.10),
- targetheight = canvas_height-(targettop*2);
- target.drawRect(x, targettop, options.get('targetWidth')-1, targetheight-1, options.get('targetColor'), options.get('targetColor'));
- } else {
- // Remove the tag contents if sparklines aren't supported
- this.innerHTML = '';
- }
- };
-
-
- /**
- * Pie charts
- */
- $.fn.sparkline.pie = function(values, options, width, height) {
- values = $.map(values, Number);
- width = options.get('width')=='auto' ? height : width;
-
- var target = $(this).simpledraw(width, height, options.get('composite'));
- if (target && values.length>1) {
- var canvas_width = target.pixel_width,
- canvas_height = target.pixel_height,
- radius = Math.floor(Math.min(canvas_width, canvas_height)/2),
- total = 0,
- next = 0,
- circle = 2*Math.PI;
-
- for(var i=values.length; i--;) {
- total += values[i];
- }
-
- if (options.get('offset')) {
- next += (2*Math.PI)*(options.get('offset')/360);
- }
- var vlen = values.length;
- for(i=0; i<vlen; i++) {
- var start = next;
- var end = next;
- if (total > 0) { // avoid divide by zero
- end = next + (circle*(values[i]/total));
- }
- target.drawPieSlice(radius, radius, radius, start, end, undefined, options.get('sliceColors')[i % options.get('sliceColors').length]);
- next = end;
- }
- }
- };
-
-
- /**
- * Box plots
- */
- var quartile = function(values, q) {
- if (q==2) {
- var vl2 = Math.floor(values.length/2);
- return values.length % 2 ? values[vl2] : (values[vl2]+values[vl2+1])/2;
- } else {
- var vl4 = Math.floor(values.length/4);
- return values.length % 2 ? (values[vl4*q]+values[vl4*q+1])/2 : values[vl4*q];
- }
- };
-
- $.fn.sparkline.box = function(values, options, width, height) {
- values = $.map(values, Number);
- width = options.get('width')=='auto' ? '4.0em' : width;
-
- var minvalue = options.get('chartRangeMin')===undefined ? Math.min.apply(Math, values) : options.get('chartRangeMin'),
- maxvalue = options.get('chartRangeMax')===undefined ? Math.max.apply(Math, values) : options.get('chartRangeMax'),
- target = $(this).simpledraw(width, height, options.get('composite')),
- vlen = values.length,
- lwhisker, loutlier, q1, q2, q3, rwhisker, routlier;
-
- if (target && values.length>1) {
- var canvas_width = target.pixel_width,
- canvas_height = target.pixel_height;
- if (options.get('raw')) {
- if (options.get('showOutliers') && values.length>5) {
- loutlier=values[0]; lwhisker=values[1]; q1=values[2]; q2=values[3]; q3=values[4]; rwhisker=values[5]; routlier=values[6];
- } else {
- lwhisker=values[0]; q1=values[1]; q2=values[2]; q3=values[3]; rwhisker=values[4];
- }
- } else {
- values.sort(function(a, b) { return a-b; });
- q1 = quartile(values, 1);
- q2 = quartile(values, 2);
- q3 = quartile(values, 3);
- var iqr = q3-q1;
- if (options.get('showOutliers')) {
- lwhisker=undefined; rwhisker=undefined;
- for(var i=0; i<vlen; i++) {
- if (lwhisker===undefined && values[i] > q1-(iqr*options.get('outlierIQR'))) {
- lwhisker = values[i];
- }
- if (values[i] < q3+(iqr*options.get('outlierIQR'))) {
- rwhisker = values[i];
- }
- }
- loutlier = values[0];
- routlier = values[vlen-1];
- } else {
- lwhisker = values[0];
- rwhisker = values[vlen-1];
- }
- }
-
- var unitsize = canvas_width / (maxvalue-minvalue+1),
- canvas_left = 0;
- if (options.get('showOutliers')) {
- canvas_left = Math.ceil(options.get('spotRadius'));
- canvas_width -= 2*Math.ceil(options.get('spotRadius'));
- unitsize = canvas_width / (maxvalue-minvalue+1);
- if (loutlier < lwhisker) {
- target.drawCircle((loutlier-minvalue)*unitsize+canvas_left, canvas_height/2, options.get('spotRadius'), options.get('outlierLineColor'), options.get('outlierFillColor'));
- }
- if (routlier > rwhisker) {
- target.drawCircle((routlier-minvalue)*unitsize+canvas_left, canvas_height/2, options.get('spotRadius'), options.get('outlierLineColor'), options.get('outlierFillColor'));
- }
- }
-
- // box
- target.drawRect(
- Math.round((q1-minvalue)*unitsize+canvas_left),
- Math.round(canvas_height*0.1),
- Math.round((q3-q1)*unitsize),
- Math.round(canvas_height*0.8),
- options.get('boxLineColor'),
- options.get('boxFillColor'));
- // left whisker
- target.drawLine(
- Math.round((lwhisker-minvalue)*unitsize+canvas_left),
- Math.round(canvas_height/2),
- Math.round((q1-minvalue)*unitsize+canvas_left),
- Math.round(canvas_height/2),
- options.get('lineColor'));
- target.drawLine(
- Math.round((lwhisker-minvalue)*unitsize+canvas_left),
- Math.round(canvas_height/4),
- Math.round((lwhisker-minvalue)*unitsize+canvas_left),
- Math.round(canvas_height-canvas_height/4),
- options.get('whiskerColor'));
- // right whisker
- target.drawLine(Math.round((rwhisker-minvalue)*unitsize+canvas_left),
- Math.round(canvas_height/2),
- Math.round((q3-minvalue)*unitsize+canvas_left),
- Math.round(canvas_height/2),
- options.get('lineColor'));
- target.drawLine(
- Math.round((rwhisker-minvalue)*unitsize+canvas_left),
- Math.round(canvas_height/4),
- Math.round((rwhisker-minvalue)*unitsize+canvas_left),
- Math.round(canvas_height-canvas_height/4),
- options.get('whiskerColor'));
- // median line
- target.drawLine(
- Math.round((q2-minvalue)*unitsize+canvas_left),
- Math.round(canvas_height*0.1),
- Math.round((q2-minvalue)*unitsize+canvas_left),
- Math.round(canvas_height*0.9),
- options.get('medianColor'));
- if (options.get('target')) {
- var size = Math.ceil(options.get('spotRadius'));
- target.drawLine(
- Math.round((options.get('target')-minvalue)*unitsize+canvas_left),
- Math.round((canvas_height/2)-size),
- Math.round((options.get('target')-minvalue)*unitsize+canvas_left),
- Math.round((canvas_height/2)+size),
- options.get('targetColor'));
- target.drawLine(
- Math.round((options.get('target')-minvalue)*unitsize+canvas_left-size),
- Math.round(canvas_height/2),
- Math.round((options.get('target')-minvalue)*unitsize+canvas_left+size),
- Math.round(canvas_height/2),
- options.get('targetColor'));
- }
- } else {
- // Remove the tag contents if sparklines aren't supported
- this.innerHTML = '';
- }
- };
-
-
- // Setup a very simple "virtual canvas" to make drawing the few shapes we need easier
- // This is accessible as $(foo).simpledraw()
-
- if ($.browser.msie && !document.namespaces.v) {
- document.namespaces.add('v', 'urn:schemas-microsoft-com:vml', '#default#VML');
- }
-
- if ($.browser.hasCanvas === undefined) {
- var t = document.createElement('canvas');
- $.browser.hasCanvas = t.getContext!==undefined;
- }
-
- VCanvas_base = function(width, height, target) {
- };
-
- VCanvas_base.prototype = {
- init : function(width, height, target) {
- this.width = width;
- this.height = height;
- this.target = target;
- if (target[0]) {
- target=target[0];
- }
- target.VCanvas = this;
- },
-
- drawShape : function(path, lineColor, fillColor, lineWidth) {
- alert('drawShape not implemented');
- },
-
- drawLine : function(x1, y1, x2, y2, lineColor, lineWidth) {
- return this.drawShape([ [x1,y1], [x2,y2] ], lineColor, lineWidth);
- },
-
- drawCircle : function(x, y, radius, lineColor, fillColor) {
- alert('drawCircle not implemented');
- },
-
- drawPieSlice : function(x, y, radius, startAngle, endAngle, lineColor, fillColor) {
- alert('drawPieSlice not implemented');
- },
-
- drawRect : function(x, y, width, height, lineColor, fillColor) {
- alert('drawRect not implemented');
- },
-
- getElement : function() {
- return this.canvas;
- },
-
- _insert : function(el, target) {
- $(target).html(el);
- }
- };
-
- VCanvas_canvas = function(width, height, target) {
- return this.init(width, height, target);
- };
-
- VCanvas_canvas.prototype = $.extend(new VCanvas_base(), {
- _super : VCanvas_base.prototype,
-
- init : function(width, height, target) {
- this._super.init(width, height, target);
- this.canvas = document.createElement('canvas');
- if (target[0]) {
- target=target[0];
- }
- target.VCanvas = this;
- $(this.canvas).css({ display:'inline-block', width:width, height:height, verticalAlign:'top' });
- this._insert(this.canvas, target);
- this.pixel_height = $(this.canvas).height();
- this.pixel_width = $(this.canvas).width();
- this.canvas.width = this.pixel_width;
- this.canvas.height = this.pixel_height;
- $(this.canvas).css({width: this.pixel_width, height: this.pixel_height});
- },
-
- _getContext : function(lineColor, fillColor, lineWidth) {
- var context = this.canvas.getContext('2d');
- if (lineColor !== undefined) {
- context.strokeStyle = lineColor;
- }
- context.lineWidth = lineWidth===undefined ? 1 : lineWidth;
- if (fillColor !== undefined) {
- context.fillStyle = fillColor;
- }
- return context;
- },
-
- drawShape : function(path, lineColor, fillColor, lineWidth) {
- var context = this._getContext(lineColor, fillColor, lineWidth);
- context.beginPath();
- context.moveTo(path[0][0]+0.5, path[0][1]+0.5);
- for(var i=1, plen=path.length; i<plen; i++) {
- context.lineTo(path[i][0]+0.5, path[i][1]+0.5); // the 0.5 offset gives us crisp pixel-width lines
- }
- if (lineColor !== undefined) {
- context.stroke();
- }
- if (fillColor !== undefined) {
- context.fill();
- }
- },
-
- drawCircle : function(x, y, radius, lineColor, fillColor) {
- var context = this._getContext(lineColor, fillColor);
- context.beginPath();
- context.arc(x, y, radius, 0, 2*Math.PI, false);
- if (lineColor !== undefined) {
- context.stroke();
- }
- if (fillColor !== undefined) {
- context.fill();
- }
- },
-
- drawPieSlice : function(x, y, radius, startAngle, endAngle, lineColor, fillColor) {
- var context = this._getContext(lineColor, fillColor);
- context.beginPath();
- context.moveTo(x, y);
- context.arc(x, y, radius, startAngle, endAngle, false);
- context.lineTo(x, y);
- context.closePath();
- if (lineColor !== undefined) {
- context.stroke();
- }
- if (fillColor) {
- context.fill();
- }
- },
-
- drawRect : function(x, y, width, height, lineColor, fillColor) {
- return this.drawShape([ [x,y], [x+width, y], [x+width, y+height], [x, y+height], [x, y] ], lineColor, fillColor);
- }
-
- });
-
- VCanvas_vml = function(width, height, target) {
- return this.init(width, height, target);
- };
-
- VCanvas_vml.prototype = $.extend(new VCanvas_base(), {
- _super : VCanvas_base.prototype,
-
- init : function(width, height, target) {
- this._super.init(width, height, target);
- if (target[0]) {
- target=target[0];
- }
- target.VCanvas = this;
- this.canvas = document.createElement('span');
- $(this.canvas).css({ display:'inline-block', position: 'relative', overflow:'hidden', width:width, height:height, margin:'0px', padding:'0px', verticalAlign: 'top'});
- this._insert(this.canvas, target);
- this.pixel_height = $(this.canvas).height();
- this.pixel_width = $(this.canvas).width();
- this.canvas.width = this.pixel_width;
- this.canvas.height = this.pixel_height;
- var groupel = '<v:group coordorigin="0 0" coordsize="'+this.pixel_width+' '+this.pixel_height+'"' +
- ' style="position:absolute;top:0;left:0;width:'+this.pixel_width+'px;height='+this.pixel_height+'px;"></v:group>';
- this.canvas.insertAdjacentHTML('beforeEnd', groupel);
- this.group = $(this.canvas).children()[0];
- },
-
- drawShape : function(path, lineColor, fillColor, lineWidth) {
- var vpath = [];
- for(var i=0, plen=path.length; i<plen; i++) {
- vpath[i] = ''+(path[i][0])+','+(path[i][1]);
- }
- var initial = vpath.splice(0,1);
- lineWidth = lineWidth === undefined ? 1 : lineWidth;
- var stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="'+lineWidth+'" strokeColor="'+lineColor+'" ';
- var fill = fillColor === undefined ? ' filled="false"' : ' fillColor="'+fillColor+'" filled="true" ';
- var closed = vpath[0] == vpath[vpath.length-1] ? 'x ' : '';
- var vel = '<v:shape coordorigin="0 0" coordsize="'+this.pixel_width+' '+this.pixel_height+'" ' +
- stroke +
- fill +
- ' style="position:absolute;left:0px;top:0px;height:'+this.pixel_height+'px;width:'+this.pixel_width+'px;padding:0px;margin:0px;" ' +
- ' path="m '+initial+' l '+vpath.join(', ')+' '+closed+'e">' +
- ' </v:shape>';
- this.group.insertAdjacentHTML('beforeEnd', vel);
- },
-
- drawCircle : function(x, y, radius, lineColor, fillColor) {
- x -= radius+1;
- y -= radius+1;
- var stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="1" strokeColor="'+lineColor+'" ';
- var fill = fillColor === undefined ? ' filled="false"' : ' fillColor="'+fillColor+'" filled="true" ';
- var vel = '<v:oval ' +
- stroke +
- fill +
- ' style="position:absolute;top:'+y+'px; left:'+x+'px; width:'+(radius*2)+'px; height:'+(radius*2)+'px"></v:oval>';
- this.group.insertAdjacentHTML('beforeEnd', vel);
-
- },
-
- drawPieSlice : function(x, y, radius, startAngle, endAngle, lineColor, fillColor) {
- if (startAngle == endAngle) {
- return; // VML seems to have problem when start angle equals end angle.
- }
- if ((endAngle - startAngle) == (2*Math.PI)) {
- startAngle = 0.0; // VML seems to have a problem when drawing a full circle that doesn't start 0
- endAngle = (2*Math.PI);
- }
-
- var startx = x + Math.round(Math.cos(startAngle) * radius);
- var starty = y + Math.round(Math.sin(startAngle) * radius);
- var endx = x + Math.round(Math.cos(endAngle) * radius);
- var endy = y + Math.round(Math.sin(endAngle) * radius);
-
- // Prevent very small slices from being mistaken as a whole pie
- if (startx==endx && starty==endy && (endAngle-startAngle) < Math.PI) {
- return;
- }
-
- var vpath = [ x-radius, y-radius, x+radius, y+radius, startx, starty, endx, endy ];
- var stroke = lineColor === undefined ? ' stroked="false" ' : ' strokeWeight="1" strokeColor="'+lineColor+'" ';
- var fill = fillColor === undefined ? ' filled="false"' : ' fillColor="'+fillColor+'" filled="true" ';
- var vel = '<v:shape coordorigin="0 0" coordsize="'+this.pixel_width+' '+this.pixel_height+'" ' +
- stroke +
- fill +
- ' style="position:absolute;left:0px;top:0px;height:'+this.pixel_height+'px;width:'+this.pixel_width+'px;padding:0px;margin:0px;" ' +
- ' path="m '+x+','+y+' wa '+vpath.join(', ')+' x e">' +
- ' </v:shape>';
- this.group.insertAdjacentHTML('beforeEnd', vel);
- },
-
- drawRect : function(x, y, width, height, lineColor, fillColor) {
- return this.drawShape( [ [x, y], [x, y+height], [x+width, y+height], [x+width, y], [x, y] ], lineColor, fillColor);
- }
- });
-
-})(jQuery);
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/jquery.sparkline-2.0.min.js b/modules/enterprise/gui/coregui/src/main/webapp/js/jquery.sparkline-2.0.min.js
new file mode 100644
index 0000000..ea174b6
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/webapp/js/jquery.sparkline-2.0.min.js
@@ -0,0 +1,5 @@
+/* jquery.sparkline 2.0 - http://omnipotent.net/jquery.sparkline/
+** Licensed under the New BSD License - see above site for details */
+
+(function(a){"use strict";var b={},c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I=0;c=function(){return{common:{type:"line",lineColor:"#00f",fillColor:"#cdf",defaultPixelsPerValue:3,width:"auto",height:"auto",composite:!1,tagValuesAttribute:"values",tagOptionsPrefix:"spark",enableTagOptions:!1,enableHighlight:!0,highlightLighten:1.4,tooltipSkipNull:!0,tooltipPrefix:"",tooltipSuffix:"",disableHiddenCheck:!1,numberFormatter:!1,numberDigitGroupCount:3,numberDigitGroupSep:",",numberDecimalMark:".",disableTooltips:!1,disableInteraction:!1},line:{spotColor:"#f80",highlightSpotColor:"#5f5",highlightLineColor:"#f22",spotRadius:1.5,minSpotColor:"#f80",maxSpotColor:"#f80",lineWidth:1,normalRangeMin:undefined,normalRangeMax:undefined,normalRangeColor:"#ccc",drawNormalOnTop:!1,chartRangeMin:undefined,chartRangeMax:undefined,chartRangeMinX:undefined,chartRangeMaxX:undefined,tooltipFormat:new e('<span style="color: {{color}}">●</span> {{prefix}}{{y}}{{suffix}}')},
bar:{barColor:"#3366cc",negBarColor:"#f44",stackedBarColor:["#3366cc","#dc3912","#ff9900","#109618","#66aa00","#dd4477","#0099c6","#990099"],zeroColor:undefined,nullColor:undefined,zeroAxis:!0,barWidth:4,barSpacing:1,chartRangeMax:undefined,chartRangeMin:undefined,chartRangeClip:!1,colorMap:undefined,tooltipFormat:new e('<span style="color: {{color}}">●</span> {{prefix}}{{value}}{{suffix}}')},tristate:{barWidth:4,barSpacing:1,posBarColor:"#6f6",negBarColor:"#f44",zeroBarColor:"#999",colorMap:{},tooltipFormat:new e('<span style="color: {{color}}">●</span> {{value:map}}'),tooltipValueLookups:{map:{"-1":"Loss",0:"Draw",1:"Win"}}},discrete:{lineHeight:"auto",thresholdColor:undefined,thresholdValue:0,chartRangeMax:undefined,chartRangeMin:undefined,chartRangeClip:!1,tooltipFormat:new e("{{prefix}}{{value}}{{suffix}}")},bullet:{targetColor:"#f33",targetWidth:3,performanceColor:"#33f",rangeColors:["#d3dafe","#a8b6ff","#7f94ff"],base:undefined,tooltipFormat:new e("{{field
key:fields}} - {{value}}"),tooltipValueLookups:{fields:{r:"Range",p:"Performance",t:"Target"}}},pie:{offset:0,sliceColors:["#3366cc","#dc3912","#ff9900","#109618","#66aa00","#dd4477","#0099c6","#990099"],borderWidth:0,borderColor:"#000",tooltipFormat:new e('<span style="color: {{color}}">●</span> {{value}} ({{percent.1}}%)')},box:{raw:!1,boxLineColor:"#000",boxFillColor:"#cdf",whiskerColor:"#000",outlierLineColor:"#333",outlierFillColor:"#fff",medianColor:"#f00",showOutliers:!0,outlierIQR:1.5,spotRadius:1.5,target:undefined,targetColor:"#4a2",chartRangeMax:undefined,chartRangeMin:undefined,tooltipFormat:new e("{{field:fields}}: {{value}}"),tooltipFormatFieldlistKey:"field",tooltipValueLookups:{fields:{lq:"Lower Quartile",med:"Median",uq:"Upper Quartile",lo:"Left Outlier",ro:"Right Outlier",lw:"Left Whisker",rw:"Right Whisker"}}}}},B='.jqstooltip { position: absolute;left: 0px;top: 0px;visibility: hidden;background: rgb(0, 0, 0) transparent;background-color: rgba(0,0,0,
0.6);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)";color: white;font: 10px arial, san serif;text-align: left;white-space: nowrap;padding: 5px;border: 1px solid white;}.jqsfield { color: white;font: 10px arial, san serif;text-align: left;}',C=function(){n(B)},a(C),d=function(){var b,c;return b=function(){this.init.apply(this,arguments)},arguments.length>1?(arguments[0]?(b.prototype=a.extend(new arguments[0],arguments[arguments.length-1]),b._super=arguments[0].prototype):b.prototype=arguments[arguments.length-1],arguments.length>2&&(c=Array.prototype.slice.call(arguments,1,-1),c.unshift(b.prototype),a.extend.apply(a,c))):b.prototype=arguments[0],b.prototype.cls=b,b},a.SPFormatClass=e=d({fre:/\{\{([\w.]+?)(:(.+?))?\}\}/g,precre:/(\w+)\.(\d+)/,init:function(a,b){this.format=a,this.fclass=b},render:function(a,b,c){var d=this,
e=a,f,g,h,i,j;return this.format.replace(this.fre,function(){var a;return g=arguments[1],h=arguments[3],f=d.precre.exec(g),f?(j=f[2],g=f[1]):j=!1,i=e[g],i===undefined?"":h&&b&&b[h]?(a=b[h],a.get?b[h].get(i)||i:b[h][i]||i):(k(i)&&(c.get("numberFormatter")?i=c.get("numberFormatter")(i):i=p(i,j,c.get("numberDigitGroupCount"),c.get("numberDigitGroupSep"),c.get("numberDecimalMark"))),i)})}}),a.spformat=function(a,b){return new e(a,b)},f=function(a,b,c){return a<b?b:a>c?c:a},g=function(a,b){var c;return b===2?(c=Math.floor(a.length/2),a.length%2?a[c]:(a[c]+a[c+1])/2):(c=Math.floor(a.length/4),a.length%2?(a[c*b]+a[c*b+1])/2:a[c*b])},h=function(a){var b;switch(a){case"undefined":a=undefined;break;case"null":a=null;break;case"true":a=!0;break;case"false":a=!1;break;default:b=parseFloat(a),a==b&&(a=b)}return a},i=function(a){var b,c=[];for(b=a.length;b--;)c[b]=h(a[b]);return c},j=function(a,b){var c,d,e=[];for(c=0,d=a.length;c<d;c++)a[c]!==b&&e.push(a[c]);return e},k=function(a){retur
n!isNaN(parseFloat(a))&&isFinite(a)},p=function(b,c,d,e,f){var g,h;b=(c===!1?parseFloat(b).toString():b.toFixed(c)).split(""),g=(g=a.inArray(".",b))<0?b.length:g,g<b.length&&(b[g]=f);for(h=g-d;h>0;h-=d)b.splice(h,0,e);return b.join("")},l=function(a,b,c){var d;for(d=b.length;d--;)if(b[d]!==a||!c&&a===null)return!1;return!0},m=function(a){var b=0,c;for(c=a.length;c--;)b+=typeof a[c]=="number"?a[c]:0;return b},o=function(b){return a.isArray(b)?b:[b]},n=function(a){var b;document.createStyleSheet?document.createStyleSheet().cssText=a:(b=document.createElement("style"),b.type="text/css",document.getElementsByTagName("head")[0].appendChild(b),b[typeof document.body.style.WebkitAppearance=="string"?"innerText":"innerHTML"]=a)},a.fn.simpledraw=function(b,c,d,e){var f,g;if(d&&(f=this.data("_jqs_vcanvas")))return f;b===undefined&&(b=a(this).innerWidth()),c===undefined&&(c=a(this).innerHeight());if(a.browser.hasCanvas)f=new F(b,c,this,e);else{if(!a.browser.msie)return!1;f=new G(b,c,th
is)}return g=a(this).data("_jqs_mhandler"),g&&g.registerCanvas(f),f},a.fn.cleardraw=function(){var a=this.data("_jqs_vcanvas");a&&a.reset()},a.RangeMapClass=q=d({init:function(a){var b,c,d=[];for(b in a)a.hasOwnProperty(b)&&typeof b=="string"&&b.indexOf(":")>-1&&(c=b.split(":"),c[0]=c[0].length===0?-Infinity:parseFloat(c[0]),c[1]=c[1].length===0?Infinity:parseFloat(c[1]),c[2]=a[b],d.push(c));this.map=a,this.rangelist=d||!1},get:function(a){var b=this.rangelist,c,d,e;if((e=this.map[a])!==undefined)return e;if(b)for(c=b.length;c--;){d=b[c];if(d[0]<=a&&d[1]>=a)return d[2]}return undefined}}),a.range_map=function(a){return new q(a)},r=d({init:function(b,c){var d=a(b);this.$el=d,this.options=c,this.currentPageX=0,this.currentPageY=0,this.el=b,this.splist=[],this.tooltip=null,this.over=!1,this.displayTooltips=!c.get("disableTooltips"),this.highlightEnabled=!c.get("disableHighlight")},registerSparkline:function(a){this.splist.push(a),this.over&&this.updateDisplay()},registerCanvas:
function(b){var c=a(b.canvas);this.canvas=b,this.$canvas=c,c.mouseenter(a.proxy(this.mouseenter,this)),c.mouseleave(a.proxy(this.mouseleave,this)),c.click(a.proxy(this.mouseclick,this))},reset:function(a){this.splist=[],this.tooltip&&a&&(this.tooltip.remove(),this.tooltip=undefined)},mouseclick:function(b){var c=a.Event("sparklineClick");c.originalEvent=b,c.sparklines=this.splist,this.$el.trigger(c)},mouseenter:function(b){a(document.body).unbind("mousemove.jqs"),a(document.body).bind("mousemove.jqs",a.proxy(this.mousemove,this)),this.over=!0,this.currentPageX=b.pageX,this.currentPageY=b.pageY,this.currentEl=b.target,!this.tooltip&&this.displayTooltips&&(this.tooltip=new s(this.options),this.tooltip.updatePosition(b.pageX,b.pageY)),this.updateDisplay()},mouseleave:function(){a(document.body).unbind("mousemove.jqs");var b=this.splist,c=b.length,d=!1,e,f;this.over=!1,this.currentEl=null,this.tooltip&&(this.tooltip.remove(),this.tooltip=null);for(f=0;f<c;f++)e=b[f],e.clearRegio
nHighlight()&&(d=!0);d&&this.canvas.render()},mousemove:function(a){this.currentPageX=a.pageX,this.currentPageY=a.pageY,this.currentEl=a.target,this.tooltip&&this.tooltip.updatePosition(a.pageX,a.pageY),this.updateDisplay()},updateDisplay:function(){var b=this.splist,c=b.length,d=!1,e=this.$canvas.offset(),f=this.currentPageX-e.left,g=this.currentPageY-e.top,h,i,j,k,l;if(!this.over)return;for(j=0;j<c;j++)i=b[j],k=i.setRegionHighlight(this.currentEl,f,g),k&&(d=!0);if(d){l=a.Event("sparklineRegionChange"),l.sparklines=this.splist,this.$el.trigger(l);if(this.tooltip){h="";for(j=0;j<c;j++)i=b[j],h+=i.getCurrentRegionTooltip();this.tooltip.setContent(h)}this.disableHighlight||this.canvas.render()}k===null&&this.mouseleave()}}),s=d({sizeStyle:"position: static !important;display: block !important;visibility: hidden !important;float: left !important;",init:function(b){var c=b.get("tooltipClassname","jqstooltip"),d=this.sizeStyle,e;this.container=b.get("tooltipContainer")||document.
body,this.tooltipOffsetX=b.get("tooltipOffsetX",10),this.tooltipOffsetY=b.get("tooltipOffsetY",12),a("#jqssizetip").remove(),a("#jqstooltip").remove(),this.sizetip=a("<div/>",{id:"jqssizetip",style:d,"class":c}),this.tooltip=a("<div/>",{id:"jqstooltip","class":c}).appendTo(this.container),e=this.tooltip.offset(),this.offsetLeft=e.left,this.offsetTop=e.top,this.hidden=!0,a(window).unbind("resize.jqs scroll.jqs"),a(window).bind("resize.jqs scroll.jqs",a.proxy(this.updateWindowDims,this)),this.updateWindowDims()},updateWindowDims:function(){this.scrollTop=a(window).scrollTop(),this.scrollLeft=a(window).scrollLeft(),this.scrollRight=this.scrollLeft+a(window).width(),this.updatePosition()},getSize:function(a){this.sizetip.html(a).appendTo(this.container),this.width=this.sizetip.width()+1,this.height=this.sizetip.height(),this.sizetip.remove()},setContent:function(a){if(!a){this.tooltip.css("visibility","hidden"),this.hidden=!0;return}this.getSize(a),this.tooltip.html(a).css({widt
h:this.width,height:this.height,visibility:"visible"}),this.hidden&&(this.hidden=!1,this.updatePosition())},updatePosition:function(a,b){if(a===undefined){if(this.mousex===undefined)return;a=this.mousex-this.offsetLeft,b=this.mousey-this.offsetTop}else this.mousex=a-=this.offsetLeft,this.mousey=b-=this.offsetTop;if(!this.height||!this.width||this.hidden)return;b-=this.height+this.tooltipOffsetY,a+=this.tooltipOffsetX,b<this.scrollTop&&(b=this.scrollTop),a<this.scrollLeft?a=this.scrollLeft:a+this.width>this.scrollRight&&(a=this.scrollRight-this.width),this.tooltip.css({left:a,top:b})},remove:function(){this.tooltip.remove(),this.sizetip.remove(),this.sizetip=this.tooltip=undefined,a(window).unbind("resize.jqs scroll.jqs")}}),H=[],a.fn.sparkline=function(b,c){return this.each(function(){var d=new a.fn.sparkline.options(this,c),e=a(this),f,g;f=function(){var c,f,g,h,i,j,k;if(b==="html"||b===undefined){k=this.getAttribute(d.get("tagValuesAttribute"));if(k===undefined||k===null)k
=e.html();c=k.replace(/(^\s*<!--)|(-->\s*$)|\s+/g,"").split(",")}else c=b;f=d.get("width")==="auto"?c.length*d.get("defaultPixelsPerValue"):d.get("width");if(d.get("height")==="auto"){if(!d.get("composite")||!a.data(this,"_jqs_vcanvas"))h=document.createElement("span"),h.innerHTML="a",e.html(h),g=a(h).innerHeight()||a(h).height(),a(h).remove(),h=null}else g=d.get("height");d.get("disableInteraction")?i=!1:(i=a.data(this,"_jqs_mhandler"),i?d.get("composite")||i.reset():(i=new r(this,d),a.data(this,"_jqs_mhandler",i)));if(d.get("composite")&&!a.data(this,"_jqs_vcanvas")){a.data(this,"_jqs_errnotify")||(alert("Attempted to attach a composite sparkline to an element with no existing sparkline"),a.data(this,"_jqs_errnotify",!0));return}j=new(a.fn.sparkline[d.get("type")])(this,c,d,f,g),j.render(),i&&i.registerSparkline(j)};if(a(this).html()&&!d.get("disableHiddenCheck")&&a(this).is(":hidden")||a.fn.jquery<"1.3.0"&&a(this).parents().is(":hidden")||!a(this).parents("body").length){
if(!d.get("composite")&&a.data(this,"_jqs_pending"))for(g=H.length;g;g--)H[g-1][0]==this&&H.splice(g-1,1);H.push([this,f]),a.data(this,"_jqs_pending",!0)}else f.call(this)})},a.fn.sparkline.defaults=c(),a.sparkline_display_visible=function(){var b,c,d,e=[];for(c=0,d=H.length;c<d;c++)b=H[c][0],a(b).is(":visible")&&!a(b).parents().is(":hidden")?(H[c][1].call(b),a.data(H[c][0],"_jqs_pending",!1),e.push(c)):!a(b).closest("html").length&&!a.data(b,"_jqs_pending")&&(a.data(H[c][0],"_jqs_pending",!1),e.push(c));for(c=e.length;c;c--)H.splice(e[c-1],1)},a.fn.sparkline.options=d({init:function(c,d){var e,f,g,h;this.userOptions=d=d||{},this.tag=c,this.tagValCache={},f=a.fn.sparkline.defaults,g=f.common,this.tagOptionsPrefix=d.enableTagOptions&&(d.tagOptionsPrefix||g.tagOptionsPrefix),h=this.getTagSetting("type"),h===b?e=f[d.type||g.type]:e=f[h],this.mergedOptions=a.extend({},g,e,d)},getTagSetting:function(a){var c=this.tagOptionsPrefix,d,e,f,g;if(c===!1||c===undefined)return b;if(this.
tagValCache.hasOwnProperty(a))d=this.tagValCache.key;else{d=this.tag.getAttribute(c+a);if(d===undefined||d===null)d=b;else if(d.substr(0,1)==="["){d=d.substr(1,d.length-2).split(",");for(e=d.length;e--;)d[e]=h(d[e].replace(/(^\s*)|(\s*$)/g,""))}else if(d.substr(0,1)==="{"){f=d.substr(1,d.length-2).split(","),d={};for(e=f.length;e--;)g=f[e].split(":",2),d[g[0].replace(/(^\s*)|(\s*$)/g,"")]=h(g[1].replace(/(^\s*)|(\s*$)/g,""))}else d=h(d);this.tagValCache.key=d}return d},get:function(a,c){var d=this.getTagSetting(a),e;return d!==b?d:(e=this.mergedOptions[a])===undefined?c:e}}),a.fn.sparkline._base=d({disabled:!1,init:function(b,c,d,e,f){this.el=b,this.$el=a(b),this.values=c,this.options=d,this.width=e,this.height=f,this.currentRegion=undefined},initTarget:function(){var a=!this.options.get("disableInteraction");(this.target=this.$el.simpledraw(this.width,this.height,this.options.get("composite"),a))?(this.canvasWidth=this.target.pixelWidth,this.canvasHeight=this.target.pixelHe
ight):this.disabled=!0},render:function(){return this.disabled?(this.el.innerHTML="",!1):!0},getRegion:function(a,b){},setRegionHighlight:function(a,b,c){var d=this.currentRegion,e=!this.options.get("disableHighlight"),f;return b>this.canvasWidth||c>this.canvasHeight||b<0||c<0?null:(f=this.getRegion(a,b,c),d!==f?(d!==undefined&&e&&this.removeHighlight(),this.currentRegion=f,f!==undefined&&e&&this.renderHighlight(),!0):!1)},clearRegionHighlight:function(){return this.currentRegion!==undefined?(this.removeHighlight(),this.currentRegion=undefined,!0):!1},renderHighlight:function(){this.changeHighlight(!0)},removeHighlight:function(){this.changeHighlight(!1)},changeHighlight:function(a){},getCurrentRegionTooltip:function(){var b=this.options,c="",d=[],f,g,h,i,j,k,l,m,n,o,p,q,r,s;if(this.currentRegion===undefined)return"";f=this.getCurrentRegionFields(),p=b.get("tooltipFormatter");if(p)return p(this,b,f);b.get("tooltipChartTitle")&&(c+='<div class="jqs jqstitle">'+b.get("tooltipC
hartTitle")+"</div>\n"),g=this.options.get("tooltipFormat");if(!g)return"";a.isArray(g)||(g=[g]),a.isArray(f)||(f=[f]),l=this.options.get("tooltipFormatFieldlist"),m=this.options.get("tooltipFormatFieldlistKey");if(l&&m){n=[];for(k=f.length;k--;)o=f[k][m],(s=a.inArray(o,l))!=-1&&(n[s]=f[k]);f=n}h=g.length,r=f.length;for(k=0;k<h;k++){q=g[k],typeof q=="string"&&(q=new e(q)),i=q.fclass||"jqsfield";for(s=0;s<r;s++)if(!f[s].isNull||!b.get("tooltipSkipNull"))a.extend(f[s],{prefix:b.get("tooltipPrefix"),suffix:b.get("tooltipSuffix")}),j=q.render(f[s],b.get("tooltipValueLookups"),b),d.push('<div class="'+i+'">'+j+"</div>")}return d.length?c+d.join("\n"):""},getCurrentRegionFields:function(){},calcHighlightColor:function(a,b){var c=b.get("highlightColor"),d=b.get("highlightLighten"),e,g,h,i;if(c)return c;if(d){e=/^#([0-9a-f])([0-9a-f])([0-9a-f])$/i.exec(a)||/^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})$/i.exec(a);if(e){h=[],g=a.length===4?16:1;for(i=0;i<3;i++)h[i]=f(Math.round(parseInt(
e[i+1],16)*g*d),0,255);return"rgb("+h.join(",")+")"}}return a}}),t={changeHighlight:function(b){var c=this.currentRegion,d=this.target,e=this.regionShapes[c],f;e&&(f=this.renderRegion(c,b),a.isArray(f)||a.isArray(e)?(d.replaceWithShapes(e,f),this.regionShapes[c]=a.map(f,function(a){return a.id})):(d.replaceWithShape(e,f),this.regionShapes[c]=f.id))},render:function(){var b=this.values,c=this.target,d=this.regionShapes,e,f,g,h;if(!this.cls._super.render.call(this))return;for(g=b.length;g--;){e=this.renderRegion(g);if(e)if(a.isArray(e)){f=[];for(h=e.length;h--;)e[h].append(),f.push(e[h].id);d[g]=f}else e.append(),d[g]=e.id;else d[g]=null}c.render()}},a.fn.sparkline.line=u=d(a.fn.sparkline._base,{type:"line",init:function(a,b,c,d,e){u._super.init.call(this,a,b,c,d,e),this.vertices=[],this.regionMap=[],this.xvalues=[],this.yvalues=[],this.yminmax=[],this.hightlightSpotId=null,this.lastShapeId=null,this.initTarget()},getRegion:function(a,b,c){var d,e=this.regionMap;for(d=e.length
;d--;)if(e[d]!==null&&b>=e[d][0]&&b<=e[d][1])return e[d][2];return undefined},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.yvalues[a]===null,x:this.xvalues[a],y:this.yvalues[a],color:this.options.get("lineColor"),fillColor:this.options.get("fillColor"),offset:a}},renderHighlight:function(){var a=this.currentRegion,b=this.target,c=this.vertices[a],d=this.options,e=d.get("spotRadius"),f=d.get("highlightSpotColor"),g=d.get("highlightLineColor"),h,i;if(!c)return;e&&f&&(h=b.drawCircle(c[0],c[1],e,undefined,f),this.highlightSpotId=h.id,b.insertAfterShape(this.lastShapeId,h)),g&&(i=b.drawLine(c[0],this.canvasTop,c[0],this.canvasTop+this.canvasHeight,g),this.highlightLineId=i.id,b.insertAfterShape(this.lastShapeId,i))},removeHighlight:function(){var a=this.target;this.highlightSpotId&&(a.removeShapeId(this.highlightSpotId),this.highlightSpotId=null),this.highlightLineId&&(a.removeShapeId(this.highlightLineId),this.highlightLineId=null)},scanValues:fu
nction(){var a=this.values,b=a.length,c=this.xvalues,d=this.yvalues,e=this.yminmax,f,g,h,i,j;for(f=0;f<b;f++)g=a[f],h=typeof a[f]=="string",i=typeof a[f]=="object"&&a[f]instanceof Array,j=h&&a[f].split(":"),h&&j.length===2?(c.push(Number(j[0])),d.push(Number(j[1])),e.push(Number(j[1]))):i?(c.push(g[0]),d.push(g[1]),e.push(g[1])):(c.push(f),a[f]===null||a[f]==="null"?d.push(null):(d.push(Number(g)),e.push(Number(g))));this.options.get("xvalues")&&(c=this.options.get("xvalues")),this.maxy=this.maxyorg=Math.max.apply(Math,e),this.miny=this.minyorg=Math.min.apply(Math,e),this.maxx=Math.max.apply(Math,c),this.minx=Math.min.apply(Math,c),this.xvalues=c,this.yvalues=d,this.yminmax=e},processRangeOptions:function(){var a=this.options,b=a.get("normalRangeMin"),c=a.get("normalRangeMax");b!==undefined&&(b<this.miny&&(this.miny=b),c>this.maxy&&(this.maxy=c)),a.get("chartRangeMin")!==undefined&&(a.get("chartRangeClip")||a.get("chartRangeMin")<this.miny)&&(this.miny=a.get("chartRangeMin")
),a.get("chartRangeMax")!==undefined&&(a.get("chartRangeClip")||a.get("chartRangeMax")>this.maxy)&&(this.maxy=a.get("chartRangeMax")),a.get("chartRangeMinX")!==undefined&&(a.get("chartRangeClipX")||a.get("chartRangeMinX")<this.minx)&&(this.minx=a.get("chartRangeMinX")),a.get("chartRangeMaxX")!==undefined&&(a.get("chartRangeClipX")||a.get("chartRangeMaxX")>this.maxx)&&(this.maxx=a.get("chartRangeMaxX"))},drawNormalRange:function(a,b,c,d,e){var f=this.options.get("normalRangeMin"),g=this.options.get("normalRangeMax"),h=b+Math.round(c-c*((g-this.miny)/e)),i=Math.round(c*(g-f)/e);this.target.drawRect(a,h,d,i,undefined,this.options.get("normalRangeColor")).append()},render:function(){var b=this.options,c=this.target,d=this.canvasWidth,e=this.canvasHeight,f=this.vertices,g=b.get("spotRadius"),h=this.regionMap,i,j,k,l,m,n,o,p,r,s,t,v,w,x,y,z,A,B,C,D,E,F,G,H;if(!u._super.render.call(this))return;this.scanValues(),this.processRangeOptions(),F=this.xvalues,G=this.yvalues;if(!this.ymin
max.length||this.yvalues.length<2)return;l=m=0,i=this.maxx-this.minx===0?1:this.maxx-this.minx,j=this.maxy-this.miny===0?1:this.maxy-this.miny,k=this.yvalues.length-1,g&&(d<g*4||e<g*4)&&(g=0);if(g){if(b.get("minSpotColor")||b.get("spotColor")&&G[k]===this.miny)e-=Math.ceil(g);if(b.get("maxSpotColor")||b.get("spotColor")&&G[k]===this.maxy)e-=Math.ceil(g),l+=Math.ceil(g);(b.get("minSpotColor")||b.get("maxSpotColor"))&&(G[0]===this.miny||G[0]===this.maxy)&&(m+=Math.ceil(g),d-=Math.ceil(g));if(b.get("spotColor")||b.get("minSpotColor")||b.get("maxSpotColor")&&(G[k]===this.miny||G[k]===this.maxy))d-=Math.ceil(g)}e--,b.get("normalRangeMin")&&!b.get("drawNormalOnTop")&&this.drawNormalRange(m,l,e,d,j),o=[],p=[o],x=y=null,z=G.length;for(H=0;H<z;H++)r=F[H],t=F[H+1],s=G[H],v=m+Math.round((r-this.minx)*(d/i)),w=H<z-1?m+Math.round((t-this.minx)*(d/i)):d,y=v+(w-v)/2,h[H]=[x||0,y,H],x=y,s===null?H&&G[H-1]!==null&&(o=[],p.push(o),f.push(null)):(s<this.miny&&(s=this.miny),s>this.maxy&&(s=this
.maxy),o.length||o.push([v,l+e]),n=[v,l+Math.round(e-e*((s-this.miny)/j))],o.push(n),f.push(n));A=[],B=[],C=p.length;for(H=0;H<C;H++)o=p[H],o.length&&(b.get("fillColor")&&(o.push([o[o.length-1][0],l+e]),B.push(o.slice(0)),o.pop()),o.length>2&&(o[0]=[o[0][0],o[1][1]]),A.push(o));C=B.length;for(H=0;H<C;H++)c.drawShape(B[H],b.get("fillColor"),b.get("fillColor")).append();b.get("normalRangeMin")&&b.get("drawNormalOnTop")&&this.drawNormalRange(m,l,e,d,j),C=A.length;for(H=0;H<C;H++)c.drawShape(A[H],b.get("lineColor"),undefined,b.get("lineWidth")).append();if(g&&b.get("valueSpots")){D=b.get("valueSpots"),D.get===undefined&&(D=new q(D));for(H=0;H<z;H++)E=D.get(G[H]),E&&c.drawCircle(m+Math.round((F[H]-this.minx)*(d/i)),l+Math.round(e-e*((G[H]-this.miny)/j)),g,undefined,E).append()}g&&b.get("spotColor")&&c.drawCircle(m+Math.round((F[F.length-1]-this.minx)*(d/i)),l+Math.round(e-e*((G[k]-this.miny)/j)),g,undefined,b.get("spotColor")).append(),this.maxy!==this.minyorg&&(g&&b.get("minSpot
Color")&&(r=F[a.inArray(this.minyorg,G)],c.drawCircle(m+Math.round((r-this.minx)*(d/i)),l+Math.round(e-e*((this.minyorg-this.miny)/j)),g,undefined,b.get("minSpotColor")).append()),g&&b.get("maxSpotColor")&&(r=F[a.inArray(this.maxyorg,G)],c.drawCircle(m+Math.round((r-this.minx)*(d/i)),l+Math.round(e-e*((this.maxyorg-this.miny)/j)),g,undefined,b.get("maxSpotColor")).append())),this.lastShapeId=c.getLastShapeId(),this.canvasTop=l,c.render()}}),a.fn.sparkline.bar=v=d(a.fn.sparkline._base,t,{type:"bar",init:function(b,c,d,e,g){var k=parseInt(d.get("barWidth"),10),l=parseInt(d.get("barSpacing"),10),m=d.get("chartRangeMin"),n=d.get("chartRangeMax"),o=d.get("chartRangeClip"),p=Infinity,r=-Infinity,s,t,u,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P;v._super.init.call(this,b,c,d,e,g);for(y=0,z=c.length;y<z;y++){M=c[y],s=typeof M=="string"&&M.indexOf(":")>-1;if(s||a.isArray(M))H=!0,s&&(M=c[y]=i(M.split(":"))),M=j(M,null),t=Math.min.apply(Math,M),u=Math.max.apply(Math,M),t<p&&(p=t),u>r&&(r=u
)}this.stacked=H,this.regionShapes={},this.barWidth=k,this.barSpacing=l,this.totalBarWidth=k+l,this.width=e=c.length*k+(c.length-1)*l,this.initTarget(),o&&(F=m===undefined?-Infinity:m,G=n===undefined?Infinity:n),x=[],w=H?[]:x;var Q=[],R=[];for(y=0,z=c.length;y<z;y++)if(H){I=c[y],c[y]=L=[],Q[y]=0,w[y]=R[y]=0;for(J=0,K=I.length;J<K;J++)M=L[J]=o?f(I[J],F,G):I[J],M!==null&&(M>0&&(Q[y]+=M),p<0&&r>0?M<0?R[y]+=Math.abs(M):w[y]+=M:w[y]+=Math.abs(M-(M<0?r:p)),x.push(M))}else M=o?f(c[y],F,G):c[y],M=c[y]=h(M),M!==null&&x.push(M);this.max=E=Math.max.apply(Math,x),this.min=D=Math.min.apply(Math,x),this.stackMax=r=H?Math.max.apply(Math,Q):E,this.stackMin=p=H?Math.min.apply(Math,x):D,d.get("chartRangeMin")!==undefined&&(d.get("chartRangeClip")||d.get("chartRangeMin")<D)&&(D=d.get("chartRangeMin")),d.get("chartRangeMax")!==undefined&&(d.get("chartRangeClip")||d.get("chartRangeMax")>E)&&(E=d.get("chartRangeMax")),this.zeroAxis=B=d.get("zeroAxis",!0),D<=0&&E>=0&&B?C=0:B==0?C=D:D>0?C=D:C=E,thi
s.xaxisOffset=C,A=H?Math.max.apply(Math,w)+Math.max.apply(Math,R):E-D,this.canvasHeightEf=B&&D<0?this.canvasHeight-2:this.canvasHeight-1,D<C?(O=H&&E>=0?r:E,N=(O-C)/A*this.canvasHeight,N!==Math.ceil(N)&&(this.canvasHeightEf-=2,N=Math.ceil(N))):N=this.canvasHeight,this.yoffset=N,a.isArray(d.get("colorMap"))?(this.colorMapByIndex=d.get("colorMap"),this.colorMapByValue=null):(this.colorMapByIndex=null,this.colorMapByValue=d.get("colorMap"),this.colorMapByValue&&this.colorMapByValue.get===undefined&&(this.colorMapByValue=new q(this.colorMapByValue))),this.range=A},getRegion:function(a,b,c){var d=Math.floor(b/this.totalBarWidth);return d<0||d>=this.values.length?undefined:d},getCurrentRegionFields:function(){var a=this.currentRegion,b=o(this.values[a]),c=[],d,e;for(e=b.length;e--;)d=b[e],c.push({isNull:d===null,value:d,color:this.calcColor(e,d,a),offset:a});return c},calcColor:function(b,c,d){var e=this.colorMapByIndex,f=this.colorMapByValue,g=this.options,h,i;return this.stacked?
h=g.get("stackedBarColor"):h=c<0?g.get("negBarColor"):g.get("barColor"),c===0&&g.get("zeroColor")!==undefined&&(h=g.get("zeroColor")),f&&(i=f.get(c))?h=i:e&&e.length>d&&(h=e[d]),a.isArray(h)?h[b%h.length]:h},renderRegion:function(b,c){var d=this.values[b],e=this.options,f=this.xaxisOffset,g=[],h=this.range,i=this.stacked,j=this.target,k=b*this.totalBarWidth,m=this.canvasHeightEf,n=this.yoffset,o,p,q,r,s,t,u,v,w,x;d=a.isArray(d)?d:[d],u=d.length,v=d[0],r=l(null,d),x=l(f,d,!0);if(r)return e.get("nullColor")?(q=c?e.get("nullColor"):this.calcHighlightColor(e.get("nullColor"),e),o=n>0?n-1:n,j.drawRect(k,o,this.barWidth-1,0,q,q)):undefined;s=n;for(t=0;t<u;t++){v=d[t];if(i&&v===f){if(!x||w)continue;w=!0}h>0?p=Math.floor(m*(Math.abs(v-f)/h))+1:p=1,v<f||v===f&&n===0?(o=s,s+=p):(o=n-p,n-=p),q=this.calcColor(t,v,b),c&&(q=this.calcHighlightColor(q,e)),g.push(j.drawRect(k,o,this.barWidth-1,p-1,q,q))}return g.length===1?g[0]:g}}),a.fn.sparkline.tristate=w=d(a.fn.sparkline._base,t,{type:"t
ristate",init:function(b,c,d,e,f){var g=parseInt(d.get("barWidth"),10),h=parseInt(d.get("barSpacing"),10);w._super.init.call(this,b,c,d,e,f),this.regionShapes={},this.barWidth=g,this.barSpacing=h,this.totalBarWidth=g+h,this.values=a.map(c,Number),this.width=e=c.length*g+(c.length-1)*h,a.isArray(d.get("colorMap"))?(this.colorMapByIndex=d.get("colorMap"),this.colorMapByValue=null):(this.colorMapByIndex=null,this.colorMapByValue=d.get("colorMap"),this.colorMapByValue&&this.colorMapByValue.get===undefined&&(this.colorMapByValue=new q(this.colorMapByValue))),this.initTarget()},getRegion:function(a,b,c){return Math.floor(b/this.totalBarWidth)},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===undefined,value:this.values[a],color:this.calcColor(this.values[a],a),offset:a}},calcColor:function(a,b){var c=this.values,d=this.options,e=this.colorMapByIndex,f=this.colorMapByValue,g,h;return f&&(h=f.get(a))?g=h:e&&e.length>b?g=e[b]:c[b]<0?g=d.get("n
egBarColor"):c[b]>0?g=d.get("posBarColor"):g=d.get("zeroBarColor"),g},renderRegion:function(a,b){var c=this.values,d=this.options,e=this.target,f,g,h,i,j,k;f=e.pixelHeight,h=Math.round(f/2),i=a*this.totalBarWidth,c[a]<0?(j=h,g=h-1):c[a]>0?(j=0,g=h-1):(j=h-1,g=2),k=this.calcColor(c[a],a);if(k===null)return;return b&&(k=this.calcHighlightColor(k,d)),e.drawRect(i,j,this.barWidth-1,g-1,k,k)}}),a.fn.sparkline.discrete=x=d(a.fn.sparkline._base,t,{type:"discrete",init:function(b,c,d,e,f){x._super.init.call(this,b,c,d,e,f),this.regionShapes={},this.values=c=a.map(c,Number),this.min=Math.min.apply(Math,c),this.max=Math.max.apply(Math,c),this.range=this.max-this.min,this.width=e=d.get("width")==="auto"?c.length*2:this.width,this.interval=Math.floor(e/c.length),this.itemWidth=e/c.length,d.get("chartRangeMin")!==undefined&&(d.get("chartRangeClip")||d.get("chartRangeMin")<this.min)&&(this.min=d.get("chartRangeMin")),d.get("chartRangeMax")!==undefined&&(d.get("chartRangeClip")||d.get("cha
rtRangeMax")>this.max)&&(this.max=d.get("chartRangeMax")),this.initTarget(),this.target&&(this.lineHeight=d.get("lineHeight")==="auto"?Math.round(this.canvasHeight*.3):d.get("lineHeight"))},getRegion:function(a,b,c){return Math.floor(b/this.itemWidth)},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===undefined,value:this.values[a],offset:a}},renderRegion:function(a,b){var c=this.values,d=this.options,e=this.min,g=this.max,h=this.range,i=this.interval,j=this.target,k=this.canvasHeight,l=this.lineHeight,m=k-l,n,o,p,q;return o=f(c[a],e,g),q=a*i,n=Math.round(m-m*((o-e)/h)),p=d.get("thresholdColor")&&o<d.get("thresholdValue")?d.get("thresholdColor"):d.get("lineColor"),b&&(p=this.calcHighlightColor(p,d)),j.drawLine(q,n,q,n+l,p)}}),a.fn.sparkline.bullet=y=d(a.fn.sparkline._base,{type:"bullet",init:function(b,c,d,e,f){var g,h;y._super.init.call(this,b,c,d,e,f),c=a.map(c,Number),g=Math.min.apply(Math,c),h=Math.max.apply(Math,c),d.get("base")==
=undefined?g=g<0?g:0:g=d.get("base"),this.min=g,this.max=h,this.range=h-g,this.shapes={},this.valueShapes={},this.regiondata={},this.width=e=d.get("width")==="auto"?"4.0em":e,this.target=this.$el.simpledraw(e,f,d.get("composite")),c.length||(this.disabled=!0),this.initTarget()},getRegion:function(a,b,c){var d=this.target.getShapeAt(a,b,c);return d!==undefined&&this.shapes[d]!==undefined?this.shapes[d]:undefined},getCurrentRegionFields:function(){var a=this.currentRegion;return{fieldkey:a.substr(0,1),value:this.values[a.substr(1)],region:a}},changeHighlight:function(a){var b=this.currentRegion,c=this.valueShapes[b],d;delete this.shapes[c];switch(b.substr(0,1)){case"r":d=this.renderRange(b.substr(1),a);break;case"p":d=this.renderPerformance(a);break;case"t":d=this.renderTarget(a)}this.valueShapes[b]=d.id,this.shapes[d.id]=b,this.target.replaceWithShape(c,d)},renderRange:function(a,b){var c=this.values[a],d=Math.round(this.canvasWidth*((c-this.min)/this.range)),e=this.options.g
et("rangeColors")[a-2];return b&&(e=this.calcHighlightColor(e,this.options)),this.target.drawRect(0,0,d-1,this.canvasHeight-1,e,e)},renderPerformance:function(a){var b=this.values[1],c=Math.round(this.canvasWidth*((b-this.min)/this.range)),d=this.options.get("performanceColor");return a&&(d=this.calcHighlightColor(d,this.options)),this.target.drawRect(0,Math.round(this.canvasHeight*.3),c-1,Math.round(this.canvasHeight*.4)-1,d,d)},renderTarget:function(a){var b=this.values[0],c=Math.round(this.canvasWidth*((b-this.min)/this.range)-this.options.get("targetWidth")/2),d=Math.round(this.canvasHeight*.1),e=this.canvasHeight-d*2,f=this.options.get("targetColor");return a&&(f=this.calcHighlightColor(f,this.options)),this.target.drawRect(c,d,this.options.get("targetWidth")-1,e-1,f,f)},render:function(){var a=this.values.length,b=this.target,c,d;if(!y._super.render.call(this))return;for(c=2;c<a;c++)d=this.renderRange(c).append(),this.shapes[d.id]="r"+c,this.valueShapes["r"+c]=d.id;d=t
his.renderPerformance().append(),this.shapes[d.id]="p1",this.valueShapes.p1=d.id,d=this.renderTarget().append(),this.shapes[d.id]="t0",this.valueShapes.t0=d.id,b.render()}}),a.fn.sparkline.pie=z=d(a.fn.sparkline._base,{type:"pie",init:function(b,c,d,e,f){var g=0,h;z._super.init.call(this,b,c,d,e,f),this.shapes={},this.valueShapes={},this.values=c=a.map(c,Number),d.get("width")==="auto"&&(this.width=this.height);if(c.length>0)for(h=c.length;h--;)g+=c[h];this.total=g,this.initTarget(),this.radius=Math.floor(Math.min(this.canvasWidth,this.canvasHeight)/2)},getRegion:function(a,b,c){var d=this.target.getShapeAt(a,b,c);return d!==undefined&&this.shapes[d]!==undefined?this.shapes[d]:undefined},getCurrentRegionFields:function(){var a=this.currentRegion;return{isNull:this.values[a]===undefined,value:this.values[a],percent:this.values[a]/this.total*100,color:this.options.get("sliceColors")[a%this.options.get("sliceColors").length],offset:a}},changeHighlight:function(a){var b=this.cur
rentRegion,c=this.renderSlice(b,a),d=this.valueShapes[b];delete this.shapes[d],this.target.replaceWithShape(d,c),this.valueShapes[b]=c.id,this.shapes[c.id]=b},renderSlice:function(a,b){var c=this.target,d=this.options,e=this.radius,f=d.get("borderWidth"),g=d.get("offset"),h=2*Math.PI,i=this.values,j=this.total,k=g?2*Math.PI*(g/360):0,l,m,n,o,p;o=i.length;for(n=0;n<o;n++){l=k,m=k,j>0&&(m=k+h*(i[n]/j));if(a===n)return p=d.get("sliceColors")[n%d.get("sliceColors").length],b&&(p=this.calcHighlightColor(p,d)),c.drawPieSlice(e,e,e-f,l,m,undefined,p);k=m}},render:function(){var a=this.target,b=this.values,c=this.options,d=this.radius,e=c.get("borderWidth"),f,g;if(!z._super.render.call(this))return;e&&a.drawCircle(d,d,Math.floor(d-e/2),c.get("borderColor"),undefined,e).append();for(g=b.length;g--;)f=this.renderSlice(g).append(),this.valueShapes[g]=f.id,this.shapes[f.id]=g;a.render()}}),a.fn.sparkline.box=A=d(a.fn.sparkline._base,{type:"box",init:function(b,c,d,e,f){A._super.init.cal
l(this,b,c,d,e,f),this.values=a.map(c,Number),this.width=d.get("width")==="auto"?"4.0em":e,this.initTarget(),this.values.length||(this
+.disabled=1)},getRegion:function(){return 1},getCurrentRegionFields:function(){var a=[{field:"lq",value:this.quartiles[0]},{field:"med",value:this.quartiles[1]},{field:"uq",value:this.quartiles[2]},{field:"lo",value:this.loutlier},{field:"ro",value:this.routlier}];return this.lwhisker!==undefined&&a.push({field:"lw",value:this.lwhisker}),this.rwhisker!==undefined&&a.push({field:"rw",value:this.rwhisker}),a},render:function(){var a=this.target,b=this.values,c=b.length,d=this.options,e=this.canvasWidth,f=this.canvasHeight,h=d.get("chartRangeMin")===undefined?Math.min.apply(Math,b):d.get("chartRangeMin"),i=d.get("chartRangeMax")===undefined?Math.max.apply(Math,b):d.get("chartRangeMax"),j=0,k,l,m,n,o,p,q,r,s,t,u;if(!A._super.render.call(this))return;if(d.get("raw"))d.get("showOutliers")&&b.length>5?(l=b[0],k=b[1],n=b[2],o=b[3],p=b[4],q=b[5],r=b[6]):(k=b[0],n=b[1],o=b[2],p=b[3],q=b[4]);else{b.sort(function(a,b){return a-b}),n=g(b,1),o=g(b,2),p=g(b,3),m=p-n;if(d.get("showOutliers"
)){k=q=undefined;for(s=0;s<c;s++)k===undefined&&b[s]>n-m*d.get("outlierIQR")&&(k=b[s]),b[s]<p+m*d.get("outlierIQR")&&(q=b[s]);l=b[0],r=b[c-1]}else k=b[0],q=b[c-1]}this.quartiles=[n,o,p],this.lwhisker=k,this.rwhisker=q,this.loutlier=l,this.routlier=r,u=e/(i-h+1),d.get("showOutliers")&&(j=Math.ceil(d.get("spotRadius")),e-=2*Math.ceil(d.get("spotRadius")),u=e/(i-h+1),l<k&&a.drawCircle((l-h)*u+j,f/2,d.get("spotRadius"),d.get("outlierLineColor"),d.get("outlierFillColor")).append(),r>q&&a.drawCircle((r-h)*u+j,f/2,d.get("spotRadius"),d.get("outlierLineColor"),d.get("outlierFillColor")).append()),a.drawRect(Math.round((n-h)*u+j),Math.round(f*.1),Math.round((p-n)*u),Math.round(f*.8),d.get("boxLineColor"),d.get("boxFillColor")).append(),a.drawLine(Math.round((k-h)*u+j),Math.round(f/2),Math.round((n-h)*u+j),Math.round(f/2),d.get("lineColor")).append(),a.drawLine(Math.round((k-h)*u+j),Math.round(f/4),Math.round((k-h)*u+j),Math.round(f-f/4),d.get("whiskerColor")).append(),a.drawLine(Math
.round((q-h)*u+j),Math.round(f/2),Math.round((p-h)*u+j),Math.round(f/2),d.get("lineColor")).append(),a.drawLine(Math.round((q-h)*u+j),Math.round(f/4),Math.round((q-h)*u+j),Math.round(f-f/4),d.get("whiskerColor")).append(),a.drawLine(Math.round((o-h)*u+j),Math.round(f*.1),Math.round((o-h)*u+j),Math.round(f*.9),d.get("medianColor")).append(),d.get("target")&&(t=Math.ceil(d.get("spotRadius")),a.drawLine(Math.round((d.get("target")-h)*u+j),Math.round(f/2-t),Math.round((d.get("target")-h)*u+j),Math.round(f/2+t),d.get("targetColor")).append(),a.drawLine(Math.round((d.get("target")-h)*u+j-t),Math.round(f/2),Math.round((d.get("target")-h)*u+j+t),Math.round(f/2),d.get("targetColor")).append()),a.render()}}),a.browser.msie&&!document.namespaces.v&&document.namespaces.add("v","urn:schemas-microsoft-com:vml","#default#VML"),a.browser.hasCanvas===undefined&&(a.browser.hasCanvas=document.createElement("canvas").getContext!==undefined),D=d({init:function(a,b,c,d){this.target=a,this.id=b,th
is.type=c,this.args=d},append:function(){return this.target.appendShape(this),this}}),E=d({_pxregex:/(\d+)(px)?\s*$/i,init:function(b,c,d){if(!b)return;this.width=b,this.height=c,this.target=d,this.lastShapeId=null,d[0]&&(d=d[0]),a.data(d,"_jqs_vcanvas",this)},drawLine:function(a,b,c,d,e,f){return this.drawShape([[a,b],[c,d]],e,f)},drawShape:function(a,b,c,d){return this._genShape("Shape",[a,b,c,d])},drawCircle:function(a,b,c,d,e,f){return this._genShape("Circle",[a,b,c,d,e,f])},drawPieSlice:function(a,b,c,d,e,f,g){return this._genShape("PieSlice",[a,b,c,d,e,f,g])},drawRect:function(a,b,c,d,e,f){return this._genShape("Rect",[a,b,c,d,e,f])},getElement:function(){return this.canvas},getLastShapeId:function(){return this.lastShapeId},reset:function(){alert("reset not implemented")},_insert:function(b,c){a(c).html(b)},_calculatePixelDims:function(b,c,d){var e;e=this._pxregex.exec(c),e?this.pixelHeight=e[1]:this.pixelHeight=a(d).height(),e=this._pxregex.exec(b),e?this.pixelWidth=
e[1]:this.pixelWidth=a(d).width()},_genShape:function(a,b){var c=I++;return b.unshift(c),new D(this,c,a,b)},appendShape:function(a){alert("appendShape not implemented")},replaceWithShape:function(a,b){alert("replaceWithShape not implemented")},insertAfterShape:function(a,b){alert("insertAfterShape not implemented")},removeShapeId:function(a){alert("removeShapeId not implemented")},getShapeAt:function(a,b,c){alert("getShapeAt not implemented")},render:function(){alert("render not implemented")}}),F=d(E,{init:function(b,c,d,e){F._super.init.call(this,b,c,d),this.canvas=document.createElement("canvas"),d[0]&&(d=d[0]),a.data(d,"_jqs_vcanvas",this),a(this.canvas).css({display:"inline-block",width:b,height:c,verticalAlign:"top"}),this._insert(this.canvas,d),this._calculatePixelDims(b,c,this.canvas),this.canvas.width=this.pixelWidth,this.canvas.height=this.pixelHeight,this.interact=e,this.shapes={},this.shapeseq=[],this.currentTargetShapeId=undefined,a(this.canvas).css({width:this.
pixelWidth,height:this.pixelHeight})},_getContext:function(a,b,c){var d=this.canvas.getContext("2d");return a!==undefined&&(d.strokeStyle=a),d.lineWidth=c===undefined?1:c,b!==undefined&&(d.fillStyle=b),d},reset:function(){var a=this._getContext();a.clearRect(0,0,this.pixelWidth,this.pixelHeight),this.shapes={},this.shapeseq=[],this.currentTargetShapeId=undefined},_drawShape:function(a,b,c,d,e){var f=this._getContext(c,d,e),g,h;f.beginPath(),f.moveTo(b[0][0]+.5,b[0][1]+.5);for(g=1,h=b.length;g<h;g++)f.lineTo(b[g][0]+.5,b[g][1]+.5);c!==undefined&&f.stroke(),d!==undefined&&f.fill(),this.targetX!==undefined&&this.targetY!==undefined&&f.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a)},_drawCircle:function(a,b,c,d,e,f,g){var h=this._getContext(e,f,g);h.beginPath(),h.arc(b,c,d,0,2*Math.PI,!1),this.targetX!==undefined&&this.targetY!==undefined&&h.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a),e!==undefined&&h.stroke(),f!==undefined&&h
.fill()},_drawPieSlice:function(a,b,c,d,e,f,g,h){var i=this._getContext(g,h);i.beginPath(),i.moveTo(b,c),i.arc(b,c,d,e,f,!1),i.lineTo(b,c),i.closePath(),g!==undefined&&i.stroke(),h&&i.fill(),this.targetX!==undefined&&this.targetY!==undefined&&i.isPointInPath(this.targetX,this.targetY)&&(this.currentTargetShapeId=a)},_drawRect:function(a,b,c,d,e,f,g){return this._drawShape(a,[[b,c],[b+d,c],[b+d,c+e],[b,c+e],[b,c]],f,g)},appendShape:function(a){return this.shapes[a.id]=a,this.shapeseq.push(a.id),this.lastShapeId=a.id,a.id},replaceWithShape:function(a,b){var c=this.shapeseq,d;this.shapes[b.id]=b;for(d=c.length;d--;)c[d]==a&&(c[d]=b.id);delete this.shapes[a]},replaceWithShapes:function(a,b){var c=this.shapeseq,d={},e,f,g;for(f=a.length;f--;)d[a[f]]=!0;for(f=c.length;f--;)e=c[f],d[e]&&(c.splice(f,1),delete this.shapes[e],g=f);for(f=b.length;f--;)c.splice(g,0,b[f].id),this.shapes[b[f].id]=b[f]},insertAfterShape:function(a,b){var c=this.shapeseq,d;for(d=c.length;d--;)if(c[d]===a){c
.splice(d+1,0,b.id),this.shapes[b.id]=b;return}},removeShapeId:function(a){var b=this.shapeseq,c;for(c=b.length;c--;)if(b[c]===a){b.splice(c,1);break}delete this.shapes[a]},getShapeAt:function(a,b,c){return this.targetX=b,this.targetY=c,this.render(),this.currentTargetShapeId},render:function(){var a=this.shapeseq,b=this.shapes,c=a.length,d=this._getContext(),e,f,g;d.clearRect(0,0,this.pixelWidth,this.pixelHeight);for(g=0;g<c;g++)e=a[g],f=b[e],this["_draw"+f.type].apply(this,f.args);this.interact||(this.shapes={},this.shapeseq=[])}}),G=d(E,{init:function(b,c,d){var e;G._super.init.call(this,b,c,d),d[0]&&(d=d[0]),a.data(d,"_jqs_vcanvas",this),this.canvas=document.createElement("span"),a(this.canvas).css({display:"inline-block",position:"relative",overflow:"hidden",width:b,height:c,margin:"0px",padding:"0px",verticalAlign:"top"}),this._insert(this.canvas,d),this._calculatePixelDims(b,c,this.canvas),this.canvas.width=this.pixelWidth,this.canvas.height=this.pixelHeight,e='<v:gro
up coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'"'+' style="position:absolute;top:0;left:0;width:'+this.pixelWidth+"px;height="+this.pixelHeight+'px;"></v:group>',this.canvas.insertAdjacentHTML("beforeEnd",e),this.group=a(this.canvas).children()[0],this.rendered=!1,this.prerender=""},_drawShape:function(a,b,c,d,e){var f=[],g,h,i,j,k,l,m;for(m=0,l=b.length;m<l;m++)f[m]=""+b[m][0]+","+b[m][1];return g=f.splice(0,1),e=e===undefined?1:e,h=c===undefined?' stroked="false" ':' strokeWeight="'+e+'px" strokeColor="'+c+'" ',i=d===undefined?' filled="false"':' fillColor="'+d+'" filled="true" ',j=f[0]===f[f.length-1]?"x ":"",k='<v:shape coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'" '+' id="jqsshape'+a+'" '+h+i+' style="position:absolute;left:0px;top:0px;height:'+this.pixelHeight+"px;width:"+this.pixelWidth+'px;padding:0px;margin:0px;" '+' path="m '+g+" l "+f.join(", ")+" "+j+'e">'+" </v:shape>",k},_drawCircle:function(a,b,c,d,e,f,g){var h
,i,j;return b-=d,c-=d,h=e===undefined?' stroked="false" ':' strokeWeight="'+g+'px" strokeColor="'+e+'" ',i=f===undefined?' filled="false"':' fillColor="'+f+'" filled="true" ',j='<v:oval id="jqsshape'+a+'" '+h+i+' style="position:absolute;top:'+c+"px; left:"+b+"px; width:"+d*2+"px; height:"+d*2+'px"></v:oval>',j},_drawPieSlice:function(a,b,c,d,e,f,g,h){var i,j,k,l,m,n,o,p;if(e===f)return;f-e===2*Math.PI&&(e=0,f=2*Math.PI),j=b+Math.round(Math.cos(e)*d),k=c+Math.round(Math.sin(e)*d),l=b+Math.round(Math.cos(f)*d),m=c+Math.round(Math.sin(f)*d);if(j===l&&k===m&&f-e<Math.PI)return;return i=[b-d,c-d,b+d,c+d,j,k,l,m],n=g===undefined?' stroked="false" ':' strokeWeight="1px" strokeColor="'+g+'" ',o=h===undefined?' filled="false"':' fillColor="'+h+'" filled="true" ',p='<v:shape coordorigin="0 0" coordsize="'+this.pixelWidth+" "+this.pixelHeight+'" '+' id="jqsshape'+a+'" '+n+o+' style="position:absolute;left:0px;top:0px;height:'+this.pixelHeight+"px;width:"+this.pixelWidth+'px;padding:0
px;margin:0px;" '+' path="m '+b+","+c+" wa "+i.join(", ")+' x e">'+" </v:shape>",p},_drawRect:function(a,b,c,d,e,f,g){return this._drawShape(a,[[b,c],[b,c+e],[b+d,c+e],[b+d,c],[b,c]],f,g)},reset:function(){this.group.innerHTML=""},appendShape:function(a){var b=this["_draw"+a.type].apply(this,a.args);return this.rendered?this.group.insertAdjacentHTML("beforeEnd",b):this.prerender+=b,this.lastShapeId=a.id,a.id},replaceWithShape:function(b,c){var d=a("#jqsshape"+b),e=this["_draw"+c.type].apply(this,c.args);d[0].outerHTML=e},replaceWithShapes:function(b,c){var d=a("#jqsshape"+b[0]),e="",f=c.length,g;for(g=0;g<f;g++)e+=this["_draw"+c[g].type].apply(this,c[g].args);d[0].outerHTML=e;for(g=1;g<b.length;g++)a("#jqsshape"+b[g]).remove()},insertAfterShape:function(b,c){var d=a("#jqsshape"+b),e=this["_draw"+c.type].apply(this,c.args);d[0].insertAdjacentHTML("afterEnd",e)},removeShapeId:function(b){var c=a("#jqsshape"+b);this.group.removeChild(c[0])},getShapeAt:function(a,b,c){var d=a.id
.substr(8);return d},render:function(){this.rendered||(this.group.innerHTML=this.prerender,this.rendered=!0)}})})(jQuery);
\ No newline at end of file
commit 537dfe925d879d843f3ab36bf87215ecc2735e44
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Aug 28 14:34:23 2012 +0200
[BZ 850818 - Globally uncaught exception on clicking OK button while
adding CLI Script alert notification to the alert definition] Added the
check whether the repository has been picked. (cherry picked from commit 9fda60f21e354f3b33a1ecf85b81cae19e0af1af)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java
index 225c5c5..cf66856 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java
@@ -402,6 +402,11 @@ public class CliNotificationSenderForm extends AbstractNotificationSenderForm {
}
private void validatePackage(final AsyncCallback<Void> callback) {
+ if (config.selectedRepo == null) {
+ repoSelector.setIcons(failureIcon);
+ callback.onFailure(null);
+ return;
+ }
getConfiguration().put(new PropertySimple(PROP_REPO_ID, config.selectedRepo.getId()));
if (packageSelector.getSelectedIndex() == 0) {
commit f12d439b25ae9d3b96c525d25ede3d9da40a2b4f
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Fri Nov 2 15:48:43 2012 +0100
[BZ 858676 - Global uncaught exception with 'New' group creation from
'All groups'] NPE was thrown, it was regression of b54ce46. (cherry
picked from commit 9f1758393926e3a980b7148938aa358430762053)
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
index 2947bce..8828a39 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
@@ -211,7 +211,14 @@ public class ResourceGroupListView extends Table<ResourceGroupCompositeDataSourc
addTableAction(extendLocatorId("New"), MSG.common_button_new(), new AuthorizedTableAction(this,
Permission.MANAGE_INVENTORY) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
- new GroupCreateWizard(ResourceGroupListView.this).startWizard();
+
+ GroupCategory category = null;
+ String categoryString = getInitialCriteria() == null ? null : getInitialCriteria().getAttribute(
+ ResourceGroupDataSourceField.CATEGORY.propertyName());
+ if (categoryString != null) {
+ category = GroupCategory.COMPATIBLE.name().equals(categoryString) ? GroupCategory.COMPATIBLE : GroupCategory.MIXED;
+ }
+ new GroupCreateWizard(ResourceGroupListView.this, category).startWizard();
// we can refresh the table buttons immediately since the wizard is a dialog, the
// user can't access enabled buttons anyway.
ResourceGroupListView.this.refreshTableInfo();
@@ -283,4 +290,4 @@ public class ResourceGroupListView extends Table<ResourceGroupCompositeDataSourc
return SearchSubsystem.GROUP;
}
-}
\ No newline at end of file
+}
commit d85d280545bf9112e830613693fc17b2f1830b4b
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Mon Oct 15 19:10:01 2012 +0200
[BZ 864870 - [CLI] It is possible to create Drift Detection Definition
without manageme drift permission] Authorization has been done on the
SLSB layer; user w/o MANAGE_DRIFT can still read the drift definitions
(C,U,D operations are forbidden). (cherry picked from commit b60bc4e48e25dfe2e15bd9927400deb9a3b4c614)
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
index 4f8bc15..4beb749 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/drift/DriftManagerBean.java
@@ -55,6 +55,7 @@ import org.jboss.remoting.CannotConnectException;
import org.rhq.core.clientapi.agent.drift.DriftAgentService;
import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.DriftChangeSetCriteria;
import org.rhq.core.domain.criteria.DriftCriteria;
@@ -94,6 +95,8 @@ import org.rhq.enterprise.server.agentclient.AgentClient;
import org.rhq.enterprise.server.alert.engine.AlertConditionCacheManagerLocal;
import org.rhq.enterprise.server.alert.engine.AlertConditionCacheStats;
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.core.AgentManagerLocal;
import org.rhq.enterprise.server.plugin.pc.MasterServerPluginContainer;
import org.rhq.enterprise.server.plugin.pc.drift.DriftChangeSetSummary;
@@ -152,13 +155,16 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
@EJB
private AlertConditionCacheManagerLocal alertConditionCacheManager;
+
+ @EJB
+ private AuthorizationManagerLocal authorizationManager;
// use a new transaction when putting things on the JMS queue. see
// http://management-platform.blogspot.com/2008/11/transaction-recovery-in-j...
@Override
@TransactionAttribute(REQUIRES_NEW)
public void addChangeSet(Subject subject, int resourceId, long zipSize, InputStream zipStream) throws Exception {
-
+ authorizeOrFail(subject, resourceId, "Can not update drifts");
Connection connection = factory.createConnection();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer producer = session.createProducer(changesetQueue);
@@ -173,7 +179,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
@TransactionAttribute(REQUIRES_NEW)
public void addFiles(Subject subject, int resourceId, String driftDefName, String token, long zipSize,
InputStream zipStream) throws Exception {
-
+ authorizeOrFail(subject, resourceId, "Can not update drifts");
Connection connection = factory.createConnection();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer producer = session.createProducer(fileQueue);
@@ -187,6 +193,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
@TransactionAttribute(NOT_SUPPORTED)
public void saveChangeSetContent(Subject subject, int resourceId, String driftDefName, String token,
File changeSetFilesZip) throws Exception {
+ authorizeOrFail(subject, resourceId, "Can not update drifts");
saveChangeSetFiles(subject, changeSetFilesZip);
AgentClient agent = agentManager.getAgentClient(subjectManager.getOverlord(), resourceId);
@@ -308,6 +315,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
public void detectDrift(Subject subject, EntityContext context, DriftDefinition driftDef) {
switch (context.getType()) {
case Resource:
+ authorizeOrFail(subject, context, "Can not update drifts");
int resourceId = context.getResourceId();
Resource resource = entityManager.find(Resource.class, resourceId);
if (null == resource) {
@@ -336,9 +344,9 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
@Override
@TransactionAttribute(NOT_SUPPORTED)
public void deleteDriftDefinition(Subject subject, EntityContext entityContext, String driftDefName) {
-
switch (entityContext.getType()) {
case Resource:
+ authorizeOrFail(subject, entityContext, "Can not delete drifts");
int resourceId = entityContext.getResourceId();
DriftDefinitionCriteria criteria = new DriftDefinitionCriteria();
criteria.addFilterName(driftDefName);
@@ -392,6 +400,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
@Override
public void deleteResourceDriftDefinition(Subject subject, int resourceId, int driftDefId) {
+ authorizeOrFail(subject, resourceId, "Can not delete drifts");
DriftDefinition doomed = entityManager.getReference(DriftDefinition.class, driftDefId);
doomed.getResource().setAgentSynchronizationNeeded();
entityManager.remove(doomed);
@@ -482,6 +491,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
@Override
@TransactionAttribute(REQUIRES_NEW)
public DriftChangeSetSummary saveChangeSet(Subject subject, int resourceId, File changeSetZip) throws Exception {
+ authorizeOrFail(subject, resourceId, "Can not update/create drifts");
DriftServerPluginFacet driftServerPlugin = getServerPlugin();
DriftChangeSetSummary summary = driftServerPlugin.saveChangeSet(subject, resourceId, changeSetZip);
@@ -505,6 +515,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
}
private void updateCompliance(Subject subject, DriftDefinition definition, DriftChangeSetSummary changeSetSummary) {
+ authorizeOrFail(subject, definition.getResource().getId(), "Can not update drifts");
boolean updateNeeded = false;
if (changeSetSummary.isInitialChangeSet()) {
@@ -546,6 +557,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
@Override
@TransactionAttribute(NOT_SUPPORTED)
public void purgeByDriftDefinitionName(Subject subject, int resourceId, String driftDefName) throws Exception {
+ authorizeOrFail(subject, resourceId, "Can not delete drifts");
DriftServerPluginFacet driftServerPlugin = getServerPlugin();
driftServerPlugin.purgeByDriftDefinitionName(subject, resourceId, driftDefName);
}
@@ -561,6 +573,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
@TransactionAttribute(NOT_SUPPORTED)
public void pinSnapshot(Subject subject, int driftDefId, int snapshotVersion) {
DriftDefinition driftDef = driftManager.getDriftDefinition(subject, driftDefId);
+ authorizeOrFail(subject, driftDef.getResource().getId(), "Can not update drifts");
if (driftDef.getTemplate() != null && driftDef.getTemplate().isPinned()) {
throw new IllegalArgumentException(("Cannot repin a definition that has been created from a pinned "
@@ -603,6 +616,7 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
@TransactionAttribute(NOT_SUPPORTED)
public String persistSnapshot(Subject subject, DriftSnapshot snapshot,
DriftChangeSet<? extends Drift<?, ?>> changeSet) {
+ authorizeOrFail(subject, changeSet.getResourceId(), "Can not update/create drifts");
DriftChangeSetDTO changeSetDTO = new DriftChangeSetDTO();
changeSetDTO.setCategory(changeSet.getCategory());
changeSetDTO.setDriftHandlingMode(changeSet.getDriftHandlingMode());
@@ -712,11 +726,14 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
@Override
public void updateDriftDefinition(Subject subject, DriftDefinition driftDefinition) {
+ authorizeOrFail(subject, driftDefinition.getResource().getId(), "Can not update drifts");
entityManager.merge(driftDefinition);
}
@Override
public void updateDriftDefinition(Subject subject, EntityContext entityContext, DriftDefinition driftDef) {
+ authorizeOrFail(subject, entityContext.getResourceId(), "Can not update drifts");
+
// before we do anything, validate certain field values to prevent downstream errors
validateDriftDefinition(driftDef);
@@ -951,5 +968,16 @@ public class DriftManagerBean implements DriftManagerLocal, DriftManagerRemote {
return pluginMgr.getDriftServerPluginComponent();
}
+
+ private void authorizeOrFail(Subject subject, int resourceId, String message) {
+ if (!authorizationManager.hasResourcePermission(subject, Permission.MANAGE_DRIFT, resourceId)) {
+ throw new PermissionException(message + " - " + subject + " lacks "
+ + Permission.MANAGE_DRIFT + " for resource[id=" + resourceId + "]");
+ }
+ }
+
+ private void authorizeOrFail(Subject subject, EntityContext context, String message) {
+ authorizeOrFail(subject, context.getResourceId(), message);
+ }
}
commit 04b4543aa7e055299e2a629c57ca5b11f69ddb1d
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Oct 30 14:02:31 2012 +0100
[BZ 870449 - Server silent/autoinstall sets http and https ports to
sslsocket port value] The code responsible for overriding the
"rhq.server.startup.web.http{s}.port" properties with the port # taken
from "rhq.communications.connector.bind-port" has been commented out.
(cherry picked from commit 231093c9978a9028c151894f799a87c2c6d6b17c)
diff --git a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java
index e06dbe8..b9c26c4 100644
--- a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java
+++ b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java
@@ -1064,24 +1064,25 @@ public class ConfigurationBean {
}
preconfiguredHaServer.setEndpointAddress(publicEndpointAddress);
- // define the public endpoint ports.
- // note that if using a different transport other than (ssl)servlet, we'll
- // take the connector's bind port and use it for both ports. This is to support a special deployment
- // use-case - 99% of the time, the agents will go through the web/tomcat connector and thus we'll use
- // the http/https ports for the public endpoints.
- PropertyItemWithValue connectorTransport = getConfigurationPropertyFromAll(ServerProperties.PROP_CONNECTOR_TRANSPORT);
- if (connectorTransport != null && connectorTransport.getValue() != null
- && connectorTransport.getValue().contains("socket")) {
-
- // we aren't using the (ssl)servlet protocol, take the connector bind port and use it for the public endpoint ports
- PropertyItemWithValue connectorBindPort = getConfigurationPropertyFromAll(ServerProperties.PROP_CONNECTOR_BIND_PORT);
- if (connectorBindPort == null || connectorBindPort.getValue() == null
- || "".equals(connectorBindPort.getValue().trim()) || "0".equals(connectorBindPort.getValue().trim())) {
- throw new Exception("Using non-servlet transport [" + connectorTransport + "] but didn't define a port");
- }
- preconfiguredHaServer.setEndpointPort(Integer.parseInt(connectorBindPort.getValue()));
- preconfiguredHaServer.setEndpointSecurePort(Integer.parseInt(connectorBindPort.getValue()));
- } else {
+// commented because of BZ 870533
+// // define the public endpoint ports.
+// // note that if using a different transport other than (ssl)servlet, we'll
+// // take the connector's bind port and use it for both ports. This is to support a special deployment
+// // use-case - 99% of the time, the agents will go through the web/tomcat connector and thus we'll use
+// // the http/https ports for the public endpoints.
+// PropertyItemWithValue connectorTransport = getConfigurationPropertyFromAll(ServerProperties.PROP_CONNECTOR_TRANSPORT);
+// if (connectorTransport != null && connectorTransport.getValue() != null
+// && connectorTransport.getValue().contains("socket")) {
+//
+// // we aren't using the (ssl)servlet protocol, take the connector bind port and use it for the public endpoint ports
+// PropertyItemWithValue connectorBindPort = getConfigurationPropertyFromAll(ServerProperties.PROP_CONNECTOR_BIND_PORT);
+// if (connectorBindPort == null || connectorBindPort.getValue() == null
+// || "".equals(connectorBindPort.getValue().trim()) || "0".equals(connectorBindPort.getValue().trim())) {
+// throw new Exception("Using non-servlet transport [" + connectorTransport + "] but didn't define a port");
+// }
+// preconfiguredHaServer.setEndpointPort(Integer.parseInt(connectorBindPort.getValue()));
+// preconfiguredHaServer.setEndpointSecurePort(Integer.parseInt(connectorBindPort.getValue()));
+// } else {
// this is the typical use-case - the transport is probably (ssl)servlet so use the web http/https ports
try {
PropertyItemWithValue httpPort = getPropHaEndpointPort();
@@ -1096,7 +1097,7 @@ public class ConfigurationBean {
} catch (Exception e) {
LOG.warn("Could not determine secure port, will use default: " + e);
}
- }
+// }
// everything looks good - remember these
setHaServer(preconfiguredHaServer);
11 years, 7 months
- 1
- 0
[rhq] Branch 'feature/cassandra-backend' - modules/enterprise
by John Sanda
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregatedNumericMetric.java | 139 ++++++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/ColumnMetadata.java | 74 +++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 220 +++++++---
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java | 121 +++--
4 files changed, 446 insertions(+), 108 deletions(-)
New commits:
commit d3cf93c6d879bac5990ddc04d81274727b3040df
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri Nov 2 10:42:10 2012 -0400
(cql port) first cut at aggregating raw data
This is the first of many refactorings for aggregating using CQL instead of
hector/thrift. This commit updates the aggregateRawData method and some
corresponding test code in MetricsServerTest.
This is also the initial commit for AggregatedNumericMetric and ColumnMetadata.
Right now these classes are just used in test code for verification. I
considered using some of the classes in core/domain like
MeasurementDataNumeric1H but chose not to for a few reasons.
1) There are separate, duplicate classes for 1H, 6H, and 1D. I suspect that
mulitple classes were introduced to support hibernate/jpa mappings to different
tables. A single class is sufficient.
2) The classes are cluttered with JPA mappings that are not applicable any
more. On the one hand they do not hurt anything, but on the other hand they
can cause confusion.
3) Those classes have a schedule property which is of type MeasurementSchedule.
Stuff is cassandra is denormalized and will only store a schedule id. There is
no need for the cassandra version of the corresponding domain objects to
maintain a reference to the full, complete MeasurementSchedule. The id is
sufficient and also makes testing easier.
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregatedNumericMetric.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregatedNumericMetric.java
new file mode 100644
index 0000000..9406cb5
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregatedNumericMetric.java
@@ -0,0 +1,139 @@
+/*
+ *
+ * * 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.server.metrics;
+
+/**
+ * @author John Sanda
+ */
+public class AggregatedNumericMetric {
+
+ private int scheduleId;
+
+ private Double min = Double.NaN;
+
+ private Double max = Double.NaN;
+
+ private Double avg = Double.NaN;
+
+ private long timestamp;
+
+ private ColumnMetadata columnMetadata;
+
+ public AggregatedNumericMetric() {
+ }
+
+ public AggregatedNumericMetric(int scheduleId, Double avg, Double min, Double max, long timestamp) {
+ this.scheduleId = scheduleId;
+ this.avg = avg;
+ this.min = min;
+ this.max = max;
+ this.timestamp = timestamp;
+ }
+
+ public int getScheduleId() {
+ return scheduleId;
+ }
+
+ public void setScheduleId(int scheduleId) {
+ this.scheduleId = scheduleId;
+ }
+
+ 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 getAvg() {
+ return avg;
+ }
+
+ public void setAvg(double avg) {
+ this.avg = avg;
+ }
+
+ public long getTimestamp() {
+ return timestamp;
+ }
+
+ public void setTimestamp(long timestamp) {
+ this.timestamp = timestamp;
+ }
+
+ public ColumnMetadata getColumnMetadata() {
+ return columnMetadata;
+ }
+
+ public void setColumnMetadata(ColumnMetadata metadata) {
+ columnMetadata = metadata;
+ }
+
+ @Override
+ public String toString() {
+ if (columnMetadata == null) {
+ return "AggregatedNumericMetric[scheduleId=" + scheduleId + ", avg=" + avg + ", min=" + min + ", max="
+ + max + ", timestamp=" + timestamp + "]";
+ }
+ return "AggregatedNumericMetric[scheduleId=" + scheduleId + ", avg=" + avg + ", min=" + min + ", max="
+ + max + " timestamp=" + timestamp + ", columnMetadata=" + columnMetadata + "]";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ AggregatedNumericMetric metric = (AggregatedNumericMetric) o;
+
+ if (scheduleId != metric.scheduleId) return false;
+ if (timestamp != metric.timestamp) return false;
+ if (!avg.equals(metric.avg)) return false;
+ if (!max.equals(metric.max)) return false;
+ if (!min.equals(metric.min)) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = scheduleId;
+ result = 31 * result + min.hashCode();
+ result = 31 * result + max.hashCode();
+ result = 31 * result + avg.hashCode();
+ result = 31 * result + (int) (timestamp ^ (timestamp >>> 32));
+ return result;
+ }
+}
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/ColumnMetadata.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/ColumnMetadata.java
new file mode 100644
index 0000000..6ff3a11
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/ColumnMetadata.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, 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.server.metrics;
+
+/**
+ * @author John Sanda
+ */
+public class ColumnMetadata {
+
+ private Integer ttl;
+
+ private Long writeTime;
+
+ public ColumnMetadata(Integer ttl, Long writeTime) {
+ this.ttl = ttl;
+ this.writeTime = writeTime;
+ }
+
+ public Integer getTtl() {
+ return ttl;
+ }
+
+ public Long getWriteTime() {
+ return writeTime;
+ }
+
+ @Override
+ public String toString() {
+ return "ColumnMetadata[ttl=" + ttl + ", writeTime=" + writeTime + "]";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ ColumnMetadata that = (ColumnMetadata) o;
+
+ if (ttl != null ? !ttl.equals(that.ttl) : that.ttl != null) return false;
+ if (!writeTime.equals(that.writeTime)) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = ttl != null ? ttl.hashCode() : 0;
+ result = 31 * result + writeTime.hashCode();
+ return result;
+ }
+}
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 0894339..8ed96f4 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
@@ -30,6 +30,7 @@ import static me.prettyprint.hector.api.beans.AbstractComposite.ComponentEqualit
import java.sql.Connection;
import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@@ -43,7 +44,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.Hours;
import org.joda.time.Minutes;
import org.rhq.core.domain.auth.Subject;
@@ -51,6 +51,7 @@ import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.measurement.MeasurementDataNumeric;
import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
+import org.rhq.core.util.jdbc.JDBCUtil;
import me.prettyprint.cassandra.serializers.CompositeSerializer;
import me.prettyprint.cassandra.serializers.DoubleSerializer;
@@ -320,79 +321,168 @@ public class MetricsServer {
public void calculateAggregates() {
Map<Integer, DateTime> updatedSchedules = aggregateRawData();
- updateMetricsQueue(sixHourMetricsDataCF, updatedSchedules);
-
- updatedSchedules = calculateAggregates(oneHourMetricsDataCF, sixHourMetricsDataCF, Minutes.minutes(60 * 6),
- Hours.hours(24).toStandardMinutes(), DateTimeService.ONE_MONTH);
- updateMetricsQueue(twentyFourHourMetricsDataCF, updatedSchedules);
-
- calculateAggregates(sixHourMetricsDataCF, twentyFourHourMetricsDataCF, Hours.hours(24).toStandardMinutes(),
- Hours.hours(24).toStandardMinutes(), DateTimeService.ONE_YEAR);
+// updateMetricsQueue(sixHourMetricsDataCF, updatedSchedules);
+//
+// updatedSchedules = calculateAggregates(oneHourMetricsDataCF, sixHourMetricsDataCF, Minutes.minutes(60 * 6),
+// Hours.hours(24).toStandardMinutes(), DateTimeService.ONE_MONTH);
+// updateMetricsQueue(twentyFourHourMetricsDataCF, updatedSchedules);
+//
+// calculateAggregates(sixHourMetricsDataCF, twentyFourHourMetricsDataCF, Hours.hours(24).toStandardMinutes(),
+// Hours.hours(24).toStandardMinutes(), DateTimeService.ONE_YEAR);
}
private Map<Integer, DateTime> aggregateRawData() {
Map<Integer, DateTime> updatedSchedules = new TreeMap<Integer, DateTime>();
+ Connection connection = null;
+ PreparedStatement statement = null;
+ PreparedStatement rawMetricsStatement = null;
+ PreparedStatement insert1HourData = null;
- SliceQuery<String, Composite, Integer> queueQuery = HFactory.createSliceQuery(keyspace, StringSerializer.get(),
- new CompositeSerializer().get(), IntegerSerializer.get());
- queueQuery.setColumnFamily(metricsIndex);
- queueQuery.setKey(oneHourMetricsDataCF);
-
- ColumnSliceIterator<String, Composite, Integer> queueIterator = new ColumnSliceIterator<String, Composite, Integer>(
- queueQuery, (Composite) null, (Composite) null, false);
-
- Mutator<Integer> mutator = HFactory.createMutator(keyspace, IntegerSerializer.get());
- Mutator<String> queueMutator = HFactory.createMutator(keyspace, StringSerializer.get());
+ try {
+ connection = cassandraDS.getConnection();
- while (queueIterator.hasNext()) {
- HColumn<Composite, Integer> queueColumn = queueIterator.next();
- Integer scheduleId = queueColumn.getName().get(1, IntegerSerializer.get());
- Long timestamp = queueColumn.getName().get(0, LongSerializer.get());
- DateTime startTime = new DateTime(timestamp);
- DateTime endTime = new DateTime(timestamp).plus(Minutes.minutes(60));
-
- SliceQuery<Integer, Long, Double> rawDataQuery = HFactory.createSliceQuery(keyspace,
- IntegerSerializer.get(), LongSerializer.get(), DoubleSerializer.get());
- rawDataQuery.setColumnFamily(rawMetricsDataCF);
- rawDataQuery.setKey(scheduleId);
-
- ColumnSliceIterator<Integer, Long, Double> rawDataIterator = new ColumnSliceIterator<Integer, Long, Double>(
- rawDataQuery, startTime.getMillis(), endTime.getMillis(), false);
- rawDataIterator.hasNext();
-
- HColumn<Long, Double> rawDataColumn = rawDataIterator.next();
- double min = rawDataColumn.getValue();
- double max = min;
- double sum = max;
- int count = 1;
-
- while (rawDataIterator.hasNext()) {
- rawDataColumn = rawDataIterator.next();
- if (rawDataColumn.getValue() < min) {
- min = rawDataColumn.getValue();
- } else if (rawDataColumn.getValue() > max) {
- max = rawDataColumn.getValue();
+ String indexSQL =
+ "SELECT bucket, time, schedule_id " +
+ "FROM " + metricsIndex + " " +
+ "WHERE bucket = '" + oneHourMetricsDataCF + "' " +
+ "ORDER BY time";
+
+ String rawMetricsSQL =
+ "SELECT schedule_id, time, value " +
+ "FROM " + rawMetricsDataCF + " " +
+ "WHERE schedule_id = ? AND time >= ? AND time < ?";
+
+ String insert1HourSQL =
+ "INSERT INTO " + oneHourMetricsDataCF + " (schedule_id, time, type, value) " +
+ "VALUES (?, ?, ?, ?)";
+
+ statement = connection.prepareStatement(indexSQL);
+ rawMetricsStatement = connection.prepareStatement(rawMetricsSQL);
+ insert1HourData = connection.prepareStatement(insert1HourSQL);
+ ResultSet indexResultSet = statement.executeQuery();
+
+ while (indexResultSet.next()) {
+ MetricsIndexEntry indexEntry = new MetricsIndexEntry(rawMetricsDataCF, indexResultSet.getDate(2),
+ indexResultSet.getInt(3));
+ DateTime startTime = indexEntry.getTime();
+ DateTime endTime = startTime.plusMinutes(60);
+
+ rawMetricsStatement.setInt(1, indexEntry.getScheduleId());
+ rawMetricsStatement.setDate(2, new java.sql.Date(startTime.getMillis()));
+ rawMetricsStatement.setDate(3, new java.sql.Date(endTime.getMillis()));
+ ResultSet metricsResultSet = rawMetricsStatement.executeQuery();
+
+ metricsResultSet.next();
+
+ double min = metricsResultSet.getDouble(3);
+ double max = min;
+ double sum = max;
+ int count = 1;
+ double value;
+
+ while (metricsResultSet.next()) {
+ value = metricsResultSet.getDouble(3);
+ if (value < min) {
+ min = value;
+ } else if (value > max) {
+ max = value;
+ }
+ sum += value;
+ ++count;
}
- sum += rawDataColumn.getValue();
- ++count;
+ double avg = sum / count;
+ metricsResultSet.close();
+ metricsResultSet = null;
+
+ insert1HourData.setInt(1, indexEntry.getScheduleId());
+ insert1HourData.setDate(2, new java.sql.Date(startTime.getMillis()));
+ insert1HourData.setInt(3, AggregateType.MIN.ordinal());
+ insert1HourData.setDouble(4, min);
+ insert1HourData.executeUpdate();
+
+ insert1HourData.setInt(1, indexEntry.getScheduleId());
+ insert1HourData.setDate(2, new java.sql.Date(startTime.getMillis()));
+ insert1HourData.setInt(3, AggregateType.MAX.ordinal());
+ insert1HourData.setDouble(4, max);
+ insert1HourData.executeUpdate();
+
+ insert1HourData.setInt(1, indexEntry.getScheduleId());
+ insert1HourData.setDate(2, new java.sql.Date(startTime.getMillis()));
+ insert1HourData.setInt(3, AggregateType.AVG.ordinal());
+ insert1HourData.setDouble(4, avg);
+ insert1HourData.executeUpdate();
+
+ updatedSchedules.put(indexEntry.getScheduleId(), indexEntry.getTime());
}
-
- double avg = sum / count;
-
- mutator.addInsertion(scheduleId, oneHourMetricsDataCF,
- createAvgColumn(startTime, avg, DateTimeService.TWO_WEEKS));
- mutator.addInsertion(scheduleId, oneHourMetricsDataCF,
- createMaxColumn(startTime, max, DateTimeService.TWO_WEEKS));
- mutator.addInsertion(scheduleId, oneHourMetricsDataCF,
- createMinColumn(startTime, min, DateTimeService.TWO_WEEKS));
-
- updatedSchedules.put(scheduleId, dateTimeService.getTimeSlice(startTime, Minutes.minutes(60 * 6)));
-
- queueMutator.addDeletion(oneHourMetricsDataCF, metricsIndex, queueColumn.getName(),
- CompositeSerializer.get());
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ } finally {
+ JDBCUtil.safeClose(insert1HourData);
+ JDBCUtil.safeClose(rawMetricsStatement);
+ JDBCUtil.safeClose(statement);
+ JDBCUtil.safeClose(connection);
}
- mutator.execute();
- queueMutator.execute();
+
+// SliceQuery<String, Composite, Integer> queueQuery = HFactory.createSliceQuery(keyspace, StringSerializer.get(),
+// new CompositeSerializer().get(), IntegerSerializer.get());
+// queueQuery.setColumnFamily(metricsIndex);
+// queueQuery.setKey(oneHourMetricsDataCF);
+//
+// ColumnSliceIterator<String, Composite, Integer> queueIterator = new ColumnSliceIterator<String, Composite, Integer>(
+// queueQuery, (Composite) null, (Composite) null, false);
+//
+// Mutator<Integer> mutator = HFactory.createMutator(keyspace, IntegerSerializer.get());
+// Mutator<String> queueMutator = HFactory.createMutator(keyspace, StringSerializer.get());
+//
+// while (queueIterator.hasNext()) {
+// HColumn<Composite, Integer> queueColumn = queueIterator.next();
+// Integer scheduleId = queueColumn.getName().get(1, IntegerSerializer.get());
+// Long timestamp = queueColumn.getName().get(0, LongSerializer.get());
+// DateTime startTime = new DateTime(timestamp);
+// DateTime endTime = new DateTime(timestamp).plus(Minutes.minutes(60));
+//
+// SliceQuery<Integer, Long, Double> rawDataQuery = HFactory.createSliceQuery(keyspace,
+// IntegerSerializer.get(), LongSerializer.get(), DoubleSerializer.get());
+// rawDataQuery.setColumnFamily(rawMetricsDataCF);
+// rawDataQuery.setKey(scheduleId);
+//
+// ColumnSliceIterator<Integer, Long, Double> rawDataIterator = new ColumnSliceIterator<Integer, Long, Double>(
+// rawDataQuery, startTime.getMillis(), endTime.getMillis(), false);
+// rawDataIterator.hasNext();
+//
+// HColumn<Long, Double> rawDataColumn = rawDataIterator.next();
+// double min = rawDataColumn.getValue();
+// double max = min;
+// double sum = max;
+// int count = 1;
+//
+// while (rawDataIterator.hasNext()) {
+// rawDataColumn = rawDataIterator.next();
+// if (rawDataColumn.getValue() < min) {
+// min = rawDataColumn.getValue();
+// } else if (rawDataColumn.getValue() > max) {
+// max = rawDataColumn.getValue();
+// }
+// sum += rawDataColumn.getValue();
+// ++count;
+// }
+//
+// double avg = sum / count;
+//
+// mutator.addInsertion(scheduleId, oneHourMetricsDataCF,
+// createAvgColumn(startTime, avg, DateTimeService.TWO_WEEKS));
+// mutator.addInsertion(scheduleId, oneHourMetricsDataCF,
+// createMaxColumn(startTime, max, DateTimeService.TWO_WEEKS));
+// mutator.addInsertion(scheduleId, oneHourMetricsDataCF,
+// createMinColumn(startTime, min, DateTimeService.TWO_WEEKS));
+//
+// updatedSchedules.put(scheduleId, dateTimeService.getTimeSlice(startTime, Minutes.minutes(60 * 6)));
+//
+// queueMutator.addDeletion(oneHourMetricsDataCF, metricsIndex, queueColumn.getName(),
+// CompositeSerializer.get());
+// }
+// mutator.execute();
+// queueMutator.execute();
return updatedSchedules;
}
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 cf7e9de..77d02eb 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
@@ -40,8 +40,11 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import org.apache.cassandra.cql.jdbc.CassandraDataSource;
@@ -51,12 +54,9 @@ import org.joda.time.Chronology;
import org.joda.time.DateTime;
import org.joda.time.DateTimeField;
import org.joda.time.DateTimeFieldType;
-import org.joda.time.Days;
import org.joda.time.Duration;
import org.joda.time.chrono.GregorianChronology;
import org.joda.time.field.DividedDateTimeField;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -81,14 +81,11 @@ import me.prettyprint.cassandra.serializers.LongSerializer;
import me.prettyprint.cassandra.serializers.StringSerializer;
import me.prettyprint.cassandra.service.CassandraHost;
import me.prettyprint.cassandra.service.ColumnSliceIterator;
-import me.prettyprint.cassandra.service.KeyIterator;
import me.prettyprint.hector.api.Cluster;
import me.prettyprint.hector.api.Keyspace;
-import me.prettyprint.hector.api.Serializer;
import me.prettyprint.hector.api.beans.Composite;
import me.prettyprint.hector.api.beans.HColumn;
import me.prettyprint.hector.api.factory.HFactory;
-import me.prettyprint.hector.api.mutation.MutationResult;
import me.prettyprint.hector.api.mutation.Mutator;
import me.prettyprint.hector.api.query.SliceQuery;
@@ -201,20 +198,6 @@ public class MetricsServerTest {
statement.close();
}
- private <K> MutationResult deleteAllRows(String columnFamily, Serializer<K> keySerializer) {
- KeyIterator<K> keyIterator = new KeyIterator<K>(keyspace, columnFamily, keySerializer);
- Mutator<K> rowMutator = HFactory.createMutator(keyspace, keySerializer);
- rowMutator.addDeletion(keyIterator, columnFamily);
-
- return rowMutator.execute();
- }
-
- @Test
- public void formatDate() {
- DateTime dateTime = now();
- DateTimeFormatter format = DateTimeFormat.mediumDateTime();
- }
-
@Test//(enabled = ENABLED)
public void insertMultipleRawNumericDataForOneSchedule() throws Exception {
int scheduleId = 123;
@@ -290,7 +273,7 @@ public class MetricsServerTest {
ONE_HOUR_METRIC_DATA_CF);
}
- @Test(enabled = ENABLED)
+ @Test//(enabled = ENABLED)
public void calculateAggregatesForOneScheduleWhenDBIsEmpty() {
int scheduleId = 123;
@@ -319,31 +302,34 @@ public class MetricsServerTest {
// verify one hour metric data is calculated
// The ttl for 1 hour data is 14 days.
- int ttl = Days.days(14).toStandardSeconds().getSeconds();
- List<HColumn<Composite, Double>> expected1HourData = asList(
- HFactory.createColumn(createAggregateKey(lastHour, AggregateType.MAX), 3.9, ttl, CompositeSerializer.get(),
- DoubleSerializer.get()),
- HFactory.createColumn(createAggregateKey(lastHour, AggregateType.MIN), 2.6, ttl, CompositeSerializer.get(),
- DoubleSerializer.get()),
- HFactory.createColumn(createAggregateKey(lastHour, AggregateType.AVG), (3.9 + 3.2 + 2.6) / 3, ttl,
- CompositeSerializer.get(), DoubleSerializer.get())
- );
-
- assert1HourDataEquals(scheduleId, expected1HourData);
+// int ttl = Days.days(14).toStandardSeconds().getSeconds();
+// List<HColumn<Composite, Double>> expected1HourData = asList(
+// HFactory.createColumn(createAggregateKey(lastHour, AggregateType.MAX), 3.9, ttl, CompositeSerializer.get(),
+// DoubleSerializer.get()),
+// HFactory.createColumn(createAggregateKey(lastHour, AggregateType.MIN), 2.6, ttl, CompositeSerializer.get(),
+// DoubleSerializer.get()),
+// HFactory.createColumn(createAggregateKey(lastHour, AggregateType.AVG), (3.9 + 3.2 + 2.6) / 3, ttl,
+// CompositeSerializer.get(), DoubleSerializer.get())
+// );
+//
+// assert1HourDataEquals(scheduleId, expected1HourData);
// verify six hour metric data is calculated
// the ttl for 6 hour data is 31 days
- ttl = Days.days(31).toStandardSeconds().getSeconds();
- List<HColumn<Composite, Double>> expected6HourData = asList(
- HFactory.createColumn(createAggregateKey(hour0, AggregateType.MAX), 3.9, ttl, CompositeSerializer.get(),
- DoubleSerializer.get()),
- HFactory.createColumn(createAggregateKey(hour0, AggregateType.MIN), 2.6, ttl, CompositeSerializer.get(),
- DoubleSerializer.get()),
- HFactory.createColumn(createAggregateKey(hour0, AggregateType.AVG), (3.9 + 3.2 + 2.6) / 3, ttl,
- CompositeSerializer.get(), DoubleSerializer.get())
- );
-
- assert6HourDataEquals(scheduleId, expected6HourData);
+// ttl = Days.days(31).toStandardSeconds().getSeconds();
+// List<HColumn<Composite, Double>> expected6HourData = asList(
+// HFactory.createColumn(createAggregateKey(hour0, AggregateType.MAX), 3.9, ttl, CompositeSerializer.get(),
+// DoubleSerializer.get()),
+// HFactory.createColumn(createAggregateKey(hour0, AggregateType.MIN), 2.6, ttl, CompositeSerializer.get(),
+// DoubleSerializer.get()),
+// HFactory.createColumn(createAggregateKey(hour0, AggregateType.AVG), (3.9 + 3.2 + 2.6) / 3, ttl,
+// CompositeSerializer.get(), DoubleSerializer.get())
+// );
+//
+// assert6HourDataEquals(scheduleId, expected6HourData);
+ List<AggregatedNumericMetric> expected = asList(new AggregatedNumericMetric(scheduleId, (3.9 + 3.2 + 2.6) / 3,
+ 2.6, 3.9, lastHour.getMillis()));
+ assertMetricDataEquals(ONE_HOUR_METRIC_DATA_CF, scheduleId, expected);
}
@Test(enabled = ENABLED)
@@ -882,6 +868,55 @@ public class MetricsServerTest {
}
}
+ private void assertMetricDataEquals(String columnFamily, int scheduleId, List<AggregatedNumericMetric> expected) {
+ Statement statement = null;
+ try {
+ statement = connection.createStatement();
+ String sql =
+ "SELECT schedule_id, time, type, value, ttl(value), writetime(value)" +
+ "FROM " + columnFamily + " " +
+ "WHERE schedule_id = " + scheduleId + " " +
+ "ORDER BY time, type";
+ Map<Long, AggregatedNumericMetric> metrics = new HashMap<Long, AggregatedNumericMetric>();
+ ResultSet resultSet = statement.executeQuery(sql);
+
+ while (resultSet.next()) {
+ long timestamp = resultSet.getDate(2).getTime();
+ AggregatedNumericMetric metric = metrics.get(timestamp);
+ if (metric == null) {
+ metric = new AggregatedNumericMetric();
+ metric.setScheduleId(scheduleId);
+ metric.setTimestamp(timestamp);
+ }
+ AggregateType aggregateType = AggregateType.valueOf(resultSet.getInt(3));
+ switch (aggregateType) {
+ case MAX:
+ metric.setMax(resultSet.getDouble(4));
+ break;
+ case MIN:
+ metric.setMin(resultSet.getDouble(4));
+ break;
+ default: // AVG
+ metric.setAvg(resultSet.getDouble(4));
+ break;
+ }
+ metrics.put(timestamp, metric);
+ }
+ Collection<AggregatedNumericMetric> actual = metrics.values();
+
+ assertCollectionMatchesNoOrder(expected, actual, "Metric data for schedule id " + scheduleId +
+ " in table " + columnFamily + " does not match expected values");
+ } catch (SQLException e) {
+ } finally {
+ if (statement != null) {
+ try {
+ statement.close();
+ } catch (SQLException e) {
+ }
+ }
+ }
+ }
+
private void assert6HourDataEmpty(int scheduleId) {
assertMetricDataEmpty(scheduleId, SIX_HOUR_METRIC_DATA_CF);
}
11 years, 7 months
- 1
- 0
[rhq] Branch 'jsanda/cassandra-plugin' - 3 commits - modules/plugins
by snegrea
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ComplexConfigurationResourceComponent.java | 113 ++++++++++
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/FailureDetectorComponent.java | 43 ---
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/KeyspaceDiscoveryComponent.java | 75 +++++-
modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java | 23 --
modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml | 89 ++++++-
5 files changed, 248 insertions(+), 95 deletions(-)
New commits:
commit a1654ef6ce6bdcc74771fa046469e89245e463f0
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Nov 1 16:36:43 2012 -0500
Get the list of keyspaces directly from the StorageService bean instead of using hector.
diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/KeyspaceDiscoveryComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/KeyspaceDiscoveryComponent.java
index 58c6ecc..5c761df 100644
--- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/KeyspaceDiscoveryComponent.java
+++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/KeyspaceDiscoveryComponent.java
@@ -25,33 +25,90 @@
package org.rhq.plugins.cassandra;
-import static org.rhq.plugins.cassandra.CassandraUtil.getKeyspaceDefinitions;
-
+import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
-import me.prettyprint.hector.api.ddl.KeyspaceDefinition;
+import org.mc4j.ems.connection.EmsConnection;
+import org.mc4j.ems.connection.bean.EmsBean;
+import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
-import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.plugins.jmx.JMXComponent;
/**
* @author John Sanda
*/
-public class KeyspaceDiscoveryComponent implements ResourceDiscoveryComponent<ResourceComponent<?>> {
+public class KeyspaceDiscoveryComponent implements ResourceDiscoveryComponent<JMXComponent<?>> {
+
+ private static final String STORAGE_SERVICE_BEAN = "org.apache.cassandra.db:type=StorageService";
@Override
- public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<ResourceComponent<?>> context)
+ public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext<JMXComponent<?>> context)
throws Exception {
+
Set<DiscoveredResourceDetails> details = new HashSet<DiscoveredResourceDetails>();
- for (KeyspaceDefinition keyspaceDef : getKeyspaceDefinitions()) {
- details.add(new DiscoveredResourceDetails(context.getResourceType(), keyspaceDef.getName(),
- keyspaceDef.getName(), null, null, null, null));
+ for (Object keyspaceName : getKeyspaces(context.getParentResourceComponent().getEmsConnection())) {
+ details.add(new DiscoveredResourceDetails(context.getResourceType(), keyspaceName.toString(), keyspaceName
+ .toString(), null, null, null, null));
}
return details;
}
+
+ /**
+ * Retrieve the keyspace names from the StorageService bean.
+ *
+ * @param emsConnection Ems Connection
+ * @return list of keyspaces
+ */
+ @SuppressWarnings("unchecked")
+ private List<Object> getKeyspaces(EmsConnection emsConnection) {
+ List<Object> value = null;
+
+ EmsBean emsBean = loadBean(STORAGE_SERVICE_BEAN, emsConnection);
+ if (emsBean != null) {
+ EmsAttribute attribute = emsBean.getAttribute("Keyspaces");
+ if (attribute != null) {
+ value = (List<Object>) attribute.refresh();
+ }
+ }
+
+ if (value == null) {
+ value = new ArrayList<Object>();
+ }
+
+ return value;
+ }
+
+ /**
+ * Loads the bean with the given object name.
+ *
+ * Subclasses are free to override this method in order to load the bean.
+ *
+ * @param objectName the name of the bean to load
+ * @return the bean that is loaded
+ */
+ private EmsBean loadBean(String objectName, EmsConnection emsConnection) {
+ if (emsConnection != null) {
+ EmsBean bean = emsConnection.getBean(objectName);
+ if (bean == null) {
+ // In some cases, this resource component may have been discovered by some means other than querying its
+ // parent's EMSConnection (e.g. ApplicationDiscoveryComponent uses a filesystem to discover EARs and
+ // WARs that are not yet deployed). In such cases, getBean() will return null, since EMS won't have the
+ // bean in its cache. To cover such cases, make an attempt to query the underlying MBeanServer for the
+ // bean before giving up.
+ emsConnection.queryBeans(objectName);
+ bean = emsConnection.getBean(objectName);
+ }
+
+ return bean;
+ }
+
+ return null;
+ }
}
commit e202387a977b70ddb58ac7b5bb36bbea8c005ece
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Nov 1 15:57:24 2012 -0500
Enable full support for StorageService properties and metrics.
diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ComplexConfigurationResourceComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ComplexConfigurationResourceComponent.java
index b046d08..583e2c4 100644
--- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ComplexConfigurationResourceComponent.java
+++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ComplexConfigurationResourceComponent.java
@@ -45,7 +45,7 @@ import org.rhq.plugins.jmx.MBeanResourceComponent;
*/
public class ComplexConfigurationResourceComponent extends MBeanResourceComponent<JMXComponent<?>> {
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "deprecation" })
@Override
public Configuration loadResourceConfiguration() {
Configuration configuration = super.loadResourceConfiguration();
@@ -90,6 +90,15 @@ public class ComplexConfigurationResourceComponent extends MBeanResourceComponen
for (Object entry : setValue) {
propertyList.add(new PropertySimple(entryName, entry.toString()));
}
+ } else if (result instanceof Object[]) {
+ String entryName = ((PropertyDefinitionSimple) ((PropertyDefinitionList) propertyDefinition)
+ .getMemberDefinition()).getName();
+
+ Object[] arrayValue = (Object[]) result;
+
+ for (Object entry : arrayValue) {
+ propertyList.add(new PropertySimple(entryName, entry.toString()));
+ }
}
if (propertyList.getList().size() != 0) {
diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java
index d3e61cf..65baca8 100644
--- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java
+++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/StorageServiceComponent.java
@@ -36,18 +36,14 @@ import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
import org.mc4j.ems.connection.bean.operation.EmsOperation;
import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.PropertyList;
-import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.pluginapi.operation.OperationResult;
-import org.rhq.plugins.jmx.JMXComponent;
-import org.rhq.plugins.jmx.MBeanResourceComponent;
/**
* @author John Sanda
*/
-public class StorageServiceComponent extends MBeanResourceComponent<JMXComponent<?>> {
+public class StorageServiceComponent extends ComplexConfigurationResourceComponent {
private Log log = LogFactory.getLog(StorageServiceComponent.class);
@@ -125,21 +121,4 @@ public class StorageServiceComponent extends MBeanResourceComponent<JMXComponent
return new OperationResult();
}
-
- @Override
- public Configuration loadResourceConfiguration() {
- Configuration config = super.loadResourceConfiguration();
- EmsBean emsBean = getEmsBean();
- EmsAttribute attribute = emsBean.getAttribute("AllDataFileLocations");
-
- PropertyList list = new PropertyList("dataFileLocations");
- String[] dirs = (String[]) attribute.getValue();
- for (String dir : dirs) {
- list.add(new PropertySimple("directory", dir));
- }
- config.put(list);
-
- return config;
- }
-
}
diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml
index 4cfe3e3..246d002 100644
--- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml
@@ -155,23 +155,76 @@
</parameters>
</operation>
- <metric property="Token" dataType="trait" description="A string representation of this node's token" defaultOn="true"/>
- <metric property="ReleaseVersion" dataType="trait" description="The Cassandra version"/>
+ <metric property="CurrentGenerationNumber" dataType="trait" displayType="summary" description="Current generation number"/>
+ <metric property="ExceptionCount" measurementType="trendsup" dataType="measurement" displayType="summary" description="Exception Count"/>
+ <metric property="Initialized" dataType="trait" displayType="summary" description="Initialized"/>
+ <metric property="Joined" dataType="trait" displayType="summary" description="Joined"/>
+ <metric property="Load" dataType="measurement" units="bytes" displayType="summary" description="Amount of load in disk usage on the node being queried"/>
+ <metric property="OperationMode" dataType="trait" displayType="summary" description="Current operation mode"/>
+ <metric property="ReleaseVersion" dataType="trait" displayType="summary" description="Cassandra version"/>
+ <metric property="RPCServiceRunning" dataType="trait" displayType="summary" displayName="RPC Service Running" description="RPC Service Running"/>
<metric property="SchemaVersion" dataType="trait" displayType="summary"
description="The current schema version for this node. The value is calculated as a checksum of all rows
in the system.schema_* column families. This value is used in an algorithm to compare schema versions
between nodes and apply updates as necessary. This value should be the same for all fully initialized
nodes in the cluster."/>
- <metric property="ReleaseVersion" dataType="trait" description="Cassandra version"/>
- <metric property="Load" dataType="measurement" units="bytes" displayType="summary" description="Amount of load in disk usage on the node being queried"/>
- <metric property="OperationMode" dataType="trait" description="The current operation mode"/>
+ <metric property="Token" dataType="trait" displayType="summary" description="A string representation of this node's token" defaultOn="true"/>
<resource-configuration>
- <c:simple-property name="SavedCachesLocation" type="string" readOnly="true" description="Location of the saved caches directory"/>
- <c:simple-property name="CommitLogLocation" type="string" readOnly="true" default="Location of the commit log directory"/>
- <c:list-property name="dataFileLocations" readOnly="true" description="List of data file locations">
- <c:simple-property name="directory" type="string" readOnly="true"/>
- </c:list-property>
+ <c:group name="DataStorage">
+ <c:list-property name="AllDataFileLocations" displayName="Data File Locations" readOnly="true" description="List of data file locations">
+ <c:simple-property name="directory" type="string" readOnly="true"/>
+ </c:list-property>
+ <c:simple-property name="CommitLogLocation" type="string" readOnly="true" default="Location of the commit log directory"/>
+ <c:simple-property name="SavedCachesLocation" type="string" readOnly="true" description="Location of the saved caches directory"/>
+ </c:group>
+
+ <c:group name="NodeConfiguration">
+ <c:simple-property name="CompactionThroughputMbPerSec" type="integer" required="true" displayName="Compaction Throughput Mb Per Sec" description="Compaction throughput in Mb/Sec"/>
+ <c:simple-property name="DrainProgress" type="string" required="false" readOnly="true" description="Drain progress"/>
+ <c:simple-property name="IncrementalBackupsEnabled" type="boolean" required="true" description="Incremental Backups Enabled"/>
+ <c:list-property name="PrimaryRange" readOnly="true" description="Primary Range">
+ <c:simple-property name="element" type="string" readOnly="true"/>
+ </c:list-property>
+ <c:simple-property name="RemovalStatus" type="string" readOnly="true" description="Removal status"/>
+ <c:simple-property name="StreamThroughputMbPerSec" type="integer" required="true" displayName="Stream Throughput Mb Per Sec" description="Stream throughput in Mb/Sec"/>
+ </c:group>
+
+ <c:group name="Cluster Information">
+ <c:list-property name="LeavingNodes" readOnly="true" description="List of nodes currently leaving the ring.">
+ <c:simple-property name="node" readOnly="true"/>
+ </c:list-property>
+ <c:list-property name="LiveNodes" readOnly="true" description="list of live nodes in the cluster, where liveness is determined by the failure detector of the node being queried.">
+ <c:simple-property name="node" readOnly="true"/>
+ </c:list-property>
+ <c:list-property name="JoiningNodes" readOnly="true" description="List of nodes currently joining the ring.">
+ <c:simple-property name="node" readOnly="true"/>
+ </c:list-property>
+ <c:list-property name="LoadMap" readOnly="true" description="Human-readable load values for the cluster.">
+ <c:map-property name="entry" readOnly="true">
+ <c:simple-property name="endpoint" readOnly="true"/>
+ <c:simple-property name="load" readOnly="true"/>
+ </c:map-property>
+ </c:list-property>
+ <c:list-property name="MovingNodes" readOnly="true" description="List of nodes currently moving the ring.">
+ <c:simple-property name="node" readOnly="true"/>
+ </c:list-property>
+ <c:list-property name="Ownership" readOnly="true" description="Mapping of token -> percentage of cluster owned by that token">
+ <c:map-property name="entry" readOnly="true">
+ <c:simple-property name="token" readOnly="true"/>
+ <c:simple-property name="percentage" readOnly="true"/>
+ </c:map-property>
+ </c:list-property>
+ <c:list-property name="TokenToEndpointMap" readOnly="true" description="Token To Endpoint Map">
+ <c:map-property name="entry" readOnly="true">
+ <c:simple-property name="token" readOnly="true"/>
+ <c:simple-property name="endpoint" readOnly="true"/>
+ </c:map-property>
+ </c:list-property>
+ <c:list-property name="UnreachableNodes" readOnly="true" description="List of unreachable nodes in the cluster, as determined by this node's failure detector.">
+ <c:simple-property name="node" readOnly="true"/>
+ </c:list-property>
+ </c:group>
</resource-configuration>
</service>
commit 6b654f03f9dd9fbe83ba50e131e38c722c2d1a1f
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Thu Nov 1 13:11:49 2012 -0500
Add a generic map/set property parser covers cases specific to Cassandra MBeans.
diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ComplexConfigurationResourceComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ComplexConfigurationResourceComponent.java
new file mode 100644
index 0000000..b046d08
--- /dev/null
+++ b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/ComplexConfigurationResourceComponent.java
@@ -0,0 +1,104 @@
+/*
+ * 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.plugins.cassandra;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertyList;
+import org.rhq.core.domain.configuration.PropertyMap;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.core.domain.configuration.definition.PropertyDefinition;
+import org.rhq.core.domain.configuration.definition.PropertyDefinitionList;
+import org.rhq.core.domain.configuration.definition.PropertyDefinitionMap;
+import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple;
+import org.rhq.plugins.jmx.JMXComponent;
+import org.rhq.plugins.jmx.MBeanResourceComponent;
+
+/**
+ * @author Stefan Negrea
+ *
+ */
+public class ComplexConfigurationResourceComponent extends MBeanResourceComponent<JMXComponent<?>> {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public Configuration loadResourceConfiguration() {
+ Configuration configuration = super.loadResourceConfiguration();
+
+ ConfigurationDefinition resourceConfigurationDefinition = this.resourceContext.getResourceType()
+ .getResourceConfigurationDefinition();
+
+ for (PropertyDefinition propertyDefinition : resourceConfigurationDefinition.getPropertyDefinitions().values()) {
+ if (propertyDefinition instanceof PropertyDefinitionList) {
+
+ EmsAttribute attribute = getEmsBean().getAttribute(propertyDefinition.getName());
+
+ if (attribute != null) {
+ Object result = attribute.refresh();
+
+ PropertyList propertyList = new PropertyList(propertyDefinition.getName());
+
+ if (result instanceof Map) {
+ PropertyDefinitionMap propertyDefinitionMap = (PropertyDefinitionMap) ((PropertyDefinitionList) propertyDefinition)
+ .getMemberDefinition();
+ List<PropertyDefinition> subPropertyDefinitions = propertyDefinitionMap.getPropertyDefinitions();
+ String mapName = propertyDefinitionMap.getName();
+ String keyName = ((PropertyDefinitionSimple) subPropertyDefinitions.get(0)).getName();
+ String valueName = ((PropertyDefinitionSimple) subPropertyDefinitions.get(1)).getName();
+
+ Map<Object, Object> mapValue = (Map<Object, Object>) result;
+
+ PropertyMap propertyMap;
+ for (Entry<Object, Object> entry : mapValue.entrySet()) {
+ propertyMap = new PropertyMap(mapName);
+ propertyMap.put(new PropertySimple(keyName, entry.getKey().toString()));
+ propertyMap.put(new PropertySimple(valueName, entry.getValue().toString()));
+
+ propertyList.add(propertyMap);
+ }
+ } else if (result instanceof Set) {
+ String entryName = ((PropertyDefinitionSimple) ((PropertyDefinitionList) propertyDefinition)
+ .getMemberDefinition()).getName();
+
+ Set<Object> setValue = (Set<Object>) result;
+
+ for (Object entry : setValue) {
+ propertyList.add(new PropertySimple(entryName, entry.toString()));
+ }
+ }
+
+ if (propertyList.getList().size() != 0) {
+ configuration.put(propertyList);
+ }
+ }
+ }
+ }
+
+ return configuration;
+ }
+}
diff --git a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/FailureDetectorComponent.java b/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/FailureDetectorComponent.java
deleted file mode 100644
index 38d0149..0000000
--- a/modules/plugins/cassandra/src/main/java/org/rhq/plugins/cassandra/FailureDetectorComponent.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.plugins.cassandra;
-
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.pluginapi.configuration.ConfigurationUpdateReport;
-import org.rhq.plugins.jmx.JMXComponent;
-import org.rhq.plugins.jmx.MBeanResourceComponent;
-
-/**
- * @author Stefan Negrea
- *
- */
-public class FailureDetectorComponent extends MBeanResourceComponent<JMXComponent<?>> {
-
- @Override
- public Configuration loadResourceConfiguration() {
- return super.loadResourceConfiguration();
- }
-
- @Override
- public void updateResourceConfiguration(ConfigurationUpdateReport report) {
- super.updateResourceConfiguration(report);
- }
-}
diff --git a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml
index 73ed5a6..4cfe3e3 100644
--- a/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/cassandra/src/main/resources/META-INF/rhq-plugin.xml
@@ -401,7 +401,7 @@
<service name="FailureDetector"
discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
- class="org.rhq.plugins.cassandra.FailureDetectorComponent"
+ class="org.rhq.plugins.cassandra.ComplexConfigurationResourceComponent"
singleton="true"
subCategory="Network Services">
@@ -467,7 +467,7 @@
<service name="StreamingService"
discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
- class="org.rhq.plugins.jmx.MBeanResourceComponent"
+ class="org.rhq.plugins.cassandra.ComplexConfigurationResourceComponent"
singleton="true"
subCategory="Network Services">
@@ -479,23 +479,17 @@
<resource-configuration>
<c:simple-property name="Status" type="string" required="false" readOnly="true" description="Status"/>
<c:list-property name="StreamDestinations" readOnly="true">
- <c:map-property name="StreamDestination" readOnly="true">
- <c:simple-property name="name" type="string" readOnly="true"/>
- <c:simple-property name="value" type="string" readOnly="true"/>
- </c:map-property>
+ <c:simple-property name="StreamDestination" readOnly="true" type="string"/>
</c:list-property>
<c:list-property name="StreamSources" readOnly="true">
- <c:map-property name="StreamSource" readOnly="true">
- <c:simple-property name="name" type="string" readOnly="true"/>
- <c:simple-property name="value" type="string" readOnly="true"/>
- </c:map-property>
+ <c:simple-property name="StreamSource" readOnly="true" type="string"/>
</c:list-property>
</resource-configuration>
</service>
<service name="MessagingService"
discovery="org.rhq.plugins.jmx.MBeanResourceDiscoveryComponent"
- class="org.rhq.plugins.jmx.MBeanResourceComponent"
+ class="org.rhq.plugins.cassandra.ComplexConfigurationResourceComponent"
singleton="true"
subCategory="Network Services">
11 years, 7 months
- 1
- 0
[rhq] Branch 'rhq-on-as7' - .classpath modules/enterprise pom.xml
by mazz
.classpath | 5
modules/enterprise/server/pom.xml | 1
modules/enterprise/server/startup-subsystem/pom.xml | 123 +++++++
modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupExtension.java | 158 ++++++++++
modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupSubsystemAdd.java | 95 ++++++
modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupSubsystemDefinition.java | 48 +++
modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupSubsystemRemove.java | 62 +++
modules/enterprise/server/startup-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension | 1
modules/enterprise/server/startup-subsystem/src/main/resources/module/main/module.xml | 27 +
modules/enterprise/server/startup-subsystem/src/main/resources/org/rhq/enterprise/startup/LocalDescriptions.properties | 3
modules/enterprise/server/startup-subsystem/src/main/resources/schema/rhq-startup-subsystem.xsd | 25 +
modules/enterprise/server/startup-subsystem/src/main/scripts/module-assembly.xml | 37 ++
modules/enterprise/server/startup-subsystem/src/test/java/org/rhq/enterprise/startup/SubsystemXmlParsingTest.java | 66 ++++
pom.xml | 35 ++
14 files changed, 686 insertions(+)
New commits:
commit 0af8d0ac510656b288089f11415d2d0ff0b00d1e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Nov 1 16:05:57 2012 -0400
introduce a new "startup-subsystem" extension module for AS7. This currently is not used, but will eventually be the mechanism by which the ear will be deployed.
diff --git a/.classpath b/.classpath
index d8ecdc6..1c3a946 100644
--- a/.classpath
+++ b/.classpath
@@ -65,6 +65,8 @@
<classpathentry kind="src" path="modules/enterprise/server/sars/agent-sar/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/server/safe-invoker/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/server/safe-invoker/src/test/java"/>
+ <classpathentry kind="src" path="modules/enterprise/server/startup-subsystem/src/main/java"/>
+ <classpathentry kind="src" path="modules/enterprise/server/startup-subsystem/src/test/java"/>
<classpathentry kind="src" path="modules/enterprise/server/container-lib/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/server/plugins/ant-bundle/src/main/java"/>
<classpathentry kind="src" path="modules/enterprise/server/plugins/filetemplate-bundle/src/main/java"/>
@@ -287,6 +289,9 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-dmr/1.1.1.Final/jboss-dmr-1.1.1.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/as/jboss-as-naming/7.1.1.Final/jboss-as-naming-7.1.1.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/as/jboss-as-server/7.1.1.Final/jboss-as-server-7.1.1.Final.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/staxmapper/1.1.0.Final/staxmapper-1.1.0.Final.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/modules/jboss-modules/1.1.1.GA/jboss-modules-1.1.1.GA.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/as/jboss-as-subsystem-test/7.1.1.Final/jboss-as-subsystem-test-7.1.1.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/as/jboss-as-controller/7.1.1.Final/jboss-as-controller-7.1.1.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/as/jboss-as-controller-client/7.1.1.Final/jboss-as-controller-client-7.1.1.Final.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-links/2.3.2.Final/resteasy-links-2.3.2.Final.jar"/>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index bd3e77b..db001bd 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -30,6 +30,7 @@
<module>sars</module>
<module>plugins</module>
<module>ear</module>
+ <module>startup-subsystem</module>
<module>safe-invoker</module>
<module>client-api</module>
<module>itests</module>
diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml
new file mode 100644
index 0000000..2a5df22
--- /dev/null
+++ b/modules/enterprise/server/startup-subsystem/pom.xml
@@ -0,0 +1,123 @@
+<?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/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-parent</artifactId>
+ <version>4.6.0-SNAPSHOT</version>
+ <relativePath>../../../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>rhq-enterprise-server-startup-subsystem</artifactId>
+
+ <name>RHQ Server Startup AS7 Subsystem</name>
+
+ <properties>
+ <!-- this is used to replace the variable in module.xml -->
+ <moduleName>${project.groupId}.${project.artifactId}</moduleName>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-ear</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server-ear</artifactId>
+ <type>ear</type>
+ <destFileName>rhq.ear</destFileName>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/deployments</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/scripts/module-assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>module-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.modules</groupId>
+ <artifactId>jboss-modules</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-controller</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>staxmapper</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-ee</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- our startup subsystem will be deploying this -->
+ <dependency>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-enterprise-server-ear</artifactId>
+ <version>${project.version}</version>
+ <type>ear</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- test deps -->
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-subsystem-test</artifactId>
+ <version>${jboss.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupExtension.java b/modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupExtension.java
new file mode 100644
index 0000000..5354e7e
--- /dev/null
+++ b/modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupExtension.java
@@ -0,0 +1,158 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 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.startup;
+
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DESCRIBE;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM;
+
+import java.util.List;
+
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+
+import org.jboss.as.controller.Extension;
+import org.jboss.as.controller.ExtensionContext;
+import org.jboss.as.controller.PathElement;
+import org.jboss.as.controller.SubsystemRegistration;
+import org.jboss.as.controller.descriptions.StandardResourceDescriptionResolver;
+import org.jboss.as.controller.operations.common.GenericSubsystemDescribeHandler;
+import org.jboss.as.controller.parsing.ExtensionParsingContext;
+import org.jboss.as.controller.parsing.ParseUtils;
+import org.jboss.as.controller.persistence.SubsystemMarshallingContext;
+import org.jboss.as.controller.registry.ManagementResourceRegistration;
+import org.jboss.as.controller.registry.OperationEntry;
+import org.jboss.dmr.ModelNode;
+import org.jboss.staxmapper.XMLElementReader;
+import org.jboss.staxmapper.XMLElementWriter;
+import org.jboss.staxmapper.XMLExtendedStreamReader;
+import org.jboss.staxmapper.XMLExtendedStreamWriter;
+
+/**
+ * A JBoss AS7 subsystem extension that starts up the RHQ deployment applications.
+ *
+ * @author Ian Springer
+ * @author John Mazzitelli
+ */
+
+public class StartupExtension implements Extension {
+
+ // The namespace used for the subsystem XML element
+ public static final String NAMESPACE = "urn:org.rhq:startup:1.0";
+ // The name of our subsystem within the model
+ public static final String SUBSYSTEM_NAME = "rhq-startup";
+ // The path of our subsystem within the model
+ static final PathElement SUBSYSTEM_PATH = PathElement.pathElement(SUBSYSTEM, SUBSYSTEM_NAME);
+
+ // the deployments we are managing
+ static final String DEPLOYMENT_APP_EAR = "rhq.ear";
+
+ // our management API version
+ private static final int API_MAJOR_VERSION = 1;
+ private static final int API_MINOR_VERSION = 0;
+
+ // location in the classloader of the description messages
+ private static final String RESOURCE_NAME = StartupExtension.class.getPackage().getName() + ".LocalDescriptions";
+
+ // used to read and write the XML of our subsystem config
+ private static final StartupSubsystemParser parser = new StartupSubsystemParser();
+
+ static StandardResourceDescriptionResolver getResourceDescriptionResolver(final String... keyPrefix) {
+ StringBuilder prefix = new StringBuilder(SUBSYSTEM_NAME);
+ for (String kp : keyPrefix) {
+ prefix.append('.').append(kp);
+ }
+ return new StandardResourceDescriptionResolver(prefix.toString(), RESOURCE_NAME,
+ StartupExtension.class.getClassLoader(), true, false);
+ }
+
+ @Override
+ public void initializeParsers(ExtensionParsingContext context) {
+ context.setSubsystemXmlMapping(SUBSYSTEM_NAME, NAMESPACE, parser);
+ }
+
+ @Override
+ public void initialize(ExtensionContext context) {
+ // register subsystem with its model version
+ final SubsystemRegistration subsystem;
+ subsystem = context.registerSubsystem(SUBSYSTEM_NAME, API_MAJOR_VERSION, API_MINOR_VERSION);
+
+ // register subsystem model with subsystem definition that defines all attributes and operations
+ final ManagementResourceRegistration registration;
+ registration = subsystem.registerSubsystemModel(StartupSubsystemDefinition.INSTANCE);
+
+ // register describe operation
+ registration.registerOperationHandler(DESCRIBE, GenericSubsystemDescribeHandler.INSTANCE,
+ GenericSubsystemDescribeHandler.INSTANCE, false, OperationEntry.EntryType.PRIVATE);
+
+ // register the object that persists our subsystem XML config
+ subsystem.registerXMLElementWriter(parser);
+ }
+
+ /**
+ * The subsystem reader/writer, which uses STAX to read and write the subsystem XML.
+ */
+ private static class StartupSubsystemParser implements XMLStreamConstants, XMLElementReader<List<ModelNode>>,
+ XMLElementWriter<SubsystemMarshallingContext> {
+
+ @Override
+ public void readElement(XMLExtendedStreamReader reader, List<ModelNode> list) throws XMLStreamException {
+ // Parse the 'subsystem' element...
+ ParseUtils.requireNoAttributes(reader);
+
+ // (I think we are required to add this)
+ list.add(createAddSubsystemOperation());
+
+ // // Read the child elements
+ // while (reader.hasNext() && reader.nextTag() != END_ELEMENT) {
+ // if (reader.getLocalName().equals("some-xml-element-name")) {
+ // status = reader.getElementText();
+ // } else {
+ // throw ParseUtils.unexpectedElement(reader);
+ // }
+ // }
+ ParseUtils.requireNoContent(reader);
+
+ return;
+ }
+
+ private static ModelNode createAddSubsystemOperation() {
+ final ModelNode subsystem = new ModelNode();
+ subsystem.get(OP).set(ADD);
+ subsystem.get(OP_ADDR).add(SUBSYSTEM, SUBSYSTEM_NAME);
+ return subsystem;
+ }
+
+ @Override
+ public void writeContent(XMLExtendedStreamWriter writer, SubsystemMarshallingContext context) throws XMLStreamException {
+ //TODO seems to be a problem with empty elements
+ //context.startSubsystemElement(StartupExtension.NAMESPACE, true); // <subsystem/>
+ context.startSubsystemElement(StartupExtension.NAMESPACE, false); // <subsystem>
+
+ // writer.writeStartElement("some-xml-element-name"); // <xml-element-name>
+ // writer.writeCharacters(something);
+ // writer.writeEndElement(); // </xml-element-name>
+
+ writer.writeEndElement(); // </subsystem>
+ }
+ }
+
+}
diff --git a/modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupSubsystemAdd.java b/modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupSubsystemAdd.java
new file mode 100644
index 0000000..c3f28ed
--- /dev/null
+++ b/modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupSubsystemAdd.java
@@ -0,0 +1,95 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 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.startup;
+
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ADD;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.CONTENT;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEPLOYMENT;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ENABLED;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.PERSISTENT;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.URL;
+
+import java.net.URL;
+
+import org.jboss.as.controller.AbstractAddStepHandler;
+import org.jboss.as.controller.OperationContext;
+import org.jboss.as.controller.OperationFailedException;
+import org.jboss.as.controller.OperationStepHandler;
+import org.jboss.as.controller.PathAddress;
+import org.jboss.as.controller.PathElement;
+import org.jboss.as.controller.operations.common.Util;
+import org.jboss.as.controller.registry.ImmutableManagementResourceRegistration;
+import org.jboss.as.controller.registry.Resource;
+import org.jboss.dmr.ModelNode;
+import org.jboss.modules.Module;
+
+/**
+ * Handler responsible for adding the subsystem resource to the model
+ *
+ * @author John Mazzitelli
+ */
+class StartupSubsystemAdd extends AbstractAddStepHandler {
+
+ static final StartupSubsystemAdd INSTANCE = new StartupSubsystemAdd();
+
+ @Override
+ protected void populateModel(OperationContext context, ModelNode operation, Resource resource)
+ throws OperationFailedException {
+
+ try {
+ if (requiresRuntime(context)) { // only add the step if we are going to actually deploy the ear
+ PathAddress deploymentAddress = PathAddress.pathAddress(PathElement.pathElement(DEPLOYMENT,
+ StartupExtension.DEPLOYMENT_APP_EAR));
+ ModelNode op = Util.getEmptyOperation(ADD, deploymentAddress.toModelNode());
+ op.get(ENABLED).set(true);
+ op.get(PERSISTENT).set(false); // prevents writing this deployment out to standalone.xml
+
+ Module module = Module.forClass(getClass());
+
+ URL url = module.getExportedResource(StartupExtension.DEPLOYMENT_APP_EAR);
+ String urlString = url.toExternalForm();
+
+ ModelNode contentItem = new ModelNode();
+ contentItem.get(URL).set(urlString);
+
+ op.get(CONTENT).add(contentItem);
+
+ ImmutableManagementResourceRegistration rootResourceRegistration;
+ rootResourceRegistration = context.getRootResourceRegistration();
+ OperationStepHandler handler = rootResourceRegistration.getOperationHandler(deploymentAddress, ADD);
+
+ context.addStep(op, handler, OperationContext.Stage.MODEL);
+ return;
+ }
+ } catch (Exception e) {
+ throw new OperationFailedException("The RHQ EAR failed to be deployed", e);
+ }
+ }
+
+ @Override
+ protected void populateModel(ModelNode operation, ModelNode model) throws OperationFailedException {
+ // We overrode the code that calls this method
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ protected boolean requiresRuntimeVerification() {
+ return false;
+ }
+}
diff --git a/modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupSubsystemDefinition.java b/modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupSubsystemDefinition.java
new file mode 100644
index 0000000..392fea2
--- /dev/null
+++ b/modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupSubsystemDefinition.java
@@ -0,0 +1,48 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 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.startup;
+
+import org.jboss.as.controller.SimpleResourceDefinition;
+import org.jboss.as.controller.registry.ManagementResourceRegistration;
+
+/**
+ * Definition of the rhq-startup resource.
+ *
+ * @author Ian Springer
+ * @author John Mazzitelli
+ */
+public class StartupSubsystemDefinition extends SimpleResourceDefinition {
+
+ public static final StartupSubsystemDefinition INSTANCE = new StartupSubsystemDefinition();
+
+ private StartupSubsystemDefinition() {
+ super(StartupExtension.SUBSYSTEM_PATH, StartupExtension.getResourceDescriptionResolver(),
+ StartupSubsystemAdd.INSTANCE, StartupSubsystemRemove.INSTANCE);
+ }
+
+ @Override
+ public void registerOperations(ManagementResourceRegistration resourceRegistration) {
+ super.registerOperations(resourceRegistration);
+ }
+
+ @Override
+ public void registerAttributes(ManagementResourceRegistration resourceRegistration) {
+ super.registerAttributes(resourceRegistration);
+ }
+}
diff --git a/modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupSubsystemRemove.java b/modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupSubsystemRemove.java
new file mode 100644
index 0000000..2595547
--- /dev/null
+++ b/modules/enterprise/server/startup-subsystem/src/main/java/org/rhq/enterprise/startup/StartupSubsystemRemove.java
@@ -0,0 +1,62 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 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.startup;
+
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.DEPLOYMENT;
+import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.REMOVE;
+
+import org.jboss.as.controller.AbstractRemoveStepHandler;
+import org.jboss.as.controller.OperationContext;
+import org.jboss.as.controller.OperationFailedException;
+import org.jboss.as.controller.OperationStepHandler;
+import org.jboss.as.controller.PathAddress;
+import org.jboss.as.controller.PathElement;
+import org.jboss.as.controller.operations.common.Util;
+import org.jboss.as.controller.registry.ImmutableManagementResourceRegistration;
+import org.jboss.dmr.ModelNode;
+
+/**
+ * Handler responsible for removing the deployments.
+ *
+ * @author John Mazzitelli
+ */
+class StartupSubsystemRemove extends AbstractRemoveStepHandler {
+
+ static final StartupSubsystemRemove INSTANCE = new StartupSubsystemRemove();
+
+ private StartupSubsystemRemove() {
+ }
+
+ @Override
+ protected void performRemove(OperationContext context, ModelNode operation, ModelNode model)
+ throws OperationFailedException {
+
+ // Add a step to remove the the deployments
+ if (requiresRuntime(context)) { // only add the step if we are going to actually undeploy the ear
+ PathAddress deploymentAddress = PathAddress.pathAddress(PathElement.pathElement(DEPLOYMENT,
+ StartupExtension.DEPLOYMENT_APP_EAR));
+ ModelNode op = Util.getEmptyOperation(REMOVE, deploymentAddress.toModelNode());
+ ImmutableManagementResourceRegistration rootResourceRegistration = context.getRootResourceRegistration();
+ OperationStepHandler handler = rootResourceRegistration.getOperationHandler(deploymentAddress, REMOVE);
+ context.addStep(op, handler, OperationContext.Stage.MODEL);
+ }
+ super.performRemove(context, operation, model);
+ }
+
+}
diff --git a/modules/enterprise/server/startup-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension b/modules/enterprise/server/startup-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension
new file mode 100644
index 0000000..9254be7
--- /dev/null
+++ b/modules/enterprise/server/startup-subsystem/src/main/resources/META-INF/services/org.jboss.as.controller.Extension
@@ -0,0 +1 @@
+org.rhq.enterprise.startup.StartupExtension
\ No newline at end of file
diff --git a/modules/enterprise/server/startup-subsystem/src/main/resources/module/main/module.xml b/modules/enterprise/server/startup-subsystem/src/main/resources/module/main/module.xml
new file mode 100644
index 0000000..307029d
--- /dev/null
+++ b/modules/enterprise/server/startup-subsystem/src/main/resources/module/main/module.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<module xmlns="urn:jboss:module:1.0" name="${moduleName}">
+
+ <resources>
+ <resource-root path="${project.build.finalName}.jar"/>
+ <resource-root path="deployments"/>
+ </resources>
+
+ <dependencies>
+ <!-- modules required by any subsystem -->
+ <module name="javax.api"/>
+ <module name="org.jboss.staxmapper"/>
+ <module name="org.jboss.as.controller"/>
+ <module name="org.jboss.as.server"/>
+ <module name="org.jboss.modules"/>
+ <module name="org.jboss.msc"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.jboss.vfs"/>
+
+ <!-- additional modules that this subsystem depends on -->
+ <module name="org.jboss.metadata"/>
+ <module name="org.jboss.as.ee"/>
+ <module name="org.jboss.as.web"/>
+ </dependencies>
+
+</module>
diff --git a/modules/enterprise/server/startup-subsystem/src/main/resources/org/rhq/enterprise/startup/LocalDescriptions.properties b/modules/enterprise/server/startup-subsystem/src/main/resources/org/rhq/enterprise/startup/LocalDescriptions.properties
new file mode 100644
index 0000000..b9179ba
--- /dev/null
+++ b/modules/enterprise/server/startup-subsystem/src/main/resources/org/rhq/enterprise/startup/LocalDescriptions.properties
@@ -0,0 +1,3 @@
+rhq-startup=RHQ Startup Subsystem
+rhq-startup.add=Operation Adds subsystem
+rhq-startup.remove=Operation Removes subsystem
diff --git a/modules/enterprise/server/startup-subsystem/src/main/resources/schema/rhq-startup-subsystem.xsd b/modules/enterprise/server/startup-subsystem/src/main/resources/schema/rhq-startup-subsystem.xsd
new file mode 100644
index 0000000..d067aca
--- /dev/null
+++ b/modules/enterprise/server/startup-subsystem/src/main/resources/schema/rhq-startup-subsystem.xsd
@@ -0,0 +1,25 @@
+<xsd:schema
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="urn:org.rhq:startup:1.0"
+ xmlns="urn:org.rhq:startup:1.0"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.0">
+
+ <!-- The subsystem root element -->
+ <xsd:element name="subsystem" type="subsystemType"/>
+
+ <xsd:complexType name="subsystemType">
+ <!--
+ <xsd:sequence>
+ <xsd:element name="status" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Indicates the status of the deployment.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ -->
+ </xsd:complexType>
+</xsd:schema>
diff --git a/modules/enterprise/server/startup-subsystem/src/main/scripts/module-assembly.xml b/modules/enterprise/server/startup-subsystem/src/main/scripts/module-assembly.xml
new file mode 100644
index 0000000..cca4581
--- /dev/null
+++ b/modules/enterprise/server/startup-subsystem/src/main/scripts/module-assembly.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<assembly>
+ <id>module-assembly</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <baseDirectory>${project.build.finalName}-module</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}/module</directory>
+ <outputDirectory>/org/rhq/${artifactId}</outputDirectory>
+ <includes>
+ <include>main/module.xml</include>
+ </includes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <outputDirectory>/org/rhq/${artifactId}/main</outputDirectory>
+ <includes>
+ <include>${project.build.finalName}.jar</include>
+ </includes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/deployments</directory>
+ <outputDirectory>/org/rhq/${artifactId}/main/deployments</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ </fileSets>
+</assembly>
+
diff --git a/modules/enterprise/server/startup-subsystem/src/test/java/org/rhq/enterprise/startup/SubsystemXmlParsingTest.java b/modules/enterprise/server/startup-subsystem/src/test/java/org/rhq/enterprise/startup/SubsystemXmlParsingTest.java
new file mode 100644
index 0000000..497810e
--- /dev/null
+++ b/modules/enterprise/server/startup-subsystem/src/test/java/org/rhq/enterprise/startup/SubsystemXmlParsingTest.java
@@ -0,0 +1,66 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 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.startup;
+
+import java.io.IOException;
+
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import org.jboss.as.subsystem.test.AbstractSubsystemBaseTest;
+
+/**
+ * Test for parsing of the subsystem XML.
+ *
+ * @author Ian Springer
+ * @author John Mazzitelli
+ */
+@Test(enabled = false)
+// TODO: can't get the XML test to pass, but I can't see why it fails
+public class SubsystemXmlParsingTest extends AbstractSubsystemBaseTest {
+
+ public SubsystemXmlParsingTest() {
+ super(StartupExtension.SUBSYSTEM_NAME, new StartupExtension());
+ }
+
+ @Override
+ @BeforeTest
+ public void initializeParser() throws Exception {
+ super.initializeParser();
+ }
+
+ @Override
+ public void testSubsystem() throws Exception {
+ super.testSubsystem();
+ }
+
+ @Override
+ @AfterTest
+ public void cleanup() throws Exception {
+ super.cleanup();
+ }
+
+ @Override
+ protected String getSubsystemXml() throws IOException {
+ return "<subsystem xmlns=\"" + StartupExtension.NAMESPACE + "\">" //
+ + "</subsystem>";
+ }
+
+}
diff --git a/pom.xml b/pom.xml
index 7b33a1a..627dc57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,6 +91,9 @@
<jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version>
<picketbox.version>4.0.7.Final</picketbox.version>
<resteasy.version>2.3.2.Final</resteasy.version>
+ <jboss-staxmapper.version>1.1.0.Final</jboss-staxmapper.version>
+ <jboss-modules.version>1.1.1.GA</jboss-modules.version>
+ <jboss-dmr.version>1.1.1.Final</jboss-dmr.version>
<!-- Not Provided - some of these are needed by the agent -->
<jboss-annotations.version>4.2.3.GA</jboss-annotations.version>
@@ -326,6 +329,32 @@
<version>${jboss-jts.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.modules</groupId>
+ <artifactId>jboss-modules</artifactId>
+ <version>${jboss-modules.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-dmr</artifactId>
+ <version>${jboss-dmr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-controller</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-ee</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+
<!-- see BZ-820629 and CVE-2009-2625 for why this is needed -->
<dependency>
<groupId>xerces</groupId>
@@ -545,6 +574,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>staxmapper</artifactId>
+ <version>${jboss-staxmapper.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.picketbox</groupId>
<artifactId>picketbox</artifactId>
<version>${picketbox.version}</version>
11 years, 7 months
- 1
- 0