modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 205 +++++
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java | 402 +++++++++-
2 files changed, 605 insertions(+), 2 deletions(-)
New commits:
commit a6ddf5dc69904e8b6876ab8365397737a8a964e8
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Oct 9 12:57:12 2012 -0400
Porting code from github repo for calculating aggregates
This commit is a port of code from the https://github.com/jsanda/rhq-metrics-plugins
repo. It adds the calculateAggregates method to MetricsServer along with
accompanying tests. I am currently seeing a failure in
MetricsServerTest.calculateAggregatesForOneScheduleWhenDBIsEmpty.
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 b2a990e..1fd0e26 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,9 @@ import java.util.Set;
import java.util.TreeMap;
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.measurement.MeasurementDataNumeric;
@@ -38,6 +41,7 @@ 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;
import me.prettyprint.hector.api.beans.Composite;
@@ -45,6 +49,7 @@ 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;
/**
* @author John Sanda
@@ -176,6 +181,181 @@ public class MetricsServer {
updateMetricsQueue(oneHourMetricsDataCF, updates);
}
+ 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);
+ }
+
+ private Map<Integer, DateTime> aggregateRawData() {
+ 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(metricsQueueCF);
+ 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, metricsQueueCF, queueColumn.getName(),
+ CompositeSerializer.get());
+ }
+ mutator.execute();
+ queueMutator.execute();
+
+ 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(metricsQueueCF);
+ 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;
+
+ 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, metricsQueueCF, queueColumn.getName(), CompositeSerializer.get());
+ }
+ mutator.execute();
+ queueMutator.execute();
+
+ return updatedSchedules;
+ }
+
// public void addTraitData(Set<MeasurementDataTrait> dataSet) {
// Mutator<Integer> mutator = HFactory.createMutator(keyspace, IntegerSerializer.get());
// Mutator<Integer> indexMutator = HFactory.createMutator(keyspace, IntegerSerializer.get());
@@ -221,4 +401,29 @@ public class MetricsServer {
return mutator.execute();
}
+ protected DateTime getCurrentHour() {
+ DateTime now = new DateTime();
+ return now.hourOfDay().roundFloorCopy();
+ }
+
+ private HColumn<Composite, Double> createAvgColumn(DateTime timestamp, double value, int ttl) {
+ return createAggregateColumn(AggregateType.AVG, timestamp, value, ttl);
+ }
+
+ private HColumn<Composite, Double> createMaxColumn(DateTime timestamp, double value, int ttl) {
+ return createAggregateColumn(AggregateType.MAX, timestamp, value, ttl);
+ }
+
+ private HColumn<Composite, Double> createMinColumn(DateTime timestamp, double value, int ttl) {
+ return createAggregateColumn(AggregateType.MIN, timestamp, value, ttl);
+ }
+
+ private HColumn<Composite, Double> createAggregateColumn(AggregateType type, DateTime timestamp, double value,
+ int ttl) {
+ Composite composite = new Composite();
+ composite.addComponent(timestamp.getMillis(), LongSerializer.get());
+ composite.addComponent(type.ordinal(), IntegerSerializer.get());
+ return HFactory.createColumn(composite, value, ttl, CompositeSerializer.get(), DoubleSerializer.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 5dbb629..ece1dee 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
@@ -26,6 +26,10 @@
package org.rhq.server.metrics;
import static java.util.Arrays.asList;
+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.test.AssertUtils.assertPropertiesMatch;
import static org.testng.Assert.assertEquals;
@@ -35,8 +39,14 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+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.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -92,10 +102,26 @@ public class MetricsServerTest {
private final String RESOURCE_TRAITS_CF = "resource_traits";
- private MetricsServer metricsServer;
+ private MetricsServerStub metricsServer;
private Keyspace keyspace;
+ private static class MetricsServerStub extends MetricsServer {
+ private DateTime currentHour;
+
+ public void setCurrentHour(DateTime currentHour) {
+ this.currentHour = currentHour;
+ }
+
+ @Override
+ protected DateTime getCurrentHour() {
+ if (currentHour == null) {
+ return super.getCurrentHour();
+ }
+ return currentHour;
+ }
+ }
+
@BeforeClass
public void deployCluster() throws CassandraException {
File basedir = new File("target");
@@ -123,7 +149,7 @@ public class MetricsServerTest {
Cluster cluster = HFactory.getOrCreateCluster("rhq", "127.0.0.1:9160");
keyspace = HFactory.createKeyspace("rhq", cluster);
- metricsServer = new MetricsServer();
+ metricsServer = new MetricsServerStub();
metricsServer.setCluster(cluster);
metricsServer.setKeyspace(keyspace);
metricsServer.setRawMetricsDataCF(RAW_METRIC_DATA_CF);
@@ -211,10 +237,275 @@ public class MetricsServerTest {
IntegerSerializer.get())));
}
+ @Test
+ public void calculateAggregatesForOneScheduleWhenDBIsEmpty() {
+ int scheduleId = 123;
+
+ DateTime now = new DateTime();
+ DateTime lastHour = now.hourOfDay().roundFloorCopy().minusHours(1);
+ DateTime firstMetricTime = lastHour.plusMinutes(5);
+ DateTime secondMetricTime = lastHour.plusMinutes(10);
+ DateTime thirdMetricTime = lastHour.plusMinutes(15);
+
+ String scheduleName = getClass().getName() + "_SCHEDULE";
+ long interval = MINUTE * 15;
+ 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(firstMetricTime.getMillis(), request, 3.2));
+ data.add(new MeasurementDataNumeric(secondMetricTime.getMillis(), request, 3.9));
+ data.add(new MeasurementDataNumeric(thirdMetricTime.getMillis(), request, 2.6));
+
+ metricsServer.addNumericData(data);
+ metricsServer.calculateAggregates();
+
+ // 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);
+
+ // verify six hour metric data is calculated
+ List<HColumn<Composite, Double>> expected6HourData = expected1HourData;
+
+ assert6HourDataEquals(scheduleId, expected6HourData);
+ }
+
+ @Test
+ public void aggregateRawDataDuring9thHour() {
+ int scheduleId = 123;
+
+ DateTime now = new DateTime();
+ DateTime hour0 = now.hourOfDay().roundFloorCopy().minusHours(now.hourOfDay().get());
+ DateTime hour9 = hour0.plusHours(9);
+ DateTime hour8 = hour9.minusHours(1);
+
+ DateTime firstMetricTime = hour8.plusMinutes(5);
+ DateTime secondMetricTime = hour8.plusMinutes(10);
+ DateTime thirdMetricTime = hour8.plusMinutes(15);
+
+ double firstValue = 1.1;
+ double secondValue = 2.2;
+ double thirdValue = 3.3;
+
+ // insert raw data to be aggregated
+ Mutator<Integer> rawMetricsMutator = HFactory.createMutator(keyspace, IntegerSerializer.get());
+ rawMetricsMutator.addInsertion(scheduleId, RAW_METRIC_DATA_CF, createRawDataColumn(firstMetricTime,
+ firstValue));
+ rawMetricsMutator.addInsertion(scheduleId, RAW_METRIC_DATA_CF,
+ createRawDataColumn(secondMetricTime, secondValue));
+ rawMetricsMutator.addInsertion(scheduleId, RAW_METRIC_DATA_CF, createRawDataColumn(thirdMetricTime,
+ thirdValue));
+
+ rawMetricsMutator.execute();
+
+ // update the one hour queue
+ Mutator<String> queueMutator = HFactory.createMutator(keyspace, StringSerializer.get());
+ Composite key = createQueueColumnName(hour8, scheduleId);
+ HColumn<Composite, Integer> oneHourQueueColumn = HFactory.createColumn(key, 0, CompositeSerializer.get(),
+ IntegerSerializer.get());
+ queueMutator.addInsertion(ONE_HOUR_METRIC_DATA_CF, METRICS_WORK_QUEUE_CF, oneHourQueueColumn);
+
+ queueMutator.execute();
+
+ metricsServer.setCurrentHour(hour9);
+ metricsServer.calculateAggregates();
+
+ // verify that the 1 hour aggregates are calculated
+
+ assert1HourDataEquals(scheduleId, asList(
+ create1HourColumn(hour8, AggregateType.MAX, thirdValue),
+ create1HourColumn(hour8, AggregateType.MIN, firstValue),
+ create1HourColumn(hour8, AggregateType.AVG, (firstValue + secondValue + thirdValue) / 3)
+ ));
+
+ Chronology chronology = GregorianChronology.getInstance();
+ DateTimeField hourField = chronology.hourOfDay();
+ DividedDateTimeField dividedField = new DividedDateTimeField(hourField, DateTimeFieldType.clockhourOfDay(), 6);
+ long timestamp = dividedField.roundFloor(hour9.getMillis());
+ DateTime sixHourSlice = new DateTime(timestamp);
+
+ // verify that the 6 hour queue is updated
+ assert6HourMetricsQueueEquals(asList(HFactory.createColumn(createQueueColumnName(sixHourSlice, scheduleId), 0,
+ CompositeSerializer.get(), IntegerSerializer.get())));
+
+ // The 6 hour data should not get aggregated since the current 6 hour time slice
+ // has not passed yet. More specifically, the aggregation job is running at 09:00
+ // which means that the current 6 hour slice is from 06:00 to 12:00.
+ assert6HourDataEmpty(scheduleId);
+
+ // verify that the 24 hour queue is empty
+ assert24HourMetricsQueueEmpty(scheduleId);
+
+ // verify that the 1 hour queue has been purged
+ assert1HourMetricsQueueEmpty(scheduleId);
+ }
+
+ @Test
+ public void aggregate1HourDataDuring12thHour() {
+ // set up the test fixture
+ int scheduleId = 123;
+
+ DateTime now = new DateTime();
+ DateTime hour0 = now.hourOfDay().roundFloorCopy().minusHours(now.hourOfDay().get());
+ DateTime hour12 = hour0.plusHours(12);
+ DateTime hour6 = hour0.plusHours(6);
+ DateTime hour7 = hour0.plusHours(7);
+ DateTime hour8 = hour0.plusHours(8);
+
+ double min1 = 1.1;
+ double avg1 = 2.2;
+ //double max1 = 3.3;
+ double max1 = 9.9;
+
+ double min2 = 4.4;
+ double avg2 = 5.5;
+ double max2 = 6.6;
+
+ // insert one hour data to be aggregated
+ Mutator<Integer> oneHourMutator = HFactory.createMutator(keyspace, IntegerSerializer.get());
+ oneHourMutator.addInsertion(scheduleId, ONE_HOUR_METRIC_DATA_CF, create1HourColumn(hour7, AggregateType.MAX,
+ max1));
+ oneHourMutator.addInsertion(scheduleId, ONE_HOUR_METRIC_DATA_CF, create1HourColumn(hour7, AggregateType.MIN,
+ min1));
+ oneHourMutator.addInsertion(scheduleId, ONE_HOUR_METRIC_DATA_CF, create1HourColumn(hour7, AggregateType.AVG,
+ avg1));
+ oneHourMutator.addInsertion(scheduleId, ONE_HOUR_METRIC_DATA_CF, create1HourColumn(hour8, AggregateType.MAX,
+ max2));
+ oneHourMutator.addInsertion(scheduleId, ONE_HOUR_METRIC_DATA_CF, create1HourColumn(hour8, AggregateType.MIN,
+ min2));
+ oneHourMutator.addInsertion(scheduleId, ONE_HOUR_METRIC_DATA_CF, create1HourColumn(hour8, AggregateType.AVG,
+ avg2));
+ oneHourMutator.execute();
+
+ // update the 6 hour queue
+ Mutator<String> queueMutator = HFactory.createMutator(keyspace, StringSerializer.get());
+ Composite key = createQueueColumnName(hour6, scheduleId);
+ HColumn<Composite, Integer> sixHourQueueColumn = HFactory.createColumn(key, 0, CompositeSerializer.get(),
+ IntegerSerializer.get());
+ queueMutator.addInsertion(SIX_HOUR_METRIC_DATA_CF, METRICS_WORK_QUEUE_CF, sixHourQueueColumn);
+
+ queueMutator.execute();
+
+ // execute the system under test
+ metricsServer.setCurrentHour(hour12);
+ metricsServer.calculateAggregates();
+
+ // verify the results
+ // verify that the one hour data has been aggregated
+ assert6HourDataEquals(scheduleId, asList(
+ create6HourColumn(hour6, AggregateType.MAX, max1),
+ create6HourColumn(hour6, AggregateType.MIN, min1),
+ create6HourColumn(hour6, AggregateType.AVG, (avg1 + avg2) / 2)
+ ));
+
+ // verify that the 6 hour queue has been updated
+ assert6HourMetricsQueueEmpty(scheduleId);
+
+ // verify that the 24 hour queue is updated
+ assert24HourMetricsQueueEquals(asList(HFactory.createColumn(createQueueColumnName(hour0, scheduleId), 0,
+ CompositeSerializer.get(), IntegerSerializer.get())));
+
+ // verify that 6 hour data is not rolled up into the 24 hour bucket
+ assert24HourDataEmpty(scheduleId);
+ }
+
+ @Test
+ public void aggregate6HourDataDuring24thHour() {
+ // set up the test fixture
+ int scheduleId = 123;
+
+ DateTime now = new DateTime();
+ DateTime hour0 = now.hourOfDay().roundFloorCopy().minusHours(now.hourOfDay().get());
+ DateTime hour12 = hour0.plusHours(12);
+ DateTime hour6 = hour0.plusHours(6);
+ DateTime hour24 = hour0.plusHours(24);
+
+ double min1 = 1.1;
+ double avg1 = 2.2;
+ double max1 = 3.3;
+
+ double min2 = 4.4;
+ double avg2 = 5.5;
+ double max2 = 6.6;
+
+ // insert 6 hour data to be aggregated
+ Mutator<Integer> sixHourMutator = HFactory.createMutator(keyspace, IntegerSerializer.get());
+ sixHourMutator.addInsertion(scheduleId, SIX_HOUR_METRIC_DATA_CF, create6HourColumn(hour6, AggregateType.MAX,
+ max1));
+ sixHourMutator.addInsertion(scheduleId, SIX_HOUR_METRIC_DATA_CF, create6HourColumn(hour6, AggregateType.MIN,
+ min1));
+ sixHourMutator.addInsertion(scheduleId, SIX_HOUR_METRIC_DATA_CF, create6HourColumn(hour6, AggregateType.AVG,
+ avg1));
+ sixHourMutator.addInsertion(scheduleId, SIX_HOUR_METRIC_DATA_CF, create6HourColumn(hour12, AggregateType.MAX,
+ max2));
+ sixHourMutator.addInsertion(scheduleId, SIX_HOUR_METRIC_DATA_CF, create6HourColumn(hour12, AggregateType.MIN,
+ min2));
+ sixHourMutator.addInsertion(scheduleId, SIX_HOUR_METRIC_DATA_CF, create6HourColumn(hour12, AggregateType.AVG,
+ avg2));
+ sixHourMutator.execute();
+
+ // update the 24 queue
+ Mutator<String> queueMutator = HFactory.createMutator(keyspace, StringSerializer.get());
+ Composite key = createQueueColumnName(hour0, scheduleId);
+ HColumn<Composite, Integer> twentyFourHourQueueColumn = HFactory.createColumn(key, 0, CompositeSerializer.get(),
+ IntegerSerializer.get());
+ queueMutator.addInsertion(TWENTY_FOUR_HOUR_METRIC_DATA_CF, METRICS_WORK_QUEUE_CF, twentyFourHourQueueColumn);
+
+ queueMutator.execute();
+
+ // execute the system under test
+ metricsServer.setCurrentHour(hour24);
+ metricsServer.calculateAggregates();
+
+ // verify the results
+ // verify that the 6 hour data is aggregated
+ assert24HourDataEquals(scheduleId, asList(
+ create24HourColumn(hour0, AggregateType.MAX, max2),
+ create24HourColumn(hour0, AggregateType.MIN, min1),
+ create24HourColumn(hour0, AggregateType.AVG, (avg1 + avg2) / 2)
+ ));
+
+ // verify that the 24 hour queue is updated
+ assert24HourMetricsQueueEmpty(scheduleId);
+ }
+
+ private HColumn<Long, Double> createRawDataColumn(DateTime timestamp, double value) {
+ return HFactory.createColumn(timestamp.getMillis(), value, SEVEN_DAYS, LongSerializer.get(),
+ DoubleSerializer.get());
+ }
+
+ private Composite createQueueColumnName(DateTime dateTime, int scheduleId) {
+ Composite composite = new Composite();
+ composite.addComponent(dateTime.getMillis(), LongSerializer.get());
+ composite.addComponent(scheduleId, IntegerSerializer.get());
+
+ return composite;
+ }
+
private void assert1HourMetricsQueueEquals(List<HColumn<Composite, Integer>> expected) {
assertMetricsQueueEquals(ONE_HOUR_METRIC_DATA_CF, expected);
}
+ private void assert6HourMetricsQueueEquals(List<HColumn<Composite, Integer>> expected) {
+ assertMetricsQueueEquals(SIX_HOUR_METRIC_DATA_CF, expected);
+ }
+
+ private void assert24HourMetricsQueueEquals(List<HColumn<Composite, Integer>> expected) {
+ assertMetricsQueueEquals(TWENTY_FOUR_HOUR_METRIC_DATA_CF, expected);
+ }
+
private void assertMetricsQueueEquals(String columnFamily, List<HColumn<Composite, Integer>> expected) {
SliceQuery<String,Composite, Integer> sliceQuery = HFactory.createSliceQuery(keyspace, StringSerializer.get(),
new CompositeSerializer().get(), IntegerSerializer.get());
@@ -244,6 +535,14 @@ public class MetricsServerTest {
assertMetricDataEquals(scheduleId, ONE_HOUR_METRIC_DATA_CF, expected);
}
+ private void assert6HourDataEquals(int scheduleId, List<HColumn<Composite, Double>> expected) {
+ assertMetricDataEquals(scheduleId, SIX_HOUR_METRIC_DATA_CF, expected);
+ }
+
+ private void assert24HourDataEquals(int scheduleId, List<HColumn<Composite, Double>> expected) {
+ assertMetricDataEquals(scheduleId, TWENTY_FOUR_HOUR_METRIC_DATA_CF, expected);
+ }
+
private void assertMetricDataEquals(int scheduleId, String columnFamily, List<HColumn<Composite,
Double>> expected) {
SliceQuery<Integer, Composite, Double> query = HFactory.createSliceQuery(keyspace, IntegerSerializer.get(),
@@ -283,6 +582,83 @@ public class MetricsServerTest {
}
}
+ private void assert6HourDataEmpty(int scheduleId) {
+ assertMetricDataEmpty(scheduleId, SIX_HOUR_METRIC_DATA_CF);
+ }
+
+ private void assert24HourDataEmpty(int scheduleId) {
+ assertMetricDataEmpty(scheduleId, TWENTY_FOUR_HOUR_METRIC_DATA_CF);
+ }
+
+ private void assertMetricDataEmpty(int scheduleId, String columnFamily) {
+ SliceQuery<Integer, Composite, Double> query = HFactory.createSliceQuery(keyspace, IntegerSerializer.get(),
+ CompositeSerializer.get(), DoubleSerializer.get());
+ query.setColumnFamily(columnFamily);
+ query.setKey(scheduleId);
+
+ ColumnSliceIterator<Integer, Composite, Double> iterator = new ColumnSliceIterator<Integer, Composite, Double>(
+ query, (Composite) null, (Composite) null, false);
+
+ List<HColumn<Composite, Double>> actual = new ArrayList<HColumn<Composite, Double>>();
+ while (iterator.hasNext()) {
+ actual.add(iterator.next());
+ }
+
+ String prefix;
+ if (columnFamily.equals(ONE_HOUR_METRIC_DATA_CF)) {
+ prefix = "The one hour data for schedule id " + scheduleId + " is wrong.";
+ } else if (columnFamily.equals(SIX_HOUR_METRIC_DATA_CF)) {
+ prefix = "The six hour data for schedule id " + scheduleId + " is wrong.";
+ } else if (columnFamily.equals(TWENTY_FOUR_HOUR_METRIC_DATA_CF)) {
+ prefix = "The twenty-four hour data for schedule id " + scheduleId + " is wrong.";
+ } else {
+ throw new IllegalArgumentException(columnFamily + " is not a recognized column family");
+ }
+
+ assertEquals(actual.size(), 0, prefix + " Expected the row to be empty.");
+ }
+
+ private void assert1HourMetricsQueueEmpty(int scheduleId) {
+ assertMetricsQueueEmpty(scheduleId, ONE_HOUR_METRIC_DATA_CF);
+ }
+
+ private void assert6HourMetricsQueueEmpty(int scheduleId) {
+ assertMetricsQueueEmpty(scheduleId, SIX_HOUR_METRIC_DATA_CF);
+ }
+
+ private void assert24HourMetricsQueueEmpty(int scheduleId) {
+ assertMetricsQueueEmpty(scheduleId, TWENTY_FOUR_HOUR_METRIC_DATA_CF);
+ }
+
+ private void assertMetricsQueueEmpty(int scheduleId, String columnFamily) {
+ SliceQuery<String,Composite, Integer> sliceQuery = HFactory.createSliceQuery(keyspace, StringSerializer.get(),
+ new CompositeSerializer().get(), IntegerSerializer.get());
+ sliceQuery.setColumnFamily(METRICS_WORK_QUEUE_CF);
+ sliceQuery.setKey(columnFamily);
+
+ ColumnSliceIterator<String, Composite, Integer> iterator = new ColumnSliceIterator<String, Composite, Integer>(
+ sliceQuery, (Composite) null, (Composite) null, false);
+
+ List<HColumn<Composite, Integer>> actual = new ArrayList<HColumn<Composite, Integer>>();
+ while (iterator.hasNext()) {
+ actual.add(iterator.next());
+ }
+
+ String queueName;
+ if (columnFamily.equals(ONE_HOUR_METRIC_DATA_CF)) {
+ queueName = "1 hour";
+ } else if (columnFamily.equals(SIX_HOUR_METRIC_DATA_CF)) {
+ queueName = "6 hour";
+ } else if (columnFamily.equals(TWENTY_FOUR_HOUR_METRIC_DATA_CF)) {
+ queueName = "24 hour";
+ } else {
+ throw new IllegalArgumentException(columnFamily + " is not a recognized metric data column family.");
+ }
+
+ assertEquals(actual.size(), 0, "Expected the " + queueName + " queue to be empty for schedule id " +
+ scheduleId);
+ }
+
private Integer getScheduleId(Composite composite) {
return composite.get(1, IntegerSerializer.get());
}
@@ -296,4 +672,26 @@ public class MetricsServerTest {
return AggregateType.valueOf(type);
}
+ private HColumn<Composite, Double> create1HourColumn(DateTime dateTime, AggregateType type, double value) {
+ return HFactory.createColumn(createAggregateKey(dateTime, type), value, TWO_WEEKS, CompositeSerializer.get(),
+ DoubleSerializer.get());
+ }
+
+ private HColumn<Composite, Double> create6HourColumn(DateTime dateTime, AggregateType type, double value) {
+ return HFactory.createColumn(createAggregateKey(dateTime, type), value, ONE_MONTH, CompositeSerializer.get(),
+ DoubleSerializer.get());
+ }
+
+ private HColumn<Composite, Double> create24HourColumn(DateTime dateTime, AggregateType type, double value) {
+ return HFactory.createColumn(createAggregateKey(dateTime, type), value, ONE_YEAR, CompositeSerializer.get(),
+ DoubleSerializer.get());
+ }
+
+ private Composite createAggregateKey(DateTime dateTime, AggregateType type) {
+ Composite composite = new Composite();
+ composite.addComponent(dateTime.getMillis(), LongSerializer.get());
+ composite.addComponent(type.ordinal(), IntegerSerializer.get());
+
+ return composite;
+ }
}
1
0
09 Oct '12
.classpath | 2
.mailmap | 74
etc/scripts/createRelasenotes.pl | 38
modules/cli-tests/pom.xml | 2
modules/common/ant-bundle/pom.xml | 2
modules/common/drift/pom.xml | 2
modules/common/filetemplate-bundle/pom.xml | 2
modules/common/jboss-as/pom.xml | 2
modules/common/pom.xml | 2
modules/core/arquillian-integration/archive/pom.xml | 2
modules/core/arquillian-integration/container/pom.xml | 2
modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java | 2
modules/core/arquillian-integration/pom.xml | 2
modules/core/client-api/pom.xml | 2
modules/core/comm-api/pom.xml | 2
modules/core/dbutils/pom.xml | 4
modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseTypeFactory.java | 4
modules/core/dbutils/src/main/java/org/rhq/core/db/Postgresql91DatabaseType.java | 6
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 25
modules/core/domain/intentional-api-changes-since-4.4.0.xml | 22
modules/core/domain/pom.xml | 3
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionList.java | 9
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/event/Event.java | 11
modules/core/gui/pom.xml | 2
modules/core/native-system/ant-run.xml | 2
modules/core/native-system/pom.xml | 6
modules/core/native-system/src/main/java/org/rhq/core/system/pquery/Attribute.java | 2
modules/core/native-system/src/main/java/org/rhq/core/system/pquery/Conditional.java | 21
modules/core/native-system/src/main/java/org/rhq/core/system/pquery/ProcessInfoQuery.java | 28
modules/core/native-system/src/test/java/org/rhq/core/system/pquery/ProcessInfoQueryTest.java | 38
modules/core/plugin-api/intentional-api-changes-since-4.4.0.xml | 15
modules/core/plugin-api/pom.xml | 6
modules/core/plugin-container-itest/pom.xml | 2
modules/core/plugin-container/pom.xml | 2
modules/core/plugin-test-api/pom.xml | 2
modules/core/plugin-test-util/pom.xml | 2
modules/core/plugin-validator/pom.xml | 2
modules/core/plugindoc/pom.xml | 2
modules/core/pom.xml | 2
modules/core/util/intentional-api-changes-since-4.4.0.xml | 15
modules/core/util/pom.xml | 7
modules/core/util/src/main/java/org/rhq/core/util/exec/ProcessExecutor.java | 93
modules/core/util/src/test/java/org/rhq/core/util/exec/ProcessExecTest.java | 18
modules/enterprise/agent/ant-run.xml | 2
modules/enterprise/agent/pom.xml | 2
modules/enterprise/agentupdate/pom.xml | 2
modules/enterprise/binding/pom.xml | 4
modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java | 25
modules/enterprise/binding/src/main/java/org/rhq/bindings/script/BaseRhqSchemeScriptSourceProvider.java | 13
modules/enterprise/binding/src/main/java/org/rhq/bindings/script/RepoScriptSourceProvider.java | 14
modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java | 7
modules/enterprise/comm/pom.xml | 2
modules/enterprise/gui/base-perspective-jar/pom.xml | 2
modules/enterprise/gui/base-perspective-war/pom.xml | 2
modules/enterprise/gui/content_http-war/pom.xml | 2
modules/enterprise/gui/coregui/pom.xml | 2
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/admin/DownloadsView.java | 57
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java | 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 24
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 38
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DateTimeFilterItem.java | 86
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java | 102
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java | 272
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java | 290
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMetricGraphView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricGraphView.java | 8
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 | 24
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/LiveGraphView.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeDataSource.java | 148
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeView.java | 142
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/AbstractSearchBar.java | 36
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java | 550
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java | 196
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java | 762
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/filter/CacheControlFilter.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java | 26
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGroupGWTServiceImpl.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java | 29
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 7
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 7
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 7
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 7
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 7
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 7
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 7
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css | 54
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 3
modules/enterprise/gui/coregui/src/main/webapp/css/search.css | 245
modules/enterprise/gui/coregui/src/main/webapp/js/search.js | 61
modules/enterprise/gui/installer-war/pom.xml | 2
modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java | 16
modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.3.0.xml | 4
modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.4.0.xml | 398
modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.4.0.xml | 2649 +++
modules/enterprise/gui/pom.xml | 3
modules/enterprise/gui/portal-war/pom.xml | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java | 2
modules/enterprise/gui/rest-war/pom.xml | 2
modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml | 2
modules/enterprise/gui/webdav-war/pom.xml | 286
modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/AuthenticatedCollectionResource.java | 36
modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/Authenticator.java | 96
modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/AvailabilityResource.java | 75
modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/BasicResource.java | 89
modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/ConfigResource.java | 95
modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/GetableBasicResource.java | 88
modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/MeasurementDataResource.java | 129
modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/ResourceFolder.java | 120
modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/RootFolder.java | 120
modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/SafeEncoder.java | 45
modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/TraitsResource.java | 106
modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/WebDAVResourceFactory.java | 110
modules/enterprise/gui/webdav-war/src/main/webapp/WEB-INF/jboss-web.xml | 5
modules/enterprise/gui/webdav-war/src/main/webapp/WEB-INF/web.xml | 27
modules/enterprise/pom.xml | 2
modules/enterprise/remoting/cli/pom.xml | 2
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/script/FileSystemScriptSourceProvider.java | 28
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/script/ModulesDirectoryScriptSourceProvider.java | 49
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/script/SamplesScriptSourceProvider.java | 16
modules/enterprise/remoting/cli/src/main/resources/META-INF/services/org.rhq.scripting.ScriptSourceProvider | 1
modules/enterprise/remoting/cli/src/main/samples/README.txt | 31
modules/enterprise/remoting/cli/src/main/samples/modules/bundles.js | 150
modules/enterprise/remoting/cli/src/main/samples/modules/drift.js | 240
modules/enterprise/remoting/cli/src/main/samples/modules/jbossas.js | 811 +
modules/enterprise/remoting/cli/src/main/samples/modules/util.js | 280
modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml | 2
modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java | 4
modules/enterprise/remoting/client-api/pom.xml | 16
modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java | 14
modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RhqDownloadsScriptSourceProvider.java | 31
modules/enterprise/remoting/client-api/src/test/java/org/rhq/enterprise/clienapi/RhqDownloadsScriptSourceProviderTest.java | 121
modules/enterprise/remoting/client-deps/pom.xml | 2
modules/enterprise/remoting/pom.xml | 6
modules/enterprise/remoting/webservices/pom.xml | 2
modules/enterprise/scripting/api/pom.xml | 8
modules/enterprise/scripting/javascript/pom.xml | 4
modules/enterprise/scripting/javascript/src/main/java/org/rhq/scripting/javascript/JsEngineProvider.java | 4
modules/enterprise/scripting/javascript/src/main/java/org/rhq/scripting/javascript/util/ScriptSourceToModuleSourceProviderAdapter.java | 32
modules/enterprise/scripting/javascript/src/test/java/org/rhq/scripting/javascript/EngineTest.java | 19
modules/enterprise/scripting/javascript/src/test/java/org/rhq/scripting/javascript/InitializerTest.java | 4
modules/enterprise/scripting/javascript/src/test/java/org/rhq/scripting/javascript/util/ScriptSourceToModuleSourceProviderAdapterTest.java | 117
modules/enterprise/scripting/javascript/src/test/resources/nest.js | 9
modules/enterprise/scripting/javascript/src/test/resources/nested/deep-nest.js | 8
modules/enterprise/scripting/pom.xml | 4
modules/enterprise/scripting/python/pom.xml | 4
modules/enterprise/server/client-api/pom.xml | 21
modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java | 66
modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java | 26
modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java | 26
modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/RhqDownloadsScriptSourceProviderTest.java | 102
modules/enterprise/server/container-lib/pom.xml | 2
modules/enterprise/server/container/pom.xml | 2
modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js | 417
modules/enterprise/server/container/src/main/downloadable-resources/script-modules/bundles.js | 150
modules/enterprise/server/container/src/main/downloadable-resources/script-modules/drift.js | 240
modules/enterprise/server/container/src/main/downloadable-resources/script-modules/jbossas.js | 811 +
modules/enterprise/server/container/src/main/downloadable-resources/script-modules/util.js | 280
modules/enterprise/server/ear/pom.xml | 2
modules/enterprise/server/itests/pom.xml | 36
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java | 148
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/TestServerPluginServiceMBean.java | 31
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java | 716
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/alert/TestAlertSender.java | 107
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/alert/TestAlertSenderPluginService.java | 67
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginService.java | 103
modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginServiceMBean.java | 25
modules/enterprise/server/itests/src/test/resources/log4j.xml | 4
modules/enterprise/server/itests/src/test/resources/test-alert-sender-serverplugin.xml | 23
modules/enterprise/server/jar/intentional-api-changes-since-4.4.0.xml | 14
modules/enterprise/server/jar/pom.xml | 47
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java | 76
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java | 42
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java | 18
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java | 18
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java | 16
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerLocal.java | 22
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java | 12
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerBean.java | 269
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerLocal.java | 121
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/EventRest.java | 89
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/EventSourceRest.java | 98
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java | 32
modules/enterprise/server/jar/src/main/xsl/apiout2docbook.xsl | 42
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java | 10
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementDataManagerTest.java | 243
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java | 2
modules/enterprise/server/plugins/alert-cli/pom.xml | 4
modules/enterprise/server/plugins/alert-email/pom.xml | 4
modules/enterprise/server/plugins/alert-irc/pom.xml | 4
modules/enterprise/server/plugins/alert-log4j/pom.xml | 4
modules/enterprise/server/plugins/alert-microblog/pom.xml | 4
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4
modules/enterprise/server/plugins/alert-operations/pom.xml | 4
modules/enterprise/server/plugins/alert-roles/pom.xml | 4
modules/enterprise/server/plugins/alert-snmp/pom.xml | 4
modules/enterprise/server/plugins/alert-subject/pom.xml | 4
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2
modules/enterprise/server/plugins/cobbler/pom.xml | 4
modules/enterprise/server/plugins/disk/pom.xml | 2
modules/enterprise/server/plugins/drift-mongodb/pom.xml | 2
modules/enterprise/server/plugins/drift-rhq/pom.xml | 2
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2
modules/enterprise/server/plugins/jboss-software/pom.xml | 2
modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2
modules/enterprise/server/plugins/pom.xml | 2
modules/enterprise/server/plugins/url/pom.xml | 2
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2
modules/enterprise/server/plugins/yum/pom.xml | 2
modules/enterprise/server/pom.xml | 2
modules/enterprise/server/safe-invoker/pom.xml | 2
modules/enterprise/server/sars/agent-sar/pom.xml | 2
modules/enterprise/server/sars/pom.xml | 2
modules/enterprise/server/xml-schemas/pom.xml | 2
modules/helpers/bundleGen/pom.xml | 4
modules/helpers/jeeGen/pom.xml | 2
modules/helpers/perftest-support/pom.xml | 4
modules/helpers/pom.xml | 2
modules/helpers/rest-docs-generator/pom.xml | 2
modules/helpers/rest-docs-generator/src/main/java/org/rhq/helpers/rest_docs_generator/ClassLevelProcessor.java | 79
modules/helpers/rtfilter-subsystem/pom.xml | 2
modules/helpers/rtfilter/pom.xml | 2
modules/integration-tests/apache-plugin-test/pom.xml | 2
modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java | 38
modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 2
modules/integration-tests/jndi-access/pom.xml | 2
modules/integration-tests/jndi-access/remote-server/pom.xml | 2
modules/integration-tests/pom.xml | 2
modules/plugins/aliases/pom.xml | 2
modules/plugins/ant-bundle/pom.xml | 2
modules/plugins/apache/pom.xml | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java | 32
modules/plugins/augeas/pom.xml | 4
modules/plugins/byteman/pom.xml | 2
modules/plugins/cobbler/pom.xml | 2
modules/plugins/cron/pom.xml | 2
modules/plugins/database/intentional-api-changes-since-4.4.0.xml | 14
modules/plugins/database/pom.xml | 7
modules/plugins/filetemplate-bundle/pom.xml | 2
modules/plugins/grub/pom.xml | 2
modules/plugins/hadoop/pom.xml | 2
modules/plugins/hibernate/pom.xml | 2
modules/plugins/hosts/pom.xml | 2
modules/plugins/hudson/pom.xml | 4
modules/plugins/iis/pom.xml | 2
modules/plugins/irc/pom.xml | 2
modules/plugins/jboss-as-5/intentional-api-changes-since-4.4.0.xml | 16
modules/plugins/jboss-as-5/pom.xml | 5
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java | 8
modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml | 50
modules/plugins/jboss-as-7/json-api/domain.txt | 5051 ++++--
modules/plugins/jboss-as-7/json-api/standalone_full_ha.txt | 8016 ++++++----
modules/plugins/jboss-as-7/pom.xml | 4
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java | 10
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java | 2
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java | 10
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java | 10
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/ResourcesDomainServerTest.java | 139
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java | 46
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/ResourcesStandaloneServerTest.java | 2
modules/plugins/jboss-as/pom.xml | 7
modules/plugins/jboss-cache-v3/pom.xml | 2
modules/plugins/jboss-cache/pom.xml | 2
modules/plugins/jmx/pom.xml | 10
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java | 128
modules/plugins/kickstart/pom.xml | 2
modules/plugins/mod-cluster/pom.xml | 2
modules/plugins/mysql/pom.xml | 2
modules/plugins/netservices/pom.xml | 2
modules/plugins/noop/pom.xml | 2
modules/plugins/oracle/pom.xml | 2
modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleAsmDiskGroupComponent.java | 117
modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleAsmDiskGroupDiscoveryComponent.java | 92
modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml | 27
modules/plugins/pattern-generator/pom.xml | 2
modules/plugins/perftest/pom.xml | 2
modules/plugins/platform/pom.xml | 2
modules/plugins/pom.xml | 2
modules/plugins/postfix/pom.xml | 2
modules/plugins/postgres/pom.xml | 2
modules/plugins/rhq-agent/pom.xml | 2
modules/plugins/rhq-server/pom.xml | 2
modules/plugins/samba/pom.xml | 2
modules/plugins/script/pom.xml | 2
modules/plugins/script2/pom.xml | 2
modules/plugins/snmptrapd/pom.xml | 2
modules/plugins/sshd/pom.xml | 2
modules/plugins/sudoers/pom.xml | 2
modules/plugins/tomcat/pom.xml | 2
modules/plugins/twitter/pom.xml | 2
modules/plugins/validate-all-plugins/pom.xml | 2
modules/plugins/virt/pom.xml | 2
modules/pom.xml | 7
modules/test-utils/pom.xml | 2
pom.xml | 141
318 files changed, 20429 insertions(+), 8917 deletions(-)
New commits:
commit 82de3c99862db845f13f7f038cfcf269cac2d454
Merge: 6b04d51 b44ad1b
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Tue Oct 9 10:29:31 2012 -0500
Merge branch 'master' into jsanda/cassandra-plugin
commit b44ad1b934bbc80a52bfa1d4202294a63a94802c
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Oct 8 17:48:27 2012 -0400
[BZ 864213] fix the web resource's ability to collect response time data.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java
index 3022478..8db5980 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java
@@ -19,6 +19,7 @@
package org.rhq.modules.plugins.jbossas7;
import java.io.File;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -62,7 +63,14 @@ public class WebRuntimeComponent extends BaseComponent<BaseComponent<?>> {
}
@Override
- public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception {
+ public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> origReqs) throws Exception {
+ // make our own copy so, as we iterate, we can remove the item that we can process,
+ // which will leave the rest for super.getValues() to process
+ HashSet<MeasurementScheduleRequest> requests;
+ requests = new HashSet<MeasurementScheduleRequest>(origReqs.size());
+ requests.addAll(origReqs);
+
+ // now process schedule requests
for (Iterator<MeasurementScheduleRequest> iterator = requests.iterator(); iterator.hasNext(); ) {
MeasurementScheduleRequest request = iterator.next();
if (request.getName().equals(RESPONSE_TIME_METRIC)) {
commit f4e6014c04a1b6d7bb81c1392f49a372d4477f93
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Mon Oct 8 14:52:02 2012 +0200
[BZ 857462 - RFE: Disable 'Purge' button on destination level when no deployment is LIVE] If at least one deployment is LIVE the button is enabled, otherwise it is disabled. The call is made, when constructing the UI components.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
index 5ac720f..ed1cf7b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
@@ -37,7 +37,9 @@ import com.smartgwt.client.widgets.form.fields.CanvasItem;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import org.rhq.core.domain.bundle.Bundle;
+import org.rhq.core.domain.bundle.BundleDeployment;
import org.rhq.core.domain.bundle.BundleDestination;
+import org.rhq.core.domain.criteria.BundleDeploymentCriteria;
import org.rhq.core.domain.criteria.BundleDestinationCriteria;
import org.rhq.core.domain.tagging.Tag;
import org.rhq.core.domain.util.PageList;
@@ -235,6 +237,7 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka
});
}
});
+ checkIfDisabled(purgeButton);
actionLayout.addMember(purgeButton);
IButton deleteButton = new LocatableIButton(actionLayout.extendLocatorId("Delete"), MSG.common_button_delete());
@@ -277,6 +280,27 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka
return actionLayout;
}
+ private void checkIfDisabled(final IButton purgeButton) {
+ BundleGWTServiceAsync bundleService = GWTServiceLookup.getBundleService();
+ BundleDeploymentCriteria criteria = new BundleDeploymentCriteria();
+ criteria.addFilterDestinationId(destination.getId());
+ bundleService.findBundleDeploymentsByCriteria(criteria, new AsyncCallback<PageList<BundleDeployment>>() {
+ public void onFailure(Throwable caught) {
+ purgeButton.setDisabled(false);
+ }
+
+ public void onSuccess(PageList<BundleDeployment> result) {
+ for (BundleDeployment deployment : result) {
+ if (deployment.isLive()) {
+ purgeButton.setDisabled(false);
+ return;
+ }
+ }
+ purgeButton.setDisabled(true);
+ }
+ });
+ }
+
private Table createDeploymentsTable() {
Criteria criteria = new Criteria();
criteria.addCriteria("bundleDestinationId", destination.getId());
commit 84017565d54238af8d59fa832bb809d5d8005bc1
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Oct 3 09:50:04 2012 -0500
[BZ 861127] Revert back to sequential db upgrade ids.
(cherry picked from commit 84e7e552a2ee7d05aff8eb489c66cdfe6adf2bd0)
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 700e079..e0ceba4 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -17,7 +17,7 @@
<description>Database schema setup, upgrade and other utilities</description>
<properties>
- <db.schema.version>2.125</db.schema.version>
+ <db.schema.version>2.124</db.schema.version>
<rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
<rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name>
<rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name>
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 00722db..84fbf5e 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -4037,20 +4037,25 @@
</schemaSpec>
-<!-- RHQ 4.5.0 uses DB Schema 2.125 -->
- <schemaSpec version="2.125">
+<!-- RHQ 4.5.0 uses DB Schema 2.123 -->
+
+ <schemaSpec version="2.124">
+
<schema-directSQL>
<statement desc="Update the NULL to 0 for MIN_ENTRIES">
UPDATE RHQ_CONFIG_PROP_DEF
SET MIN_ENTRIES = 0
WHERE MIN_ENTRIES IS NULL
+ AND DTYPE = 'list'
</statement>
<statement desc="Update the NULL to 32767 for MAX_ENTRIES">
UPDATE RHQ_CONFIG_PROP_DEF
SET MAX_ENTRIES = 32767
WHERE MAX_ENTRIES IS NULL
+ AND DTYPE = 'list'
</statement>
</schema-directSQL>
+
</schemaSpec>
</dbupgrade>
commit 47a3f040c5019f794bd7eb198a662dd2ac5ad0ea
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Oct 3 09:49:02 2012 -0500
Revert "Trivial: Comment on skipped db-upgrade version 2.124"
This reverts commit 783da488b14c341d9dabd2f678f0cbd6150db2a1.
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 52b359c..00722db 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -4037,8 +4037,6 @@
</schemaSpec>
-<!-- DB Schema 2.124 was bad so skipping intentionally -->
-
<!-- RHQ 4.5.0 uses DB Schema 2.125 -->
<schemaSpec version="2.125">
<schema-directSQL>
commit 88e982cc45e152fc2025bd73f7e8f7a6ed9d52bb
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Oct 2 22:18:32 2012 +0200
[Bug 860818 - operation schedule doesn't show proper "repeat every" value] The "seconds" unit type was used no matter what actual units were selected. Now when the operation is scheduled, the "repeat every" value is persisted to DB in millis and when displaying the details about the op., the millis are converted to human readable form.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java
index 486b20b..acd80bf 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java
@@ -55,6 +55,14 @@ public class DurationItem extends CanvasItem {
private static final String FIELD_VALUE = "value";
private static final String FIELD_UNITS = "units";
+
+ private static final long SECOND_IN_MILLIS = 1000L;
+ private static final long MINUTE_IN_MILLIS = 60 * SECOND_IN_MILLIS;
+ private static final long HOUR_IN_MILLIS = 60 * MINUTE_IN_MILLIS;
+ private static final long DAY_IN_MILLIS = 24 * HOUR_IN_MILLIS;
+ private static final long WEEK_IN_MILLIS = 7 * DAY_IN_MILLIS;
+ private static final long MONTH_IN_MILLIS = 30 * DAY_IN_MILLIS;
+ private static final long YEAR_IN_MILLIS = 365 * DAY_IN_MILLIS;
private final DynamicForm form;
private TimeUnit defaultTimeUnit;
@@ -214,6 +222,86 @@ public class DurationItem extends CanvasItem {
setValue(value);
}
+ /**
+ * Sets human readable time representation to the form's field "value"
+ *
+ * @param longValue the time period representation in milliseconds
+ */
+ public void setAndFormatValue(long longValue) {
+ if (longValue < 0) {
+ throw new IllegalArgumentException("negative time period " + longValue);
+ }
+ String formattedOutput = formatMilliseconds(longValue);
+ this.unitType = UnitType.TIME;
+ this.form.setValue(FIELD_VALUE, formattedOutput);
+ setValue(formattedOutput);
+ }
+
+ /**
+ * formatMilliseconds(10 * WEEK_IN_MILLIS + 2 * SECOND_IN_MILLIS) = 2 months 2 weeks 2 seconds
+ *
+ * @param longValue
+ * @return formatted string with time period representation
+ */
+ private String formatMilliseconds(long longValue) {
+ if (longValue < 0) {
+ throw new IllegalArgumentException("negative time period " + longValue);
+ }
+ String formattedOutput = null;
+ long wholeUnits = 0;
+ if (longValue < SECOND_IN_MILLIS) { //ms
+ return getTimeValue(longValue, TimeUnit.MILLISECONDS);
+ } else if (longValue < MINUTE_IN_MILLIS) { //s
+ wholeUnits = longValue / SECOND_IN_MILLIS;
+ formattedOutput = getTimeValue(wholeUnits, TimeUnit.SECONDS);
+ return formattedOutput
+ + ((wholeUnits * SECOND_IN_MILLIS < longValue) ? " "
+ + formatMilliseconds(longValue - wholeUnits * SECOND_IN_MILLIS) : "");
+ } else if (longValue < HOUR_IN_MILLIS) { //m
+ wholeUnits = longValue / MINUTE_IN_MILLIS;
+ formattedOutput = getTimeValue(wholeUnits, TimeUnit.MINUTES);
+ return formattedOutput
+ + ((wholeUnits * MINUTE_IN_MILLIS < longValue) ? " "
+ + formatMilliseconds(longValue - wholeUnits * MINUTE_IN_MILLIS) : "");
+ } else if (longValue < DAY_IN_MILLIS) { //h
+ wholeUnits = longValue / HOUR_IN_MILLIS;
+ formattedOutput = getTimeValue(wholeUnits, TimeUnit.HOURS);
+ return formattedOutput
+ + ((wholeUnits * HOUR_IN_MILLIS < longValue) ? " "
+ + formatMilliseconds(longValue - wholeUnits * HOUR_IN_MILLIS) : "");
+ } else if (longValue < WEEK_IN_MILLIS) { //d
+ wholeUnits = longValue / DAY_IN_MILLIS;
+ formattedOutput = getTimeValue(wholeUnits, TimeUnit.DAYS);
+ return formattedOutput
+ + ((wholeUnits * DAY_IN_MILLIS < longValue) ? " "
+ + formatMilliseconds(longValue - wholeUnits * DAY_IN_MILLIS) : "");
+ } else if (longValue < MONTH_IN_MILLIS) { //w
+ wholeUnits = longValue / WEEK_IN_MILLIS;
+ formattedOutput = getTimeValue(wholeUnits, TimeUnit.WEEKS);
+ return formattedOutput
+ + ((wholeUnits * WEEK_IN_MILLIS < longValue) ? " "
+ + formatMilliseconds(longValue - wholeUnits * WEEK_IN_MILLIS) : "");
+ } else if (longValue < YEAR_IN_MILLIS) { //M
+ wholeUnits = longValue / MONTH_IN_MILLIS;
+ formattedOutput = getTimeValue(wholeUnits, TimeUnit.MONTHS);
+ return formattedOutput
+ + ((wholeUnits * MONTH_IN_MILLIS < longValue) ? " "
+ + formatMilliseconds(longValue - wholeUnits * MONTH_IN_MILLIS) : "");
+ } else if (longValue >= YEAR_IN_MILLIS) { //y
+ wholeUnits = longValue / YEAR_IN_MILLIS;
+ formattedOutput = getTimeValue(wholeUnits, TimeUnit.YEARS);
+ return formattedOutput
+ + ((wholeUnits * YEAR_IN_MILLIS < longValue) ? " "
+ + formatMilliseconds(longValue - wholeUnits * YEAR_IN_MILLIS) : "");
+ } else {
+ return "";
+ }
+ }
+
+ private String getTimeValue(long value, TimeUnit valueUnit) {
+ return value + " " + valueUnit.getDisplayName();
+ }
+
private void updateValue() {
Long value = calculateValue();
setValue(value);
@@ -253,7 +341,7 @@ public class DurationItem extends CanvasItem {
convertedValue = integerValue;
break;
case MILLISECONDS:
- convertedValue = integerValue * 1000;
+ convertedValue = integerValue * SECOND_IN_MILLIS;
break;
}
break;
@@ -266,7 +354,7 @@ public class DurationItem extends CanvasItem {
convertedValue = integerValue * 60;
break;
case MILLISECONDS:
- convertedValue = integerValue * 60 * 1000;
+ convertedValue = integerValue * MINUTE_IN_MILLIS;
break;
}
break;
@@ -282,7 +370,7 @@ public class DurationItem extends CanvasItem {
convertedValue = integerValue * 60 * 60;
break;
case MILLISECONDS:
- convertedValue = integerValue * 60 * 60 * 1000;
+ convertedValue = integerValue * HOUR_IN_MILLIS;
break;
}
break;
@@ -301,7 +389,7 @@ public class DurationItem extends CanvasItem {
convertedValue = integerValue * 24 * 60 * 60;
break;
case MILLISECONDS:
- convertedValue = integerValue * 24 * 60 * 60 * 1000;
+ convertedValue = integerValue * DAY_IN_MILLIS;
break;
}
break;
@@ -323,7 +411,7 @@ public class DurationItem extends CanvasItem {
convertedValue = integerValue * 7 * 24 * 60 * 60;
break;
case MILLISECONDS:
- convertedValue = integerValue * 7 * 24 * 60 * 60 * 1000;
+ convertedValue = integerValue * WEEK_IN_MILLIS;
break;
}
break;
@@ -348,7 +436,7 @@ public class DurationItem extends CanvasItem {
convertedValue = integerValue * 30 * 24 * 60 * 60;
break;
case MILLISECONDS:
- convertedValue = integerValue * 30 * 24 * 60 * 60 * 1000;
+ convertedValue = integerValue * MONTH_IN_MILLIS;
break;
}
break;
@@ -376,7 +464,7 @@ public class DurationItem extends CanvasItem {
convertedValue = integerValue * 365 * 24 * 60 * 60;
break;
case MILLISECONDS:
- convertedValue = integerValue * 365 * 24 * 60 * 60 * 1000;
+ convertedValue = integerValue * YEAR_IN_MILLIS;
break;
}
break;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
index 3cde889..c9c1c35 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java
@@ -149,8 +149,8 @@ public class JobTriggerEditor extends LocatableVLayout {
changeCalendarType("laterAndRepeat");
DurationItem repeatIntervalItem = (DurationItem) this.repeatForm.getItem(FIELD_REPEAT_INTERVAL);
- repeatIntervalItem.setValue(this.jobTrigger.getRepeatInterval().intValue(), UnitType.TIME);
-
+ repeatIntervalItem.setAndFormatValue(this.jobTrigger.getRepeatInterval());
+
FormItem endTimeItem = this.repeatForm.getField(FIELD_END_TIME);
DurationItem repeatDurationItem = (DurationItem) this.repeatForm.getItem(FIELD_REPEAT_DURATION);
FormItem recurrenceTypeItem = this.repeatForm.getField(FIELD_RECURRENCE_TYPE);
commit 76a91bd24c1acb40e190c66271964ecea3bfe881
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Oct 2 16:45:55 2012 +0200
Make the RhqManager class the sole place to define everything is necessary
for defining and making available a new *Manager to the scripting clients.
Also removed a property on RhqManager that was only used in a single test
method and replaced its usage.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java
index cfa52e2..1dd79f1 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManager.java
@@ -89,14 +89,17 @@ public enum RhqManager {
SynchronizationManager(SynchronizationManagerRemote.class, "${SynchronizationManager}");
private Class<?> remote;
- private String remoteName;
+ private String localInterfaceClassName;
private String beanName;
private boolean enabled;
+ private static final int REMOTE_IFACE_SUFFIX_LENGTH = "Remote".length();
+
private RhqManager(Class<?> remote, String enable) {
this.remote = remote;
this.beanName = this.name() + "Bean";
- this.remoteName = this.name() + "Remote";
+ localInterfaceClassName = getLocalInterfaceClassName(remote);
+
//defaults and evaluates to TRUE unless the string contains "false". Done to defend against
//possible errors in string replacement during rhq build.
this.enabled = true;
@@ -119,15 +122,25 @@ public enum RhqManager {
return this.remote;
}
- public String beanName() {
- return this.beanName;
+ public String localInterfaceClassName() {
+ return localInterfaceClassName;
}
- public String remoteName() {
- return this.remoteName;
+ public String beanName() {
+ return this.beanName;
}
public boolean enabled() {
return this.enabled;
}
+
+ private static String getLocalInterfaceClassName(Class<?> remoteIface) {
+ String ifaceName = remoteIface.getName();
+ if (!ifaceName.endsWith("Remote")) {
+ throw new AssertionError("Inconsistent SLSB naming in RHQ! Remote interface '" + remoteIface.getName()
+ + "' does not follow the established naming convention. This is a bug, please report it.");
+ }
+
+ return ifaceName.substring(0, ifaceName.length() - REMOTE_IFACE_SUFFIX_LENGTH) + "Local";
+ }
}
\ No newline at end of file
diff --git a/modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java b/modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java
index 8cf3ceb..d5f1c00 100644
--- a/modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java
+++ b/modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java
@@ -61,11 +61,11 @@ public class ScriptCommandTest {
void assertManagersBoundToScript() {
ScriptEngine scriptEngine = client.getScriptEngine();
- List<String> mgrsNotBound = new ArrayList<String>();
+ List<Class<?>> mgrsNotBound = new ArrayList<Class<?>>();
for (RhqManager mgr : RhqManager.values()) {
if (!scriptEngine.getBindings(ScriptContext.ENGINE_SCOPE).containsKey(mgr.name())) {
- mgrsNotBound.add(mgr.remoteName());
+ mgrsNotBound.add(mgr.remote());
}
}
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
index 5cbed7e..a918389 100644
--- a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
+++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java
@@ -137,70 +137,6 @@ public class LocalClient implements RhqFacade {
}
private Object getLocalSLSB(RhqManager manager) {
- switch (manager) {
- case AlertDefinitionManager:
- return LookupUtil.getAlertDefinitionManager();
- case AlertManager:
- return LookupUtil.getAlertManager();
- case AvailabilityManager:
- return LookupUtil.getAvailabilityManager();
- case BundleManager:
- return LookupUtil.getBundleManager();
- case CallTimeDataManager:
- return LookupUtil.getCallTimeDataManager();
- case ConfigurationManager:
- return LookupUtil.getConfigurationManager();
- case ContentManager:
- return LookupUtil.getContentManager();
- case DataAccessManager:
- return LookupUtil.getDataAccessManager();
- case DiscoveryBoss:
- return LookupUtil.getDiscoveryBoss();
- case DriftManager:
- return LookupUtil.getDriftManager();
- case DriftTemplateManager:
- return LookupUtil.getDriftTemplateManager();
- case EventManager:
- return LookupUtil.getEventManager();
- case MeasurementBaselineManager:
- return LookupUtil.getMeasurementBaselineManager();
- case MeasurementDataManager:
- return LookupUtil.getMeasurementDataManager();
- case MeasurementDefinitionManager:
- return LookupUtil.getMeasurementDefinitionManager();
- case MeasurementScheduleManager:
- return LookupUtil.getMeasurementScheduleManager();
- case OperationManager:
- return LookupUtil.getOperationManager();
- case RemoteInstallManager:
- return LookupUtil.getRemoteInstallManager();
- case RepoManager:
- return LookupUtil.getRepoManagerLocal();
- case ResourceFactoryManager:
- return LookupUtil.getResourceFactoryManager();
- case ResourceGroupManager:
- return LookupUtil.getResourceGroupManager();
- case ResourceManager:
- return LookupUtil.getResourceManager();
- case ResourceTypeManager:
- return LookupUtil.getResourceTypeManager();
- case RoleManager:
- return LookupUtil.getRoleManager();
- case SavedSearchManager:
- return LookupUtil.getSavedSearchManager();
- case SubjectManager:
- return LookupUtil.getSubjectManager();
- case SupportManager:
- return LookupUtil.getSupportManager();
- case SynchronizationManager:
- return LookupUtil.getSynchronizationManager();
- case SystemManager:
- return LookupUtil.getSystemManager();
- case TagManager:
- return LookupUtil.getTagManager();
- }
-
- throw new IllegalStateException("LocalClient does not handle the manager: " + manager
- + ". This is a bug, please report it.");
+ return LookupUtil.getEjb(manager.beanName(), manager.localInterfaceClassName());
}
}
diff --git a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java
index 61f9ea0..c7165cc 100644
--- a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java
+++ b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/LocalClientTest.java
@@ -19,11 +19,15 @@
package org.rhq.enterprise.client.test;
+import static org.testng.Assert.assertEquals;
+
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.Hashtable;
import javax.naming.Context;
@@ -63,8 +67,12 @@ public class LocalClientTest extends JMockTest {
System.setProperty(Context.INITIAL_CONTEXT_FACTORY, FakeContextFactory.class.getName());
}
- @Test
- public void testResilienceAgainstContextClassloaders() throws Exception {
+ /**
+ * Needs to be called from within a test method so that the "context" variable is available.
+ *
+ * @throws NamingException
+ */
+ private void setupFakeJndiLookup() throws NamingException {
CONTEXT_MOCK_FOR_TEST = context.mock(Context.class);
context.checking(new Expectations() {{
@@ -102,6 +110,20 @@ public class LocalClientTest extends JMockTest {
allowing(CONTEXT_MOCK_FOR_TEST).close();
}});
+ }
+
+ @Test
+ public void testAllManagersInstantiable() throws Exception {
+ setupFakeJndiLookup();
+
+ LocalClient lc = new LocalClient(null);
+ assertEquals(lc.getScriptingAPI().keySet(), new HashSet<RhqManager>(Arrays.asList(RhqManager.values())),
+ "Scripting API contains different managers than expected.");
+ }
+
+ @Test
+ public void testResilienceAgainstContextClassloaders() throws Exception {
+ setupFakeJndiLookup();
ClassLoader origCl = Thread.currentThread().getContextClassLoader();
try {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
index e49498c..8ef6a9f 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/LookupUtil.java
@@ -632,6 +632,18 @@ public final class LookupUtil {
return service;
}
+ /**
+ * Generic method to lookup an Ejb bean by name and the interface name
+ *
+ * @param beanName the name of the EJB bean
+ * @param interfaceName the full class name of either the remote or local interface
+ *
+ * @return the bean accessed through specified inerface
+ */
+ public static Object getEjb(String beanName, String interfaceName) {
+ return lookupByName(beanName, interfaceName);
+ }
+
//--------------------------------------------
// The TEST services
//--------------------------------------------
@@ -658,8 +670,15 @@ public final class LookupUtil {
// Private Methods
+ //in this method, we don't actually need the interfaceName yet, but
+ //this will become necessary as soon as we start using AS7 as our container.
+ //So let's be proactive here ;)
+ private static String getLocalJNDIName(String beanName, String interfaceName) {
+ return (embeddedDeployment ? "" : (RHQConstants.EAR_NAME + "/")) + beanName + "/local";
+ }
+
private static <T> String getLocalJNDIName(@NotNull Class<? super T> beanClass) {
- return (embeddedDeployment ? "" : (RHQConstants.EAR_NAME + "/")) + beanClass.getSimpleName() + "/local";
+ return getLocalJNDIName(beanClass.getSimpleName(), beanClass.getName().replace("Bean", "Local"));
}
/**
@@ -685,6 +704,17 @@ public final class LookupUtil {
}
}
+ private static Object lookupByName(String beanName, String localInterfaceName) {
+ String localJNDIName = "-not initialized-";
+ try {
+ localJNDIName = getLocalJNDIName(beanName, localInterfaceName);
+ return lookup(localJNDIName);
+ } catch (NamingException e) {
+ throw new RuntimeException("Failed to lookup local interface to EJB " + beanName + ", localJNDI=["
+ + localJNDIName + "]", e);
+ }
+ }
+
@SuppressWarnings("unchecked")
private static <T> T lookupRemote(Class<? super T> type) {
try {
commit 783da488b14c341d9dabd2f678f0cbd6150db2a1
Author: mtho11 <mikecthompson(a)gmail.com>
Date: Mon Oct 1 08:31:19 2012 -0700
Trivial: Comment on skipped db-upgrade version 2.124
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 00722db..52b359c 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -4037,6 +4037,8 @@
</schemaSpec>
+<!-- DB Schema 2.124 was bad so skipping intentionally -->
+
<!-- RHQ 4.5.0 uses DB Schema 2.125 -->
<schemaSpec version="2.125">
<schema-directSQL>
commit feb01f468685e7cedfa0938b759cc3a4102f9b1d
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Mon Oct 1 14:15:15 2012 +0200
[BZ 857423 - [EAP 5.1.2] inconsistent result of shut down operation when using JMX and shutdown.sh script and server is already stopped.] Check for return code was added.
diff --git a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java
index 60fa42d..b96a2cc 100644
--- a/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java
+++ b/modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerOperationsDelegate.java
@@ -402,9 +402,11 @@ public class ApplicationServerOperationsDelegate {
ProcessExecutionResults results = systemInfo.executeProcess(processExecution);
logExecutionResults(results);
- if (results.getError() != null) {
- throw new ExecutionFailedException("Error executing shutdown script while stopping AS instance. Exit code ["
- + results.getExitCode() + "]: " + results.getError().getMessage(), results.getError());
+ if (results.getError() != null || results.getExitCode() != 0) {
+ throw new ExecutionFailedException(
+ "Error executing shutdown script while stopping AS instance. Shutdown script returned exit code ["
+ + results.getExitCode() + "]"
+ + (results.getError() != null ? ": " + results.getError().getMessage() : ""), results.getError());
}
return "The server has been shut down.";
commit 2110dbab435cb8aba07653e7d6b404618b00550a
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Sun Sep 30 21:17:35 2012 -0500
[BZ 861127] Update DBInstallationTest with RHQ 4.4.0 schema and data files.
diff --git a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
index 4fca7e1..2c9b911 100644
--- a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
+++ b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
@@ -103,12 +103,6 @@ public class DBInstallationTest {
}
@Test
- public void upgradeJON311Schema() throws Exception {
- installSchemaAndData("3.1.1");
- installer.upgradeExistingDatabaseSchema(getInstallProperties());
- }
-
- @Test
public void upgradeRHQ420Schema() throws Exception {
installSchemaAndData("rhq-4.2.0");
installer.upgradeExistingDatabaseSchema(getInstallProperties());
@@ -126,12 +120,6 @@ public class DBInstallationTest {
installer.upgradeExistingDatabaseSchema(getInstallProperties());
}
- @Test
- public void upgradeRHQ450Schema() throws Exception {
- installSchemaAndData("rhq-4.5.0");
- installer.upgradeExistingDatabaseSchema(getInstallProperties());
- }
-
private void initLogDirectory() {
File logDir = new File(LOG_DIRECTORY);
if (logDir.exists()) {
@@ -187,7 +175,7 @@ public class DBInstallationTest {
dbProperties.put(ServerProperties.PROP_EMAIL_FROM_ADDRESS, "rhqadmin(a)localhost.com");
return dbProperties;
}
-
+
private static File filterXmlFile(File xmlFile, Properties props) throws IOException {
// first slurp the file contents in memory
InputStream fileInStream = new FileInputStream(xmlFile);
@@ -216,11 +204,11 @@ public class DBInstallationTest {
// we now have the finished XML content - write out the file to the tmp directory
File filteredXmlFile = File.createTempFile("rhq", xmlFile.getName());
- FileOutputStream xmlFileOutStream = new FileOutputStream(xmlFile);
+ FileOutputStream xmlFileOutStream = new FileOutputStream(filteredXmlFile);
ByteArrayInputStream contentInStream = new ByteArrayInputStream(content.getBytes());
StreamUtil.copy(contentInStream, xmlFileOutStream);
return filteredXmlFile.getAbsoluteFile();
}
-
+
}
diff --git a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.3.0.xml b/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.3.0.xml
index 26574c4..a927334 100644
--- a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.3.0.xml
+++ b/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.3.0.xml
@@ -132,8 +132,8 @@
DEFAULT_PROPERTY_VALUE="2.119" FREAD_ONLY="TRUE"/>
<data ID="3" PROPERTY_KEY="CAM_JAAS_PROVIDER" PROPERTY_VALUE="JDBC"
DEFAULT_PROPERTY_VALUE="JDBC" FREAD_ONLY="FALSE"/>
- <data ID="4" PROPERTY_KEY="CAM_BASE_URL" PROPERTY_VALUE="http://10.16.88.220:7080/"
- DEFAULT_PROPERTY_VALUE="http://10.16.88.220:7080/" FREAD_ONLY="FALSE"/>
+ <data ID="4" PROPERTY_KEY="CAM_BASE_URL" PROPERTY_VALUE="http://localhost:7080/"
+ DEFAULT_PROPERTY_VALUE="http://localhost:7080/" FREAD_ONLY="FALSE"/>
<data ID="9" PROPERTY_KEY="CAM_HELP_USER" PROPERTY_VALUE="web"
DEFAULT_PROPERTY_VALUE="web" FREAD_ONLY="FALSE"/>
<data ID="10" PROPERTY_KEY="CAM_HELP_PASSWORD" PROPERTY_VALUE="user"
diff --git a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.4.0.xml b/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.4.0.xml
new file mode 100644
index 0000000..1c2fbb1
--- /dev/null
+++ b/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-data-combined-rhq-4.4.0.xml
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dbsetup name="data.xml">
+<!-- BEGIN: auth-data.xml -->
+
+
+ <table name="RHQ_PRINCIPAL">
+ <data id="2" PRINCIPAL="rhqadmin" PASSWORD="x1XwrxKuPvYUILiOnOZTLg=="/>
+ </table>
+
+<!-- END: auth-data.xml -->
+<!-- BEGIN: authz-data.xml -->
+
+
+ <!-- the overlord user -->
+ <table name="RHQ_SUBJECT">
+ <data ID="1"
+ NAME="admin"
+ FIRST_NAME="Super"
+ LAST_NAME="User"
+ FSYSTEM="TRUE"/>
+ </table>
+
+ <!-- the initial rhqadmin user -->
+ <table name="RHQ_SUBJECT">
+ <data ID="2"
+ NAME="rhqadmin"
+ FIRST_NAME="RHQ"
+ LAST_NAME="Administrator"
+ EMAIL_ADDRESS="rhqadmin@localhost"
+ FSYSTEM="FALSE"/>
+ </table>
+
+ <!-- Define the system root role which includes our overlord and rhqadmin users -->
+ <table name="RHQ_ROLE">
+ <data ID="1"
+ NAME="Super User Role"
+ FSYSTEM="TRUE"
+ DESCRIPTION="System superuser role that provides full access to everything. This role cannot be modified."/>
+ <data ID="2"
+ NAME="All Resources Role"
+ FSYSTEM="FALSE"
+ DESCRIPTION="Provides full access to all resources in inventory. Cannot modify users, roles or server settings."/>
+ </table>
+
+ <!-- associate the root users with all security permissions -->
+ <table name="RHQ_SUBJECT_ROLE_MAP">
+ <!-- overlord user -->
+ <data SUBJECT_ID="1" ROLE_ID="1"/>
+ <!-- rhqadmin user -->
+ <data SUBJECT_ID="2" ROLE_ID="1"/>
+ </table>
+
+ <table name="RHQ_PERMISSION">
+ <!-- give super-user-role all permissions
+ (explicitly add resource perms, even though they are implied by MANAGE_INVENTORY) -->
+ <data ROLE_ID="1" OPERATION="0"/> <!-- Permission.MANAGE_SECURITY -->
+ <data ROLE_ID="1" OPERATION="1"/> <!-- Permission.MANAGE_INVENTORY -->
+ <data ROLE_ID="1" OPERATION="2"/> <!-- Permission.MANAGE_SETTINGS -->
+ <data ROLE_ID="1" OPERATION="12"/> <!-- Permission.MANAGE_BUNDLE -->
+ <data ROLE_ID="1" OPERATION="15"/> <!-- Permission.MANAGE_REPOSITORIES -->
+ <data ROLE_ID="1" OPERATION="17"/> <!-- Permission.VIEW_USERS -->
+ <!-- resource permissions start here-->
+ <data ROLE_ID="1" OPERATION="3"/> <!-- Permission.VIEW_RESOURCE -->
+ <data ROLE_ID="1" OPERATION="4"/> <!-- Permission.MODIFY_RESOURCE -->
+ <data ROLE_ID="1" OPERATION="5"/> <!-- Permission.DELETE_RESOURCE -->
+ <data ROLE_ID="1" OPERATION="6"/> <!-- Permission.CREATE_CHILD_RESOURCES -->
+ <data ROLE_ID="1" OPERATION="7"/> <!-- Permission.MANAGE_ALERTS -->
+ <data ROLE_ID="1" OPERATION="8"/> <!-- Permission.MANAGE_MEASUREMENTS -->
+ <data ROLE_ID="1" OPERATION="9"/> <!-- Permission.MANAGE_CONTENT -->
+ <data ROLE_ID="1" OPERATION="10"/> <!-- Permission.CONTROL -->
+ <data ROLE_ID="1" OPERATION="11"/> <!-- Permission.CONFIGURE_WRITE -->
+ <data ROLE_ID="1" OPERATION="13"/> <!-- Permission.CONFIGURE_READ -->
+ <data ROLE_ID="1" OPERATION="14"/> <!-- Permission.MANAGE_EVENTS -->
+ <data ROLE_ID="1" OPERATION="16"/> <!-- Permission.MANAGE_DRIFT -->
+
+ <!-- give all-resources-role MANAGE_INVENTORY and MANAGE_BUNDLE permissions
+ (explicitly add resource perms as well, even though they are implied by MANAGE_INVENTORY) -->
+ <data ROLE_ID="2" OPERATION="1"/> <!-- Permission.MANAGE_INVENTORY -->
+ <data ROLE_ID="2" OPERATION="12"/> <!-- Permission.MANAGE_BUNDLE -->
+ <data ROLE_ID="2" OPERATION="17"/> <!-- Permission.VIEW_USERS -->
+ <!-- resource permissions start here-->
+ <data ROLE_ID="2" OPERATION="3"/> <!-- Permission.VIEW_RESOURCE -->
+ <data ROLE_ID="2" OPERATION="4"/> <!-- Permission.MODIFY_RESOURCE -->
+ <data ROLE_ID="2" OPERATION="5"/> <!-- Permission.DELETE_RESOURCE -->
+ <data ROLE_ID="2" OPERATION="6"/> <!-- Permission.CREATE_CHILD_RESOURCES -->
+ <data ROLE_ID="2" OPERATION="7"/> <!-- Permission.MANAGE_ALERTS -->
+ <data ROLE_ID="2" OPERATION="8"/> <!-- Permission.MANAGE_MEASUREMENTS -->
+ <data ROLE_ID="2" OPERATION="9"/> <!-- Permission.MANAGE_CONTENT -->
+ <data ROLE_ID="2" OPERATION="10"/> <!-- Permission.CONTROL -->
+ <data ROLE_ID="2" OPERATION="11"/> <!-- Permission.CONFIGURE_WRITE -->
+ <data ROLE_ID="2" OPERATION="13"/> <!-- Permission.CONFIGURE_READ -->
+ <data ROLE_ID="2" OPERATION="14"/> <!-- Permission.MANAGE_EVENTS -->
+ <data ROLE_ID="2" OPERATION="16"/> <!-- Permission.MANAGE_DRIFT -->
+ </table>
+
+<!-- END: authz-data.xml -->
+<!-- BEGIN: search-data.xml -->
+
+
+ <!-- overlord-created, global, default saved searches -->
+ <table name="RHQ_SAVED_SEARCH">
+ <data ID="1"
+ CONTEXT="RESOURCE"
+ NAME="Downed Platforms"
+ DESCRIPTION="All downed machines across the entire enterprise"
+ PATTERN="availability=down category=platform"
+ LAST_COMPUTE_TIME="0"
+ SUBJECT_ID="1"
+ GLOBAL="TRUE" />
+ <data ID="2"
+ CONTEXT="RESOURCE"
+ NAME="Downed Servers"
+ DESCRIPTION="All downed servers across the entire enterprise"
+ PATTERN="availability=down category=server"
+ LAST_COMPUTE_TIME="0"
+ SUBJECT_ID="1"
+ GLOBAL="TRUE" />
+ </table>
+
+<!-- END: search-data.xml -->
+<!-- BEGIN: sysconfig-data.xml -->
+
+
+ <!--
+ This file contains the seed data for the configuration table.
+ All keys mentioned here should be referenced via the RHQConstants class
+ -->
+ <table name="RHQ_SYSTEM_CONFIG">
+ <data ID="1" PROPERTY_KEY="SERVER_VERSION" PROPERTY_VALUE="4.4.0"
+ DEFAULT_PROPERTY_VALUE="4.4.0" FREAD_ONLY="TRUE"/>
+ <data ID="2" PROPERTY_KEY="DB_SCHEMA_VERSION" PROPERTY_VALUE="2.121"
+ DEFAULT_PROPERTY_VALUE="2.121" FREAD_ONLY="TRUE"/>
+ <data ID="3" PROPERTY_KEY="CAM_JAAS_PROVIDER" PROPERTY_VALUE="JDBC"
+ DEFAULT_PROPERTY_VALUE="JDBC" FREAD_ONLY="FALSE"/>
+ <data ID="4" PROPERTY_KEY="CAM_BASE_URL" PROPERTY_VALUE="http://localhost:7080/"
+ DEFAULT_PROPERTY_VALUE="http://localhost:7080/" FREAD_ONLY="FALSE"/>
+ <data ID="9" PROPERTY_KEY="CAM_HELP_USER" PROPERTY_VALUE="web"
+ DEFAULT_PROPERTY_VALUE="web" FREAD_ONLY="FALSE"/>
+ <data ID="10" PROPERTY_KEY="CAM_HELP_PASSWORD" PROPERTY_VALUE="user"
+ DEFAULT_PROPERTY_VALUE="user" FREAD_ONLY="FALSE"/>
+
+ <!-- default LDAP configuration options -->
+ <data ID="11" PROPERTY_KEY="CAM_LDAP_NAMING_FACTORY_INITIAL"
+ PROPERTY_VALUE="com.sun.jndi.ldap.LdapCtxFactory"
+ DEFAULT_PROPERTY_VALUE="com.sun.jndi.ldap.LdapCtxFactory"
+ FREAD_ONLY="FALSE"/>
+ <data ID="12" PROPERTY_KEY="CAM_LDAP_NAMING_PROVIDER_URL"
+ PROPERTY_VALUE="ldap://localhost/"
+ DEFAULT_PROPERTY_VALUE="ldap://localhost/"
+ FREAD_ONLY="FALSE"/>
+ <data ID="13" PROPERTY_KEY="CAM_LDAP_LOGIN_PROPERTY"
+ PROPERTY_VALUE="cn"
+ DEFAULT_PROPERTY_VALUE="cn" FREAD_ONLY="FALSE"/>
+ <data ID="14" PROPERTY_KEY="CAM_LDAP_BASE_DN"
+ PROPERTY_VALUE="o=JBoss,c=US"
+ DEFAULT_PROPERTY_VALUE="o=JBoss,c=US"
+ FREAD_ONLY="FALSE"/>
+ <data ID="15" PROPERTY_KEY="CAM_LDAP_BIND_DN"
+ PROPERTY_VALUE=""
+ DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
+ <data ID="16" PROPERTY_KEY="CAM_LDAP_BIND_PW"
+ PROPERTY_VALUE=""
+ DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="FALSE"/>
+ <data ID="17" PROPERTY_KEY="CAM_LDAP_PROTOCOL"
+ PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE=""
+ FREAD_ONLY="FALSE"/>
+ <data ID="18" PROPERTY_KEY="CAM_LDAP_FILTER"
+ PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE=""
+ FREAD_ONLY="FALSE"/>
+
+ <!-- Does this build support Syslog actions? -->
+ <data ID="21" PROPERTY_KEY="CAM_SYSLOG_ACTIONS_ENABLED"
+ PROPERTY_VALUE="false" DEFAULT_PROPERTY_VALUE="false"
+ FREAD_ONLY="FALSE"/>
+ <data ID="23" PROPERTY_KEY="CAM_GUIDE_ENABLED"
+ PROPERTY_VALUE="true"
+ DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
+ <data ID="24" PROPERTY_KEY="CAM_RT_COLLECT_IP_ADDRS"
+ PROPERTY_VALUE="true"
+ DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
+
+ <!-- Default data storage options -->
+ <!-- Default 14 days -->
+ <data ID="26" PROPERTY_KEY="CAM_DATA_PURGE_1H"
+ PROPERTY_VALUE="1209600000" DEFAULT_PROPERTY_VALUE="1209600000"
+ FREAD_ONLY="FALSE"/>
+ <!-- Default 31 days -->
+ <data ID="27" PROPERTY_KEY="CAM_DATA_PURGE_6H"
+ PROPERTY_VALUE="2678400000" DEFAULT_PROPERTY_VALUE="2678400000"
+ FREAD_ONLY="FALSE"/>
+ <!-- Default 1 year -->
+ <data ID="28" PROPERTY_KEY="CAM_DATA_PURGE_1D"
+ PROPERTY_VALUE="31536000000" DEFAULT_PROPERTY_VALUE="31536000000"
+ FREAD_ONLY="FALSE"/>
+
+ <!-- Baseline options -->
+ <!-- How often to calculate, default 3 days; if 0, never calculate them automatically -->
+ <data ID="29" PROPERTY_KEY="CAM_BASELINE_FREQUENCY"
+ PROPERTY_VALUE="259200000" DEFAULT_PROPERTY_VALUE="259200000"
+ FREAD_ONLY="FALSE"/>
+ <!-- How much data to include in the calulation, default 7 days -->
+ <data ID="30" PROPERTY_KEY="CAM_BASELINE_DATASET"
+ PROPERTY_VALUE="604800000" DEFAULT_PROPERTY_VALUE="604800000"
+ FREAD_ONLY="FALSE"/>
+
+ <!-- ID 31 has been deleted -->
+
+ <!-- How often to run database maintainence routines -->
+ <data ID="32" PROPERTY_KEY="CAM_DATA_MAINTENANCE"
+ PROPERTY_VALUE="3600000" DEFAULT_PROPERTY_VALUE="3600000" FREAD_ONLY="FALSE"/>
+
+ <!-- How long to keep RT data around -->
+ <data ID="34" PROPERTY_KEY="RT_DATA_PURGE" PROPERTY_VALUE="2678400000"
+ DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
+
+ <!-- Whether to reindex the data tables nightly -->
+ <data ID="35" PROPERTY_KEY="DATA_REINDEX_NIGHTLY" PROPERTY_VALUE="true"
+ DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
+
+ <!-- How long to keep alerts around -->
+ <data ID="36" PROPERTY_KEY="ALERT_PURGE" PROPERTY_VALUE="2678400000"
+ DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
+
+ <!-- How long to keep events around (1209600000 millis == 14 days) -->
+ <data ID="51" PROPERTY_KEY="EVENT_PURGE" PROPERTY_VALUE="1209600000"
+ DEFAULT_PROPERTY_VALUE="1209600000" FREAD_ONLY="FALSE"/>
+
+ <!-- How long an agent is allowed to be quiet before we consider it down and backfill it -->
+ <data ID="52" PROPERTY_KEY="AGENT_MAX_QUIET_TIME_ALLOWED" PROPERTY_VALUE="300000"
+ DEFAULT_PROPERTY_VALUE="300000" FREAD_ONLY="FALSE"/>
+
+ <!-- Will our server-cloud support agents auto-updating themselves? -->
+ <data ID="53" PROPERTY_KEY="ENABLE_AGENT_AUTO_UPDATE" PROPERTY_VALUE="true"
+ DEFAULT_PROPERTY_VALUE="true" FREAD_ONLY="FALSE"/>
+
+ <!-- How old does a trait have to be in order to get purged -->
+ <data ID="54" PROPERTY_KEY="TRAIT_PURGE" PROPERTY_VALUE="31536000000"
+ DEFAULT_PROPERTY_VALUE="31536000000" FREAD_ONLY="FALSE"/>
+
+ <!-- How old does availability have to be in order to get purged -->
+ <data ID="55" PROPERTY_KEY="AVAILABILITY_PURGE" PROPERTY_VALUE="31536000000"
+ DEFAULT_PROPERTY_VALUE="31536000000" FREAD_ONLY="FALSE"/>
+
+ <data ID="56" PROPERTY_KEY="RESOURCE_GENERIC_PROPERTIES_UPGRADE" PROPERTY_VALUE="false"
+ DEFAULT_PROPERTY_VALUE="false" FREAD_ONLY="FALSE"/>
+
+ <!-- default drift server plugin settings -->
+ <data ID="57" PROPERTY_KEY="ACTIVE_DRIFT_PLUGIN" PROPERTY_VALUE="drift-jpa"
+ DEFAULT_PROPERTY_VALUE="drift-jpa" FREAD_ONLY="FALSE"/>
+
+ <!-- purge drift files older than 31 days by default -->
+ <data ID="58" PROPERTY_KEY="DRIFT_FILE_PURGE" PROPERTY_VALUE="2678400000"
+ DEFAULT_PROPERTY_VALUE="2678400000" FREAD_ONLY="FALSE"/>
+
+ </table>
+
+<!-- END: sysconfig-data.xml -->
+<!-- BEGIN: measurement-data.xml -->
+
+ <table name="RHQ_NUMBERS">
+ <data i="0"/>
+ <data i="1"/>
+ <data i="2"/>
+ <data i="3"/>
+ <data i="4"/>
+ <data i="5"/>
+ <data i="6"/>
+ <data i="7"/>
+ <data i="8"/>
+ <data i="9"/>
+ <data i="10"/>
+ <data i="11"/>
+ <data i="12"/>
+ <data i="13"/>
+ <data i="14"/>
+ <data i="15"/>
+ <data i="16"/>
+ <data i="17"/>
+ <data i="18"/>
+ <data i="19"/>
+ <data i="20"/>
+ <data i="21"/>
+ <data i="22"/>
+ <data i="23"/>
+ <data i="24"/>
+ <data i="25"/>
+ <data i="26"/>
+ <data i="27"/>
+ <data i="28"/>
+ <data i="29"/>
+ <data i="30"/>
+ <data i="31"/>
+ <data i="32"/>
+ <data i="33"/>
+ <data i="34"/>
+ <data i="35"/>
+ <data i="36"/>
+ <data i="37"/>
+ <data i="38"/>
+ <data i="39"/>
+ <data i="40"/>
+ <data i="41"/>
+ <data i="42"/>
+ <data i="43"/>
+ <data i="44"/>
+ <data i="45"/>
+ <data i="46"/>
+ <data i="47"/>
+ <data i="48"/>
+ <data i="49"/>
+ <data i="50"/>
+ <data i="51"/>
+ <data i="52"/>
+ <data i="53"/>
+ <data i="54"/>
+ <data i="55"/>
+ <data i="56"/>
+ <data i="57"/>
+ <data i="58"/>
+ <data i="59"/>
+ </table>
+
+<!-- END: measurement-data.xml -->
+<!-- BEGIN: content-data.xml -->
+
+ <table name="RHQ_ARCHITECTURE">
+ <data id="1" name="noarch"/>
+ <data id="2" name="i386"/>
+ <data id="3" name="i486"/>
+ <data id="4" name="i586"/>
+ <data id="5" name="i686"/>
+ <data id="6" name="alpha"/>
+ <data id="7" name="alphaev6"/>
+ <data id="8" name="ia64"/>
+ <data id="9" name="sparc"/>
+ <data id="10" name="sparcv9"/>
+ <data id="11" name="sparc64"/>
+ <data id="12" name="src"/>
+ <data id="13" name="s390"/>
+ <data id="14" name="athlon"/>
+ <data id="15" name="s390x"/>
+ <data id="16" name="ppc"/>
+ <data id="17" name="ppc64"/>
+ <data id="18" name="pSeries"/>
+ <data id="19" name="iSeries"/>
+ <data id="20" name="x86_64"/>
+ <data id="21" name="ppc64iseries"/>
+ <data id="22" name="ppc64pseries"/>
+ <data id="23" name="sparc-solaris"/>
+ <data id="24" name="sparc.sun4u-solaris"/>
+ <data id="25" name="tar"/>
+ <data id="26" name="ia32e"/>
+ <data id="27" name="amd64"/>
+ <data id="28" name="i386-solaris"/>
+ <data id="29" name="nosrc"/>
+ <data id="30" name="sparc-solaris-patch"/>
+ <data id="31" name="i386-solaris-patch"/>
+ <data id="32" name="sparc-solaris-patch-cluster"/>
+ <data id="33" name="i386-solaris-patch-cluster"/>
+ <data id="34" name="noarch-solaris"/>
+ <data id="35" name="noarch-solaris-patch"/>
+ <data id="36" name="noarch-solaris-patch-cluster"/>
+ <data id="37" name="solaris-patch"/>
+ <data id="38" name="solaris-patch-cluster"/>
+ </table>
+
+ <table name="RHQ_REPO_GROUP_TYPE">
+ <data id="1" name="family"/>
+ </table>
+
+ <table name="RHQ_REPO_RELATION_TYPE">
+ <data id="1" name="parent"/>
+ <data id="2" name="clone"/>
+ </table>
+
+ <table name="RHQ_DISTRIBUTION_TYPE">
+ <data id="1" name="kickstart" description="Linux kickstart distribution"/>
+ <data id="2" name="jumpstart" description="solaris jumpstart distribution"/>
+ </table>
+
+<!-- END: content-data.xml -->
+<!-- BEGIN: jms-data.xml -->
+
+<!-- the schema matches that which would be automatically created by the JMS subsystem -->
+<!-- see deploy/jms/rhq-jdbc-state-service.xml and rhq-jdbc2-service.xml -->
+<!-- the data must match that which is expected in conf/login-config.xml -->
+
+
+ <table name="JMS_USERS">
+ <data USERID="guest" PASSWD="guest" />
+ </table>
+
+ <table name="JMS_ROLES">
+ <data ROLEID="guest" USERID="guest" />
+ </table>
+
+<!-- END: jms-data.xml -->
+</dbsetup>
diff --git a/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.4.0.xml b/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.4.0.xml
new file mode 100644
index 0000000..2eb4b19
--- /dev/null
+++ b/modules/enterprise/gui/installer-war/src/test/resources/org/rhq/enterprise/installer/db-schema-combined-rhq-4.4.0.xml
@@ -0,0 +1,2649 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dbsetup name="schema">
+<!-- BEGIN: config-schema.xml -->
+
+
+ <!-- Definition or Metadata tables -->
+
+ <table name="RHQ_CONFIG_DEF">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="DESCRIPTION" type="VARCHAR2" required="false" size="250"/>
+ <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
+ <column name="CONFIG_FORMAT" type="VARCHAR2" required="false" size="32"/>
+ </table>
+
+ <table name="RHQ_CONFIG_PROP_GRP_DEF">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="DISPLAY_NAME" type="VARCHAR2" required="false" size="100"/>
+ <column name="DESCRIPTION" type="VARCHAR2" required="false" size="250"/>
+ <column name="DEFAULT_HIDDEN" type="BOOLEAN" required="false"/>
+ <column name="ORDER_INDEX" type="INTEGER" required="false"/>
+ </table>
+
+ <table name="RHQ_CONFIG_PROP_DEF">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="NAME" type="VARCHAR2" required="false" size="255"/>
+ <column name="DISPLAY_NAME" type="VARCHAR2" required="false" size="100"/>
+ <column name="DESCRIPTION" type="VARCHAR2" required="false" size="1000"/>
+ <column name="DEFAULT_VALUE" type="VARCHAR2" required="false" size="2000"/>
+ <column name="REQUIRED" type="BOOLEAN" required="false"/>
+ <column name="READONLY" type="BOOLEAN" required="false"/>
+ <column name="SUMMARY" type="BOOLEAN" required="false"/>
+ <column name="ACTIVATION_POLICY" type="VARCHAR2" required="false" size="20"/>
+ <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_GRP_DEF"/>
+ <column name="ORDER_INDEX" type="INTEGER" required="false"/>
+ <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
+ <column name="PARENT_MAP_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
+ <column name="PARENT_LIST_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
+ <column name="SIMPLE_TYPE" type="VARCHAR2" required="false" size="20"/>
+ <column name="ALLOW_CUSTOM_ENUM_VALUE" type="BOOLEAN" required="false"/>
+ <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
+ <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF"/>
+
+ <!-- only simple properties (not lists and maps) have this -->
+ <column name="UNITS" type="SMALLINT" required="false"/>
+
+ <!-- only dynamic properties (not simple) have this -->
+ <column name="DYNAMIC_TYPE" type="VARCHAR2" size="20" required="false"/>
+ <column name="DYNAMIC_KEY" type="VARCHAR2" size="128" required="false"/>
+ </table>
+
+ <table name="RHQ_CONF_PROP_DEF_ENUM">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="STRING_VALUE" type="VARCHAR2" required="false" size="500"/>
+ <column name="ORDER_INDEX" type="INTEGER" required="false"/>
+ <column name="NAME" type="VARCHAR2" required="false" size="100"/>
+ <column name="PROPERTY_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
+ </table>
+
+ <table name="RHQ_CONFIG_PD_OSRC">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="LINK_TO_TARGET" type="BOOLEAN" required="false"/>
+ <column name="FILTER" type="VARCHAR2" required="false" size="40"/>
+ <column name="EXPRESSION" type="VARCHAR2" required="true" size="400"/>
+ <column name="TARGET_TYPE" type="VARCHAR2" required="true" size="20"/>
+ <column name="PROPERTY_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
+ </table>
+
+ <table name="RHQ_CONFIG_PROP_CONSTR">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="DTYPE" type="VARCHAR2" required="true" size="15"/>
+ <column name="DETAILS" type="VARCHAR2" required="false" size="250"/>
+ <column name="CONFIG_PROP_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROP_DEF"/>
+ <column name="ORDER_INDEX" type="INTEGER" required="false"/>
+ </table>
+
+
+ <!-- Content or value tables -->
+
+ <table name="RHQ_CONFIG">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="NOTES" type="VARCHAR2" required="false" size="512"/>
+ <column name="VERSION" type="VARCHAR2" required="false" size="50"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ </table>
+
+ <table name="RHQ_CONFIG_PROPERTY">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG" ondelete="cascade"/>
+ <column name="STRING_VALUE" type="VARCHAR2" required="false" size="2000"/>
+ <column name="OVERRIDE" type="BOOLEAN" required="false"/>
+ <column name="NAME" type="VARCHAR2" required="true" size="255"/>
+ <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
+ <!-- Recursive cascade path to RHQ_CONFIG_PROPERTY causes constraint creation errors on SQL Server, see
+ http://support.microsoft.com/kb/321843 -->
+ <column name="PARENT_LIST_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROPERTY" ondelete="cascade" />
+ <column name="PARENT_MAP_ID" type="INTEGER" required="false" references="RHQ_CONFIG_PROPERTY" ondelete="cascade" />
+ <column name="LIST_INDEX" type="INTEGER"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <index name="RHQ_CONFIG_PROP_idx_prop_key" unique="false">
+ <field ref="CONFIGURATION_ID"/>
+ <field ref="NAME"/>
+ </index>
+ <index name="RHQ_CONFIG_PROP_idx_map_key" unique="false">
+ <field ref="PARENT_MAP_ID"/>
+ <field ref="NAME"/>
+ </index>
+ <index name="RHQ_CONFIG_PROP_idx_list_key" unique="false">
+ <field ref="PARENT_LIST_ID"/>
+ </index>
+ <!-- List entries all have the same name -->
+ </table>
+
+ <table name="RHQ_CONFIG_TEMPLATE">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="NAME" type="VARCHAR2" required="false" size="100"/>
+ <column name="DESCRIPTION" type="VARCHAR2" required="false" size="500"/>
+ <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
+ <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF"/>
+ <column name="IS_DEFAULT" type="BOOLEAN" required="false"/>
+ </table>
+
+ <table name="RHQ_RAW_CONFIG">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="CONFIG_ID" type="INTEGER" required="true" references="RHQ_CONFIG(ID)"/>
+ <column name="PATH" type="VARCHAR2" required="false" size="512"/>
+ <column name="CONTENTS" type="CLOB" required="true"/>
+ <column name="SHA256" type="VARCHAR2" size="64" required="true"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ </table>
+
+<!-- END: config-schema.xml -->
+<!-- BEGIN: cluster-schema.xml -->
+
+ <table name="RHQ_AFFINITY_GROUP">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" required="true" size="255" type="VARCHAR2"/>
+ </table>
+
+ <table name="RHQ_SERVER">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" required="true" size="255" type="VARCHAR2"/>
+ <column name="ADDRESS" required="true" size="255" type="VARCHAR2"/>
+ <column name="PORT" required="true" type="INTEGER"/>
+ <column name="SECURE_PORT" required="true" type="INTEGER"/>
+ <column name="CTIME" required="true" type="LONG"/>
+ <column name="MTIME" required="true" type="LONG"/>
+ <column name="AFFINITY_GROUP_ID" type="INTEGER" references="RHQ_AFFINITY_GROUP" required="false"/>
+ <column name="COMPUTE_POWER" required="true" type="INTEGER"/>
+ <column name="OPERATION_MODE" required="true" size="32" type="VARCHAR2"/>
+ <column name="STATUS" type="INTEGER" required="false" default="0" />
+
+ <!-- This index is for constraint, not performance -->
+ <index name="RHQ_SERVER_NAME_UNIQUE" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <!-- new agent -->
+ <table name="RHQ_AGENT">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" required="true" size="255" type="VARCHAR2"/>
+ <column name="ADDRESS" required="true" size="255" type="VARCHAR2"/>
+ <column name="PORT" required="true" type="INTEGER"/>
+ <column name="AGENTTOKEN" required="true" size="100" type="VARCHAR2"/>
+ <column name="REMOTE_ENDPOINT" required="false" size="4000" type="VARCHAR2"/>
+ <column name="CTIME" required="true" type="LONG"/>
+ <column name="MTIME" required="true" type="LONG"/>
+ <column name="LAST_AVAILABILITY_REPORT" required="false" type="LONG"/>
+ <column name="LAST_AVAILABILITY_PING" required="false" type="LONG"/>
+ <column name="AFFINITY_GROUP_ID" type="INTEGER" references="RHQ_AFFINITY_GROUP" required="false"/>
+ <column name="SERVER_ID" type="INTEGER" references="RHQ_SERVER" required="false"/>
+ <column name="STATUS" type="INTEGER" required="false" default="0" />
+ <column name="BACKFILLED" type="BOOLEAN" required="true" />
+
+ <index name="RHQ_AGENT_NAME_UNIQUE" unique="true">
+ <field ref="NAME"/>
+ </index>
+
+ <index name="RHQ_AGENT_ADDRESS_PORT" unique="true">
+ <field ref="ADDRESS"/>
+ <field ref="PORT"/>
+ </index>
+
+ <index name="RHQ_AGENT_TOKEN_UNIQUE" unique="true">
+ <field ref="AGENTTOKEN"/>
+ </index>
+ </table>
+
+ <table name="RHQ_PARTITION_EVENT">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="SUBJECT_NAME" required="true" size="100" type="VARCHAR2"/>
+ <column name="CTIME" required="true" type="LONG"/>
+ <column name="EVENT_TYPE" required="true" size="50" type="VARCHAR2"/>
+ <column name="EVENT_DETAIL" required="false" size="512" type="VARCHAR2"/>
+ <column name="EXECUTION_STATUS" required="true" size="32" type="VARCHAR2"/>
+ </table>
+
+ <table name="RHQ_PARTITION_DETAILS">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="PARTITION_EVENT_ID" type="INTEGER" references="RHQ_PARTITION_EVENT" required="true"/>
+ <column name="AGENT_NAME" type="VARCHAR2" size="255" required="true"/>
+ <column name="SERVER_NAME" type="VARCHAR2" size="255" required="true"/>
+ </table>
+
+ <table name="RHQ_FAILOVER_LIST">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="PARTITION_EVENT_ID" type="INTEGER" references="RHQ_PARTITION_EVENT" required="true"/>
+ <column name="AGENT_ID" type="INTEGER" references="RHQ_AGENT" required="true"/>
+ <column name="CTIME" required="true" type="LONG"/>
+ </table>
+
+ <table name="RHQ_FAILOVER_DETAILS">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="FAILOVER_LIST_ID" type="INTEGER" references="RHQ_FAILOVER_LIST" required="true"/>
+ <column name="SERVER_ID" type="INTEGER" references="RHQ_SERVER" required="true"/>
+ <column name="ORDINAL" type = "INTEGER" required="true"/>
+ </table>
+
+<!-- END: cluster-schema.xml -->
+<!-- BEGIN: auth-schema.xml -->
+
+
+ <table name="RHQ_PRINCIPAL">
+
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="PRINCIPAL" required="true" type="VARCHAR2" size="100"/>
+ <column name="PASSWORD" required="true" type="VARCHAR2" size="64"/>
+
+ <!-- ensure that principals are unique -->
+ <index name="RHQ_PRINCIPAL_PRINCIPAL_KEY" unique="true">
+ <field ref="PRINCIPAL"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_SUBJECT">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" required="true" size="100" type="VARCHAR2"/>
+ <column name="CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
+ <column name="FIRST_NAME" required="false" size="100" type="VARCHAR2"/>
+ <column name="LAST_NAME" required="false" size="100" type="VARCHAR2"/>
+ <column name="EMAIL_ADDRESS" size="100" type="VARCHAR2"/>
+ <column name="SMS_ADDRESS" size="100" type="VARCHAR2"/>
+ <column name="PHONE_NUMBER" size="100" type="VARCHAR2"/>
+ <column name="DEPARTMENT" size="100" type="VARCHAR2"/>
+ <column name="FACTIVE" required="true" type="BOOLEAN" default="true"/>
+ <column name="FSYSTEM" required="true" type="BOOLEAN" default="false"/>
+
+ <index name="RHQ_SUBJECT_AUTH_KEY" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+<!-- END: auth-schema.xml -->
+<!-- BEGIN: inventory-schema.xml -->
+
+
+ <!-- NEW RESOURCE TYPES -->
+ <table name="RHQ_RESOURCE_TYPE">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" type="VARCHAR2" size="100" required="true"/>
+ <column name="CATEGORY" type="VARCHAR2" size="16" required="true"/>
+ <column name="CREATION_DATA_TYPE" type="VARCHAR2" size="16" required="true"/>
+ <column name="CREATE_DELETE_POLICY" type="VARCHAR2" size="16" required="true"/>
+ <column name="SINGLETON" type="BOOLEAN" required="true"/>
+ <column name="SUPPORTS_MANUAL_ADD" type="BOOLEAN" required="true"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
+ <column name="PLUGIN" type="VARCHAR2" size="100"/>
+ <column name="CTIME" type="LONG"/>
+ <column name="MTIME" type="LONG"/>
+ <column name="DELETED" type="BOOLEAN" default="FALSE" required="TRUE"/>
+ <column name="SUBCATEGORY_ID" type="INTEGER"/>
+ <!--
+ TODO add support to DB setup for tables with circular dependencies and then add back this RI
+ <column name="SUBCATEGORY_ID" type="INTEGER" references="RHQ_RESOURCE_SUBCAT" />
+ -->
+ <column name="PLUGIN_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
+ <column name="RES_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
+ <column name="BUNDLE_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG"/>
+
+ <index name="RHQ_RES_TYPE_IDX_PLG_NAME" unique="true">
+ <field ref="NAME"/>
+ <field ref="PLUGIN"/>
+ </index>
+ </table>
+
+ <!-- NEW RESOURCE SUBCATEGORIES -->
+ <table name="RHQ_RESOURCE_SUBCAT">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" type="VARCHAR2" size="100"/>
+ <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
+ <column name="CTIME" type="LONG"/>
+ <column name="MTIME" type="LONG"/>
+ <column name="PARENT_SUBCATEGORY_ID" type="INTEGER" references="RHQ_RESOURCE_SUBCAT"/>
+ <!-- resourceTypeId is not required on child sub categories -->
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
+ </table>
+
+ <!-- Many To Many mapping for resource type to its parents -->
+ <table name="RHQ_RESOURCE_TYPE_PARENTS">
+ <column name="RESOURCE_TYPE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
+ <column name="PARENT_RESOURCE_TYPE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
+
+ <!-- not using full words to fit index name length -->
+ <constraint name="RHQ_RES_TYPE_PARENTS_KEY">
+ <primaryKey>
+ <field ref="RESOURCE_TYPE_ID"/>
+ <field ref="PARENT_RESOURCE_TYPE_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_PROCESS_SCAN">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="QUERY" type="VARCHAR2" size="256" required="true"/>
+ <column name="NAME" type="VARCHAR2" size="100" required="false"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
+
+ <index name="RHQ_PROCESS_SCAN_QUERY_INDEX" unique="true">
+ <field ref="QUERY"/>
+ <field ref="RESOURCE_TYPE_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_PRD_VER">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="VERSION" type="VARCHAR2" size="100" required="true"/>
+ <column name="RES_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
+ </table>
+
+ <table name="RHQ_RESOURCE">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
+ <column name="UUID" type="CHAR" size="36" required="true"/>
+ <column name="NAME" type="VARCHAR2" size="500"/>
+ <!-- ancestry holds the full parental ancestry, used for disambiguation -->
+ <column name="ANCESTRY" type="VARCHAR2" required="false" size="4000"/>
+ <column name="RESOURCE_KEY" type="VARCHAR2" required="true" size="500"/>
+ <column name="AGENT_ID" required="false" type="INTEGER" references="RHQ_AGENT(id)"/>
+ <column name="INVENTORY_STATUS" type="VARCHAR2" size="20"/>
+ <column name="CONNECTED" type="BOOLEAN"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
+ <column name="VERSION" type="VARCHAR2" size="100"/>
+ <column name="CTIME" type="LONG"/>
+ <column name="MTIME" type="LONG"/>
+ <column name="ITIME" type="LONG"/>
+ <column name="RES_CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
+ <column name="PLUGIN_CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG"/>
+ <column name="MODIFIED_BY" required="false" size="100" type="VARCHAR2"/>
+ <column name="LOCATION" required="false" size="100" type="VARCHAR2"/>
+ <column name="PARENT_RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE"/>
+ <column name="PRODUCT_VERSION_ID" type="INTEGER" references="RHQ_PRD_VER"/>
+
+ <index name="RHQ_RESOURCE_idx_key">
+ <field ref="RESOURCE_KEY"/>
+ </index>
+
+ <index name="RHQ_RESOURCE_idx_type">
+ <field ref="RESOURCE_TYPE_ID"/>
+ </index>
+
+ <index name="RHQ_RESOURCE_idx_agent">
+ <field ref="AGENT_ID"/>
+ </index>
+
+ <index name="RHQ_RESOURCE_idx_parent">
+ <field ref="PARENT_RESOURCE_ID"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_RESOURCE_ERROR">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
+ <column name="TIME_OCCURRED" type="LONG" required="true"/>
+ <column name="ERROR_TYPE" type="VARCHAR2" required="true" size="32"/>
+ <column name="SUMMARY" type="VARCHAR2" required="true" size="1000"/>
+ <column name="DETAIL" type="LONGVARCHAR" required="false"/>
+
+ <index name="RHQ_RES_ERROR_IDX_RES_ID">
+ <field ref="RESOURCE_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_GROUP_DEF">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" required="true" size="100" type="VARCHAR2"/>
+ <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
+ <column name="CTIME" type="LONG"/>
+ <column name="MTIME" type="LONG"/>
+ <column name="CALC_TIME" type="LONG"/>
+ <column name="CALC_INTERVAL" type="LONG"/>
+ <column name="RECURSIVE" type="BOOLEAN"/>
+ <column name="EXPRESSION" type="VARCHAR2" size="1000"/>
+
+ <index name="RHQ_GROUP_DEF_NAME" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <table name="RHQ_RESOURCE_GROUP">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <!-- this name can be longer than the size of the GROUP_BY column, which is used to uniquely identify it -->
+ <!-- Max bytes for Oracle Varchar2 to accommodate large cluster keys -->
+ <column name="NAME" required="true" size="4000" type="VARCHAR2"/>
+ <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE"/>
+ <!-- Compatible groups only -->
+ <column name="CTIME" type="LONG"/>
+ <column name="MTIME" type="LONG"/>
+ <column name="MODIFIED_BY" required="false" size="100" type="VARCHAR2"/>
+ <column name="RECURSIVE" type="BOOLEAN"/>
+
+ <column name="GROUP_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_GROUP_DEF"/>
+ <column name="GROUP_BY" size="500" type="VARCHAR2"/>
+
+ <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
+
+ <!-- This is only set if this is a subject-owned group (like an autogroup) -->
+ <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT"/>
+
+ <!-- These two only set if this is a backing group for a resource auto-cluster -->
+ <column name="CLUSTER_KEY" type="VARCHAR2" size="4000" required="false"/>
+ <column name="CLUSTER_RESOURCE_GROUP_ID" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
+
+ <!-- This is only set if this is a backing group for a resource auto-group -->
+ <column name="AUTO_GROUP_PARENT_RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE"/>
+
+ <column name="VISIBLE" type="BOOLEAN"/>
+
+ <index name="RHQ_RES_GROUP_NAME" unique="false">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <!-- Many To Many mapping for groups to implicit resources -->
+ <table name="RHQ_RESOURCE_GROUP_RES_IMP_MAP">
+ <column name="RESOURCE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE"/>
+ <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
+
+ <!-- not using full words to fit index name length -->
+ <constraint name="RHQ_RES_GROUP_RES_IMP_MAP_KEY">
+ <primaryKey>
+ <field ref="RESOURCE_ID"/>
+ <field ref="RESOURCE_GROUP_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <!-- Many To Many mapping for groups to explicit resources -->
+ <table name="RHQ_RESOURCE_GROUP_RES_EXP_MAP">
+ <column name="RESOURCE_ID" required="true" type="INTEGER" references="RHQ_RESOURCE"/>
+ <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
+
+ <!-- not using full words to fit index name length -->
+ <constraint name="RHQ_RES_GROUP_RES_EXP_MAP_KEY">
+ <primaryKey>
+ <field ref="RESOURCE_ID"/>
+ <field ref="RESOURCE_GROUP_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_CONFIG_GROUP_UPDATE">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
+ <column name="CONFIGURATION_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/>
+ <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="100"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
+ </table>
+
+ <table name="RHQ_CONFIG_UPDATE">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="CONFIGURATION_ID" type="INTEGER" required="true" references="RHQ_CONFIG" ondelete="cascade"/>
+ <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="100"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="CONFIG_RES_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
+ <column name="PLUGIN_CONFIG_RES_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
+ <column name="AGG_RES_UPDATE_ID" type="INTEGER" required="false" references="RHQ_CONFIG_GROUP_UPDATE"/>
+ <column name="AGG_PLUGIN_UPDATE_ID" type="INTEGER" required="false" references="RHQ_CONFIG_GROUP_UPDATE"/>
+ <column name="DTYPE" type="VARCHAR2" required="true" size="10"/>
+ </table>
+
+
+ <table name="RHQ_TAGGING">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="NAMESPACE" type="VARCHAR2" required="false" size="20"/>
+ <column name="SEMANTIC" type="VARCHAR2" required="false" size="50"/>
+ <column name="NAME" type="VARCHAR2" required="true" size="100"/>
+ </table>
+
+ <table name="RHQ_TAGGING_RESOURCE_MAP">
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
+ <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
+ <constraint name="RHQ_TAGGING_RESOURCE_MAP_KEY">
+ <primaryKey>
+ <field ref="RESOURCE_ID"/>
+ <field ref="TAG_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_TAGGING_RES_GROUP_MAP">
+ <column name="RESOURCE_GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
+ <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
+ <constraint name="RHQ_TAGGING_RES_GROUP_MAP_KEY">
+ <primaryKey>
+ <field ref="RESOURCE_GROUP_ID"/>
+ <field ref="TAG_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+<!-- END: inventory-schema.xml -->
+<!-- BEGIN: authz-schema.xml -->
+
+
+ <table name="RHQ_ROLE">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" required="true" size="100" type="VARCHAR2"/>
+ <column name="DESCRIPTION" size="100" type="VARCHAR2"/>
+ <column name="FSYSTEM" type="BOOLEAN" default="false"/>
+
+ <index name="RHQ_ROLE_NAME_KEY" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <table name="RHQ_ROLE_RESOURCE_GROUP_MAP">
+ <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
+ <column name="RESOURCE_GROUP_ID" required="true" type="INTEGER" references="RHQ_RESOURCE_GROUP"/>
+
+ <constraint name="RHQ_ROLE_RES_GROUP_MAP_KEY">
+ <primaryKey>
+ <field ref="ROLE_ID"/>
+ <field ref="RESOURCE_GROUP_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_ROLE_LDAP_GROUP">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
+ <column name="LDAP_GROUP_NAME" size="128" required="true" type="VARCHAR2"/>
+
+ <index name="RHQ_ROLE_LDAP_GROUP_IDX" unique="true">
+ <field ref="ROLE_ID"/>
+ <field ref="LDAP_GROUP_NAME"/>
+ </index>
+ </table>
+
+ <table name="RHQ_PERMISSION">
+ <column name="ROLE_ID" type="INTEGER" references="RHQ_ROLE" required="true"/>
+ <column name="OPERATION" type="INTEGER" required="true"/>
+ <constraint name="RHQ_PERMISSION_PK">
+ <primaryKey>
+ <field ref="ROLE_ID"/>
+ <field ref="OPERATION"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_SUBJECT_ROLE_MAP">
+ <column name="SUBJECT_ID" required="true" type="INTEGER" references="RHQ_SUBJECT"/>
+ <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
+
+ <constraint name="RHQ_SUBJECT_ROLE_MAPPING_KEY">
+ <primaryKey>
+ <field ref="SUBJECT_ID"/>
+ <field ref="ROLE_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_SUBJECT_ROLE_LDAP_MAP">
+ <column name="SUBJECT_ID" required="true" type="INTEGER" references="RHQ_SUBJECT"/>
+ <column name="ROLE_ID" required="true" type="INTEGER" references="RHQ_ROLE"/>
+ <constraint name="RHQ_SUBJECT_ROLE_LDAP_MAP_PK">
+ <primaryKey>
+ <field ref="SUBJECT_ID" />
+ <field ref="ROLE_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+<!-- END: authz-schema.xml -->
+<!-- BEGIN: search-schema.xml -->
+
+
+ <table name="RHQ_SAVED_SEARCH">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="CONTEXT" type="VARCHAR2" size="25" required="true"/>
+
+ <column name="NAME" type="VARCHAR2" size="200" required="true"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="500" required="false"/>
+ <column name="PATTERN" type="VARCHAR2" size="1000" required="true"/>
+
+ <column name="LAST_COMPUTE_TIME" type="LONG" required="true"/>
+ <column name="RESULT_COUNT" type="LONG" required="false"/>
+
+ <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT" required="true"/>
+ <column name="GLOBAL" type="BOOLEAN" required="true"/>
+ </table>
+
+<!-- END: search-schema.xml -->
+<!-- BEGIN: dashboard-schema.xml -->
+
+
+
+ <table name="RHQ_DASHBOARD">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" type="VARCHAR2" size="200" required="true"/>
+ <column name="SUBJECT_ID" type="INTEGER" required="true" references="RHQ_SUBJECT"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
+ <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
+ <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
+ <column name="SHARED" type="BOOLEAN" required="true"/>
+ <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
+ </table>
+
+
+ <table name="RHQ_DASHBOARD_PORTLET">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" type="VARCHAR2" size="200" required="true"/>
+ <column name="PORTLET_KEY" type="VARCHAR2" size="200" required="true"/>
+ <column name="COL" type="INTEGER" required="true"/>
+ <column name="COL_INDEX" type="INTEGER" required="true"/>
+ <column name="HEIGHT" type="INTEGER" required="true"/>
+ <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
+ <column name="DASHBOARD_ID" type="INTEGER" required="false" references="RHQ_DASHBOARD"/>
+ </table>
+
+<!-- END: dashboard-schema.xml -->
+<!-- BEGIN: operation-schema.xml -->
+
+
+ <table name="RHQ_OPERATION_DEF">
+
+ <!-- === required columns === -->
+
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
+ <column name="NAME" type="VARCHAR2" required="true" size="100"/>
+
+ <!-- === optional columns === -->
+
+ <!-- an OSGI version range - if null, the operation def applies to all versions of the associated resource type -->
+ <column name="RESOURCE_VERSION_RANGE" type="VARCHAR2" size="100"/>
+
+ <!-- A parameter config definition is only required for operations that have parameters. -->
+ <!-- A results config definition is only required for operations that return data. -->
+ <column name="PARAMETER_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
+ <column name="RESULTS_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF(ID)"/>
+ <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="4000"/>
+ <column name="TIMEOUT" type="INTEGER"/>
+
+ <!-- === business key (RESOURCE_TYPE_ID + NAME) === -->
+ <index name="RHQ_OPERATION_DEF_KEY_IDX" unique="true">
+ <field ref="RESOURCE_TYPE_ID"/>
+ <field ref="NAME"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_OPERATION_HISTORY">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="DTYPE" type="VARCHAR2" required="true" size="8"/>
+ <column name="JOB_NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="JOB_GROUP" type="VARCHAR2" required="true" size="100"/>
+ <column name="OPERATION_DEF_ID" type="INTEGER" required="true" references="RHQ_OPERATION_DEF"/>
+ <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="STIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="PARAMETERS_CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
+
+ <!-- for resource history -->
+ <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
+ <column name="RESULTS_CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
+ <column name="GROUP_HISTORY_ID" type="INTEGER" required="false" references="RHQ_OPERATION_HISTORY"/>
+
+ <!-- for group history -->
+ <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
+
+ <index name="RHQ_OPERATION_HISTORY_JOB_IDX" unique="true">
+ <field ref="JOB_NAME"/>
+ <field ref="JOB_GROUP"/>
+ <field ref="CTIME"/>
+ </index>
+
+ </table>
+
+ <!--
+ This table is really just to support some specific use-cases.
+ Specifically, to be able to get a list of histories for a specific schedule (aka quartz job)
+ and to be able to query a list of all schedules along with their associated resource/group IDs
+ possibly sorted by their next fire time.
+ Note that a NULL next fire time means it won't fire again and the row is probaby about to be deleted;
+ we can probably not even insert rows with NULL and make it a non-nullable field. But rather than
+ code special conditions into the session bean, we'll allow a short-lived NULL next fire time row.
+ -->
+ <table name="RHQ_OPERATION_SCHEDULE">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+
+ <column name="JOB_NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="JOB_GROUP" type="VARCHAR2" required="true" size="100"/>
+ <column name="DTYPE" type="VARCHAR2" required="true" size="8"/>
+ <column name="NEXT_FIRE_TIME" type="LONG" required="false"/>
+
+ <!-- for resource history -->
+ <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
+
+ <!-- for group history -->
+ <column name="GROUP_ID" type="INTEGER" required="false" references="RHQ_RESOURCE_GROUP"/>
+
+ <!--
+ Note, this is the same as the primary key that Quartz uses for its schedules (RHQ_QRTZ_JOB_DETAILS).
+ We do not need to add DTYPE to the key, because we ensure the name/group are unique across resource/group
+ schedules
+ -->
+ <!-- === business key (JOB_NAME + JOB_GROUP) === -->
+ <index name="RHQ_OPERATION_SCHEDULE_KEY_IDX" unique="true">
+ <field ref="JOB_NAME"/>
+ <field ref="JOB_GROUP"/>
+ </index>
+ </table>
+
+<!-- END: operation-schema.xml -->
+<!-- BEGIN: event-schema.xml -->
+
+
+ <!-- metadata -->
+
+ <table name="RHQ_EVENT_DEF">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
+
+ <column name="NAME" type="VARCHAR2" size="100" required="true"/>
+ <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="1000"/>
+
+ <index name="RHQ_EVENT_DEF_IDX" unique="true">
+ <field ref="RESOURCE_TYPE_ID"/>
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <!-- instance data -->
+
+ <table name="RHQ_EVENT_SOURCE">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="EVENT_DEF_ID" type="INTEGER" required="true" references="RHQ_EVENT_DEF(ID)"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)"/>
+
+ <column name="LOCATION" required="true" size="2000" type="VARCHAR2"/>
+
+ <index name="RHQ_EVENT_SOURCE_IDX" unique="true">
+ <field ref="EVENT_DEF_ID"/>
+ <field ref="RESOURCE_ID"/>
+ <field ref="LOCATION"/>
+ </index>
+ </table>
+
+ <table name="RHQ_EVENT">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="EVENT_SOURCE_ID" type="INTEGER" required="true" references="RHQ_EVENT_SOURCE(ID)"/>
+
+ <column name="TIMESTAMP" required="true" type="LONG"/>
+ <column name="SEVERITY" required="true" size="20" type="VARCHAR2"/>
+ <column name="DETAIL" required="true" size="4000" type="VARCHAR2"/>
+ <index name="RHQ_EVENT_IDX" unique="false">
+ <field ref="EVENT_SOURCE_ID"/>
+ <field ref="TIMESTAMP"/>
+ </index>
+ </table>
+
+<!-- END: event-schema.xml -->
+<!-- BEGIN: alert-schema.xml -->
+
+
+ <table name="RHQ_ALERT_DEFINITION">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" required="true" size="100" type="VARCHAR2"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="PARENT_ID" type="INTEGER" required="false"/>
+ <column name="GROUP_ALERT_DEF_ID" type="INTEGER" required="false"/>
+ <column name="DESCRIPTION" required="false" size="250" type="VARCHAR2"/>
+ <column name="PRIORITY" type="VARCHAR2" size="15" required="true"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE" required="false"/>
+ <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="false"/>
+ <column name="RESOURCE_GROUP_ID" type="INTEGER" references="RHQ_RESOURCE_GROUP" required="false"/>
+ <column name="ENABLED" required="true" default="TRUE" type="BOOLEAN"/>
+
+ <column name="REQUIRED" required="true" type="SMALLINT"/>
+
+ <column name="RECOVERY_ID" type="INTEGER" required="true"/>
+ <!-- required, but 0 effectively means null -->
+ <column name="WILL_RECOVER" required="true" default="false" type="BOOLEAN"/>
+ <column name="NOTIFY_FILTERED" required="true" default="false" type="BOOLEAN"/>
+ <column name="CONTROL_FILTERED" required="true" default="FALSE" type="BOOLEAN"/>
+
+ <column name="DELETED" required="true" default="FALSE" type="BOOLEAN"/>
+ <column name="READ_ONLY" required="true" default="FALSE" type="BOOLEAN"/>
+
+ <column name="DAMPENING_CATEGORY" type="SMALLINT" required="true"/>
+ <column name="DAMPENING_VALUE" type="INTEGER"/>
+ <column name="DAMPENING_VALUE_UNITS" type="SMALLINT"/>
+ <column name="DAMPENING_PERIOD" type="INTEGER"/>
+ <column name="DAMPENING_PERIOD_UNITS" type="SMALLINT"/>
+ </table>
+
+ <table name="RHQ_ALERT_DAMPEN_EVENT">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
+ <column name="EVENT_TYPE" required="true" type="SMALLINT"/>
+ <column name="EVENT_TIMESTAMP" required="true" type="LONG"/>
+
+ <index name="RHQ_DAMPENING_EVENT_TYPE_IDX">
+ <field ref="EVENT_TYPE"/>
+ </index>
+ <index name="RHQ_DAMPENING_EVENT_TS_IDX">
+ <field ref="EVENT_TIMESTAMP"/>
+ </index>
+ </table>
+
+ <table name="RHQ_ALERT_CONDITION">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="TYPE" required="true" type="VARCHAR2" size="15"/>
+ <!--
+ <column name="REQUIRED" required="true" type="BOOLEAN"/>
+ -->
+ <column name="MEASUREMENT_DEFINITION_ID" required="false" type="INTEGER"/>
+ <column name="NAME" required="false" size="100" type="VARCHAR2"/>
+ <column name="COMPARATOR" required="false" size="2" type="VARCHAR2"/>
+ <column name="THRESHOLD" required="false" type="DOUBLE"/>
+ <!-- event-based conditions use OPTION_STATUS for the string match, so should be a decent length -->
+ <column name="OPTION_STATUS" required="false" size="256" type="VARCHAR2"/>
+ <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
+ <column name="TRIGGER_ID" required="false" type="INTEGER"/>
+ </table>
+
+ <table name="RHQ_ALERT" tablespace="DEFAULT"
+ storage-options="freelists 5" cache="true">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
+ <column name="CTIME" required="true" type="LONG"/>
+ <column name="RECOVERY_ID" type="INTEGER" required="true"/>
+ <!-- required, but 0 effectively means null -->
+ <column name="WILL_RECOVER" required="true" default="false" type="BOOLEAN"/>
+ <column name="ACK_TIME" required="false" type="LONG"/>
+ <column name="ACK_SUBJECT" required="false" size="100" type="VARCHAR2"/>
+ <index name="RHQ_ALERT_IDX_TIME" unique="false">
+ <field ref="CTIME"/>
+ </index>
+ <index name="RHQ_ALERT_IDX_ALERTDEF" unique="false">
+ <field ref="ALERT_DEFINITION_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_ALERT_NOTIF_LOG" tablespace="DEFAULT"
+ storage-options="freelists 5" cache="true">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="ALERT_ID" required="true" type="INTEGER" references="RHQ_ALERT(ID)"/>
+ <index name="RHQ_ALERT_IDX_ALERT" unique="false">
+ <field ref="ALERT_ID"/>
+ </index>
+ <column name="SENDER" required="false" size="100" type="VARCHAR2"/>
+ <column name="RESULT_STATE" required="false" size="20" type="VARCHAR2"/>
+ <column name="MESSAGE" required="false" size="4000" type="VARCHAR2"/>
+ </table>
+
+ <table name="RHQ_ALERT_CONDITION_LOG" tablespace="DEFAULT"
+ storage-options="freelists 5" cache="true">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="CTIME" required="true" type="LONG"/>
+ <column name="ALERT_ID" required="false" type="INTEGER" references="RHQ_ALERT(ID)"/>
+ <column name="CONDITION_ID" required="true" type="INTEGER" references="RHQ_ALERT_CONDITION(ID)"/>
+ <column name="VALUE" required="true" size="250" type="VARCHAR2"/>
+ <index name="RHQ_ALERT_COND_LOG_IDX_TIME">
+ <field ref="CTIME" />
+ </index>
+ <index name="RHQ_ALERT_COND_LOG_IDX_ALERT">
+ <field ref="ALERT_ID"/>
+ </index>
+ <index name="RHQ_ALERT_COND_LOG_COND_IDX">
+ <field ref="CONDITION_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_ALERT_NOTIFICATION">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="ALERT_DEFINITION_ID" required="false" type="INTEGER" references="RHQ_ALERT_DEFINITION(ID)"/>
+ <column name="SENDER_CONFIG_ID" required="false" type="INTEGER" references="RHQ_CONFIG(ID)"/>
+ <column name="EXTRA_CONFIG_ID" required="false" type="INTEGER" references="RHQ_CONFIG(ID)"/>
+ <column name="SENDER_NAME" required="true" size="100" type="VARCHAR2" />
+ </table>
+
+<!-- END: alert-schema.xml -->
+<!-- BEGIN: sysconfig-schema.xml -->
+
+
+ <table name="RHQ_SYSTEM_CONFIG">
+ <column name="ID" default="sequence-only" initial="10001"
+ primarykey="true" required="true" type="INTEGER"/>
+ <column name="PROPERTY_KEY" type="VARCHAR2" size="80"/>
+ <column name="PROPERTY_VALUE" type="VARCHAR2" size="300"/>
+ <column name="DEFAULT_PROPERTY_VALUE" type="VARCHAR2" size="300"/>
+ <column name="FREAD_ONLY" type="BOOLEAN" default="FALSE"/>
+
+ <index name="RHQ_SYSTEM_CONFIG_KEY_INDX" unique="true">
+ <field ref="PROPERTY_KEY"/>
+ </index>
+ </table>
+
+<!-- END: sysconfig-schema.xml -->
+<!-- BEGIN: scheduler-schema.xml -->
+
+
+ <table name="RHQ_QRTZ_JOB_DETAILS">
+ <column name="JOB_NAME" required="true" type="VARCHAR2" size="80"/>
+ <column name="JOB_GROUP" required="true" type="VARCHAR2" size="80"/>
+ <column name="DESCRIPTION" required="false" type="VARCHAR2" size="120"/>
+ <column name="JOB_CLASS_NAME" required="true" type="VARCHAR2" size="128"/>
+ <column name="IS_DURABLE" required="true" type="BOOLEAN" default="FALSE"/>
+ <column name="IS_VOLATILE" required="true" type="BOOLEAN"/>
+ <column name="IS_STATEFUL" required="true" type="BOOLEAN" default="FALSE"/>
+ <column name="REQUESTS_RECOVERY" required="true" type="BOOLEAN" default="FALSE"/>
+ <column name="JOB_DATA" required="false" type="BLOB"/>
+
+ <constraint name="RHQ_PK_QRTZ_JOB_DETAILS">
+ <primaryKey>
+ <field ref="JOB_NAME"/>
+ <field ref="JOB_GROUP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_QRTZ_JOB_LISTENERS">
+ <column name="JOB_NAME" required="true" type="VARCHAR2" size="80"/>
+ <column name="JOB_GROUP" required="true" type="VARCHAR2" size="80"/>
+ <column name="JOB_LISTENER" required="true" type="VARCHAR2" size="80"/>
+
+ <constraint name="RHQ_PK_QRTZ_JOB_LISTENERS">
+ <primaryKey>
+ <field ref="JOB_NAME"/>
+ <field ref="JOB_GROUP"/>
+ <field ref="JOB_LISTENER"/>
+ </primaryKey>
+ </constraint>
+ <constraint name="RHQ_FK_QRTZ_JOB_LSTNRS_JN_JG">
+ <foreignKey local="JOB_NAME,JOB_GROUP"
+ references="RHQ_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)"
+ ondelete="cascade"/>
+ </constraint>
+ </table>
+
+ <table name="RHQ_QRTZ_TRIGGERS">
+ <column name="TRIGGER_NAME" type="VARCHAR2" required="true" size="80"/>
+ <column name="TRIGGER_GROUP" type="VARCHAR2" required="true" size="80"/>
+ <column name="JOB_NAME" type="VARCHAR2" required="true" size="80"/>
+ <column name="JOB_GROUP" type="VARCHAR2" required="true" size="80"/>
+ <column name="IS_VOLATILE" type="BOOLEAN" required="true"/>
+ <column name="DESCRIPTION" type="VARCHAR2" required="false" size="120"/>
+ <column name="NEXT_FIRE_TIME" type="LONG" required="false"/>
+ <column name="PREV_FIRE_TIME" type="LONG" required="false"/>
+ <column name="PRIORITY" type="INTEGER" required="false"/>
+ <column name="TRIGGER_STATE" type="VARCHAR" required="true" size="16"/>
+ <column name="TRIGGER_TYPE" type="VARCHAR" required="true" size="8"/>
+ <column name="START_TIME" type="LONG" required="true"/>
+ <column name="END_TIME" type="LONG" required="false"/>
+ <column name="CALENDAR_NAME" type="VARCHAR2" required="false" size="80"/>
+ <column name="MISFIRE_INSTR" type="INTEGER" required="false"/>
+ <column name="JOB_DATA" type="BLOB" required="false"/>
+
+ <constraint name="RHQ_PK_QRTZ_TRIGGERS">
+ <primaryKey>
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </primaryKey>
+ </constraint>
+ <constraint name="RHQ_FK_QRTZ_TRIGGERS_JN_JG">
+ <foreignKey local="JOB_NAME,JOB_GROUP"
+ references="RHQ_QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)"
+ ondelete="cascade"/>
+ </constraint>
+
+ <!-- Quartz docs recommend these indexes. -->
+ <index name="RHQ_QRTZ_TRIGGERS_JN_JG_IDX">
+ <field ref="JOB_NAME"/>
+ <field ref="JOB_GROUP"/>
+ </index>
+ <index name="RHQ_QRTZ_TRIGGERS_NFT_IDX">
+ <field ref="NEXT_FIRE_TIME"/>
+ </index>
+ <index name="RHQ_QRTZ_TRIGGERS_TS_IDX">
+ <field ref="TRIGGER_STATE"/>
+ </index>
+ <index name="RHQ_QRTZ_TRIGGERS_TS_NFT_IDX">
+ <field ref="TRIGGER_STATE"/>
+ <field ref="NEXT_FIRE_TIME"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_QRTZ_SIMPLE_TRIGGERS">
+ <column name="TRIGGER_NAME" type="VARCHAR2" required="true" size="80"/>
+ <column name="TRIGGER_GROUP" type="VARCHAR2" required="true" size="80"/>
+ <column name="REPEAT_COUNT" type="LONG" required="true"/>
+ <column name="REPEAT_INTERVAL" type="LONG" required="true"/>
+ <column name="TIMES_TRIGGERED" type="LONG" required="true"/>
+
+ <constraint name="RHQ_PK_QRTZ_SIMPLE_TRIGGERS">
+ <primaryKey>
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </primaryKey>
+ </constraint>
+ <constraint name="RHQ_FK_QRTZ_SIMPLE_TRGRS_TN_TG">
+ <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
+ references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
+ ondelete="cascade"/>
+ </constraint>
+
+ <!-- Quartz docs recommend this index. -->
+ <!-- Commenting out, because Oracle auto-creates an index for the
+ primary key column(s) and fails if you try to create another
+ index for the same column(s) (ips, 03/29/07).
+ -->
+ <!--
+ <index name="RHQ_QRTZ_SIMPLE_TRGRS_TN_TG_IDX">
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </index>
+ -->
+ </table>
+
+ <table name="RHQ_QRTZ_CRON_TRIGGERS">
+ <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
+ <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
+ <column name="CRON_EXPRESSION" type="VARCHAR2" size="80" required="true"/>
+ <column name="TIME_ZONE_ID" type="VARCHAR2" size="80" required="false"/>
+
+ <constraint name="RHQ_PK_QRTZ_CRON_TRIGGERS">
+ <primaryKey>
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </primaryKey>
+ </constraint>
+ <constraint name="RHQ_FK_QRTZ_CRON_TRIG_TN_TG">
+ <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
+ references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
+ ondelete="cascade"/>
+ </constraint>
+
+ <!-- Quartz docs recommend this index. -->
+ <!-- Commenting out, because Oracle auto-creates an index for the
+ primary key column(s) and fails if you try to create another
+ index for the same column(s) (ips, 03/29/07).
+ -->
+ <!--
+ <index name="RHQ_QRTZ_CRON_TRGRS_TN_TG_IDX">
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </index>
+ -->
+ </table>
+
+ <table name="RHQ_QRTZ_BLOB_TRIGGERS">
+ <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
+ <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
+ <column name="BLOB_DATA" type="BLOB" required="false"/>
+
+ <constraint name="RHQ_PK_QRTZ_BLOB_TRIGGERS">
+ <primaryKey>
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </primaryKey>
+ </constraint>
+ <constraint name="RHQ_FK_QRTZ_BLOB_TRIGG_TN_TG">
+ <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
+ references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
+ ondelete="cascade"/>
+ </constraint>
+
+ <!-- Quartz docs recommend this index. -->
+ <!-- Commenting out, because Oracle auto-creates an index for the
+ primary key column(s) and fails if you try to create another
+ index for the same column(s) (ips, 03/29/07).
+ -->
+ <!--
+ <index name="RHQ_QRTZ_BLOB_TRGRS_TN_TG_IDX">
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </index>
+ -->
+ </table>
+
+ <table name="RHQ_QRTZ_TRIGGER_LISTENERS">
+ <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
+ <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
+ <column name="TRIGGER_LISTENER" type="VARCHAR2" size="80" required="true"/>
+
+ <constraint name="RHQ_PK_QRTZ_TRIGGER_LISTENERS">
+ <primaryKey>
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ <field ref="TRIGGER_LISTENER"/>
+ </primaryKey>
+ </constraint>
+ <constraint name="RHQ_FK_QRTZ_TRGR_LSTNRS_TN_TG">
+ <foreignKey local="TRIGGER_NAME,TRIGGER_GROUP"
+ references="RHQ_QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)"
+ ondelete="cascade"/>
+ </constraint>
+
+ <!-- Quartz docs recommend this index. -->
+ <index name="RHQ_QRTZ_TRGR_LSTNRS_TN_TG_IDX">
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_QRTZ_FIRED_TRIGGERS">
+ <column name="ENTRY_ID" primarykey="true" type="VARCHAR2" size="95" required="true"/>
+ <column name="TRIGGER_NAME" type="VARCHAR2" size="80" required="true"/>
+ <column name="TRIGGER_GROUP" type="VARCHAR2" size="80" required="true"/>
+ <column name="INSTANCE_NAME" type="VARCHAR2" size="80" required="true"/>
+ <column name="FIRED_TIME" type="LONG" required="true"/>
+ <column name="PRIORITY" type="INTEGER" required="false"/>
+ <column name="STATE" type="VARCHAR2" size="16" required="true"/>
+ <column name="IS_VOLATILE" type="BOOLEAN" required="true"/>
+ <column name="JOB_NAME" type="VARCHAR2" size="80" required="false"/>
+ <column name="JOB_GROUP" type="VARCHAR2" size="80" required="false"/>
+ <column name="IS_STATEFUL" type="BOOLEAN" required="false"/>
+ <column name="REQUESTS_RECOVERY" type="BOOLEAN" required="false"/>
+
+ <!-- Quartz docs recommend these indexes. -->
+ <index name="RHQ_QRTZ_FIRED_TRGRS_TN_IDX">
+ <field ref="TRIGGER_NAME"/>
+ </index>
+ <index name="RHQ_QRTZ_FIRED_TRGRS_TG_IDX">
+ <field ref="TRIGGER_GROUP"/>
+ </index>
+ <index name="RHQ_QRTZ_FIRED_TRGRS_TN_TG_IDX">
+ <field ref="TRIGGER_NAME"/>
+ <field ref="TRIGGER_GROUP"/>
+ </index>
+ <index name="RHQ_QRTZ_FIRED_TRGRS_IN_IDX">
+ <field ref="INSTANCE_NAME"/>
+ </index>
+ <index name="RHQ_QRTZ_FIRED_TRGRS_JN_IDX">
+ <field ref="JOB_NAME"/>
+ </index>
+ <index name="RHQ_QRTZ_FIRED_TRGRS_JG_IDX">
+ <field ref="JOB_GROUP"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_QRTZ_CALENDARS">
+ <column name="CALENDAR_NAME" primarykey="true" type="VARCHAR2" size="80" required="true"/>
+ <column name="CALENDAR" type="BLOB" required="true"/>
+ </table>
+
+ <table name="RHQ_QRTZ_PAUSED_TRIGGER_GRPS">
+ <column name="TRIGGER_GROUP" primarykey="true" type="VARCHAR2" size="80" required="true"/>
+ </table>
+
+ <table name="RHQ_QRTZ_SCHEDULER_STATE">
+ <column name="INSTANCE_NAME" primarykey="true" type="VARCHAR2" size="80" required="true"/>
+ <column name="LAST_CHECKIN_TIME" type="LONG" required="true"/>
+ <column name="CHECKIN_INTERVAL" type="LONG" required="true"/>
+ <column name="RECOVERER" type="VARCHAR2" size="80" required="false"/>
+ </table>
+
+ <table name="RHQ_QRTZ_LOCKS">
+ <column name="LOCK_NAME" primarykey="true" type="VARCHAR2" size="40" required="true"/>
+ <data LOCK_NAME="TRIGGER_ACCESS"/>
+ <data LOCK_NAME="JOB_ACCESS"/>
+ <data LOCK_NAME="CALENDAR_ACCESS"/>
+ <data LOCK_NAME="STATE_ACCESS"/>
+ <data LOCK_NAME="MISFIRE_ACCESS"/>
+ </table>
+
+<!-- END: scheduler-schema.xml -->
+<!-- BEGIN: amps-schema.xml -->
+
+
+ <table name="RHQ_PLUGIN">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="4000" type="VARCHAR2" required="false"/>
+ <column name="VERSION" size="200" type="VARCHAR2" required="false"/>
+ <column name="AMPS_VERSION" size="16" type="VARCHAR2" required="false"/>
+ <column name="ENABLED" type="BOOLEAN" required="true"/>
+ <column name="STATUS" size="16" type="VARCHAR2" required="true"/>
+ <column name="HELP" type="CLOB" required="false"/>
+ <column name="PATH" size="500" type="VARCHAR2" required="true"/>
+ <column name="MD5" size="100" type="VARCHAR2" required="true"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="DEPLOYMENT" size="8" type="VARCHAR2" required="true"/>
+ <column name="PTYPE" size="200" type="VARCHAR2" required="false"/>
+ <column name="PLUGIN_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
+ <column name="JOBS_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
+ <column name="CONTENT" type="BLOB" required="false"/>
+
+ <index name="RHQ_PLUGIN_NAME_DEPLOY_IDX" unique="true">
+ <field ref="NAME"/>
+ <field ref="DEPLOYMENT"/>
+ </index>
+ </table>
+
+<!-- END: amps-schema.xml -->
+<!-- BEGIN: measurement-schema.xml -->
+
+ <table name="RHQ_MEASUREMENT_DEF">
+
+ <!-- === required columns === -->
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE(ID)"/>
+ <column name="NAME" type="VARCHAR2" size="100" required="true"/>
+
+ <!-- === optional columns === -->
+ <!-- an OSGI version range - if null, the metric def applies to all versions of the associated resource type -->
+ <column name="RESOURCE_VERSION_RANGE" type="VARCHAR2" size="100"/>
+ <column name="CATEGORY" type="SMALLINT"/>
+ <column name="UNITS" type="SMALLINT"/>
+ <column name="NUMERIC_TYPE" type="SMALLINT"/>
+ <column name="DISPLAY_TYPE" type="SMALLINT"/>
+ <column name="DATA_TYPE" type="SMALLINT"/>
+ <column name="RAW_NUMERIC_TYPE" type="SMALLINT"/>
+ <column name="DEFAULT_ON" type="BOOLEAN" default="false"/>
+ <column name="DEFAULT_INTERVAL" type="LONG" />
+ <column name="DISPLAY_NAME" type="VARCHAR2" size="100"/>
+ <column name="DISPLAY_ORDER" type="INTEGER" default="1000"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="500"/>
+ <column name="DESTINATION_TYPE" type="VARCHAR2" size="100"/>
+
+ <column name="VERSION" type="INTEGER"/>
+ <!-- for optimistic locking -->
+
+ <!-- === business key (RESOURCE_TYPE_ID + NAME + RAW_NUMERIC_TYPE) === -->
+ <index name="RHQ_METRIC_DEF_KEY_IDX" unique="true">
+ <field ref="RESOURCE_TYPE_ID"/>
+ <field ref="NAME"/>
+ <field ref="RAW_NUMERIC_TYPE"/>
+ </index>
+ <index name="RHQ_METRIC_DEF_NT_IDX">
+ <field ref="NUMERIC_TYPE"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_MEASUREMENT_SCHED">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+
+ <column name="ENABLED" type="BOOLEAN" default="false"/>
+ <column name="MTIME" type="LONG" />
+ <column name="DEFINITION" type="INTEGER" references="RHQ_MEASUREMENT_DEF(ID)"/>
+ <column name="VERSION" type="INTEGER" />
+ <column name="COLL_INTERVAL" type="LONG" />
+ <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE(ID)"/>
+ <index name="RHQ_MEAS_SCHED_UNIQ" unique="true">
+ <field ref="RESOURCE_ID"/>
+ <field ref="DEFINITION"/>
+ </index>
+ <index name="RHQ_MEAS_SCHED_RESID_IDX">
+ <field ref="RESOURCE_ID"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_MEASUREMENT_BLINE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+
+ <column name="BL_USER_ENTERED" type="BOOLEAN" default="false" required="true"/>
+ <column name="BL_MIN" type="DOUBLE" required="true"/>
+ <column name="BL_MAX" type="DOUBLE" required="true"/>
+ <column name="BL_MEAN" type="DOUBLE" required="true"/>
+ <column name="BL_COMPUTE_TIME" type="LONG" required="true"/>
+ <column name="SCHEDULE_ID" type="INTEGER" required="true" references="RHQ_MEASUREMENT_SCHED(ID)"/>
+ <index name="RHQ_MEAS_BASELINE_CTIME_IDX">
+ <field ref="BL_COMPUTE_TIME"/>
+ </index>
+ <index name="RHQ_MEAS_BASELINE_SID_IDX">
+ <field ref="SCHEDULE_ID"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_MEASUREMENT_DATA_NUM_1H" cache="true"
+ tablespace="DEFAULT" storage-options="freelists 20">
+
+ <column name="TIME_STAMP" required="true" type="LONG"/>
+ <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
+ <column name="VALUE" required="false" type="DOUBLE"/>
+ <column name="MINVALUE" required="false" type="DOUBLE"/>
+ <column name="MAXVALUE" required="false" type="DOUBLE"/>
+
+ <constraint name="RHQ_MEAS_DATA_1H_ID_TIME_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+
+ <index name="RHQ_MEAS_DATA_1H_TIME_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_MEASUREMENT_DATA_NUM_6H" cache="true"
+ tablespace="DEFAULT" storage-options="freelists 20">
+
+ <column name="TIME_STAMP" required="true" type="LONG"/>
+ <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
+ <column name="VALUE" required="false" type="DOUBLE"/>
+ <column name="MINVALUE" required="false" type="DOUBLE"/>
+ <column name="MAXVALUE" required="false" type="DOUBLE"/>
+
+ <constraint name="RHQ_MEAS_DATA_6H_ID_TIME_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+
+ <index name="RHQ_MEAS_DATA_6H_TIME_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_MEASUREMENT_DATA_NUM_1D" cache="true"
+ tablespace="DEFAULT" storage-options="freelists 20">
+
+ <column name="TIME_STAMP" required="true" type="LONG"/>
+ <column name="SCHEDULE_ID" required="true" type="INTEGER"/>
+ <column name="VALUE" required="false" type="DOUBLE"/>
+ <column name="MINVALUE" required="false" type="DOUBLE"/>
+ <column name="MAXVALUE" required="false" type="DOUBLE"/>
+
+ <constraint name="RHQ_MEAS_DATA_1D_ID_TIME_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+
+ <index name="RHQ_MEAS_DATA_1D_TIME_IDX">
+ <field ref="TIME_STAMP" />
+ </index>
+ </table>
+
+
+ <table name="RHQ_MEASUREMENT_DATA_TRAIT">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER" />
+ <column name="VALUE" type="VARCHAR2" size="4000" />
+ <constraint name="RHQ_MEAS_DATA_TRAIT_ID_TIME_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+
+ <table name="RHQ_CALLTIME_DATA_KEY">
+ <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
+ <column name="SCHEDULE_ID" type="INTEGER" required="true"/>
+ <column name="CALL_DESTINATION" type="VARCHAR2" size="4000" required="true"/>
+ <index name="RHQ_CALLTIME_DATA_KEY_IDX" unique="true">
+ <field ref="SCHEDULE_ID"/>
+ <field ref="CALL_DESTINATION"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_CALLTIME_DATA_VALUE" logging="false">
+ <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
+ <column name="KEY_ID" type="INTEGER" references="RHQ_CALLTIME_DATA_KEY" required="true"/>
+ <column name="BEGIN_TIME" type="LONG" required="true"/>
+ <column name="END_TIME" type="LONG" required="true"/>
+ <column name="MINIMUM" type="DOUBLE" required="true"/>
+ <column name="MAXIMUM" type="DOUBLE" required="true"/>
+ <column name="TOTAL" type="DOUBLE" required="true"/>
+ <column name="COUNT" type="LONG" required="true"/>
+ <index name="RHQ_CT_DA_VA_END_TIM_IDX">
+ <field ref="END_TIME"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_AVAILABILITY">
+ <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)"/>
+ <column name="START_TIME" type="LONG" required="true" />
+ <column name="END_TIME" type="LONG" required="false" />
+ <column name="AVAILABILITY_TYPE" type="SMALLINT" required="true" />
+ <index name="RHQ_AVAIL_RESOURCE_START_IDX">
+ <field ref="RESOURCE_ID"/>
+ <field ref="START_TIME"/>
+ </index>
+ <!-- only one null row can exist for any resource -->
+ <index name="RHQ_AVAIL_RESOURCE_END_IDX" condition="END_TIME IS NULL">
+ <field ref="RESOURCE_ID"/>
+ <field ref="END_TIME" />
+ </index>
+ </table>
+
+ <table name="RHQ_RESOURCE_AVAIL">
+ <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE(ID)" ondelete="cascade"/>
+ <column name="AVAILABILITY_TYPE" type="SMALLINT" required="true" />
+ <index name="RHQ_RESOURCE_AVAIL_IDX">
+ <field ref="RESOURCE_ID" />
+ </index>
+ </table>
+
+ <table name="RHQ_MEASUREMENT_OOB">
+ <column name="SCHEDULE_ID" type="INTEGER" references="RHQ_MEASUREMENT_SCHED(ID)" required="true"/>
+ <column name="TIME_STAMP" type="LONG" required="true"/>
+ <column name="OOB_FACTOR" type="INTEGER" required="true" />
+ <constraint name="RHQ_MEAS_OOB_ID_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_MEASUREMENT_OOB_TMP">
+ <column name="SCHEDULE_ID" type="INTEGER" required="true"/>
+ <column name="TIME_STAMP" type="LONG" required="true"/>
+ <column name="OOB_FACTOR" type="INTEGER" required="true" />
+ <constraint name="RHQ_MEAS_OOB_TMP_ID_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_NUMBERS">
+ <column name="i" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true" />
+ </table>
+
+
+ <table name="RHQ_MEAS_DATA_NUM_R00" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R00_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R00_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R01" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R01_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R01_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R02" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R02_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R02_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R03" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R03_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R03_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R04" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R04_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R04_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R05" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R05_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R05_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R06" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R06_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R06_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R07" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R07_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R07_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R08" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R08_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R08_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R09" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R09_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R09_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R10" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R10_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R10_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R11" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R11_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R11_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R12" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R12_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R12_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R13" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R13_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R13_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+ <table name="RHQ_MEAS_DATA_NUM_R14" logging="false">
+ <column name="TIME_STAMP" type="LONG"/>
+ <column name="SCHEDULE_ID" type="INTEGER"/>
+ <column name="VALUE" type="DOUBLE"/>
+ <index name="RHQ_MEAS_DATA_R14_TS_IDX">
+ <field ref="TIME_STAMP"/>
+ </index>
+ <constraint name="RHQ_MEAS_DATA_NUM_R14_ID_T_PK">
+ <primaryKey>
+ <field ref="SCHEDULE_ID"/>
+ <field ref="TIME_STAMP"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+<!-- END: measurement-schema.xml -->
+<!-- BEGIN: content-schema.xml -->
+
+
+ <table name="RHQ_ARCHITECTURE">
+ <column name="ID" default="sequence-only" initial="100" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="50" type="VARCHAR2" required="true"/>
+ <index name="RHQ_ARCHITECTURE_NAME_IDX" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <table name="RHQ_REPO_GROUP_TYPE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ </table>
+
+
+ <table name="RHQ_REPO_GROUP">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+
+ <column name="REPO_GROUP_TYPE_ID" type="INTEGER" references="RHQ_REPO_GROUP_TYPE" required="true"/>
+
+ <index name="RHQ_REPO_GROUP_IDX" unique="true">
+ <field ref="NAME"/>
+ <field ref="REPO_GROUP_TYPE_ID"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_CONTENT_SOURCE_TYPE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ <column name="PLUGIN_NAME" size="100" type="VARCHAR2" required="false"/>
+ <!-- we might want this as part of natural key -->
+ <column name="DEFAULT_LAZY_LOAD" type="BOOLEAN" required="true"/>
+ <column name="DEFAULT_DOWNLOAD_MODE" size="16" type="VARCHAR2" required="true"/>
+ <column name="DEFAULT_SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
+ <column name="API_CLASS" size="100" type="VARCHAR2" required="true"/>
+
+ <column name="SOURCE_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
+
+ <index name="RHQ_CONTENT_SOURCE_TYPE_IDX" unique="true">
+ <field ref="NAME"/>
+ <!-- <field ref="PLUGIN_NAME"/> -->
+ </index>
+ </table>
+
+ <table name="RHQ_CONTENT_SOURCE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ <column name="LAZY_LOAD" type="BOOLEAN" required="true"/>
+ <column name="DOWNLOAD_MODE" size="16" type="VARCHAR2" required="true"/>
+ <column name="SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
+ <column name="LOAD_ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="CREATION_TIME" type="LONG" required="true"/>
+ <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
+
+ <column name="CONTENT_SOURCE_TYPE_ID" type="INTEGER" references="RHQ_CONTENT_SOURCE_TYPE" required="true"/>
+ <column name="CONFIGURATION_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
+
+ <index name="RHQ_CONTENT_SOURCE_IDX" unique="true">
+ <field ref="NAME"/>
+ <field ref="CONTENT_SOURCE_TYPE_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_REPO">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ <column name="CREATION_TIME" type="LONG" required="true"/>
+ <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
+ <column name="IS_CANDIDATE" type="BOOLEAN" required="true"/>
+ <column name="SYNC_SCHEDULE" size="64" type="VARCHAR2" required="false"/>
+ <column name="OWNER_ID" type="INTEGER" required="false" references="RHQ_SUBJECT" />
+ <column name="IS_PRIVATE" type="BOOLEAN" required="true" />
+
+ <index name="RHQ_REPO_IDX" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_REPO_RELATION_TYPE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ </table>
+
+
+ <table name="RHQ_REPO_RELATION">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="RELATED_REPO_ID" type="INTEGER" references="RHQ_REPO" required="true"/>
+ <column name="REPO_RELATION_TYPE_ID" type="INTEGER" references="RHQ_REPO_RELATION_TYPE" required="true"/>
+ </table>
+
+
+
+ <table name="RHQ_PACKAGE_TYPE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ <column name="CATEGORY" size="50" type="VARCHAR2" required="false"/>
+ <column name="DISCOVERY_INTERVAL" type="INTEGER" required="false"/>
+ <column name="IS_CREATION_DATA" type="BOOLEAN" required="true"/>
+ <column name="SUPPORTS_ARCHITECTURE" type="BOOLEAN" required="true"/>
+
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" references="RHQ_RESOURCE_TYPE" required="false"/>
+ <column name="DEPLOYMENT_CONFIG_DEF_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
+ <column name="PACKAGE_EXTRA_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG_DEF" required="false"/>
+
+ <index name="RHQ_PACKAGE_TYPE_IDX" unique="true">
+ <field ref="NAME"/>
+ <field ref="RESOURCE_TYPE_ID"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_PACKAGE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="CLASSIFICATION" size="200" type="VARCHAR2" required="false"/>
+
+ <column name="PACKAGE_TYPE_ID" type="INTEGER" references="RHQ_PACKAGE_TYPE" required="true"/>
+
+ <index name="RHQ_PACKAGE_IDX" unique="true">
+ <field ref="NAME"/>
+ <field ref="PACKAGE_TYPE_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_PACKAGE_BITS">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="BITS" type="LARGEOBJECT" required="false"/>
+ </table>
+
+ <table name="RHQ_PACKAGE_VERSION">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="DISPLAY_NAME" size="200" type="VARCHAR2" required="false"/>
+ <column name="SHORT_DESCRIPTION" size="10000" type="CLOB" required="false"/>
+ <column name="LONG_DESCRIPTION" size="50000" type="CLOB" required="false"/>
+ <column name="VERSION" size="500" type="VARCHAR2" required="true"/>
+ <column name="DISPLAY_VERSION" size="500" type="VARCHAR2" required="false"/>
+ <column name="FILE_NAME" size="255" type="VARCHAR2" required="false"/>
+ <column name="FILE_SIZE" type="LONG" required="false"/>
+ <column name="FILE_MD5" size="32" type="VARCHAR2" required="false"/>
+ <column name="FILE_SHA256" size="64" type="VARCHAR2" required="false"/>
+ <column name="FILE_CREATION_TIME" type="LONG" required="false"/>
+ <column name="LICENSE_NAME" size="255" type="VARCHAR2" required="false"/>
+ <column name="LICENSE_VERSION" size="20" type="VARCHAR2" required="false"/>
+ <column name="METADATA" type="BLOB" required="false"/>
+
+ <column name="PACKAGE_ID" type="INTEGER" references="RHQ_PACKAGE" required="true"/>
+ <column name="ARCHITECTURE_ID" type="INTEGER" references="RHQ_ARCHITECTURE" required="true"/>
+ <column name="CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
+ <column name="PACKAGE_BITS_ID" type="INTEGER" references="RHQ_PACKAGE_BITS" required="false"/>
+
+ <index name="RHQ_PACKAGE_VERSION_IDX" unique="true">
+ <field ref="PACKAGE_ID"/>
+ <field ref="VERSION"/>
+ <field ref="ARCHITECTURE_ID"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_CONTENT_REQ">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
+ <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="REQUEST_TYPE" type="VARCHAR2" required="true" size="20"/>
+ <column name="NOTES" type="VARCHAR2" required="false" size="512"/>
+ </table>
+
+ <table name="RHQ_INSTALLED_PACKAGE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="INSTALLATION_TIME" type="LONG" required="false"/>
+
+ <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="true"/>
+ <column name="PACKAGE_VERSION_ID" type="INTEGER" references="RHQ_PACKAGE_VERSION" required="true"/>
+ <column name="SUBJECT_ID" type="INTEGER" references="RHQ_SUBJECT" required="false"/>
+ </table>
+
+ <table name="RHQ_INSTALLED_PKG_HIST">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="STATUS" type="VARCHAR2" size="24" required="true"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="HISTORY_TIMESTAMP" type="LONG" required="false"/>
+
+ <column name="PACKAGE_VERSION_ID" type="INTEGER" references="RHQ_PACKAGE_VERSION" required="true"/>
+ <column name="RESOURCE_ID" type="INTEGER" references="RHQ_RESOURCE" required="true"/>
+ <column name="DEPLOYMENT_CONFIG_ID" type="INTEGER" references="RHQ_CONFIG" required="false"/>
+ <column name="CONTENT_SERVICE_REQUEST_ID" type="INTEGER" references="RHQ_CONTENT_REQ" required="false"/>
+ </table>
+
+ <table name="RHQ_CONTENT_SRC_SYNC">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="STATUS" type="VARCHAR2" size="16" required="true"/>
+ <column name="START_TIME" type="LONG" required="true"/>
+ <column name="END_TIME" type="LONG" required="false"/>
+ <column name="RESULTS" type="LONGVARCHAR" required="false"/>
+ <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
+ </table>
+
+ <table name="RHQ_REPO_SYNC">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="STATUS" type="VARCHAR2" size="16" required="true"/>
+ <column name="START_TIME" type="LONG" required="true"/>
+ <column name="END_TIME" type="LONG" required="false"/>
+ <column name="RESULTS" type="LONGVARCHAR" required="false"/>
+ <column name="PERCENT_COMPLETE" type="LONG" required="false"/>
+ <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
+ </table>
+
+
+ <table name="RHQ_PACKAGE_INST_STEP">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="STEP_KEY" type="VARCHAR2" size="500" required="true"/>
+ <column name="STEP_ORDER" type="INTEGER" required="true"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="4000" required="true"/>
+ <column name="ERROR_MSG" type="LONGVARCHAR" required="false"/>
+ <column name="RESULT" type="VARCHAR2" size="25" required="true"/>
+
+ <column name="INSTALLED_PKG_HIST_ID" type="INTEGER" references="RHQ_INSTALLED_PKG_HIST"/>
+ </table>
+
+ <table name="RHQ_REPO_RESOURCE_MAP">
+ <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
+ <column name="CTIME" type="LONG" required="true"/>
+
+ <constraint name="RHQ_REPO_RESOURCE_MAP_KEY">
+ <primaryKey>
+ <field ref="REPO_ID"/>
+ <field ref="RESOURCE_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_REPO_CONTENT_SRC_MAP"> 1
+ <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
+ <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
+ <column name="CTIME" type="LONG" required="true"/>
+
+ <constraint name="RHQ_REPO_CONTENT_SRC_MAP_KEY">
+ <primaryKey>
+ <field ref="REPO_ID"/>
+ <field ref="CONTENT_SRC_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_REPO_REPO_GROUP_MAP">
+ <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
+ <column name="REPO_GROUP_ID" type="INTEGER" required="true" references="RHQ_REPO_GROUP"/>
+ <column name="CTIME" type="LONG" required="true"/>
+
+ <constraint name="RHQ_REPO_REPO_GROUP_MAP_KEY">
+ <primaryKey>
+ <field ref="REPO_ID"/>
+ <field ref="REPO_GROUP_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_REPO_REPO_RELATION_MAP">
+ <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
+ <column name="REPO_RELATION_ID" type="INTEGER" required="true" references="RHQ_REPO_RELATION"/>
+ <column name="CTIME" type="LONG" required="true"/>
+
+ <constraint name="RHQ_REPO_REPO_RELATION_MAP_KEY">
+ <primaryKey>
+ <field ref="REPO_ID"/>
+ <field ref="REPO_RELATION_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+
+ <table name="RHQ_REPO_PKG_VERSION_MAP">
+ <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
+ <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
+ <column name="CTIME" type="LONG" required="true"/>
+
+ <constraint name="RHQ_REPO_PKG_VER_MAP_KEY">
+ <primaryKey>
+ <field ref="REPO_ID"/>
+ <field ref="PACKAGE_VERSION_ID"/>
+ </primaryKey>
+ </constraint>
+ <index name="RHQ_REPO_PKG_VER_MAP_IDX" unique="false">
+ <field ref="PACKAGE_VERSION_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_PKG_VER_CONTENT_SRC_MAP">
+ <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
+ <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
+ <column name="LOCATION" type="VARCHAR2" size="4000" required="true"/>
+
+ <constraint name="RHQ_PKG_VER_CONTENT_SRC_KEY">
+ <primaryKey>
+ <field ref="PACKAGE_VERSION_ID"/>
+ <field ref="CONTENT_SRC_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_PKG_PRD_MAP">
+ <column name="PKG_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
+ <column name="PRD_ID" type="INTEGER" required="true" references="RHQ_PRD_VER"/>
+
+ <constraint name="RHQ_PKG_PRD_KEY">
+ <primaryKey>
+ <field ref="PKG_ID"/>
+ <field ref="PRD_ID"/>
+ </primaryKey>
+ </constraint>
+
+ </table>
+
+ <table name="RHQ_DISTRIBUTION_TYPE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+
+ </table>
+
+ <table name="RHQ_DISTRIBUTION">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="DISTRIBUTION_TYPE_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION_TYPE"/>
+ <column name="LABEL" size="64" type="VARCHAR2" required="true"/>
+ <column name="BASE_PATH" size="256" type="VARCHAR2" required="true"/>
+ <column name="LAST_MODIFIED" type="LONG" required="true"/>
+
+ <index name="RHQ_DISTRIBUTION_IDX" unique="true">
+ <field ref="LABEL"/>
+ <field ref="BASE_PATH"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_REPO_DISTRIBUTION">
+ <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
+ <column name="DISTRIBUTION_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION"/>
+ <column name="LAST_MODIFIED" type="LONG" required="true"/>
+
+ <constraint name="RHQ_REPO_DIST_MAP_KEY">
+ <primaryKey>
+ <field ref="REPO_ID"/>
+ <field ref="DISTRIBUTION_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+
+
+ <table name="RHQ_DISTRIBUTION_FILE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="DISTRIBUTION_ID" type="INTEGER" required="true" references="RHQ_DISTRIBUTION"/>
+ <column name="RELATIVE_FILENAME" size="256" type="VARCHAR2" required="true"/>
+ <!--<column name="FILE_SIZE" type="NUMBER" required="true"/>-->
+ <column name="MD5SUM" size="64" type="VARCHAR2" required="true"/>
+ <column name="LAST_MODIFIED" type="LONG" required="true"/>
+ <!--<column name="CTIME" type="LONG" required="true"/>-->
+
+ <index name="RHQ_DISTRIBUTION_FILE_IDX" unique="true">
+ <field ref="DISTRIBUTION_ID"/>
+ <field ref="RELATIVE_FILENAME"/>
+ </index>
+ </table>
+
+
+
+
+ <table name="RHQ_ADVISORY">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="ADVISORY" size="64" type="VARCHAR2" required="true"/>
+ <column name="ADVISORY_TYPE" size="64" type="VARCHAR2" required="true" />
+ <column name="ADVISORY_REL" size="64" type="VARCHAR2" required="false"/>
+ <column name="ADVISORY_NAME" size="64" type="VARCHAR2" required="false"/>
+ <column name="DESCRIPTION" size="4000" type="VARCHAR2" required="false"/>
+ <column name="SYNOPSIS" size="4000" type="VARCHAR2" required="true"/>
+ <column name="TOPIC" size="4000" type="VARCHAR2" required="false"/>
+ <column name="SOLUTION" size="4000" type="VARCHAR2" required="false"/>
+ <column name="SEVERITY" size="64" type="VARCHAR2" required="false"/>
+ <column name="ISSUE_DATE" type="LONG" required="false"/>
+ <column name="UPDATE_DATE" type="LONG" required="false"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="LAST_MODIFIED" type="LONG" required="true"/>
+
+ <index name="RHQ_ADVISORY_NAME_UQ" unique="true">
+ <field ref="ADVISORY_NAME"/>
+ </index>
+
+ <index name="RHQ_ADVISORY_UQ" unique="true">
+ <field ref="ADVISORY"/>
+ </index>
+
+ <index name="RHQ_ADVISORY_UDATE_IDX" unique="false">
+ <field ref="UPDATE_DATE"/>
+ </index>
+ </table>
+
+ <table name="RHQ_ADVISORY_PACKAGE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
+ <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
+ <column name="LAST_MODIFIED" type="LONG" required="true"/>
+
+ <index name="RHQ_ADVISORY_PKG_IDX" unique="true">
+ <field ref="ADVISORY_ID"/>
+ <field ref="PACKAGE_VERSION_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_CVE">
+ <column name="ID" default="sequence-only" initial="101" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="64" type="VARCHAR2" required="true"/>
+ </table>
+
+ <table name="RHQ_ADVISORY_CVE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
+ <column name="CVE_ID" type="INTEGER" required="true" references="RHQ_CVE"/>
+ <column name="LAST_MODIFIED" type="LONG" required="true"/>
+
+ <index name="RHQ_ADVISORY_CVE_IDX" unique="true">
+ <field ref="ADVISORY_ID"/>
+ <field ref="CVE_ID"/>
+ </index>
+
+ </table>
+
+ <table name="RHQ_ADVISORY_BUGLIST">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
+ <column name="BUG_ID" size="256" type="VARCHAR2" required="true"/>
+ <column name="LAST_MODIFIED" type="LONG" required="true"/>
+
+ <index name="RHQ_ADVISORY_BUG_IDX" unique="true">
+ <field ref="ADVISORY_ID"/>
+ <field ref="BUG_ID"/>
+ </index>
+ </table>
+
+
+ <table name="RHQ_REPO_ADVISORY">
+ <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
+ <column name="ADVISORY_ID" type="INTEGER" required="true" references="RHQ_ADVISORY"/>
+ <column name="LAST_MODIFIED" type="LONG" required="true"/>
+
+ <constraint name="RHQ_REPO_ADV_MAP_KEY">
+ <primaryKey>
+ <field ref="REPO_ID"/>
+ <field ref="ADVISORY_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <!-- BUNDLE_TYPE is things like "Cobbler profile" or "file-based bundle" or "puppet recipe" -->
+ <table name="RHQ_BUNDLE_TYPE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
+
+ <!-- This index is for constraint, not performance -->
+ <index name="RHQ_BUNDLE_TYPE_UNIQUE" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <!-- BUNDLE is a named piece of content that can be versioned and installed somewhere -->
+ <table name="RHQ_BUNDLE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ <column name="BUNDLE_TYPE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_TYPE"/>
+ <column name="PACKAGE_TYPE_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_TYPE"/>
+ <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
+
+ <!-- This index is for constraint, not performance -->
+ <index name="RHQ_BUNDLE_UNIQUE" unique="true">
+ <field ref="BUNDLE_TYPE_ID"/>
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <!-- BUNDLE_VERSION represents an actual piece of content that needs to be installed somewhere -->
+ <table name="RHQ_BUNDLE_VERSION">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ <column name="VERSION" size="500" type="VARCHAR2" required="true"/>
+ <column name="VERSION_ORDER" type="INTEGER" required="true"/>
+ <column name="ACTION" type="CLOB" required="true"/>
+ <column name="CONFIG_DEF_ID" type="INTEGER" required="false" references="RHQ_CONFIG_DEF" />
+ <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
+
+ <!-- This index is for constraint, not performance -->
+ <index name="RHQ_BUNDLE_VERSION_UNIQUE" unique="true">
+ <field ref="BUNDLE_ID"/>
+ <field ref="NAME"/>
+ <field ref="VERSION"/>
+ </index>
+ </table>
+
+ <!-- Many-to-many table that links many repos to a particular bundle version. destination platforms -->
+ <!-- would be required to have associations to the specified repos (to access required content -->
+ <table name="RHQ_BUNDLE_VERSION_REPO">
+ <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
+ <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
+
+ <constraint name="RHQ_BUNDLE_VERSION_REPO_KEY">
+ <primaryKey>
+ <field ref="BUNDLE_VERSION_ID"/>
+ <field ref="REPO_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <!-- BUNDLE_FILE represents a file that is associated with (possibly bundled inside) a bundle version -->
+ <table name="RHQ_BUNDLE_FILE">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
+ <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
+ </table>
+
+ <!-- A logical destination for a bundle deployment. Defines the platforms and directory on those targets. -->
+ <table name="RHQ_BUNDLE_DESTINATION">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
+ <column name="GROUP_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_GROUP"/>
+ <column name="DEPLOY_DIR" size="256" type="VARCHAR2" required="true"/>
+ <column name="DEST_BASE_DIR_NAME" size="200" type="VARCHAR2" required="true"/>
+
+ <!-- This index is for constraint, not performance -->
+ <index name="RHQ_BUNDLE_DESTINATION_UNIQUE" unique="true">
+ <field ref="BUNDLE_ID"/>
+ <field ref="GROUP_ID"/>
+ <field ref="DEPLOY_DIR"/>
+ </index>
+ </table>
+
+ <!-- An actual deployment of a bundle version to a destination, with a specific config. Bundle deployments
+ can differ only on ctime, which is assumed to be different -->
+ <table name="RHQ_BUNDLE_DEPLOYMENT">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
+ <column name="BUNDLE_DESTINATION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DESTINATION"/>
+ <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG" />
+ <column name="SUBJECT_NAME" type="VARCHAR2" required="false" size="255"/>
+ <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="IS_LIVE" type="BOOLEAN" required="true"/>
+ <column name="REPLACED_BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="false" references="RHQ_BUNDLE_DEPLOYMENT"/>
+ </table>
+
+ <!-- Represents a bundle version that is deployed on a platform resource -->
+ <table name="RHQ_BUNDLE_RES_DEPLOY">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DEPLOYMENT" />
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE" />
+ <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
+ <column name="CTIME" type="LONG" required="true"/>
+
+ <index name="RHQ_BUNDLE_RES_DEPLOY_IDX" unique="true">
+ <field ref="BUNDLE_DEPLOYMENT_ID"/>
+ <field ref="RESOURCE_ID"/>
+ </index>
+ </table>
+
+ <table name="RHQ_BUNDLE_RES_DEP_HIST">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="BUNDLE_RES_DEPLOY_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_RES_DEPLOY" />
+ <column name="SUBJECT_NAME" required="false" size="255" type="VARCHAR2"/>
+ <column name="AUDIT_TIME" required="true" type="LONG"/>
+ <column name="ACTION" required="true" size="128" type="VARCHAR2"/>
+ <column name="INFO" required="true" size="512" type="VARCHAR2"/>
+ <column name="CATEGORY" required="false" size="32" type="VARCHAR2"/>
+ <column name="STATUS" required="true" type="VARCHAR2" size="16"/>
+ <column name="MESSAGE" required="false" type="LONGVARCHAR"/>
+ <column name="ATTACHMENT" required="false" type="LONGVARCHAR"/>
+ </table>
+
+ <table name="RHQ_TAGGING_BUNDLE_MAP">
+ <column name="BUNDLE_ID" type="INTEGER" required="true" references="RHQ_BUNDLE"/>
+ <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
+ <constraint name="RHQ_TAGGING_BUNDLE_MAP_KEY">
+ <primaryKey>
+ <field ref="BUNDLE_ID"/>
+ <field ref="TAG_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_TAGGING_BUNDLE_VERSION_MAP">
+ <column name="BUNDLE_VERSION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_VERSION"/>
+ <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
+ <constraint name="RHQ_TAGGING_BUNDLE_VER_MAP_KEY">
+ <primaryKey>
+ <field ref="BUNDLE_VERSION_ID"/>
+ <field ref="TAG_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_TAGGING_BUNDLE_DEPLOY_MAP">
+ <column name="BUNDLE_DEPLOYMENT_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DEPLOYMENT"/>
+ <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
+ <constraint name="RHQ_TAGGING_BUNDLE_DEP_MAP_KEY">
+ <primaryKey>
+ <field ref="BUNDLE_DEPLOYMENT_ID"/>
+ <field ref="TAG_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_TAGGING_BUNDLE_DEST_MAP">
+ <column name="BUNDLE_DESTINATION_ID" type="INTEGER" required="true" references="RHQ_BUNDLE_DESTINATION"/>
+ <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAGGING"/>
+ <constraint name="RHQ_TAGGING_BUNDLE_DES_MAP_KEY">
+ <primaryKey>
+ <field ref="BUNDLE_DESTINATION_ID"/>
+ <field ref="TAG_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <!-- Drift Management Tables -->
+ <table name="RHQ_DRIFT_DEF_TEMPLATE">
+ <column name="ID" default="sequence-only" initial="1001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
+ <column name="CONFIG_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/>
+ <column name="NAME" type="VARCHAR2" size="128" required="true"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="512" required="false"/>
+ <!-- true if defined by user, false if provided by plugin -->
+ <column name="IS_USER_DEFINED" type="BOOLEAN" required="true"/>
+ <!--
+ Change sets are managed by the drift server plugins; therefore, we cannot maintain
+ a FK constraint on the change set id. And the type cannot be integer because
+ other back ends like MongoDB use other types that are basically variants of a
+ UUID
+
+ jsanda
+ -->
+ <column name="DRIFT_CHANGE_SET_ID" type="VARCHAR2" size="64" required="false"/>
+ <column name="CTIME" type="LONG" required="true"/>
+
+ <index name="RHQ_DRIFT_DEF_TEMPLATE_UNIQUE" unique="true">
+ <field ref="RESOURCE_TYPE_ID"/>
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <!-- Content of a file being managed for drift. Used for diff and/or remediation -->
+ <table name="RHQ_DRIFT_FILE">
+ <column name="HASH_ID" type="VARCHAR2" size="64" primarykey="true" required="true"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="DATA" type="LARGEOBJECT" required="false"/>
+ <column name="DATA_SIZE" type="LONG" required="false"/>
+ <column name="STATUS" type="VARCHAR2" size="20" required="true"/>
+ </table>
+
+ <!-- A single drift definition defining file tracking
+ Note: A resource or group (todo: group, other?) can have zero or more drift configurations.
+ Note: The name, interval and is_enabled values are also stored withing the referenced config.
+ This allows us to use the config editor to manipulate all fields.
+ Note: Name is read-only
+ Note: Interval unit is millis
+ -->
+ <table name="RHQ_DRIFT_DEFINITION">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="CONFIG_ID" type="INTEGER" required="true" references="RHQ_CONFIG"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
+ <column name="DRIFT_DEF_TEMPLATE_ID" type="INTEGER" required="false" references="RHQ_DRIFT_DEF_TEMPLATE"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="NAME" type="VARCHAR2" size="512" required="true"/>
+ <column name="DESCRIPTION" type="VARCHAR2" size="512" required="false"/>
+ <column name="INTERVAL" type="LONG" required="true"/>
+ <column name="IS_ENABLED" type="BOOLEAN" required="true"/>
+ <column name="DRIFT_HANDLING_MODE" type="VARCHAR2" size="20" required="true"/>
+ <column name="IS_PINNED" type="BOOLEAN" required="true"/>
+ <column name="IS_ATTACHED" type="BOOLEAN" required="true"/>
+ <column name="COMPLIANCE_STATUS" type="INTEGER" required="true"/>
+ </table>
+
+ <!-- A set of drift records (note, this is for the JPA server plugin impl only) -->
+ <table name="RHQ_DRIFT_SET">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ </table>
+
+ <!-- A drift change-set report for a resource (note, this is for the JPA server plugin impl only) -->
+ <table name="RHQ_DRIFT_CHANGE_SET">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="DRIFT_SET_ID" type="INTEGER" required="false" references="RHQ_DRIFT_SET"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <!-- Version 0 is initial change-set -->
+ <column name="VERSION" type="INTEGER" required="true"/>
+ <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="false" references="RHQ_RESOURCE"/>
+ <column name="DRIFT_DEFINITION_ID" type="INTEGER" required="false" references="RHQ_DRIFT_DEFINITION"/>
+ <!-- the drift handling mode at changeset creation time -->
+ <column name="DRIFT_HANDLING_MODE" type="VARCHAR2" size="20" required="true"/>
+ </table>
+
+ <!-- A single occurence of drift for a resource (note, this is for the JPA server plugin impl only) -->
+ <table name="RHQ_DRIFT">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="CATEGORY" type="VARCHAR2" size="20" required="true"/>
+ <column name="DRIFT_SET_ID" type="INTEGER" required="false" references="RHQ_DRIFT_SET"/>
+ <column name="DRIFT_CHANGE_SET_ID" type="INTEGER" required="true" references="RHQ_DRIFT_CHANGE_SET"/>
+ <!-- the file path not including the base directory -->
+ <column name="PATH" type="VARCHAR2" size="1024" required="true"/>
+ <!-- the same as PATH less [/]filename.ext. Redundant storage for the purpose of strict directory search.
+ this field can be considered transient for serialization purposes -->
+ <column name="PATH_DIRECTORY" type="VARCHAR2" size="1024" required="true"/>
+ <column name="OLD_DRIFT_FILE" type="VARCHAR2" size="64" required="false" references="RHQ_DRIFT_FILE"/>
+ <column name="NEW_DRIFT_FILE" type="VARCHAR2" size="64" required="false" references="RHQ_DRIFT_FILE"/>
+ </table>
+
+
+<!-- END: content-schema.xml -->
+<!-- BEGIN: resource-request-schema.xml -->
+
+
+ <table name="RHQ_CREATE_RES_HIST">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="PARENT_RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
+ <column name="CREATED_RESOURCE_NAME" type="VARCHAR2" size="500" required="false"/>
+ <column name="NEW_RESOURCE_KEY" type="VARCHAR2" required="false" size="500"/>
+ <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
+ <column name="CONFIGURATION_ID" type="INTEGER" required="false" references="RHQ_CONFIG"/>
+ <column name="INSTALLED_PACKAGE_ID" type="INTEGER" required="false" references="RHQ_INSTALLED_PACKAGE"/>
+ </table>
+
+ <table name="RHQ_DELETE_RES_HIST">
+ <column name="ID" type="INTEGER" required="true" default="sequence-only" initial="10001" primarykey="true"/>
+ <column name="ERROR_MESSAGE" type="LONGVARCHAR" required="false"/>
+ <column name="SUBJECT_NAME" type="VARCHAR2" required="true" size="100"/>
+ <column name="CTIME" type="LONG" required="true"/>
+ <column name="MTIME" type="LONG" required="true"/>
+ <column name="STATUS" type="VARCHAR2" required="true" size="16"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
+ </table>
+
+<!-- END: resource-request-schema.xml -->
+<!-- BEGIN: jms-schema.xml -->
+
+<!-- the schema matches that which would be automatically created by the JMS subsystem -->
+<!-- see deploy/jms/rhq-jdbc-state-service.xml and rhq-jdbc2-service.xml -->
+
+
+ <table name="JMS_MESSAGES">
+ <column name="MESSAGEID" required="true" type="INTEGER" />
+ <column name="DESTINATION" required="true" type="VARCHAR2" size="255" />
+ <column name="TXID" required="false" type="INTEGER" />
+ <column name="TXOP" required="false" type="CHAR" size="1" />
+ <column name="MESSAGEBLOB" required="false" type="BLOB" />
+
+ <constraint name="JMS_MESSAGES_PKEY">
+ <primaryKey>
+ <field ref="MESSAGEID"/>
+ <field ref="DESTINATION"/>
+ </primaryKey>
+ </constraint>
+
+ <index name="JMS_MESSAGES_TXOP_TXID">
+ <field ref="TXOP"/>
+ <field ref="TXID"/>
+ </index>
+ <index name="JMS_MESSAGES_DESTINATION">
+ <field ref="DESTINATION"/>
+ </index>
+ </table>
+
+ <table name="JMS_TRANSACTIONS">
+ <column name="TXID" required="true" type="INTEGER" primarykey="true" />
+ </table>
+
+ <table name="JMS_USERS">
+ <column name="USERID" required="true" type="VARCHAR2" size="32" primarykey="true" />
+ <column name="PASSWD" required="true" type="VARCHAR2" size="32" />
+ <column name="CLIENTID" required="false" type="VARCHAR2" size="128" />
+ </table>
+
+ <table name="JMS_ROLES">
+ <column name="ROLEID" required="true" type="VARCHAR2" size="32" />
+ <column name="USERID" required="true" type="VARCHAR2" size="32" />
+
+ <constraint name="JMS_ROLES_PKEY">
+ <primaryKey>
+ <field ref="USERID"/>
+ <field ref="ROLEID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="JMS_SUBSCRIPTIONS">
+ <column name="CLIENTID" required="true" type="VARCHAR2" size="128" />
+ <column name="SUBNAME" required="true" type="VARCHAR2" size="128" />
+ <column name="TOPIC" required="true" type="VARCHAR2" size="255" />
+ <column name="SELECTOR" required="false" type="VARCHAR2" size="255" />
+
+ <constraint name="JMS_SUBSCRIPTIONS_PKEY">
+ <primaryKey>
+ <field ref="CLIENTID"/>
+ <field ref="SUBNAME"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+<!-- END: jms-schema.xml -->
+<!-- BEGIN: obsolete-schema.xml -->
+
+
+ <!-- NOTE: The tables will be dropped in the *** REVERSE ORDER *** as listed in this file! -->
+ <!-- NOTE: So, put the table you want dropped first at the bottom, and so on... -->
+
+
+ <!-- !!! REMOVED FROM CONTENT-SCHEMA !!!! -->
+
+ <table name="RHQ_DRIFT_TEMPLATE_MAP" obsolete="true">
+ <column name="RESOURCE_TYPE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE_TYPE"/>
+ <column name="CONFIG_TEMPLATE_ID" type="INTEGER" required="true" references="RHQ_CONFIG_TEMPLATE"/>
+ </table>
+
+ <table name="RHQ_BUNDLE_CONFIG" obsolete="true">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="CONFIG_ID" type="INTEGER" required="false" references="RHQ_CONFIG" />
+ <!-- this probably needs a DTYPE discriminator so we know if its a bundle or a specific bundle version -->
+ <column name="BUNDLE_VERSION_ID" type="INTEGER" required="false" references="RHQ_BUNDLE_VERSION"/>
+ <column name="BUNDLE_ID" type="INTEGER" required="false" references="RHQ_BUNDLE"/>
+ </table>
+
+ <table name="RHQ_CHANNEL" obsolete="true">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ <column name="CREATION_TIME" type="LONG" required="true"/>
+ <column name="LAST_MODIFIED_TIME" type="LONG" required="true"/>
+
+ <index name="RHQ_CHANNEL_IDX" unique="true">
+ <field ref="NAME"/>
+ </index>
+ </table>
+
+ <table name="RHQ_CHANNEL_RESOURCE_MAP" obsolete="true">
+ <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
+ <column name="RESOURCE_ID" type="INTEGER" required="true" references="RHQ_RESOURCE"/>
+ <column name="CTIME" type="LONG" required="true"/>
+
+ <constraint name="RHQ_CHANNEL_RESOURCE_MAP_KEY">
+ <primaryKey>
+ <field ref="CHANNEL_ID"/>
+ <field ref="RESOURCE_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_CHANNEL_CONTENT_SRC_MAP" obsolete="true">
+ <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
+ <column name="CONTENT_SRC_ID" type="INTEGER" required="true" references="RHQ_CONTENT_SOURCE"/>
+ <column name="CTIME" type="LONG" required="true"/>
+
+ <constraint name="RHQ_CHAN_CONTENT_SRC_MAP_KEY">
+ <primaryKey>
+ <field ref="CHANNEL_ID"/>
+ <field ref="CONTENT_SRC_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <table name="RHQ_CHANNEL_PKG_VERSION_MAP" obsolete="true">
+ <column name="CHANNEL_ID" type="INTEGER" required="true" references="RHQ_CHANNEL"/>
+ <column name="PACKAGE_VERSION_ID" type="INTEGER" required="true" references="RHQ_PACKAGE_VERSION"/>
+ <column name="CTIME" type="LONG" required="true"/>
+
+ <constraint name="RHQ_CHANNEL_PKG_VER_MAP_KEY">
+ <primaryKey>
+ <field ref="CHANNEL_ID"/>
+ <field ref="PACKAGE_VERSION_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+ <!-- !!! REMOVED FROM MEASUREMENT-SCHEMA !!!! -->
+
+ <table name="RHQ_MEASUREMENT_OOB" obsolete="true">
+ <column name="ID" type="INTEGER" default="sequence-only" initial="10001" primarykey="true" required="true"/>
+ <column name="SCHEDULE_ID" type="INTEGER" references="RHQ_MEASUREMENT_SCHED(ID)" required="true"/>
+ <column name="OCCURRED" type="LONG" required="true"/>
+ <column name="DIFF" type="DOUBLE" required="true"/>
+
+ <index name="RHQ_MEASUREMENT_OOB_IDX" unique="true">
+ <field ref="SCHEDULE_ID" />
+ <field ref="OCCURRED" />
+ </index>
+ </table>
+
+
+ <table name="RHQ_TAG" obsolete="true">
+ <column name="ID" default="sequence-only" initial="10001" primarykey="true" required="true" type="INTEGER"/>
+ <column name="NAME" size="200" type="VARCHAR2" required="true"/>
+ <column name="DESCRIPTION" size="500" type="VARCHAR2" required="false"/>
+ </table>
+
+ <table name="RHQ_REPO_TAG_MAP" obsolete="true">
+ <column name="REPO_ID" type="INTEGER" required="true" references="RHQ_REPO"/>
+ <column name="TAG_ID" type="INTEGER" required="true" references="RHQ_TAG"/>
+
+ <constraint name="RHQ_REPO_TAG_MAP_KEY">
+ <primaryKey>
+ <field ref="REPO_ID"/>
+ <field ref="TAG_ID"/>
+ </primaryKey>
+ </constraint>
+ </table>
+
+
+<!-- END: obsolete-schema.xml -->
+</dbsetup>
commit aed615737ff5d08081ccd6070aad2770976056ee
Author: mtho11 <mikecthompson(a)gmail.com>
Date: Fri Sep 28 09:56:27 2012 -0700
[BZ861127 - Upgrade issue with respect to min/max property attributes] - Fix the rhq_config_prop_def.max_entries default to 32767 instead of 0 if it is null. And changing signature of setter back to setMax(int) from setMax(Integer) although compile time coercion makes them equivalent. And fix 2 bugs in DBInstallationTest.java that wasn't checking the schema version since RHQ3.3.0 and JON3.0.0.
(cherry picked from commit 7d937712636fcad497fec9e89afc3fe84168ad23)
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index e0ceba4..700e079 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -17,7 +17,7 @@
<description>Database schema setup, upgrade and other utilities</description>
<properties>
- <db.schema.version>2.124</db.schema.version>
+ <db.schema.version>2.125</db.schema.version>
<rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
<rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name>
<rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name>
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index ad4b851..00722db 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -4031,32 +4031,23 @@
<!-- JON 3.1.1 RELEASE uses DB Schema 2.122 -->
<schemaSpec version="2.123">
+
<schema-addColumn table="RHQ_CONFIG_PROP_DEF" column="MIN_ENTRIES" columnType="INTEGER"/>
<schema-addColumn table="RHQ_CONFIG_PROP_DEF" column="MAX_ENTRIES" columnType="INTEGER"/>
- <schema-directSQL>
- <statement desc="Update the NULL to 0 for MIN_ENTRIES">
- UPDATE RHQ_CONFIG_PROP_DEF
- SET MIN_ENTRIES = 0
- WHERE MIN_ENTRIES IS NULL
- </statement>
- <statement desc="Update the NULL to 0 for MAX_ENTRIES">
- UPDATE RHQ_CONFIG_PROP_DEF
- SET MAX_ENTRIES = 0
- WHERE MAX_ENTRIES IS NULL
- </statement>
- </schema-directSQL>
+
</schemaSpec>
- <schemaSpec version="2.124">
+<!-- RHQ 4.5.0 uses DB Schema 2.125 -->
+ <schemaSpec version="2.125">
<schema-directSQL>
<statement desc="Update the NULL to 0 for MIN_ENTRIES">
UPDATE RHQ_CONFIG_PROP_DEF
SET MIN_ENTRIES = 0
WHERE MIN_ENTRIES IS NULL
</statement>
- <statement desc="Update the NULL to 0 for MAX_ENTRIES">
+ <statement desc="Update the NULL to 32767 for MAX_ENTRIES">
UPDATE RHQ_CONFIG_PROP_DEF
- SET MAX_ENTRIES = 0
+ SET MAX_ENTRIES = 32767
WHERE MAX_ENTRIES IS NULL
</statement>
</schema-directSQL>
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionList.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionList.java
index dfca8ee..3290393 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionList.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionList.java
@@ -86,24 +86,16 @@ public class PropertyDefinitionList extends PropertyDefinition {
return max;
}
- public void setMax(Integer max){
- if(null == max){
- this.max = 0;
- }else {
+ public void setMax(int max){
this.max = max;
- }
}
public int getMin() {
return min;
}
- public void setMin(Integer min){
- if(null == min){
- this.min = 0;
- }else {
+ public void setMin(int min){
this.min = min;
- }
}
}
diff --git a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
index 20dbbc0..4fca7e1 100644
--- a/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
+++ b/modules/enterprise/gui/installer-war/src/test/java/org/rhq/enterprise/installer/DBInstallationTest.java
@@ -103,6 +103,12 @@ public class DBInstallationTest {
}
@Test
+ public void upgradeJON311Schema() throws Exception {
+ installSchemaAndData("3.1.1");
+ installer.upgradeExistingDatabaseSchema(getInstallProperties());
+ }
+
+ @Test
public void upgradeRHQ420Schema() throws Exception {
installSchemaAndData("rhq-4.2.0");
installer.upgradeExistingDatabaseSchema(getInstallProperties());
@@ -113,6 +119,18 @@ public class DBInstallationTest {
installSchemaAndData("rhq-4.3.0");
installer.upgradeExistingDatabaseSchema(getInstallProperties());
}
+
+ @Test
+ public void upgradeRHQ440Schema() throws Exception {
+ installSchemaAndData("rhq-4.4.0");
+ installer.upgradeExistingDatabaseSchema(getInstallProperties());
+ }
+
+ @Test
+ public void upgradeRHQ450Schema() throws Exception {
+ installSchemaAndData("rhq-4.5.0");
+ installer.upgradeExistingDatabaseSchema(getInstallProperties());
+ }
private void initLogDirectory() {
File logDir = new File(LOG_DIRECTORY);
@@ -202,7 +220,7 @@ public class DBInstallationTest {
ByteArrayInputStream contentInStream = new ByteArrayInputStream(content.getBytes());
StreamUtil.copy(contentInStream, xmlFileOutStream);
- return xmlFile.getAbsoluteFile();
+ return filteredXmlFile.getAbsoluteFile();
}
}
commit a751296dc9409ddb9c5e98191c1659f12d763f6d
Author: mtho11 <mikecthompson(a)gmail.com>
Date: Thu Sep 27 13:39:37 2012 -0700
[BZ 861127 - Upgrade issue with respect to min/max property attributes] - Needed to upgrade existing nulls to 0 for new min/max columns.
(cherry picked from commit 8b08fce535742c6bd7f24d3ab0d8c7d626fe7923)
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index c971f80..e0ceba4 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -17,7 +17,7 @@
<description>Database schema setup, upgrade and other utilities</description>
<properties>
- <db.schema.version>2.123</db.schema.version>
+ <db.schema.version>2.124</db.schema.version>
<rhq.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.ds.type-mapping>
<rhq.ds.server-name>${rhq.test.ds.server-name}</rhq.ds.server-name>
<rhq.ds.db-name>${rhq.test.ds.db-name}</rhq.ds.db-name>
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 1443b80..ad4b851 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -4013,7 +4013,7 @@
<schema-directSQL>
<statement desc="Updating DOWN Alert Conditions to new format">
UPDATE RHQ_ALERT_CONDITION
- SET NAME = 'AVAIL_GOES_DOWN', OPTION_STATUS = NULL
+ SET NAME = 'AVAIL_GOES_DOWN', OPTION_STATUS = NULL
WHERE TYPE = 'AVAILABILITY'
AND NAME IS NULL
AND OPTION_STATUS = 'DOWN'
@@ -4033,6 +4033,33 @@
<schemaSpec version="2.123">
<schema-addColumn table="RHQ_CONFIG_PROP_DEF" column="MIN_ENTRIES" columnType="INTEGER"/>
<schema-addColumn table="RHQ_CONFIG_PROP_DEF" column="MAX_ENTRIES" columnType="INTEGER"/>
+ <schema-directSQL>
+ <statement desc="Update the NULL to 0 for MIN_ENTRIES">
+ UPDATE RHQ_CONFIG_PROP_DEF
+ SET MIN_ENTRIES = 0
+ WHERE MIN_ENTRIES IS NULL
+ </statement>
+ <statement desc="Update the NULL to 0 for MAX_ENTRIES">
+ UPDATE RHQ_CONFIG_PROP_DEF
+ SET MAX_ENTRIES = 0
+ WHERE MAX_ENTRIES IS NULL
+ </statement>
+ </schema-directSQL>
+ </schemaSpec>
+
+ <schemaSpec version="2.124">
+ <schema-directSQL>
+ <statement desc="Update the NULL to 0 for MIN_ENTRIES">
+ UPDATE RHQ_CONFIG_PROP_DEF
+ SET MIN_ENTRIES = 0
+ WHERE MIN_ENTRIES IS NULL
+ </statement>
+ <statement desc="Update the NULL to 0 for MAX_ENTRIES">
+ UPDATE RHQ_CONFIG_PROP_DEF
+ SET MAX_ENTRIES = 0
+ WHERE MAX_ENTRIES IS NULL
+ </statement>
+ </schema-directSQL>
</schemaSpec>
</dbupgrade>
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionList.java b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionList.java
index adf1f34..dfca8ee 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionList.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/configuration/definition/PropertyDefinitionList.java
@@ -86,15 +86,24 @@ public class PropertyDefinitionList extends PropertyDefinition {
return max;
}
- public void setMax(int max) {
- this.max = max;
+ public void setMax(Integer max){
+ if(null == max){
+ this.max = 0;
+ }else {
+ this.max = max;
+ }
}
public int getMin() {
return min;
}
- public void setMin(int min) {
- this.min = min;
+ public void setMin(Integer min){
+ if(null == min){
+ this.min = 0;
+ }else {
+ this.min = min;
+ }
}
+
}
commit 949ff96d973e2592762204713235cc359d2b63b6
Author: Jay Shaughnessy <jshaughn(a)jshaughn.csb>
Date: Thu Sep 27 14:44:59 2012 -0400
[Bug 814305 - Dealing with singletons in inventory]
Fix an issue with the previous fix to handle the case where the parent
did not actually have to worry about singleton children. Also, defer
calling super's onInit until the subclass is done with it's work.
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 265778b..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
@@ -86,7 +86,6 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
@Override
protected void onInit() {
- super.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
@@ -99,7 +98,19 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
importableChildTypes = getImportableChildTypes(parentType);
hasCreatableTypes = !creatableChildTypes.isEmpty();
hasImportableTypes = !importableChildTypes.isEmpty();
- refreshSingletons(parentResource, null);
+ 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;
+ }
+
+ });
}
@@ -117,7 +128,6 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
@Override
public void onSuccess(PageList<Resource> result) {
singletonChildren = result;
- initialized = true;
if (callback != null) {
callback.onSuccess(result);
}
@@ -126,14 +136,15 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
@Override
public void onFailure(Throwable caught) {
Log.error("Failed to load child resources for [" + parentResource + "]", caught);
- initialized = true;
if (callback != null) {
callback.onFailure(caught);
}
}
});
} else {
- initialized = true;
+ if (callback != null) {
+ callback.onSuccess(new PageList<Resource>());
+ }
}
}
@@ -143,7 +154,7 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
}
// suppress unchecked warnings because the superclass has different generic types for the datasource
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
@Override
protected RPCDataSource getDataSourceInstance() {
return ResourceCompositeDataSource.getInstance();
@@ -213,7 +224,6 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
private void addImportAndCreateButtons(boolean override) {
final Resource parentResource = parentResourceComposite.getResource();
- ResourceType parentType = parentResource.getResourceType();
// Create Child Menu and Manual Import Menu
if (canCreate && (hasCreatableTypes || hasImportableTypes)) {
commit dad120db6d26c739b47b841cc0b43028a255073c
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Thu Sep 27 14:06:14 2012 +0200
[BZ 858282 - Globally uncaught exception when creating duplicate role] If rhq_role_name_key db constraint is violated, more informative message is returned to the client. Instead of "Globally uncaught exception..." with db implementation details. The same thing for user creation.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
index 686f0fd..b454fad 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesDataSource.java
@@ -18,8 +18,10 @@
*/
package org.rhq.enterprise.gui.coregui.client.admin.roles;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -140,11 +142,19 @@ public class RolesDataSource extends RPCDataSource<Role, RoleCriteria> {
@Override
protected void executeAdd(Record recordToAdd, final DSRequest request, final DSResponse response) {
- Role roleToAdd = copyValues(recordToAdd);
+ final Role roleToAdd = copyValues(recordToAdd);
roleService.createRole(roleToAdd, new AsyncCallback<Role>() {
public void onFailure(Throwable caught) {
- throw new RuntimeException(caught);
+ if (caught.getMessage() != null
+ && caught.getMessage().contains("javax.persistence.EntityExistsException")) {
+ Map<String, String> errorMessages = new HashMap<String, String>();
+ errorMessages.put(Field.NAME,
+ MSG.view_adminRoles_failCreateRoleWithExistingName(roleToAdd.getName()));
+ sendValidationErrorResponse(request, response, errorMessages);
+ } else {
+ throw new RuntimeException(caught);
+ }
}
public void onSuccess(Role addedRole) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java
index 0f0e5a8..c1d0dd7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java
@@ -215,7 +215,8 @@ public class UsersDataSource extends RPCDataSource<Subject, SubjectCriteria> {
String message = caught.getMessage();
if (message != null && message.contains("javax.persistence.EntityExistsException")) {
Map<String, String> errorMessages = new HashMap<String, String>();
- errorMessages.put(Field.NAME, "A user named [" + newSubject.getName() + "] already exists.");
+ errorMessages.put(Field.NAME,
+ MSG.view_adminUsers_failCreateUserWithExistingName(newSubject.getName()));
sendValidationErrorResponse(request, response, errorMessages);
} else {
throw new RuntimeException(caught);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java
index 7001a56..47e2b6a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java
@@ -301,7 +301,17 @@ public abstract class AbstractRecordEditor<DS extends RPCDataSource> extends Loc
message = new Message(conciseMessage, detailedMessage);
CoreGUI.goToView(getListViewPath(), message, true);
} else if (response.getStatus() == RPCResponse.STATUS_VALIDATION_ERROR) {
- Message message = new Message(MSG.widget_recordEditor_error_operationInvalidValues(),
+ String causes = null;
+ if (response.getErrors() != null && !response.getErrors().isEmpty()) {
+ // prepare detailed error message
+ StringBuffer sb = new StringBuffer();
+ for (Object cause : response.getErrors().values()) {
+ sb.append(cause);
+ sb.append('\n');
+ }
+ causes = sb.toString();
+ }
+ Message message = new Message(MSG.widget_recordEditor_error_operationInvalidValues(), causes,
Message.Severity.Error);
CoreGUI.getMessageCenter().notify(message);
} else {
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 4002fc7..20fada6 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
@@ -446,6 +446,7 @@ view_adminConfig_systemSettings = System Settings
view_adminContent_contentSources = Content Sources
view_adminRoles_assignedGroups = Assigned Resource Groups
view_adminRoles_assignedSubjects = Assigned Subjects
+view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please use another name.
view_adminRoles_failLdap = Failed to determine if LDAP configured - assuming no LDAP.
view_adminRoles_failLdapGroups = Failed to retrieve available LDAP groups - assuming no LDAP groups.
view_adminRoles_failLdapGroupsRole = Failed to load LDAP groups available for role.
@@ -537,6 +538,7 @@ view_adminTopology_partitionEvents = Partition Events
view_adminTopology_remoteAgentInstall = Remote Agent Install
view_adminTopology_servers = Servers
view_adminUsersDetails_dataTypeName = user
+view_adminUsers_failCreateUserWithExistingName = Failed to create user with existing name [{0}]. Please use another name.
view_admin_administration = Administration
view_admin_configuration = Configuration
view_admin_content = Content
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 ac127b4..f90e510 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
@@ -465,6 +465,7 @@ view_adminConfig_systemSettings = Systémová nastavení
view_adminContent_contentSources = Zdroje obsahů
view_adminRoles_assignedGroups = Přiřazené skupiny zdrojů
view_adminRoles_assignedSubjects = Přiřazené subjekty
+view_adminRoles_failCreateRoleWithExistingName = Nepodařilo se vytvořit roli s existujícím jménem [{0}]. Použíjte prosím jiné jméno.
view_adminRoles_failLdap = Nepodařilo se určit je-li LDAP nastaven - předpokládám, že LDAP není přítomen.
view_adminRoles_failLdapGroups = Nepodařilo se získat informace o LDAP skupinách - předpokládám, že LDAP není přítomen.
view_adminRoles_failLdapGroupsRole = Nepodařilo se získat informace o LDAP skupinách pro roli.
@@ -556,6 +557,7 @@ view_adminTopology_partitionEvents = Události rozdělení
view_adminTopology_remoteAgentInstall = Instalace vzdáleného agenta
view_adminTopology_servers = Servery
view_adminUsersDetails_dataTypeName = uživatel
+view_adminUsers_failCreateUserWithExistingName = Nepodařilo se vytvořit uživatele s existujícím jménem [{0}]. Použíjte prosím jiné jméno.
view_admin_administration = Administrace
view_admin_configuration = Konfigurace
view_admin_content = Obsah
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 7f3fafa..08c11c8 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
@@ -430,6 +430,7 @@ view_adminConfig_systemSettings = Systemeinstellungen
view_adminContent_contentSources = Quellen für Inhalte
view_adminRoles_assignedGroups = Zugewiesene Ressourcen-Gruppen
view_adminRoles_assignedSubjects = Zugewisene Benutzer
+##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please use another name.
view_adminRoles_failLdap = Konnte nicht ermitteln, ob LDAP konfiguriert ist - gehe von keiner LDAP-Konfiguration aus.
view_adminRoles_failLdapGroups = Konnte de LDAP-Gruppen nicht laden. Annahme ist, dass es keine gibt.
view_adminRoles_failLdapGroupsRole = Konnte die LDAP-Gruppen für die Rolle nicht laden.
@@ -504,6 +505,7 @@ view_adminTopology_partitionEvents = Partitionierungs-Ereignisse
view_adminTopology_remoteAgentInstall = Installation entfernter Agenten
view_adminTopology_servers = Server
view_adminUsersDetails_dataTypeName = Benutzer
+##view_adminUsers_failCreateUserWithExistingName = Failed to create user with existing name [{0}]. Please use another name.
view_admin_administration = Verwaltung
view_admin_configuration = Konfiguration
view_admin_content = Inhalte
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 ad760f9..b10c816 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
@@ -444,6 +444,7 @@ view_adminConfig_systemSettings = システム設定
view_adminContent_contentSources = コンテントソース
view_adminRoles_assignedGroups = 割り当てられたリソースグループ
view_adminRoles_assignedSubjects = 割り当てられたSubjects
+##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please use another name.
view_adminRoles_failLdap = LDAPが構成されたかどうかの決定に失敗しました - LDAPが無いことを仮定します
view_adminRoles_failLdapGroups = 利用可能なLDAPグループを読み出すのに失敗しました - LDAPグループが無いことを仮定します
view_adminRoles_failLdapGroupsRole = ロールのために利用可能なLDAPグループをロードするのに失敗しました
@@ -535,6 +536,7 @@ view_adminTopology_partitionEvents = イベントの分類
view_adminTopology_remoteAgentInstall = リモートエージェントのインストール
view_adminTopology_servers = サーバー
view_adminUsersDetails_dataTypeName = ユーザー
+##view_adminUsers_failCreateUserWithExistingName = Failed to create user with existing name [{0}]. Please use another name.
view_admin_administration = 管理
view_admin_configuration = 構成
view_admin_content = コンテント
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 4241b3f..e7462f3 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
@@ -450,6 +450,7 @@ view_adminConfig_systemSettings = Propriedades de Sistema
view_adminContent_contentSources = Fontes de Conte\u00FAdo
view_adminRoles_assignedGroups = Grupos de Recursos Associados
view_adminRoles_assignedSubjects = Perfis Associados
+##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please Use another name.
view_adminRoles_failLdap = Falha ao determinar se o LDAP foi configurado - assumindo como LDAP n\u00E3o configurado.
view_adminRoles_failLdapGroups = Falha ao recuperar os grupos dispon\u00EDveis no LDAP - assumindo como LDAP sem grupos.
view_adminRoles_failLdapGroupsRole = Falha ao carregar grupos do LDAP dispon\u00EDveis para o perfil.
@@ -540,6 +541,7 @@ view_adminTopology_partitionEvents = Eventos na Parti\u00E7\u00E3o
view_adminTopology_remoteAgentInstall = Instala\u00E7\u00E3o Remota de Agentes
view_adminTopology_servers = Servidores
view_adminUsersDetails_dataTypeName = usu\u00E1rio
+##view_adminUsers_failCreateUserWithExistingName = Failed to create user with existing name [{0}]. Please use another name.
view_admin_administration = Administra\u00E7\u00E3o
view_admin_configuration = Configura\u00E7\u00E3o
view_admin_content = Conte\u00FAdo
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 d74907e..3bb95c0 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
@@ -436,6 +436,7 @@
#view_adminContent_contentSources = Content Sources
#view_adminRoles_assignedGroups = Assigned Resource Groups
#view_adminRoles_assignedSubjects = Assigned Subjects
+##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please use another name.
#view_adminRoles_failLdap = Failed to determine if LDAP configured - assuming no LDAP.
#view_adminRoles_failLdapGroups = Failed to retrieve available LDAP groups - assuming no LDAP groups.
#view_adminRoles_failLdapGroupsRole = Failed to load LDAP groups available for role.
@@ -527,6 +528,7 @@
#view_adminTopology_remoteAgentInstall = Remote Agent Install
#view_adminTopology_servers = Servers
#view_adminUsersDetails_dataTypeName = user
+##view_adminUsers_failCreateUserWithExistingName = Failed to create user with existing name [{0}]. Please use another name.
#view_admin_administration = Administration
#view_admin_configuration = Configuration
#view_admin_content = Content
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 56e6d59..69c9081 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
@@ -438,6 +438,7 @@ view_adminConfig_systemSettings = \u7cfb\u7edf\u8bbe\u7f6e
view_adminContent_contentSources = Content\u6e90
view_adminRoles_assignedGroups = \u5206\u914d\u7684\u8d44\u6e90\u7ec4
view_adminRoles_assignedSubjects = \u5206\u914d\u7684\u4e3b\u9898
+##view_adminRoles_failCreateRoleWithExistingName = Failed to create role with existing name [{0}]. Please Use another name.
view_adminRoles_failLdap = \u65e0\u6cd5\u786e\u5b9aLDAP - \u5047\u5b9a\u6ca1\u6709LDAP.
view_adminRoles_failLdapGroups = \u67e5\u8be2\u6709\u6548LDAP\u7ec4\u5931\u8d25 - \u5047\u5b9a\u65e0DAP\u7ec4.
view_adminRoles_failLdapGroupsRole = \u52a0\u8f7dLDAP\u7ec4\u89d2\u8272\u5931\u8d25.
@@ -527,6 +528,7 @@ view_adminTopology_partitionEvents = Partition\u4e8b\u4ef6
view_adminTopology_remoteAgentInstall = \u8fdc\u7a0b\u4ee3\u7406\u5b89\u88c5
view_adminTopology_servers = \u670d\u52a1\u5668
view_adminUsersDetails_dataTypeName = user
+##view_adminUsers_failCreateUserWithExistingName = Failed to create user with existing name [{0}]. Please use another name.
view_admin_administration = \u7ba1\u7406
view_admin_configuration = \u914d\u7f6e
view_admin_content = Content
commit bed0ebd8edaf4a1492fb7e511e0edd810e13ca53
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Sep 26 16:34:32 2012 -0500
Updated definitions for standalone and domanin to GA.
diff --git a/modules/plugins/jboss-as-7/json-api/domain.txt b/modules/plugins/jboss-as-7/json-api/domain.txt
index dfc5e15..958e2ed 100644
--- a/modules/plugins/jboss-as-7/json-api/domain.txt
+++ b/modules/plugins/jboss-as-7/json-api/domain.txt
@@ -25,6 +25,18 @@
"access-type" => "read-only",
"storage" => "configuration"
},
+ "name" => {
+ "type" => STRING,
+ "description" => "The name given to this domain.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "Unnamed Domain",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
"process-type" => {
"description" => "The type of process represented by this root resource. Either \"Domain Controller\" or \"Host Controller\".",
"type" => STRING,
@@ -1740,7 +1752,7 @@
"nillable" => true
},
"boot-time" => {
- "type" => STRING,
+ "type" => BOOLEAN,
"description" => "If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence.",
"required" => false,
"nillable" => true,
@@ -5035,21 +5047,47 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "queue-max" => {
+ "support-ssl" => {
+ "type" => STRING,
+ "description" => "Indicates whether SSL is to be supported (on) or not (off).",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "off",
+ "allowed" => [
+ "on",
+ "off"
+ ],
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "socket-binding" => {
+ "type" => STRING,
+ "description" => "The name of the socket binding configuration that specifies the ORB port.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "jacorb",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "pool-size" => {
"type" => INT,
- "description" => "The maximum number of requests that can be queued.",
+ "description" => "The size of the request processors thread-pool. Threads that finish processing a request are placed back in the pool if the pool is not full and discarded otherwise.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => 100,
+ "default" => 5,
"min" => 1L,
- "max" => 200L,
+ "max" => 100L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "support-ssl" => {
+ "cache-poa-names" => {
"type" => STRING,
- "description" => "Indicates whether SSL is to be supported (on) or not (off).",
+ "description" => "Indicates whether POA names should be cached (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
"default" => "off",
@@ -5061,12 +5099,12 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "print-version" => {
+ "add-component-via-interceptor" => {
"type" => STRING,
- "description" => "Indicates whether the version number should be printed during ORB startup (on) or not (off).",
+ "description" => "Indicates whether SSL components should be added by an IOR interceptor (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "off",
+ "default" => "on",
"allowed" => [
"on",
"off"
@@ -5075,9 +5113,21 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "server-timeout" => {
+ "max-managed-buf-size" => {
"type" => INT,
- "description" => "The server-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
+ "description" => "The log2 of maximum size managed by the internal buffer manager.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => 24,
+ "min" => 0L,
+ "max" => 64L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "client-timeout" => {
+ "type" => INT,
+ "description" => "The client-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
"expressions-allowed" => false,
"nillable" => true,
"default" => 0,
@@ -5087,9 +5137,25 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "security" => {
+ "server-supports" => {
"type" => STRING,
- "description" => "Indicates whether the security interceptors are to be installed (on) or not (off).",
+ "description" => "Value that indicates the server SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "MutualAuth",
+ "allowed" => [
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
+ ],
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "queue-wait" => {
+ "type" => STRING,
+ "description" => "Indicates whether requests that exceed the maximum queue size should wait (on) or not (off). When disabled, a TRANSIENT exception is thrown if the queue is full.",
"expressions-allowed" => false,
"nillable" => true,
"default" => "off",
@@ -5101,24 +5167,24 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "pool-size" => {
+ "giop-minor-version" => {
"type" => INT,
- "description" => "The size of the request processors thread-pool. Threads that finish processing a request are placed back in the pool if the pool is not full and discarded otherwise.",
+ "description" => "The GIOP minor version to be used.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => 5,
+ "default" => 2,
"min" => 1L,
- "max" => 100L,
+ "max" => 2L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "sun" => {
+ "monitoring" => {
"type" => STRING,
- "description" => "Indicates whether interoperability with Sun's ORB is enabled (on) or not (off).",
+ "description" => "Indicates whether the monitoring GUI should be displayed (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "on",
+ "default" => "off",
"allowed" => [
"on",
"off"
@@ -5127,9 +5193,63 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "lax-boolean-encoding" => {
+ "server-requires" => {
"type" => STRING,
- "description" => "Indicates whether any non-zero CDR encoded boolean value should be interpreted as true (on) or not (off).",
+ "description" => "Value that indicates the server SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "None",
+ "allowed" => [
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
+ ],
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "client-supports" => {
+ "type" => STRING,
+ "description" => "Value that indicates the client SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "MutualAuth",
+ "allowed" => [
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
+ ],
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "properties" => {
+ "type" => OBJECT,
+ "description" => "A list of generic key/value properties.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "value-type" => STRING,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
+ "root-context" => {
+ "type" => STRING,
+ "description" => "The naming service root context.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "JBoss/Naming/root",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "comet" => {
+ "type" => STRING,
+ "description" => "Indicates whether interoperability with Comet's ORB is enabled (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
"default" => "off",
@@ -5141,9 +5261,49 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "cache-poa-names" => {
+ "ssl-socket-binding" => {
"type" => STRING,
- "description" => "Indicates whether POA names should be cached (on) or not (off).",
+ "description" => "The name of the socket binding configuration that specifies the ORB SSL port.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "jacorb-ssl",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "client-requires" => {
+ "type" => STRING,
+ "description" => "Value that indicates the client SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "None",
+ "allowed" => [
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
+ ],
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "max-server-connections" => {
+ "type" => INT,
+ "description" => "The maximum number of connections accepted by the server.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => 2147483647,
+ "min" => 0L,
+ "max" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "iona" => {
+ "type" => STRING,
+ "description" => "Indicates whether interoperability with IONA's ASP is enabled (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
"default" => "off",
@@ -5155,12 +5315,12 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "strict-check-on-tc-creation" => {
+ "chunk-custom-rmi-valuetypes" => {
"type" => STRING,
- "description" => "Indicates whether the method create_abstract_interface_tc should perform a validation check on the name parameter (on) or not (off).",
+ "description" => "Indicates whether custom RMI valuetypes should be encoded as chunks (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "off",
+ "default" => "on",
"allowed" => [
"on",
"off"
@@ -5169,24 +5329,24 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "max-managed-buf-size" => {
+ "queue-max" => {
"type" => INT,
- "description" => "The log2 of maximum size managed by the internal buffer manager.",
+ "description" => "The maximum number of requests that can be queued.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => 24,
- "min" => 0L,
- "max" => 64L,
+ "default" => 100,
+ "min" => 1L,
+ "max" => 200L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "add-component-via-interceptor" => {
+ "print-version" => {
"type" => STRING,
- "description" => "Indicates whether SSL components should be added by an IOR interceptor (on) or not (off).",
+ "description" => "Indicates whether the version number should be printed during ORB startup (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "on",
+ "default" => "off",
"allowed" => [
"on",
"off"
@@ -5195,9 +5355,9 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "client-timeout" => {
+ "server-timeout" => {
"type" => INT,
- "description" => "The client-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
+ "description" => "The server-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
"expressions-allowed" => false,
"nillable" => true,
"default" => 0,
@@ -5207,6 +5367,62 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
+ "security" => {
+ "type" => STRING,
+ "description" => "Indicates whether the security interceptors are to be installed (on) or not (off).",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "off",
+ "allowed" => [
+ "on",
+ "off"
+ ],
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "sun" => {
+ "type" => STRING,
+ "description" => "Indicates whether interoperability with Sun's ORB is enabled (on) or not (off).",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "on",
+ "allowed" => [
+ "on",
+ "off"
+ ],
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "lax-boolean-encoding" => {
+ "type" => STRING,
+ "description" => "Indicates whether any non-zero CDR encoded boolean value should be interpreted as true (on) or not (off).",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "off",
+ "allowed" => [
+ "on",
+ "off"
+ ],
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "strict-check-on-tc-creation" => {
+ "type" => STRING,
+ "description" => "Indicates whether the method create_abstract_interface_tc should perform a validation check on the name parameter (on) or not (off).",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "off",
+ "allowed" => [
+ "on",
+ "off"
+ ],
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
"use-imr" => {
"type" => STRING,
"description" => "Indicates whether the implementation repository should be used (on) or not (off).",
@@ -5259,48 +5475,6 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "server-supports" => {
- "type" => STRING,
- "description" => "Value that indicates the server SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => "MutualAuth",
- "allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
- ],
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
- "queue-wait" => {
- "type" => STRING,
- "description" => "Indicates whether requests that exceed the maximum queue size should wait (on) or not (off). When disabled, a TRANSIENT exception is thrown if the queue is full.",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => "off",
- "allowed" => [
- "on",
- "off"
- ],
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
- "giop-minor-version" => {
- "type" => INT,
- "description" => "The GIOP minor version to be used.",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => 2,
- "min" => 1L,
- "max" => 2L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
"cache-typecodes" => {
"type" => STRING,
"description" => "Indicates whether typecodes should be cached (on) or not (off).",
@@ -5315,36 +5489,6 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "monitoring" => {
- "type" => STRING,
- "description" => "Indicates whether the monitoring GUI should be displayed (on) or not (off).",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => "off",
- "allowed" => [
- "on",
- "off"
- ],
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
- "server-requires" => {
- "type" => STRING,
- "description" => "Value that indicates the server SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => "None",
- "allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
- ],
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
"indirection-encoding-disable" => {
"type" => STRING,
"description" => "Indicates whether indirection encoding for repeated typecodes should be disabled (on) or not (off).",
@@ -5371,44 +5515,6 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "client-supports" => {
- "type" => STRING,
- "description" => "Value that indicates the client SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => "MutualAuth",
- "allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
- ],
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
- "properties" => {
- "type" => OBJECT,
- "description" => "A list of generic key/value properties.",
- "expressions-allowed" => false,
- "nillable" => true,
- "value-type" => STRING,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "no-services"
- },
- "root-context" => {
- "type" => STRING,
- "description" => "The naming service root context.",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => "JBoss/Naming/root",
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
"retry-interval" => {
"type" => INT,
"description" => "The interval in milliseconds between retries.",
@@ -5421,20 +5527,6 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "comet" => {
- "type" => STRING,
- "description" => "Indicates whether interoperability with Comet's ORB is enabled (on) or not (off).",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => "off",
- "allowed" => [
- "on",
- "off"
- ],
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
"outbuf-cache-timeout" => {
"type" => INT,
"description" => "The buffer cache timeout in milliseconds.",
@@ -5470,22 +5562,6 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "client-requires" => {
- "type" => STRING,
- "description" => "Value that indicates the client SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => "None",
- "allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
- ],
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
"retries" => {
"type" => INT,
"description" => "The number of retries if connections cannot be promptly established.",
@@ -5498,46 +5574,6 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "max-server-connections" => {
- "type" => INT,
- "description" => "The maximum number of connections accepted by the server.",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => 2147483647,
- "min" => 0L,
- "max" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
- "iona" => {
- "type" => STRING,
- "description" => "Indicates whether interoperability with IONA's ASP is enabled (on) or not (off).",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => "off",
- "allowed" => [
- "on",
- "off"
- ],
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
- "chunk-custom-rmi-valuetypes" => {
- "type" => STRING,
- "description" => "Indicates whether custom RMI valuetypes should be encoded as chunks (on) or not (off).",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => "on",
- "allowed" => [
- "on",
- "off"
- ],
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
"export-corbaloc" => {
"type" => STRING,
"description" => "Indicates whether the root context should be exported as corbaloc::address:port/NameService (on) or not (off).",
@@ -5702,18 +5738,38 @@
"spec"
]
},
- "queue-max" => {
+ "support-ssl" => {
+ "type" => STRING,
+ "description" => "Indicates whether SSL is to be supported (on) or not (off).",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "allowed" => [
+ "on",
+ "off"
+ ]
+ },
+ "socket-binding" => {
+ "type" => STRING,
+ "description" => "The name of the socket binding configuration that specifies the ORB port.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "pool-size" => {
"type" => INT,
- "description" => "The maximum number of requests that can be queued.",
+ "description" => "The size of the request processors thread-pool. Threads that finish processing a request are placed back in the pool if the pool is not full and discarded otherwise.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"min" => 1L,
- "max" => 200L
+ "max" => 100L
},
- "support-ssl" => {
+ "cache-poa-names" => {
"type" => STRING,
- "description" => "Indicates whether SSL is to be supported (on) or not (off).",
+ "description" => "Indicates whether POA names should be cached (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -5722,9 +5778,9 @@
"off"
]
},
- "print-version" => {
+ "add-component-via-interceptor" => {
"type" => STRING,
- "description" => "Indicates whether the version number should be printed during ORB startup (on) or not (off).",
+ "description" => "Indicates whether SSL components should be added by an IOR interceptor (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -5733,18 +5789,40 @@
"off"
]
},
- "server-timeout" => {
+ "max-managed-buf-size" => {
"type" => INT,
- "description" => "The server-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
+ "description" => "The log2 of maximum size managed by the internal buffer manager.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min" => 0L,
+ "max" => 64L
+ },
+ "client-timeout" => {
+ "type" => INT,
+ "description" => "The client-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"min" => 0L,
"max" => 2147483647L
},
- "security" => {
+ "server-supports" => {
"type" => STRING,
- "description" => "Indicates whether the security interceptors are to be installed (on) or not (off).",
+ "description" => "Value that indicates the server SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "allowed" => [
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
+ ]
+ },
+ "queue-wait" => {
+ "type" => STRING,
+ "description" => "Indicates whether requests that exceed the maximum queue size should wait (on) or not (off). When disabled, a TRANSIENT exception is thrown if the queue is full.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -5753,18 +5831,18 @@
"off"
]
},
- "pool-size" => {
+ "giop-minor-version" => {
"type" => INT,
- "description" => "The size of the request processors thread-pool. Threads that finish processing a request are placed back in the pool if the pool is not full and discarded otherwise.",
+ "description" => "The GIOP minor version to be used.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"min" => 1L,
- "max" => 100L
+ "max" => 2L
},
- "sun" => {
+ "monitoring" => {
"type" => STRING,
- "description" => "Indicates whether interoperability with Sun's ORB is enabled (on) or not (off).",
+ "description" => "Indicates whether the monitoring GUI should be displayed (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -5773,31 +5851,52 @@
"off"
]
},
- "lax-boolean-encoding" => {
+ "server-requires" => {
"type" => STRING,
- "description" => "Indicates whether any non-zero CDR encoded boolean value should be interpreted as true (on) or not (off).",
+ "description" => "Value that indicates the server SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"allowed" => [
- "on",
- "off"
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
]
},
- "cache-poa-names" => {
+ "client-supports" => {
"type" => STRING,
- "description" => "Indicates whether POA names should be cached (on) or not (off).",
+ "description" => "Value that indicates the client SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"allowed" => [
- "on",
- "off"
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
]
},
- "strict-check-on-tc-creation" => {
+ "properties" => {
+ "type" => OBJECT,
+ "description" => "A list of generic key/value properties.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "value-type" => STRING
+ },
+ "root-context" => {
"type" => STRING,
- "description" => "Indicates whether the method create_abstract_interface_tc should perform a validation check on the name parameter (on) or not (off).",
+ "description" => "The naming service root context.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "comet" => {
+ "type" => STRING,
+ "description" => "Indicates whether interoperability with Comet's ORB is enabled (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -5806,38 +5905,40 @@
"off"
]
},
- "max-managed-buf-size" => {
- "type" => INT,
- "description" => "The log2 of maximum size managed by the internal buffer manager.",
+ "ssl-socket-binding" => {
+ "type" => STRING,
+ "description" => "The name of the socket binding configuration that specifies the ORB SSL port.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "min" => 0L,
- "max" => 64L
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
- "add-component-via-interceptor" => {
+ "client-requires" => {
"type" => STRING,
- "description" => "Indicates whether SSL components should be added by an IOR interceptor (on) or not (off).",
+ "description" => "Value that indicates the client SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"allowed" => [
- "on",
- "off"
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
]
},
- "client-timeout" => {
+ "max-server-connections" => {
"type" => INT,
- "description" => "The client-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
+ "description" => "The maximum number of connections accepted by the server.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"min" => 0L,
"max" => 2147483647L
},
- "use-imr" => {
+ "iona" => {
"type" => STRING,
- "description" => "Indicates whether the implementation repository should be used (on) or not (off).",
+ "description" => "Indicates whether interoperability with IONA's ASP is enabled (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -5846,27 +5947,29 @@
"off"
]
},
- "name" => {
+ "chunk-custom-rmi-valuetypes" => {
"type" => STRING,
- "description" => "The name of the running ORB.",
+ "description" => "Indicates whether custom RMI valuetypes should be encoded as chunks (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
+ "allowed" => [
+ "on",
+ "off"
+ ]
},
- "max-threads" => {
+ "queue-max" => {
"type" => INT,
- "description" => "The maximum number of active request processor threads. Threads are first obtained from the pool and once the pool is exhausted new threads are created until the number of threads reaches this limit. New requests will wait until an active thread finishes its job.",
+ "description" => "The maximum number of requests that can be queued.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "min" => 5L,
- "max" => 150L
+ "min" => 1L,
+ "max" => 200L
},
- "use-bom" => {
+ "print-version" => {
"type" => STRING,
- "description" => "Indicates whether GIOP 1.2 byte order markers should be used (on) or not (off).",
+ "description" => "Indicates whether the version number should be printed during ORB startup (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -5875,22 +5978,18 @@
"off"
]
},
- "server-supports" => {
- "type" => STRING,
- "description" => "Value that indicates the server SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "server-timeout" => {
+ "type" => INT,
+ "description" => "The server-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
- ]
+ "min" => 0L,
+ "max" => 2147483647L
},
- "queue-wait" => {
+ "security" => {
"type" => STRING,
- "description" => "Indicates whether requests that exceed the maximum queue size should wait (on) or not (off). When disabled, a TRANSIENT exception is thrown if the queue is full.",
+ "description" => "Indicates whether the security interceptors are to be installed (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -5899,18 +5998,9 @@
"off"
]
},
- "giop-minor-version" => {
- "type" => INT,
- "description" => "The GIOP minor version to be used.",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "min" => 1L,
- "max" => 2L
- },
- "cache-typecodes" => {
+ "sun" => {
"type" => STRING,
- "description" => "Indicates whether typecodes should be cached (on) or not (off).",
+ "description" => "Indicates whether interoperability with Sun's ORB is enabled (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -5919,9 +6009,9 @@
"off"
]
},
- "monitoring" => {
+ "lax-boolean-encoding" => {
"type" => STRING,
- "description" => "Indicates whether the monitoring GUI should be displayed (on) or not (off).",
+ "description" => "Indicates whether any non-zero CDR encoded boolean value should be interpreted as true (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -5930,22 +6020,20 @@
"off"
]
},
- "server-requires" => {
+ "strict-check-on-tc-creation" => {
"type" => STRING,
- "description" => "Value that indicates the server SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "description" => "Indicates whether the method create_abstract_interface_tc should perform a validation check on the name parameter (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
+ "on",
+ "off"
]
},
- "indirection-encoding-disable" => {
+ "use-imr" => {
"type" => STRING,
- "description" => "Indicates whether indirection encoding for repeated typecodes should be disabled (on) or not (off).",
+ "description" => "Indicates whether the implementation repository should be used (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -5954,64 +6042,74 @@
"off"
]
},
- "queue-min" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the running ORB.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "max-threads" => {
"type" => INT,
- "description" => "The size of the queue for notifying waiting requests. In other words, blocked requests are only notified when the queue has no more than queue-min requests.",
+ "description" => "The maximum number of active request processor threads. Threads are first obtained from the pool and once the pool is exhausted new threads are created until the number of threads reaches this limit. New requests will wait until an active thread finishes its job.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "min" => 1L,
- "max" => 100L
+ "min" => 5L,
+ "max" => 150L
},
- "client-supports" => {
+ "use-bom" => {
"type" => STRING,
- "description" => "Value that indicates the client SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "description" => "Indicates whether GIOP 1.2 byte order markers should be used (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
+ "on",
+ "off"
]
},
- "properties" => {
- "type" => OBJECT,
- "description" => "A list of generic key/value properties.",
+ "cache-typecodes" => {
+ "type" => STRING,
+ "description" => "Indicates whether typecodes should be cached (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "value-type" => STRING
+ "allowed" => [
+ "on",
+ "off"
+ ]
},
- "root-context" => {
+ "indirection-encoding-disable" => {
"type" => STRING,
- "description" => "The naming service root context.",
+ "description" => "Indicates whether indirection encoding for repeated typecodes should be disabled (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
+ "allowed" => [
+ "on",
+ "off"
+ ]
},
- "retry-interval" => {
+ "queue-min" => {
"type" => INT,
- "description" => "The interval in milliseconds between retries.",
+ "description" => "The size of the queue for notifying waiting requests. In other words, blocked requests are only notified when the queue has no more than queue-min requests.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "min" => 0L,
- "max" => 2147483647L
+ "min" => 1L,
+ "max" => 100L
},
- "comet" => {
- "type" => STRING,
- "description" => "Indicates whether interoperability with Comet's ORB is enabled (on) or not (off).",
+ "retry-interval" => {
+ "type" => INT,
+ "description" => "The interval in milliseconds between retries.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "allowed" => [
- "on",
- "off"
- ]
+ "min" => 0L,
+ "max" => 2147483647L
},
"outbuf-cache-timeout" => {
"type" => INT,
@@ -6040,19 +6138,6 @@
"min-length" => 1L,
"max-length" => 2147483647L
},
- "client-requires" => {
- "type" => STRING,
- "description" => "Value that indicates the client SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
- ]
- },
"retries" => {
"type" => INT,
"description" => "The number of retries if connections cannot be promptly established.",
@@ -6062,37 +6147,6 @@
"min" => 0L,
"max" => 50L
},
- "max-server-connections" => {
- "type" => INT,
- "description" => "The maximum number of connections accepted by the server.",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "min" => 0L,
- "max" => 2147483647L
- },
- "iona" => {
- "type" => STRING,
- "description" => "Indicates whether interoperability with IONA's ASP is enabled (on) or not (off).",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "allowed" => [
- "on",
- "off"
- ]
- },
- "chunk-custom-rmi-valuetypes" => {
- "type" => STRING,
- "description" => "Indicates whether custom RMI valuetypes should be encoded as chunks (on) or not (off).",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "allowed" => [
- "on",
- "off"
- ]
- },
"export-corbaloc" => {
"type" => STRING,
"description" => "Indicates whether the root context should be exported as corbaloc::address:port/NameService (on) or not (off).",
@@ -21531,18 +21585,6 @@
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L
- },
- "properties" => {
- "type" => LIST,
- "description" => "A list of properties for a protocol layer. Used to customize protocol behaviour.",
- "expressions-allowed" => false,
- "nillable" => true,
- "value-type" => {"property" => {
- "type" => PROPERTY,
- "description" => "A protocol property with name and value.",
- "expressions-allowed" => false,
- "nillable" => true
- }}
}
}
},
@@ -21573,18 +21615,6 @@
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L
- },
- "properties" => {
- "type" => LIST,
- "description" => "A list of properties for a protocol layer. Used to customize protocol behaviour.",
- "expressions-allowed" => false,
- "nillable" => true,
- "value-type" => {"property" => {
- "type" => PROPERTY,
- "description" => "A protocol property with name and value.",
- "expressions-allowed" => false,
- "nillable" => true
- }}
}
}
}}
@@ -22153,39 +22183,6 @@
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
- },
- "site" => {
- "type" => STRING,
- "description" => "A site identifier for the transport",
- "expressions-allowed" => true,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
- "rack" => {
- "type" => STRING,
- "description" => "A rack identifier for the transport",
- "expressions-allowed" => true,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
- "machine" => {
- "type" => STRING,
- "description" => "A machine identifier for the transport",
- "expressions-allowed" => true,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
}
},
"operations" => {
@@ -22358,33 +22355,6 @@
"required" => false,
"nillable" => true,
"unit" => "MILLISECONDS"
- },
- "site" => {
- "type" => STRING,
- "description" => "A site identifier for the transport",
- "expressions-allowed" => true,
- "required" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
- },
- "rack" => {
- "type" => STRING,
- "description" => "A rack identifier for the transport",
- "expressions-allowed" => true,
- "required" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
- },
- "machine" => {
- "type" => STRING,
- "description" => "A machine identifier for the transport",
- "expressions-allowed" => true,
- "required" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
}
}
},
@@ -60264,13 +60234,13 @@
}
},
"osgi" => {
- "description" => "The OSGi subsystem configuration.",
+ "description" => "The OSGi subsystem configuration",
"head-comment-allowed" => true,
"tail-comment-allowed" => true,
"namespace" => "urn:jboss:domain:osgi:1.2",
"attributes" => {
"activation" => {
- "description" => "Activation flag for the OSGi subsystem. Possible values: lazy, eager.",
+ "description" => "Activation flag for the OSGi subsystem. Possible values: lazy, eager",
"type" => STRING,
"default" => "LAZY",
"access-type" => "read-write",
@@ -60278,7 +60248,7 @@
"storage" => "configuration"
},
"startlevel" => {
- "description" => "The current Start Level of the OSGi Framework. Changing this value will change the Start Level of the Framework accordingly.",
+ "description" => "The current Start Level of the OSGi Framework. Changing this value will change the Start Level of the Framework accordingly",
"type" => INT,
"access-type" => "read-only",
"restart-required" => "RESTART_NONE",
@@ -60287,11 +60257,11 @@
},
"children" => {
"property" => {
- "description" => "A framework property. The identity of the resource defines the property name.",
+ "description" => "A framework property. The identity of the resource defines the property name",
"model-description" => {"*" => {
- "description" => "A framework property. The identity of the resource defines the property name.",
+ "description" => "A framework property. The identity of the resource defines the property name",
"attributes" => {"value" => {
- "description" => "The framework property value.",
+ "description" => "The framework property value",
"type" => STRING,
"required" => true,
"access-type" => "read-write",
@@ -60337,7 +60307,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Remove a framework property.",
+ "description" => "Remove a framework property",
"request-properties" => {},
"reply-properties" => {}
},
@@ -60433,9 +60403,9 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Add a framework property.",
+ "description" => "Add a framework property",
"request-properties" => {"value" => {
- "description" => "The framework property value.",
+ "description" => "The framework property value",
"type" => STRING,
"required" => true
}},
@@ -60570,16 +60540,16 @@
}}
},
"capability" => {
- "description" => "A framework capability. A capability maps to a JBoss Module in the modules directory or an OSGi bundle in the bundles directory. The identity maps to the resource identifier of the module or bundle.",
+ "description" => "A framework capability. A capability maps to a JBoss Module in the modules directory or an OSGi bundle in the bundles directory. The identity maps to the resource identifier of the module or bundle",
"model-description" => {"*" => {
- "description" => "A framework capability. A capability maps to a JBoss Module in the modules directory or an OSGi bundle in the bundles directory. The identity maps to the resource identifier of the module or bundle.",
+ "description" => "A framework capability. A capability maps to a JBoss Module in the modules directory or an OSGi bundle in the bundles directory. The identity maps to the resource identifier of the module or bundle",
"attributes" => {"startlevel" => {
- "description" => "The startlevel for the capability. Can only be specified for OSGi bundles.",
+ "description" => "The startlevel for the capability. Can only be specified for OSGi bundles",
"type" => INT,
"required" => false,
"access-type" => "read-only",
"restart-required" => "all-services",
- "storage" => "configuration"
+ "storage" => "runtime"
}},
"operations" => {
"read-children-names" => {
@@ -60620,7 +60590,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Remove a framework capability.",
+ "description" => "Remove a framework capability",
"request-properties" => {},
"reply-properties" => {}
},
@@ -60716,9 +60686,9 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Add a framework capability.",
+ "description" => "Add a framework capability",
"request-properties" => {"startlevel" => {
- "description" => "The startlevel for the capability. Can only be specified for OSGi bundles.",
+ "description" => "The startlevel for the capability. Can only be specified for OSGi bundles",
"type" => INT,
"required" => false
}},
@@ -60852,7 +60822,7 @@
}
}}
},
- "bundle" => {"description" => "Runtime bundle information."}
+ "bundle" => {"description" => "Runtime bundle information. The resource can be identified by bundle id or bundle location "}
},
"operations" => {
"read-children-names" => {
@@ -60893,7 +60863,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Remove the OSGi subsystem configuration.",
+ "description" => "Remove the OSGi subsystem configuration",
"reply-properties" => {},
"request-properties" => {}
},
@@ -60989,9 +60959,9 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Add the OSGi subsystem configuration.",
+ "description" => "Add the OSGi subsystem configuration",
"request-properties" => {"activation" => {
- "description" => "Activation flag for the OSGi subsystem. Possible values: lazy, eager.",
+ "description" => "Activation flag for the OSGi subsystem. Possible values: lazy, eager",
"type" => STRING,
"default" => "LAZY"
}},
@@ -65677,12 +65647,17 @@
"model-description" => {"log-store" => {
"description" => "Representation of the transaction logging storage mechanism.",
"attributes" => {"type" => {
- "description" => "Specifies the implementation type of the logging store.",
"type" => STRING,
- "access-type" => "read-only",
- "storage" => "configuration"
+ "description" => "Specifies the implementation type of the logging store.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "default",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
}},
- "children" => {"transactions" => {"description" => "The persistent information that the transaction manager stores for the purpose of recovering a transaction in the event of failure. The probe operation will add and remove transactions from the model as the corresponding real transactions start and finish the prepare and commit phases. A stuck transaction will remain in the model until either it is completed or explicitly removed by the delete operation."}},
"operations" => {
"read-children-names" => {
"operation-name" => "read-children-names",
@@ -65722,7 +65697,9 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Remove a representation of the transaction logging storage mechanism."
+ "description" => "Remove a representation of the transaction logging storage mechanism.",
+ "request-properties" => {},
+ "reply-properties" => {}
},
"read-resource-description" => {
"operation-name" => "read-resource-description",
@@ -65818,11 +65795,15 @@
"operation-name" => "add",
"description" => "Add a representation of the transaction logging storage mechanism.",
"request-properties" => {"type" => {
- "description" => "Specifies the implementation type of the logging store.",
"type" => STRING,
+ "description" => "Specifies the implementation type of the logging store.",
+ "expressions-allowed" => false,
"required" => false,
- "default" => "\"default\""
- }}
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ }},
+ "reply-properties" => {}
},
"read-attribute" => {
"operation-name" => "read-attribute",
@@ -65848,7 +65829,9 @@
},
"probe" => {
"operation-name" => "probe",
- "description" => "Scan for new transaction logs. This operation will creates a child for each pending transaction."
+ "description" => "Scan for new transaction logs. This operation will creates a child for each pending transaction.",
+ "request-properties" => {},
+ "reply-properties" => {}
},
"whoami" => {
"operation-name" => "whoami",
@@ -65953,7 +65936,8 @@
}
}
}
- }
+ },
+ "children" => {}
}}
}}
},
@@ -71253,16 +71237,6 @@
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
- },
- "category" => {
- "type" => STRING,
- "description" => "Specifies the category for the logger.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-only",
- "storage" => "configuration"
}
},
"operations" => {
@@ -72770,16 +72744,6 @@
"model-description" => {"*" => {
"description" => "Defines a handler which writes to the sub-handlers in an asynchronous thread. Used for handlers which introduce a substantial amount of lag.",
"attributes" => {
- "name" => {
- "type" => STRING,
- "description" => "The handler's name.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-only",
- "storage" => "configuration"
- },
"level" => {
"type" => STRING,
"description" => "The log level specifying which message levels will be logged by this. Message levels lower than this value will be discarded.",
@@ -73987,6 +73951,17 @@
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
+ },
+ "encoding" => {
+ "type" => STRING,
+ "description" => "The character encoding used by this Handler.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
}
},
"operations" => {
@@ -76731,16 +76706,6 @@
"model-description" => {"*" => {
"description" => "Defines a handler which writes to the console.",
"attributes" => {
- "name" => {
- "type" => STRING,
- "description" => "The handler's name.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-only",
- "storage" => "configuration"
- },
"encoding" => {
"type" => STRING,
"description" => "The character encoding used by this Handler.",
@@ -80643,16 +80608,6 @@
"model-description" => {"*" => {
"description" => "Defines a handler which writes to a file.",
"attributes" => {
- "name" => {
- "type" => STRING,
- "description" => "The handler's name.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-only",
- "storage" => "configuration"
- },
"encoding" => {
"type" => STRING,
"description" => "The character encoding used by this Handler.",
@@ -84623,16 +84578,6 @@
"model-description" => {"*" => {
"description" => "Defines a handler which writes to a file, rotating the log after a time period derived from the given suffix string, which should be in a format understood by java.text.SimpleDateFormat.",
"attributes" => {
- "name" => {
- "type" => STRING,
- "description" => "The handler's name.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-only",
- "storage" => "configuration"
- },
"encoding" => {
"type" => STRING,
"description" => "The character encoding used by this Handler.",
@@ -88626,16 +88571,6 @@
"model-description" => {"*" => {
"description" => "Defines a handler which writes to a file, rotating the log after a the size of the file grows beyond a certain point and keeping a fixed number of backups.",
"attributes" => {
- "name" => {
- "type" => STRING,
- "description" => "The handler's name.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-only",
- "storage" => "configuration"
- },
"encoding" => {
"type" => STRING,
"description" => "The character encoding used by this Handler.",
@@ -92660,16 +92595,6 @@
"model-description" => {"*" => {
"description" => "Defines a custom logging handler. The custom handler must extend java.util.logging.Handler.",
"attributes" => {
- "name" => {
- "type" => STRING,
- "description" => "The handler's name.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-only",
- "storage" => "configuration"
- },
"encoding" => {
"type" => STRING,
"description" => "The character encoding used by this Handler.",
@@ -97327,151 +97252,191 @@
"tail-comment-allowed" => true,
"attributes" => {
"connection-url" => {
- "description" => "The JDBC driver connection URL",
"type" => STRING,
- "required" => true,
+ "description" => "The JDBC driver connection URL",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"driver-class" => {
- "description" => "The fully qualified name of the JDBC driver class",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified name of the JDBC driver class",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"datasource-class" => {
- "description" => "The fully qualified name of the JDBC datasource class",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified name of the JDBC datasource class",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"jndi-name" => {
- "description" => "Specifies the JNDI name for the datasource",
"type" => STRING,
- "required" => true,
+ "description" => "Specifies the JNDI name for the datasource",
+ "expressions-allowed" => true,
+ "nillable" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"driver-name" => {
- "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
"type" => STRING,
- "required" => true,
+ "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"new-connection-sql" => {
- "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"url-delimiter" => {
- "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"url-selector-strategy-class-name" => {
- "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
"type" => STRING,
- "required" => false,
+ "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-java-context" => {
- "description" => "Setting this to false will bind the datasource into global JNDI",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Setting this to false will bind the datasource into global JNDI",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"jta" => {
- "description" => "Enable JTA integration",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable JTA integration",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"max-pool-size" => {
- "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
"type" => INT,
- "required" => false,
- "default" => "20",
+ "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 20,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"min-pool-size" => {
- "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
"type" => INT,
- "required" => false,
- "default" => "0",
+ "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 0,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"pool-prefill" => {
- "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"pool-use-strict-min" => {
- "description" => "Specifies if the min-pool-size should be considered strictly",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Specifies if the min-pool-size should be considered strictly",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"user-name" => {
- "description" => "Specify the user name used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specify the user name used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"password" => {
- "description" => "Specifies the password used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the password used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"security-domain" => {
- "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"reauth-plugin-class-name" => {
- "description" => "The fully qualified class name of the reauthentication plugin implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified class name of the reauthentication plugin implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -97486,117 +97451,150 @@
"restart-required" => "no-services"
},
"flush-strategy" => {
- "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
"type" => STRING,
- "required" => false,
- "default" => "\"FailingConnectionOnly\"",
+ "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "FailingConnectionOnly",
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
+ "allow-multiple-users" => {
+ "type" => BOOLEAN,
+ "description" => "Specifies if multiple users will access the datasource through the getConnection(user, password) method and hence if the internal pool type should account for that",
+ "expressions-allowed" => false,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"prepared-statements-cache-size" => {
- "description" => "The number of prepared statements per connection in an LRU cache",
"type" => LONG,
- "required" => false,
+ "description" => "The number of prepared statements per connection in an LRU cache",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"share-prepared-statements" => {
- "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"track-statements" => {
- "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
"type" => STRING,
- "required" => false,
- "default" => "\"NOWARN\"",
+ "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "NOWARN",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"allocation-retry" => {
- "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
"type" => INT,
- "required" => false,
+ "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"allocation-retry-wait-millis" => {
- "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
"type" => LONG,
- "required" => false,
+ "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"blocking-timeout-wait-millis" => {
- "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
"type" => LONG,
- "required" => false,
+ "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"idle-timeout-minutes" => {
- "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => LONG,
- "required" => false,
+ "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MINUTES",
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"query-timeout" => {
- "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-try-lock" => {
- "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"set-tx-query-timeout" => {
- "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"transaction-isolation" => {
- "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
"type" => STRING,
- "required" => false,
+ "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"check-valid-connection-sql" => {
- "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"exception-sorter-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -97611,9 +97609,12 @@
"restart-required" => "no-services"
},
"stale-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -97628,9 +97629,12 @@
"restart-required" => "no-services"
},
"valid-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -97645,61 +97649,73 @@
"restart-required" => "no-services"
},
"background-validation-millis" => {
- "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
"type" => LONG,
- "required" => false,
+ "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
+ "min" => 1L,
+ "max" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"background-validation" => {
- "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-fast-fail" => {
- "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"validate-on-match" => {
- "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"spy" => {
- "description" => "Enable spying of SQL statements",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Enable spying of SQL statements",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-ccm" => {
- "description" => "Enable the use of a cached connection manager",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable the use of a cached connection manager",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"enabled" => {
- "description" => "Specifies if the datasource should be enabled",
"type" => BOOLEAN,
+ "description" => "Specifies if the datasource should be enabled",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "configuration"
}
@@ -98138,100 +98154,152 @@
"description" => "Add a new data-source",
"request-properties" => {
"connection-url" => {
- "description" => "The JDBC driver connection URL",
"type" => STRING,
- "required" => true
+ "description" => "The JDBC driver connection URL",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"driver-class" => {
- "description" => "The fully qualified name of the JDBC driver class",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified name of the JDBC driver class",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"datasource-class" => {
- "description" => "The fully qualified name of the JDBC datasource class",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified name of the JDBC datasource class",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"jndi-name" => {
- "description" => "Specifies the JNDI name for the datasource",
"type" => STRING,
- "required" => true
+ "description" => "Specifies the JNDI name for the datasource",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false
},
"driver-name" => {
- "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
"type" => STRING,
- "required" => true
+ "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"new-connection-sql" => {
- "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
"type" => STRING,
- "required" => false
+ "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"url-delimiter" => {
- "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"url-selector-strategy-class-name" => {
- "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
"type" => STRING,
- "required" => false
+ "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"use-java-context" => {
- "description" => "Setting this to false will bind the datasource into global JNDI",
"type" => BOOLEAN,
+ "description" => "Setting this to false will bind the datasource into global JNDI",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
},
"jta" => {
- "description" => "Enable JTA integration",
"type" => BOOLEAN,
+ "description" => "Enable JTA integration",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
},
"max-pool-size" => {
- "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
"type" => INT,
+ "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "20"
+ "nillable" => true
},
"min-pool-size" => {
- "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
"type" => INT,
+ "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "0"
+ "nillable" => true
},
"pool-prefill" => {
- "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
+ "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"pool-use-strict-min" => {
- "description" => "Specifies if the min-pool-size should be considered strictly",
"type" => BOOLEAN,
+ "description" => "Specifies if the min-pool-size should be considered strictly",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"user-name" => {
- "description" => "Specify the user name used when creating a new connection",
"type" => STRING,
- "required" => false
+ "description" => "Specify the user name used when creating a new connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"password" => {
- "description" => "Specifies the password used when creating a new connection",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the password used when creating a new connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"security-domain" => {
- "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"reauth-plugin-class-name" => {
- "description" => "The fully qualified class name of the reauthentication plugin implementation",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified class name of the reauthentication plugin implementation",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"reauth-plugin-properties" => {
"description" => "The properties for the reauthentication plugin",
@@ -98240,78 +98308,119 @@
"required" => false
},
"flush-strategy" => {
- "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
"type" => STRING,
+ "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "\"FailingConnectionOnly\""
+ "nillable" => true
+ },
+ "allow-multiple-users" => {
+ "type" => BOOLEAN,
+ "description" => "Specifies if multiple users will access the datasource through the getConnection(user, password) method and hence if the internal pool type should account for that",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true
},
"prepared-statements-cache-size" => {
- "description" => "The number of prepared statements per connection in an LRU cache",
"type" => LONG,
- "required" => false
+ "description" => "The number of prepared statements per connection in an LRU cache",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"share-prepared-statements" => {
- "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
"type" => BOOLEAN,
+ "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"track-statements" => {
- "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
"type" => STRING,
+ "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "\"NOWARN\""
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"allocation-retry" => {
- "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
"type" => INT,
- "required" => false
+ "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"allocation-retry-wait-millis" => {
- "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
"type" => LONG,
- "required" => false
+ "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"blocking-timeout-wait-millis" => {
- "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
"type" => LONG,
- "required" => false
+ "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MILLISECONDS"
},
"idle-timeout-minutes" => {
- "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => LONG,
- "required" => false
+ "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MINUTES"
},
"query-timeout" => {
- "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
"type" => LONG,
- "required" => false
+ "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"use-try-lock" => {
- "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
"type" => LONG,
- "required" => false
+ "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"set-tx-query-timeout" => {
- "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
"type" => BOOLEAN,
+ "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"transaction-isolation" => {
- "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
"type" => STRING,
- "required" => false
+ "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"check-valid-connection-sql" => {
- "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
"type" => STRING,
- "required" => false
+ "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"exception-sorter-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"exception-sorter-properties" => {
"description" => "The exception sorter properties",
@@ -98320,9 +98429,13 @@
"required" => false
},
"stale-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"stale-connection-checker-properties" => {
"description" => "The stale connection checker properties",
@@ -98331,9 +98444,13 @@
"required" => false
},
"valid-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"valid-connection-checker-properties" => {
"description" => "The valid connection checker properties",
@@ -98342,39 +98459,49 @@
"required" => false
},
"background-validation-millis" => {
- "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
"type" => LONG,
- "required" => false
+ "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
+ "min" => 1L,
+ "max" => 2147483647L
},
"background-validation" => {
- "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
+ "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"use-fast-fail" => {
- "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
"type" => BOOLEAN,
+ "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"validate-on-match" => {
- "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
"type" => BOOLEAN,
+ "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"spy" => {
- "description" => "Enable spying of SQL statements",
"type" => BOOLEAN,
+ "description" => "Enable spying of SQL statements",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"use-ccm" => {
- "description" => "Enable the use of a cached connection manager",
"type" => BOOLEAN,
+ "description" => "Enable the use of a cached connection manager",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
}
}
},
@@ -98518,170 +98645,208 @@
"tail-comment-allowed" => true,
"attributes" => {
"xa-datasource-class" => {
- "description" => "The fully qualified name of the javax.sql.XADataSource implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified name of the javax.sql.XADataSource implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"jndi-name" => {
- "description" => "Specifies the JNDI name for the datasource",
"type" => STRING,
- "required" => true,
+ "description" => "Specifies the JNDI name for the datasource",
+ "expressions-allowed" => true,
+ "nillable" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"driver-name" => {
- "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
"type" => STRING,
- "required" => true,
+ "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"new-connection-sql" => {
- "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"url-delimiter" => {
- "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"url-selector-strategy-class-name" => {
- "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
"type" => STRING,
- "required" => false,
+ "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-java-context" => {
- "description" => "Setting this to false will bind the datasource into global JNDI",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Setting this to false will bind the datasource into global JNDI",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"max-pool-size" => {
- "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
"type" => INT,
- "required" => false,
- "default" => "20",
+ "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 20,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"min-pool-size" => {
- "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
"type" => INT,
- "required" => false,
- "default" => "0",
+ "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 0,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"pool-prefill" => {
- "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"pool-use-strict-min" => {
- "description" => "Specifies if the min-pool-size should be considered strictly",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Specifies if the min-pool-size should be considered strictly",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"interleaving" => {
- "description" => "An element to enable interleaving for XA connections",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "An element to enable interleaving for XA connections",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"no-tx-separate-pool" => {
- "description" => "Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different contexts",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different contexts",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"pad-xid" => {
- "description" => "Should the Xid be padded",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Should the Xid be padded",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"same-rm-override" => {
- "description" => "The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false",
"type" => BOOLEAN,
- "required" => false,
+ "description" => "The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"wrap-xa-resource" => {
- "description" => "Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"user-name" => {
- "description" => "Specify the user name used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specify the user name used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"password" => {
- "description" => "Specifies the password used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the password used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"security-domain" => {
- "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"reauth-plugin-class-name" => {
- "description" => "The fully qualified class name of the reauthentication plugin implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified class name of the reauthentication plugin implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -98696,117 +98861,150 @@
"restart-required" => "no-services"
},
"flush-strategy" => {
- "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
"type" => STRING,
- "required" => false,
- "default" => "\"FailingConnectionOnly\"",
+ "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "FailingConnectionOnly",
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
+ "allow-multiple-users" => {
+ "type" => BOOLEAN,
+ "description" => "Specifies if multiple users will access the datasource through the getConnection(user, password) method and hence if the internal pool type should account for that",
+ "expressions-allowed" => false,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"prepared-statements-cache-size" => {
- "description" => "The number of prepared statements per connection in an LRU cache",
"type" => LONG,
- "required" => false,
+ "description" => "The number of prepared statements per connection in an LRU cache",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"share-prepared-statements" => {
- "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"track-statements" => {
- "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
"type" => STRING,
- "required" => false,
- "default" => "\"NOWARN\"",
+ "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "NOWARN",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"allocation-retry" => {
- "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
"type" => INT,
- "required" => false,
+ "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"allocation-retry-wait-millis" => {
- "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
"type" => LONG,
- "required" => false,
+ "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"blocking-timeout-wait-millis" => {
- "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
"type" => LONG,
- "required" => false,
+ "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"idle-timeout-minutes" => {
- "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => LONG,
- "required" => false,
+ "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MINUTES",
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"query-timeout" => {
- "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-try-lock" => {
- "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"set-tx-query-timeout" => {
- "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"transaction-isolation" => {
- "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
"type" => STRING,
- "required" => false,
+ "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"check-valid-connection-sql" => {
- "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"exception-sorter-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -98821,9 +99019,12 @@
"restart-required" => "no-services"
},
"stale-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -98838,9 +99039,12 @@
"restart-required" => "no-services"
},
"valid-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -98855,94 +99059,116 @@
"restart-required" => "no-services"
},
"background-validation-millis" => {
- "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
"type" => LONG,
- "required" => false,
+ "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
+ "min" => 1L,
+ "max" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"background-validation" => {
- "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-fast-fail" => {
- "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"validate-on-match" => {
- "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"xa-resource-timeout" => {
- "description" => "The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero",
"type" => INT,
- "required" => false,
+ "description" => "The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"spy" => {
- "description" => "Enable spying of SQL statements",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Enable spying of SQL statements",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-ccm" => {
- "description" => "Enable the use of a cached connection manager",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable the use of a cached connection manager",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"recovery-username" => {
- "description" => "The user name used for recovery",
"type" => STRING,
- "required" => false,
+ "description" => "The user name used for recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"recovery-password" => {
- "description" => "The password used for recovery",
"type" => STRING,
- "required" => false,
+ "description" => "The password used for recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"recovery-security-domain" => {
- "description" => "The security domain used for recovery",
"type" => STRING,
- "required" => false,
+ "description" => "The security domain used for recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"recovery-plugin-class-name" => {
- "description" => "The fully qualified class name of the recovery plugin implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified class name of the recovery plugin implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -98957,25 +99183,30 @@
"restart-required" => "no-services"
},
"no-recovery" => {
- "description" => "Specifies if the connection pool should be excluded from recovery",
"type" => BOOLEAN,
- "required" => false,
+ "description" => "Specifies if the connection pool should be excluded from recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"jta" => {
- "description" => "Enable JTA integration",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable JTA integration",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"enabled" => {
- "description" => "Specifies if the datasource should be enabled",
"type" => BOOLEAN,
+ "description" => "Specifies if the datasource should be enabled",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "configuration"
}
@@ -99414,113 +99645,162 @@
"description" => "Add a new XA data-source",
"request-properties" => {
"xa-datasource-class" => {
- "description" => "The fully qualified name of the javax.sql.XADataSource implementation",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified name of the javax.sql.XADataSource implementation",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"jndi-name" => {
- "description" => "Specifies the JNDI name for the datasource",
"type" => STRING,
- "required" => true
+ "description" => "Specifies the JNDI name for the datasource",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false
},
"driver-name" => {
- "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
"type" => STRING,
- "required" => true
+ "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"new-connection-sql" => {
- "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
"type" => STRING,
- "required" => false
+ "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"url-delimiter" => {
- "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"url-selector-strategy-class-name" => {
- "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
"type" => STRING,
- "required" => false
+ "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"use-java-context" => {
- "description" => "Setting this to false will bind the datasource into global JNDI",
"type" => BOOLEAN,
+ "description" => "Setting this to false will bind the datasource into global JNDI",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
},
"max-pool-size" => {
- "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
"type" => INT,
+ "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "20"
+ "nillable" => true
},
"min-pool-size" => {
- "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
"type" => INT,
+ "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "0"
+ "nillable" => true
},
"pool-prefill" => {
- "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
+ "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"pool-use-strict-min" => {
- "description" => "Specifies if the min-pool-size should be considered strictly",
"type" => BOOLEAN,
+ "description" => "Specifies if the min-pool-size should be considered strictly",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"interleaving" => {
- "description" => "An element to enable interleaving for XA connections",
"type" => BOOLEAN,
+ "description" => "An element to enable interleaving for XA connections",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"no-tx-separate-pool" => {
- "description" => "Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different contexts",
"type" => BOOLEAN,
+ "description" => "Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different contexts",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"pad-xid" => {
- "description" => "Should the Xid be padded",
"type" => BOOLEAN,
+ "description" => "Should the Xid be padded",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"same-rm-override" => {
- "description" => "The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false",
"type" => BOOLEAN,
- "required" => false
+ "description" => "The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"wrap-xa-resource" => {
- "description" => "Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance",
"type" => BOOLEAN,
+ "description" => "Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
},
"user-name" => {
- "description" => "Specify the user name used when creating a new connection",
"type" => STRING,
- "required" => false
+ "description" => "Specify the user name used when creating a new connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"password" => {
- "description" => "Specifies the password used when creating a new connection",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the password used when creating a new connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"security-domain" => {
- "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"reauth-plugin-class-name" => {
- "description" => "The fully qualified class name of the reauthentication plugin implementation",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified class name of the reauthentication plugin implementation",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"reauth-plugin-properties" => {
"description" => "The properties for the reauthentication plugin",
@@ -99529,78 +99809,119 @@
"required" => false
},
"flush-strategy" => {
- "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
"type" => STRING,
+ "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "\"FailingConnectionOnly\""
+ "nillable" => true
+ },
+ "allow-multiple-users" => {
+ "type" => BOOLEAN,
+ "description" => "Specifies if multiple users will access the datasource through the getConnection(user, password) method and hence if the internal pool type should account for that",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true
},
"prepared-statements-cache-size" => {
- "description" => "The number of prepared statements per connection in an LRU cache",
"type" => LONG,
- "required" => false
+ "description" => "The number of prepared statements per connection in an LRU cache",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"share-prepared-statements" => {
- "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
"type" => BOOLEAN,
+ "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"track-statements" => {
- "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
"type" => STRING,
+ "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "\"NOWARN\""
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"allocation-retry" => {
- "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
"type" => INT,
- "required" => false
+ "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"allocation-retry-wait-millis" => {
- "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
"type" => LONG,
- "required" => false
+ "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"blocking-timeout-wait-millis" => {
- "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
"type" => LONG,
- "required" => false
+ "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MILLISECONDS"
},
"idle-timeout-minutes" => {
- "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => LONG,
- "required" => false
+ "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MINUTES"
},
"query-timeout" => {
- "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
"type" => LONG,
- "required" => false
+ "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"use-try-lock" => {
- "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
"type" => LONG,
- "required" => false
+ "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"set-tx-query-timeout" => {
- "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
"type" => BOOLEAN,
+ "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"transaction-isolation" => {
- "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
"type" => STRING,
- "required" => false
+ "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"check-valid-connection-sql" => {
- "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
"type" => STRING,
- "required" => false
+ "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"exception-sorter-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"exception-sorter-properties" => {
"description" => "The exception sorter properties",
@@ -99609,9 +99930,13 @@
"required" => false
},
"stale-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"stale-connection-checker-properties" => {
"description" => "The stale connection checker properties",
@@ -99620,9 +99945,13 @@
"required" => false
},
"valid-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"valid-connection-checker-properties" => {
"description" => "The valid connection checker properties",
@@ -99631,64 +99960,92 @@
"required" => false
},
"background-validation-millis" => {
- "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
"type" => LONG,
- "required" => false
+ "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
+ "min" => 1L,
+ "max" => 2147483647L
},
"background-validation" => {
- "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
+ "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"use-fast-fail" => {
- "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
"type" => BOOLEAN,
+ "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"validate-on-match" => {
- "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
"type" => BOOLEAN,
+ "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"xa-resource-timeout" => {
- "description" => "The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero",
"type" => INT,
- "required" => false
+ "description" => "The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"spy" => {
- "description" => "Enable spying of SQL statements",
"type" => BOOLEAN,
+ "description" => "Enable spying of SQL statements",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"use-ccm" => {
- "description" => "Enable the use of a cached connection manager",
"type" => BOOLEAN,
+ "description" => "Enable the use of a cached connection manager",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
},
"recovery-username" => {
- "description" => "The user name used for recovery",
"type" => STRING,
- "required" => false
+ "description" => "The user name used for recovery",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"recovery-password" => {
- "description" => "The password used for recovery",
"type" => STRING,
- "required" => false
+ "description" => "The password used for recovery",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"recovery-security-domain" => {
- "description" => "The security domain used for recovery",
"type" => STRING,
- "required" => false
+ "description" => "The security domain used for recovery",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"recovery-plugin-class-name" => {
- "description" => "The fully qualified class name of the recovery plugin implementation",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified class name of the recovery plugin implementation",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"recovery-plugin-properties" => {
"description" => "The properties for the recovery plugin",
@@ -99697,15 +100054,18 @@
"required" => false
},
"no-recovery" => {
- "description" => "Specifies if the connection pool should be excluded from recovery",
"type" => BOOLEAN,
- "required" => false
+ "description" => "Specifies if the connection pool should be excluded from recovery",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"jta" => {
- "description" => "Enable JTA integration",
"type" => BOOLEAN,
+ "description" => "Enable JTA integration",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
}
}
},
@@ -101603,15 +101963,24 @@
"description" => "Defines a way in which in-VM connections can be made to the HornetQ server.",
"model-description" => {"*" => {
"description" => "Defines a way in which in-VM connections can be made to the HornetQ server.",
- "attributes" => {"server-id" => {
- "type" => INT,
- "description" => "The server id.",
- "expressions-allowed" => false,
- "nillable" => false,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- }},
+ "attributes" => {
+ "server-id" => {
+ "type" => INT,
+ "description" => "The server id.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "started" => {
+ "description" => "Whether this acceptor is started.",
+ "type" => BOOLEAN,
+ "nillable" => false,
+ "access-type" => "read-only",
+ "storage" => "configuration"
+ }
+ },
"children" => {"param" => {
"description" => "A key-value pair understood by the acceptor factory-class and used to configure it.",
"min-occurs" => 0,
@@ -103838,17 +104207,26 @@
"description" => "Defines a way in which remote connections can be made to the HornetQ server.",
"model-description" => {"*" => {
"description" => "Defines a way in which remote connections can be made to the HornetQ server.",
- "attributes" => {"socket-binding" => {
- "type" => STRING,
- "description" => "The socket binding reference.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- }},
+ "attributes" => {
+ "socket-binding" => {
+ "type" => STRING,
+ "description" => "The socket binding reference.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "started" => {
+ "description" => "Whether this acceptor is started.",
+ "type" => BOOLEAN,
+ "nillable" => false,
+ "access-type" => "read-only",
+ "storage" => "configuration"
+ }
+ },
"children" => {"param" => {
"description" => "A key-value pair understood by the acceptor factory-class and used to configure it.",
"min-occurs" => 0,
@@ -106414,6 +106792,13 @@
"access-type" => "read-only",
"storage" => "configuration"
},
+ "topology" => {
+ "description" => "The topology of the nodes that this cluster connection is aware of.",
+ "type" => STRING,
+ "nillable" => false,
+ "access-type" => "read-only",
+ "storage" => "configuration"
+ },
"started" => {
"description" => "Whether the cluster connection is started.",
"type" => BOOLEAN,
@@ -107407,7 +107792,7 @@
"attributes" => {
"connector" => {
"type" => OBJECT,
- "description" => "Defines the connectors. These are stored in a map by connector name, with the backup connectors stored as the value, or an undefined value if there is no backup connector.",
+ "description" => "Defines the connectors. These are stored in a map by connector name (with an undefined value).",
"expressions-allowed" => false,
"nillable" => true,
"value-type" => STRING,
@@ -107946,7 +108331,7 @@
"request-properties" => {
"connector" => {
"type" => OBJECT,
- "description" => "Defines the connectors. These are stored in a map by connector name, with the backup connectors stored as the value, or an undefined value if there is no backup connector.",
+ "description" => "Defines the connectors. These are stored in a map by connector name (with an undefined value).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -111879,7 +112264,7 @@
"attributes" => {
"connector" => {
"type" => OBJECT,
- "description" => "Defines the connectors. These are stored in a map by connector name, with the backup connectors stored as the value, or an undefined value if there is no backup connector.",
+ "description" => "Defines the connectors. These are stored in a map by connector name (with an undefined value).",
"expressions-allowed" => false,
"nillable" => true,
"value-type" => STRING,
@@ -112474,7 +112859,7 @@
"request-properties" => {
"connector" => {
"type" => OBJECT,
- "description" => "Defines the connectors. These are stored in a map by connector name, with the backup connectors stored as the value, or an undefined value if there is no backup connector.",
+ "description" => "Defines the connectors. These are stored in a map by connector name (with an undefined value).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -115653,6 +116038,26 @@
"storage" => "configuration",
"restart-required" => "no-services"
},
+ "spec-descriptor-property-replacement" => {
+ "type" => BOOLEAN,
+ "description" => "Flag indicating whether descriptors defined by the Java EE specification will have property replacements applied",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
+ "jboss-descriptor-property-replacement" => {
+ "type" => BOOLEAN,
+ "description" => "Flag indicating whether JBoss specific deployment descriptors will have property replacements applied",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
"ear-subdeployments-isolated" => {
"type" => BOOLEAN,
"description" => "Flag indicating whether each of the subdeployments within a .ear can access classes belonging to another subdeployment within the same .ear. A value of false means the subdeployments can see classes belonging to other subdeployments within the .ear.",
@@ -115821,6 +116226,20 @@
}
}
},
+ "spec-descriptor-property-replacement" => {
+ "type" => BOOLEAN,
+ "description" => "Flag indicating whether descriptors defined by the Java EE specification will have property replacements applied",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
+ },
+ "jboss-descriptor-property-replacement" => {
+ "type" => BOOLEAN,
+ "description" => "Flag indicating whether JBoss specific deployment descriptors will have property replacements applied",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
+ },
"ear-subdeployments-isolated" => {
"type" => BOOLEAN,
"description" => "Flag indicating whether each of the subdeployments within a .ear can access classes belonging to another subdeployment within the same .ear. A value of false means the subdeployments can see classes belonging to other subdeployments within the .ear.",
@@ -116245,7 +116664,7 @@
},
"debug" => {
"type" => BOOLEAN,
- "description" => "Enables javamail debugging",
+ "description" => "Enables JavaMail debugging",
"expressions-allowed" => true,
"nillable" => true,
"default" => false,
@@ -116413,7 +116832,7 @@
},
"debug" => {
"type" => BOOLEAN,
- "description" => "Enables javamail debugging",
+ "description" => "Enables JavaMail debugging",
"expressions-allowed" => true,
"required" => false,
"nillable" => true
@@ -116564,7 +116983,7 @@
"attributes" => {
"outbound-socket-binding-ref" => {
"type" => STRING,
- "description" => "Outbound Socket binding to POP3 server",
+ "description" => "Outbound Socket binding to mail server",
"expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
@@ -116575,7 +116994,7 @@
},
"ssl" => {
"type" => BOOLEAN,
- "description" => "Does server requires SSL?",
+ "description" => "Does server require SSL?",
"expressions-allowed" => true,
"nillable" => true,
"default" => false,
@@ -116741,11 +117160,11 @@
},
"add" => {
"operation-name" => "add",
- "description" => "adds smtp server",
+ "description" => "adds mail server",
"request-properties" => {
"outbound-socket-binding-ref" => {
"type" => STRING,
- "description" => "Outbound Socket binding to POP3 server",
+ "description" => "Outbound Socket binding to mail server",
"expressions-allowed" => true,
"required" => false,
"nillable" => true,
@@ -116754,7 +117173,7 @@
},
"ssl" => {
"type" => BOOLEAN,
- "description" => "Does server requires SSL?",
+ "description" => "Does server require SSL?",
"expressions-allowed" => true,
"required" => false,
"nillable" => true
@@ -116913,7 +117332,7 @@
"attributes" => {
"outbound-socket-binding-ref" => {
"type" => STRING,
- "description" => "Outbound Socket binding to POP3 server",
+ "description" => "Outbound Socket binding to mail server",
"expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
@@ -116924,7 +117343,7 @@
},
"ssl" => {
"type" => BOOLEAN,
- "description" => "Does server requires SSL?",
+ "description" => "Does server require SSL?",
"expressions-allowed" => true,
"nillable" => true,
"default" => false,
@@ -117090,11 +117509,11 @@
},
"add" => {
"operation-name" => "add",
- "description" => "adds smtp server",
+ "description" => "adds mail server",
"request-properties" => {
"outbound-socket-binding-ref" => {
"type" => STRING,
- "description" => "Outbound Socket binding to POP3 server",
+ "description" => "Outbound Socket binding to mail server",
"expressions-allowed" => true,
"required" => false,
"nillable" => true,
@@ -117103,7 +117522,7 @@
},
"ssl" => {
"type" => BOOLEAN,
- "description" => "Does server requires SSL?",
+ "description" => "Does server require SSL?",
"expressions-allowed" => true,
"required" => false,
"nillable" => true
@@ -117262,7 +117681,7 @@
"attributes" => {
"outbound-socket-binding-ref" => {
"type" => STRING,
- "description" => "Outbound Socket binding to POP3 server",
+ "description" => "Outbound Socket binding to mail server",
"expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
@@ -117273,7 +117692,7 @@
},
"ssl" => {
"type" => BOOLEAN,
- "description" => "Does server requires SSL?",
+ "description" => "Does server require SSL?",
"expressions-allowed" => true,
"nillable" => true,
"default" => false,
@@ -117439,11 +117858,11 @@
},
"add" => {
"operation-name" => "add",
- "description" => "adds smtp server",
+ "description" => "adds mail server",
"request-properties" => {
"outbound-socket-binding-ref" => {
"type" => STRING,
- "description" => "Outbound Socket binding to POP3 server",
+ "description" => "Outbound Socket binding to mail server",
"expressions-allowed" => true,
"required" => false,
"nillable" => true,
@@ -117452,7 +117871,7 @@
},
"ssl" => {
"type" => BOOLEAN,
- "description" => "Does server requires SSL?",
+ "description" => "Does server require SSL?",
"expressions-allowed" => true,
"required" => false,
"nillable" => true
@@ -122037,7 +122456,7 @@
"key-alias" => {
"type" => STRING,
"description" => "The key alias.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"nillable" => true,
"default" => "jboss",
"min-length" => 1L,
@@ -122352,7 +122771,7 @@
"key-alias" => {
"type" => STRING,
"description" => "The key alias.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"required" => false,
"nillable" => true,
"min-length" => 1L,
@@ -123919,32 +124338,56 @@
"description" => "resource-adapter",
"attributes" => {
"archive" => {
- "description" => "Specifies the resource adapter archive",
"type" => STRING,
- "required" => true,
+ "description" => "Specifies the resource adapter archive",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"transaction-support" => {
- "description" => "Specifies the transaction support level of the resource adapter",
"type" => STRING,
- "required" => true,
+ "description" => "Specifies the transaction support level of the resource adapter",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "allowed" => [
+ "NoTransaction",
+ "LocalTransaction",
+ "XATransaction"
+ ],
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"bootstrap-context" => {
+ "type" => STRING,
"description" => "Specifies the unique name of the bootstrap context that should be used",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
+ "config-properties" => {
"type" => STRING,
- "required" => false,
+ "description" => "Custom defined config properties",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"beanvalidationgroups" => {
"description" => "Specifies the bean validation groups that should be used",
- "type" => STRING,
+ "type" => LIST,
+ "value-type" => STRING,
"required" => false,
"access-type" => "read-write",
"storage" => "configuration",
@@ -126180,23 +126623,48 @@
"description" => "Add a new resource adapter",
"request-properties" => {
"archive" => {
- "description" => "Specifies the resource adapter archive",
"type" => STRING,
- "required" => true
+ "description" => "Specifies the resource adapter archive",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"transaction-support" => {
- "description" => "Specifies the transaction support level of the resource adapter",
"type" => STRING,
- "required" => true
+ "description" => "Specifies the transaction support level of the resource adapter",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "allowed" => [
+ "NoTransaction",
+ "LocalTransaction",
+ "XATransaction"
+ ]
},
"bootstrap-context" => {
+ "type" => STRING,
"description" => "Specifies the unique name of the bootstrap context that should be used",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "config-properties" => {
"type" => STRING,
- "required" => false
+ "description" => "Custom defined config properties",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"beanvalidationgroups" => {
"description" => "Specifies the bean validation groups that should be used",
- "type" => STRING,
+ "type" => LIST,
+ "value-type" => STRING,
"required" => false
}
}
@@ -127880,6 +128348,22 @@
"nillable" => false,
"min-length" => 1
},
+ "flag" => {
+ "description" => "The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.",
+ "type" => STRING,
+ "nillable" => true,
+ "allowed" => [
+ "required",
+ "requisite",
+ "sufficient",
+ "optional"
+ ]
+ },
+ "module" => {
+ "type" => STRING,
+ "nillable" => true,
+ "description" => "Name of JBoss Module where the auth module code is located."
+ },
"module-options" => {
"description" => "List of module options containing a name/value pair.",
"type" => OBJECT,
@@ -128046,6 +128530,22 @@
"nillable" => false,
"min-length" => 1
},
+ "flag" => {
+ "description" => "The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.",
+ "type" => STRING,
+ "nillable" => true,
+ "allowed" => [
+ "required",
+ "requisite",
+ "sufficient",
+ "optional"
+ ]
+ },
+ "module" => {
+ "type" => STRING,
+ "nillable" => true,
+ "description" => "Name of JBoss Module where the auth module code is located."
+ },
"module-options" => {
"description" => "List of module options containing a name/value pair.",
"type" => OBJECT,
@@ -129533,7 +130033,7 @@
"client-auth" => {
"type" => BOOLEAN,
"description" => "Boolean attribute to indicate if client's certificates should also be authenticated on the server side.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
@@ -129542,7 +130042,7 @@
"protocols" => {
"type" => STRING,
"description" => "Comma separated list of protocols to enable on SSLSockets.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
@@ -129559,27 +130059,32 @@
"password" => {
"description" => "Sets the password of the truststore. Either this or 'keystore-password' must be present otherwise the security domain will be useless.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"type" => {
"description" => "Type of the truststore. If not set, type defaults to 'JKS'.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"url" => {
"description" => "URL of the truststore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the truststore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider-argument" => {
"description" => "String argument to pass to the truststore Provider constructor when instantiating it.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
},
"access-type" => "read-write",
@@ -129595,12 +130100,14 @@
"algorithm" => {
"description" => "Algorithm to use when creating the TrustManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the TrustManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
},
"access-type" => "read-write",
@@ -129616,12 +130123,14 @@
"algorithm" => {
"description" => "Algorithm to use when creating the KeyManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the KeyManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
},
"access-type" => "read-write",
@@ -129631,7 +130140,7 @@
"service-auth-token" => {
"type" => STRING,
"description" => "Token to retrieve PrivateKeys from the KeyStore.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
@@ -129648,27 +130157,32 @@
"password" => {
"description" => "Sets the password of the keystore. Either this or 'truststore-password' must be present otherwise the security domain will be useless.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"type" => {
"description" => "Type of the keystore. If not set, type defaults to 'JKS'.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"url" => {
"description" => "URL of the keystore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the KeyStore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider-argument" => {
"description" => "String argument to pass to the keystore Provider constructor when instantiating it.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
},
"access-type" => "read-write",
@@ -129688,7 +130202,7 @@
"server-alias" => {
"type" => STRING,
"description" => "Preferred alias to use when the KeyManager chooses the server alias.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
@@ -129699,7 +130213,7 @@
"client-alias" => {
"type" => STRING,
"description" => "Preferred alias to use when the KeyManager chooses the client alias.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
@@ -129710,7 +130224,7 @@
"cipher-suites" => {
"type" => STRING,
"description" => "Comma separated list of cipher suites to enable on SSLSockets.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
@@ -129859,14 +130373,14 @@
"client-auth" => {
"type" => BOOLEAN,
"description" => "Boolean attribute to indicate if client's certificates should also be authenticated on the server side.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"required" => false,
"nillable" => true
},
"protocols" => {
"type" => STRING,
"description" => "Comma separated list of protocols to enable on SSLSockets.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"required" => false,
"nillable" => true,
"min-length" => 1L,
@@ -129882,27 +130396,32 @@
"password" => {
"description" => "Sets the password of the truststore. Either this or 'keystore-password' must be present otherwise the security domain will be useless.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"type" => {
"description" => "Type of the truststore. If not set, type defaults to 'JKS'.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"url" => {
"description" => "URL of the truststore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the truststore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider-argument" => {
"description" => "String argument to pass to the truststore Provider constructor when instantiating it.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
}
},
@@ -129916,12 +130435,14 @@
"algorithm" => {
"description" => "Algorithm to use when creating the TrustManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the TrustManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
}
},
@@ -129935,19 +130456,21 @@
"algorithm" => {
"description" => "Algorithm to use when creating the KeyManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the KeyManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
}
},
"service-auth-token" => {
"type" => STRING,
"description" => "Token to retrieve PrivateKeys from the KeyStore.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"required" => false,
"nillable" => true,
"min-length" => 1L,
@@ -129963,27 +130486,32 @@
"password" => {
"description" => "Sets the password of the keystore. Either this or 'truststore-password' must be present otherwise the security domain will be useless.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"type" => {
"description" => "Type of the keystore. If not set, type defaults to 'JKS'.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"url" => {
"description" => "URL of the keystore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the KeyStore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider-argument" => {
"description" => "String argument to pass to the keystore Provider constructor when instantiating it.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
}
},
@@ -129998,7 +130526,7 @@
"server-alias" => {
"type" => STRING,
"description" => "Preferred alias to use when the KeyManager chooses the server alias.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"required" => false,
"nillable" => true,
"min-length" => 1L,
@@ -130007,7 +130535,7 @@
"client-alias" => {
"type" => STRING,
"description" => "Preferred alias to use when the KeyManager chooses the client alias.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"required" => false,
"nillable" => true,
"min-length" => 1L,
@@ -130016,7 +130544,7 @@
"cipher-suites" => {
"type" => STRING,
"description" => "Comma separated list of cipher suites to enable on SSLSockets.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"required" => false,
"nillable" => true,
"min-length" => 1L,
@@ -130509,23 +131037,23 @@
"model-description" => {"classic" => {
"description" => "Security Vault for attributes.",
"attributes" => {
- "code" => {
- "type" => STRING,
- "description" => "Fully Qualified Name of the Security Vault Implementation.",
+ "vault-options" => {
+ "type" => OBJECT,
+ "description" => "Security Vault options.",
"expressions-allowed" => false,
"nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L,
+ "value-type" => STRING,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
- "options" => {
- "type" => OBJECT,
- "description" => "Security Vault options.",
+ "code" => {
+ "type" => STRING,
+ "description" => "Fully Qualified Name of the Security Vault Implementation.",
"expressions-allowed" => false,
"nillable" => true,
- "value-type" => STRING,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -130668,6 +131196,14 @@
"operation-name" => "add",
"description" => "Adds a security vault configuration",
"request-properties" => {
+ "vault-options" => {
+ "type" => OBJECT,
+ "description" => "Security Vault options.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "value-type" => STRING
+ },
"code" => {
"type" => STRING,
"description" => "Fully Qualified Name of the Security Vault Implementation.",
@@ -130676,14 +131212,6 @@
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L
- },
- "options" => {
- "type" => OBJECT,
- "description" => "Security Vault options.",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "value-type" => STRING
}
},
"reply-properties" => {}
@@ -132365,6 +132893,7 @@
"description" => "Number of the port to which the socket should be bound.",
"expressions-allowed" => true,
"nillable" => true,
+ "default" => 0,
"min" => 0L,
"max" => 65535L,
"access-type" => "read-write",
@@ -135429,7 +135958,7 @@
"nillable" => true
},
"boot-time" => {
- "type" => STRING,
+ "type" => BOOLEAN,
"description" => "If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence.",
"required" => false,
"nillable" => true,
@@ -135573,7 +136102,7 @@
"description" => "Host controllers currently running in the domain",
"min-occurs" => 0,
"max-occurs" => 2147483647,
- "model-description" => {"*" => {
+ "model-description" => {"master" => {
"description" => "The root node of the host-level management model.",
"head-comment-allowed" => true,
"tail-comment-allowed" => true,
@@ -137169,7 +137698,7 @@
"nillable" => true
},
"boot-time" => {
- "type" => STRING,
+ "type" => BOOLEAN,
"description" => "If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence.",
"required" => false,
"nillable" => true,
@@ -142539,13 +143068,14 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "vault-option" => {
- "description" => "Security Vault option.",
+ "vault-options" => {
+ "description" => "Security Vault options.",
"type" => OBJECT,
"value-type" => STRING,
"nillable" => true,
- "access-type" => "read-only",
- "storage" => "configuration"
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
}
},
"operations" => {
@@ -142690,8 +143220,8 @@
"description" => "Fully Qualified Name of the Security Vault Implementation.",
"required" => false
},
- "vault-option" => {
- "description" => "Security Vault option.",
+ "vault-options" => {
+ "description" => "Security Vault options.",
"type" => OBJECT,
"value-type" => STRING,
"required" => false
@@ -144213,71 +144743,993 @@
},
"children" => {}
},
- "ldap" => {
- "description" => "Configuration to use LDAP as the user repository.",
+ "local" => {
+ "description" => "Configuration of the local authentication mechanism.",
"attributes" => {
- "connection" => {
+ "default-user" => {
"type" => STRING,
- "description" => "The name of the connection to use to connect to LDAP.",
+ "description" => "The name of the default user to assume if no user specified by the remote client.",
"expressions-allowed" => false,
- "nillable" => false,
+ "nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "resource-services"
},
- "advanced-filter" => {
+ "allowed-users" => {
"type" => STRING,
- "description" => "The fully defined filter to be used to search for the user based on their entered user ID. The filter should contain a variable in the form {0} - this will be replaced with the username supplied by the user.",
+ "description" => "The comma separated list of users that will be accepted using the JBOSS-LOCAL-USER mechanism or '*' to accept all. If specified the default-user is always assumed allowed.",
"expressions-allowed" => false,
- "nillable" => false,
- "alternatives" => ["username-attribute"],
+ "nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "resource-services"
+ }
+ },
+ "operations" => {
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
+ "type" => STRING,
+ "description" => "The name of the node under which to get the children names",
+ "nillable" => false
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
+ }
},
- "base-dn" => {
- "type" => STRING,
- "description" => "The base distinguished name to commence the search for the user.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
},
- "user-dn" => {
+ "remove" => {
+ "operation-name" => "remove",
+ "description" => "Removes a configuration to use JBOSS-LOCAL-USER for authentication.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "locale" => {
+ "type" => STRING,
+ "description" => "The locale to get the resource description in. If null, the default locale will be used",
+ "required" => false,
+ "nillable" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the resource"
+ }
+ },
+ "read-resource" => {
+ "operation-name" => "read-resource",
+ "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
+ "request-properties" => {
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The resource's attribute values along with information about any child resources"
+ }
+ },
+ "add" => {
+ "operation-name" => "add",
+ "description" => "Adds a configuration to use the JBOSS-LOCAL-USER mechanism for authentication.",
+ "request-properties" => {
+ "default-user" => {
+ "type" => STRING,
+ "description" => "The name of the default user to assume if no user specified by the remote client.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "allowed-users" => {
+ "type" => STRING,
+ "description" => "The comma separated list of users that will be accepted using the JBOSS-LOCAL-USER mechanism or '*' to accept all. If specified the default-user is always assumed allowed.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ }
+ },
+ "reply-properties" => {}
+ },
+ "read-attribute" => {
+ "operation-name" => "read-attribute",
+ "description" => "Gets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to get the value for under the selected resource",
+ "nillable" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The value of the attribute. The type will be that of the attribute found"
+ }
+ },
+ "whoami" => {
+ "operation-name" => "whoami",
+ "description" => "Returns the identity of the currently authenticated user.",
+ "request-properties" => {"verbose" => {
+ "type" => BOOLEAN,
+ "description" => "If set to true whoami also returns the users roles.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ }},
+ "reply-properties" => {}
+ },
+ "read-children-types" => {
+ "operation-name" => "read-children-types",
+ "description" => "Gets the type names of all the children under the selected resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children types",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-names" => {
+ "operation-name" => "read-operation-names",
+ "description" => "Gets the names of all the operations for the given resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "value-type" => STRING,
+ "description" => "The operation names"
+ }
+ },
+ "undefine-attribute" => {
+ "operation-name" => "undefine-attribute",
+ "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which should be set to 'undefined'",
+ "nillable" => false
+ }}
+ },
+ "read-children-resources" => {
+ "operation-name" => "read-children-resources",
+ "description" => "Reads information about all of a resource's children that are of a given type",
+ "request-properties" => {
+ "child-type" => {
+ "type" => STRING,
+ "description" => "The name of the resource under which to get the child resources",
+ "nillable" => false
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to get the children recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children resources",
+ "value-type" => OBJECT
+ }
+ },
+ "write-attribute" => {
+ "operation-name" => "write-attribute",
+ "description" => "Sets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to set the value for under the selected resource",
+ "nillable" => false
+ },
+ "value" => {
+ "type" => STRING,
+ "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
+ "nillable" => true,
+ "required" => false
+ }
+ }
+ }
+ },
+ "children" => {}
+ },
+ "plug-in" => {
+ "description" => "Configuration of a user store plug-in for use by the realm.",
+ "attributes" => {
+ "mechanism" => {
"type" => STRING,
- "description" => "The name of the attribute which is the user's distinguished name.",
+ "description" => "Allow the mechanism this plug-in is compatible with to be overridden from DIGEST.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "dn",
"min-length" => 1L,
"max-length" => 2147483647L,
+ "allowed" => [
+ "DIGEST",
+ "PLAIN"
+ ],
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "resource-services"
},
- "recursive" => {
- "type" => BOOLEAN,
- "description" => "Whether the search should be recursive.",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => false,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- },
- "username-attribute" => {
+ "name" => {
"type" => STRING,
- "description" => "The name of the attribute to search for the user. This filter will then perform a simple search where the username entered by the user matches the attribute specified here.",
+ "description" => "The short name of the plug-in (as registered) to use.",
"expressions-allowed" => false,
"nillable" => false,
- "alternatives" => ["advanced-filter"],
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ }
+ },
+ "operations" => {
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
+ "type" => STRING,
+ "description" => "The name of the node under which to get the children names",
+ "nillable" => false
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
+ },
+ "remove" => {
+ "operation-name" => "remove",
+ "description" => "Configuration of a user store plug-in for use by the realm.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "locale" => {
+ "type" => STRING,
+ "description" => "The locale to get the resource description in. If null, the default locale will be used",
+ "required" => false,
+ "nillable" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the resource"
+ }
+ },
+ "read-resource" => {
+ "operation-name" => "read-resource",
+ "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
+ "request-properties" => {
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The resource's attribute values along with information about any child resources"
+ }
+ },
+ "add" => {
+ "operation-name" => "add",
+ "description" => "Add the plug-in definition.",
+ "request-properties" => {
+ "mechanism" => {
+ "type" => STRING,
+ "description" => "Allow the mechanism this plug-in is compatible with to be overridden from DIGEST.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "allowed" => [
+ "DIGEST",
+ "PLAIN"
+ ]
+ },
+ "name" => {
+ "type" => STRING,
+ "description" => "The short name of the plug-in (as registered) to use.",
+ "expressions-allowed" => false,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ }
+ },
+ "reply-properties" => {}
+ },
+ "read-attribute" => {
+ "operation-name" => "read-attribute",
+ "description" => "Gets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to get the value for under the selected resource",
+ "nillable" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The value of the attribute. The type will be that of the attribute found"
+ }
+ },
+ "whoami" => {
+ "operation-name" => "whoami",
+ "description" => "Returns the identity of the currently authenticated user.",
+ "request-properties" => {"verbose" => {
+ "type" => BOOLEAN,
+ "description" => "If set to true whoami also returns the users roles.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ }},
+ "reply-properties" => {}
+ },
+ "read-children-types" => {
+ "operation-name" => "read-children-types",
+ "description" => "Gets the type names of all the children under the selected resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children types",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-names" => {
+ "operation-name" => "read-operation-names",
+ "description" => "Gets the names of all the operations for the given resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "value-type" => STRING,
+ "description" => "The operation names"
+ }
+ },
+ "undefine-attribute" => {
+ "operation-name" => "undefine-attribute",
+ "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which should be set to 'undefined'",
+ "nillable" => false
+ }}
+ },
+ "read-children-resources" => {
+ "operation-name" => "read-children-resources",
+ "description" => "Reads information about all of a resource's children that are of a given type",
+ "request-properties" => {
+ "child-type" => {
+ "type" => STRING,
+ "description" => "The name of the resource under which to get the child resources",
+ "nillable" => false
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to get the children recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children resources",
+ "value-type" => OBJECT
+ }
+ },
+ "write-attribute" => {
+ "operation-name" => "write-attribute",
+ "description" => "Sets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to set the value for under the selected resource",
+ "nillable" => false
+ },
+ "value" => {
+ "type" => STRING,
+ "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
+ "nillable" => true,
+ "required" => false
+ }
+ }
+ }
+ },
+ "children" => {"property" => {
+ "description" => "A configuration property to be made available to the plug-in.",
+ "model-description" => {"*" => {
+ "description" => "A property within a security realm resource.",
+ "attributes" => {"value" => {
+ "type" => STRING,
+ "description" => "The optional value of the property.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ }},
+ "operations" => {
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
+ "type" => STRING,
+ "description" => "The name of the node under which to get the children names",
+ "nillable" => false
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
+ },
+ "remove" => {
+ "operation-name" => "remove",
+ "description" => "Remove the property definition.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "locale" => {
+ "type" => STRING,
+ "description" => "The locale to get the resource description in. If null, the default locale will be used",
+ "required" => false,
+ "nillable" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the resource"
+ }
+ },
+ "read-resource" => {
+ "operation-name" => "read-resource",
+ "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
+ "request-properties" => {
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The resource's attribute values along with information about any child resources"
+ }
+ },
+ "add" => {
+ "operation-name" => "add",
+ "description" => "Add a property definition.",
+ "request-properties" => {"value" => {
+ "type" => STRING,
+ "description" => "The optional value of the property.",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ }},
+ "reply-properties" => {}
+ },
+ "read-attribute" => {
+ "operation-name" => "read-attribute",
+ "description" => "Gets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to get the value for under the selected resource",
+ "nillable" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The value of the attribute. The type will be that of the attribute found"
+ }
+ },
+ "whoami" => {
+ "operation-name" => "whoami",
+ "description" => "Returns the identity of the currently authenticated user.",
+ "request-properties" => {"verbose" => {
+ "type" => BOOLEAN,
+ "description" => "If set to true whoami also returns the users roles.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ }},
+ "reply-properties" => {}
+ },
+ "read-children-types" => {
+ "operation-name" => "read-children-types",
+ "description" => "Gets the type names of all the children under the selected resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children types",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-names" => {
+ "operation-name" => "read-operation-names",
+ "description" => "Gets the names of all the operations for the given resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "value-type" => STRING,
+ "description" => "The operation names"
+ }
+ },
+ "undefine-attribute" => {
+ "operation-name" => "undefine-attribute",
+ "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which should be set to 'undefined'",
+ "nillable" => false
+ }}
+ },
+ "read-children-resources" => {
+ "operation-name" => "read-children-resources",
+ "description" => "Reads information about all of a resource's children that are of a given type",
+ "request-properties" => {
+ "child-type" => {
+ "type" => STRING,
+ "description" => "The name of the resource under which to get the child resources",
+ "nillable" => false
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to get the children recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children resources",
+ "value-type" => OBJECT
+ }
+ },
+ "write-attribute" => {
+ "operation-name" => "write-attribute",
+ "description" => "Sets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to set the value for under the selected resource",
+ "nillable" => false
+ },
+ "value" => {
+ "type" => STRING,
+ "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
+ "nillable" => true,
+ "required" => false
+ }
+ }
+ }
+ },
+ "children" => {}
+ }}
+ }}
+ },
+ "ldap" => {
+ "description" => "Configuration to use LDAP as the user repository.",
+ "attributes" => {
+ "connection" => {
+ "type" => STRING,
+ "description" => "The name of the connection to use to connect to LDAP.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "advanced-filter" => {
+ "type" => STRING,
+ "description" => "The fully defined filter to be used to search for the user based on their entered user ID. The filter should contain a variable in the form {0} - this will be replaced with the username supplied by the user.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "alternatives" => ["username-attribute"],
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "base-dn" => {
+ "type" => STRING,
+ "description" => "The base distinguished name to commence the search for the user.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "user-dn" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which is the user's distinguished name.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "dn",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether the search should be recursive.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => false,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "username-attribute" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to search for the user. This filter will then perform a simple search where the username entered by the user matches the attribute specified here.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "alternatives" => ["advanced-filter"],
"min-length" => 1L,
"max-length" => 2147483647L,
"access-type" => "read-write",
@@ -144420,59 +145872,720 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Adds a configuration to use LDAP as the user repository.",
+ "description" => "Adds a configuration to use LDAP as the user repository.",
+ "request-properties" => {
+ "connection" => {
+ "type" => STRING,
+ "description" => "The name of the connection to use to connect to LDAP.",
+ "expressions-allowed" => false,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "advanced-filter" => {
+ "type" => STRING,
+ "description" => "The fully defined filter to be used to search for the user based on their entered user ID. The filter should contain a variable in the form {0} - this will be replaced with the username supplied by the user.",
+ "expressions-allowed" => false,
+ "required" => true,
+ "nillable" => false,
+ "alternatives" => ["username-attribute"],
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "base-dn" => {
+ "type" => STRING,
+ "description" => "The base distinguished name to commence the search for the user.",
+ "expressions-allowed" => false,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "user-dn" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which is the user's distinguished name.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether the search should be recursive.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true
+ },
+ "username-attribute" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to search for the user. This filter will then perform a simple search where the username entered by the user matches the attribute specified here.",
+ "expressions-allowed" => false,
+ "required" => true,
+ "nillable" => false,
+ "alternatives" => ["advanced-filter"],
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ }
+ },
+ "reply-properties" => {}
+ },
+ "read-attribute" => {
+ "operation-name" => "read-attribute",
+ "description" => "Gets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to get the value for under the selected resource",
+ "nillable" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The value of the attribute. The type will be that of the attribute found"
+ }
+ },
+ "whoami" => {
+ "operation-name" => "whoami",
+ "description" => "Returns the identity of the currently authenticated user.",
+ "request-properties" => {"verbose" => {
+ "type" => BOOLEAN,
+ "description" => "If set to true whoami also returns the users roles.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ }},
+ "reply-properties" => {}
+ },
+ "read-children-types" => {
+ "operation-name" => "read-children-types",
+ "description" => "Gets the type names of all the children under the selected resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children types",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-names" => {
+ "operation-name" => "read-operation-names",
+ "description" => "Gets the names of all the operations for the given resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "value-type" => STRING,
+ "description" => "The operation names"
+ }
+ },
+ "undefine-attribute" => {
+ "operation-name" => "undefine-attribute",
+ "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which should be set to 'undefined'",
+ "nillable" => false
+ }}
+ },
+ "read-children-resources" => {
+ "operation-name" => "read-children-resources",
+ "description" => "Reads information about all of a resource's children that are of a given type",
+ "request-properties" => {
+ "child-type" => {
+ "type" => STRING,
+ "description" => "The name of the resource under which to get the child resources",
+ "nillable" => false
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to get the children recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children resources",
+ "value-type" => OBJECT
+ }
+ },
+ "write-attribute" => {
+ "operation-name" => "write-attribute",
+ "description" => "Sets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to set the value for under the selected resource",
+ "nillable" => false
+ },
+ "value" => {
+ "type" => STRING,
+ "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
+ "nillable" => true,
+ "required" => false
+ }
+ }
+ }
+ },
+ "children" => {}
+ },
+ "truststore" => {
+ "description" => "Configuration of a keystore to use to create a trust manager to verify clients.",
+ "attributes" => {
+ "keystore-password" => {
+ "type" => STRING,
+ "description" => "The password to open the keystore.",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "keystore-path" => {
+ "type" => STRING,
+ "description" => "The path of the keystore.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "keystore-relative-to" => {
+ "type" => STRING,
+ "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ }
+ },
+ "operations" => {
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
+ "type" => STRING,
+ "description" => "The name of the node under which to get the children names",
+ "nillable" => false
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
+ },
+ "remove" => {
+ "operation-name" => "remove",
+ "description" => "Removes a keystore to use to create a trust manager to verify clients.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "locale" => {
+ "type" => STRING,
+ "description" => "The locale to get the resource description in. If null, the default locale will be used",
+ "required" => false,
+ "nillable" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the resource"
+ }
+ },
+ "read-resource" => {
+ "operation-name" => "read-resource",
+ "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
+ "request-properties" => {
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The resource's attribute values along with information about any child resources"
+ }
+ },
+ "add" => {
+ "operation-name" => "add",
+ "description" => "Adds a keystore to use to create a trust manager to verify clients.",
"request-properties" => {
- "connection" => {
+ "keystore-password" => {
"type" => STRING,
- "description" => "The name of the connection to use to connect to LDAP.",
- "expressions-allowed" => false,
+ "description" => "The password to open the keystore.",
+ "expressions-allowed" => true,
"required" => true,
"nillable" => false,
"min-length" => 1L,
"max-length" => 2147483647L
},
- "advanced-filter" => {
+ "keystore-path" => {
"type" => STRING,
- "description" => "The fully defined filter to be used to search for the user based on their entered user ID. The filter should contain a variable in the form {0} - this will be replaced with the username supplied by the user.",
+ "description" => "The path of the keystore.",
"expressions-allowed" => false,
"required" => true,
"nillable" => false,
- "alternatives" => ["username-attribute"],
"min-length" => 1L,
"max-length" => 2147483647L
},
- "base-dn" => {
+ "keystore-relative-to" => {
"type" => STRING,
- "description" => "The base distinguished name to commence the search for the user.",
+ "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
"expressions-allowed" => false,
- "required" => true,
- "nillable" => false,
+ "required" => false,
+ "nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L
+ }
+ },
+ "reply-properties" => {}
+ },
+ "read-attribute" => {
+ "operation-name" => "read-attribute",
+ "description" => "Gets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to get the value for under the selected resource",
+ "nillable" => false
},
- "user-dn" => {
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The value of the attribute. The type will be that of the attribute found"
+ }
+ },
+ "whoami" => {
+ "operation-name" => "whoami",
+ "description" => "Returns the identity of the currently authenticated user.",
+ "request-properties" => {"verbose" => {
+ "type" => BOOLEAN,
+ "description" => "If set to true whoami also returns the users roles.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ }},
+ "reply-properties" => {}
+ },
+ "read-children-types" => {
+ "operation-name" => "read-children-types",
+ "description" => "Gets the type names of all the children under the selected resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children types",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-names" => {
+ "operation-name" => "read-operation-names",
+ "description" => "Gets the names of all the operations for the given resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "value-type" => STRING,
+ "description" => "The operation names"
+ }
+ },
+ "undefine-attribute" => {
+ "operation-name" => "undefine-attribute",
+ "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which should be set to 'undefined'",
+ "nillable" => false
+ }}
+ },
+ "read-children-resources" => {
+ "operation-name" => "read-children-resources",
+ "description" => "Reads information about all of a resource's children that are of a given type",
+ "request-properties" => {
+ "child-type" => {
"type" => STRING,
- "description" => "The name of the attribute which is the user's distinguished name.",
- "expressions-allowed" => false,
+ "description" => "The name of the resource under which to get the child resources",
+ "nillable" => false
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to get the children recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
"required" => false,
"nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children resources",
+ "value-type" => OBJECT
+ }
+ },
+ "write-attribute" => {
+ "operation-name" => "write-attribute",
+ "description" => "Sets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to set the value for under the selected resource",
+ "nillable" => false
+ },
+ "value" => {
+ "type" => STRING,
+ "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
+ "nillable" => true,
+ "required" => false
+ }
+ }
+ }
+ },
+ "children" => {}
+ },
+ "properties" => {
+ "description" => "Configuration to use a list users stored within a properties file as the user repository. The entries within the properties file are username={credentials} with each user being specified on it's own line.",
+ "attributes" => {
+ "path" => {
+ "type" => STRING,
+ "description" => "The path of the properties file containing the users.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "plain-text" => {
+ "type" => BOOLEAN,
+ "description" => "Are the credentials within the properties file stored in plain text. If not the credential is expected to be the hex encoded Digest hash of 'username : realm : password'.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => false,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "relative-to" => {
+ "type" => STRING,
+ "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ }
+ },
+ "operations" => {
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
+ "type" => STRING,
+ "description" => "The name of the node under which to get the children names",
+ "nillable" => false
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
+ },
+ "remove" => {
+ "operation-name" => "remove",
+ "description" => "Removes a configuration to use a list users stored within a properties file as the user repository.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
},
"recursive" => {
"type" => BOOLEAN,
- "description" => "Whether the search should be recursive.",
- "expressions-allowed" => false,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
"required" => false,
"nillable" => true
},
- "username-attribute" => {
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "locale" => {
"type" => STRING,
- "description" => "The name of the attribute to search for the user. This filter will then perform a simple search where the username entered by the user matches the attribute specified here.",
+ "description" => "The locale to get the resource description in. If null, the default locale will be used",
+ "required" => false,
+ "nillable" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the resource"
+ }
+ },
+ "read-resource" => {
+ "operation-name" => "read-resource",
+ "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
+ "request-properties" => {
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The resource's attribute values along with information about any child resources"
+ }
+ },
+ "add" => {
+ "operation-name" => "add",
+ "description" => "Adds a configuration to use a list users stored within a properties file as the user repository.",
+ "request-properties" => {
+ "path" => {
+ "type" => STRING,
+ "description" => "The path of the properties file containing the users.",
"expressions-allowed" => false,
"required" => true,
"nillable" => false,
- "alternatives" => ["advanced-filter"],
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "plain-text" => {
+ "type" => BOOLEAN,
+ "description" => "Are the credentials within the properties file stored in plain text. If not the credential is expected to be the hex encoded Digest hash of 'username : realm : password'.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true
+ },
+ "relative-to" => {
+ "type" => STRING,
+ "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L
}
@@ -144607,7 +146720,7 @@
},
"children" => {}
},
- "user" => {
+ "users" => {
"description" => "Configuration to use a list users stored directly within the standalone.xml or host.xml configuration file as the user repository.",
"attributes" => {},
"operations" => {
@@ -145166,35 +147279,41 @@
"children" => {}
}}
}}
- },
- "truststore" => {
- "description" => "Configuration of a keystore to use to create a trust manager to verify clients.",
+ }
+ }
+ },
+ "server-identity" => {
+ "description" => "Configuration of the identities that represent the server.",
+ "model-description" => {
+ "ssl" => {
+ "description" => "Configuration of the SSL identity of a server or host controller.",
"attributes" => {
- "keystore-password" => {
+ "protocol" => {
"type" => STRING,
- "description" => "The password to open the keystore.",
- "expressions-allowed" => true,
- "nillable" => false,
+ "description" => "The protocol to use when creating the SSLContext.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "TLS",
"min-length" => 1L,
"max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "resource-services"
},
- "keystore-path" => {
+ "keystore-relative-to" => {
"type" => STRING,
- "description" => "The path of the keystore.",
+ "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
"expressions-allowed" => false,
- "nillable" => false,
+ "nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "resource-services"
},
- "keystore-relative-to" => {
+ "alias" => {
"type" => STRING,
- "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
+ "description" => "The alias of the entry to use from the keystore.",
"expressions-allowed" => false,
"nillable" => true,
"min-length" => 1L,
@@ -145202,6 +147321,39 @@
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "resource-services"
+ },
+ "key-password" => {
+ "type" => STRING,
+ "description" => "The password to obtain the key from the keystore.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "keystore-password" => {
+ "type" => STRING,
+ "description" => "The password to open the keystore.",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "keystore-path" => {
+ "type" => STRING,
+ "description" => "The path of the keystore.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
}
},
"operations" => {
@@ -145243,7 +147395,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Removes a keystore to use to create a trust manager to verify clients.",
+ "description" => "Removes the SSL identity of a server or host controller.",
"request-properties" => {},
"reply-properties" => {}
},
@@ -145339,8 +147491,44 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Adds a keystore to use to create a trust manager to verify clients.",
+ "description" => "Adds the SSL identity of a server or host controller.",
"request-properties" => {
+ "protocol" => {
+ "type" => STRING,
+ "description" => "The protocol to use when creating the SSLContext.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "keystore-relative-to" => {
+ "type" => STRING,
+ "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "alias" => {
+ "type" => STRING,
+ "description" => "The alias of the entry to use from the keystore.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "key-password" => {
+ "type" => STRING,
+ "description" => "The password to obtain the key from the keystore.",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
"keystore-password" => {
"type" => STRING,
"description" => "The password to open the keystore.",
@@ -145358,15 +147546,6 @@
"nillable" => false,
"min-length" => 1L,
"max-length" => 2147483647L
- },
- "keystore-relative-to" => {
- "type" => STRING,
- "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
}
},
"reply-properties" => {}
@@ -145499,42 +147678,19 @@
},
"children" => {}
},
- "properties" => {
- "description" => "Configuration to use a list users stored within a properties file as the user repository. The entries within the properties file are username={credentials} with each user being specified on it's own line.",
- "attributes" => {
- "path" => {
- "type" => STRING,
- "description" => "The path of the properties file containing the users.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- },
- "plain-text" => {
- "type" => BOOLEAN,
- "description" => "Are the credentials within the properties file stored in plain text. If not the credential is expected to be the hex encoded Digest hash of 'username : realm : password'.",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => false,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- },
- "relative-to" => {
- "type" => STRING,
- "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
- "expressions-allowed" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- }
- },
+ "secret" => {
+ "description" => "Configuration of the secret/password-based identity of a server or host controller.",
+ "attributes" => {"value" => {
+ "type" => STRING,
+ "description" => "The secret / password - Base64 Encoded.",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ }},
"operations" => {
"read-children-names" => {
"operation-name" => "read-children-names",
@@ -145574,7 +147730,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Removes a configuration to use a list users stored within a properties file as the user repository.",
+ "description" => "Removes a Adds a secret/password-based identity for a server or host controller.",
"request-properties" => {},
"reply-properties" => {}
},
@@ -145670,34 +147826,16 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Adds a configuration to use a list users stored within a properties file as the user repository.",
- "request-properties" => {
- "path" => {
- "type" => STRING,
- "description" => "The path of the properties file containing the users.",
- "expressions-allowed" => false,
- "required" => true,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L
- },
- "plain-text" => {
- "type" => BOOLEAN,
- "description" => "Are the credentials within the properties file stored in plain text. If not the credential is expected to be the hex encoded Digest hash of 'username : realm : password'.",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true
- },
- "relative-to" => {
- "type" => STRING,
- "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
- }
- },
+ "description" => "Adds a secret/password-based identity for a server or host controller.",
+ "request-properties" => {"value" => {
+ "type" => STRING,
+ "description" => "The secret / password - Base64 Encoded.",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ }},
"reply-properties" => {}
},
"read-attribute" => {
@@ -145830,25 +147968,24 @@
}
}
},
- "server-identity" => {
- "description" => "Configuration of the identities that represent the server.",
+ "authorization" => {
+ "description" => "Configuration server side for loading additional user information such as roles to be used for subsequent authorization checks.",
"model-description" => {
- "ssl" => {
- "description" => "Configuration of the SSL identity of a server or host controller.",
+ "properties" => {
+ "description" => "Configuration to use properties file to load a users roles. The entries within the properties file are username={roles} where roles is a comma separated list of users roles.",
"attributes" => {
- "protocol" => {
+ "path" => {
"type" => STRING,
- "description" => "The protocol to use when creating the SSLContext.",
+ "description" => "The path of the properties file containing the users roles.",
"expressions-allowed" => false,
- "nillable" => true,
- "default" => "TLS",
+ "nillable" => false,
"min-length" => 1L,
"max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "resource-services"
},
- "keystore-relative-to" => {
+ "relative-to" => {
"type" => STRING,
"description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
"expressions-allowed" => false,
@@ -145858,50 +147995,6 @@
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "resource-services"
- },
- "alias" => {
- "type" => STRING,
- "description" => "The alias of the entry to use from the keystore.",
- "expressions-allowed" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- },
- "key-password" => {
- "type" => STRING,
- "description" => "The password to obtain the key from the keystore.",
- "expressions-allowed" => true,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- },
- "keystore-password" => {
- "type" => STRING,
- "description" => "The password to open the keystore.",
- "expressions-allowed" => true,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- },
- "keystore-path" => {
- "type" => STRING,
- "description" => "The path of the keystore.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
}
},
"operations" => {
@@ -145943,7 +148036,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Removes the SSL identity of a server or host controller.",
+ "description" => "Removes a configuration to use a properties file to load a users roles.",
"request-properties" => {},
"reply-properties" => {}
},
@@ -146039,18 +148132,18 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Adds the SSL identity of a server or host controller.",
+ "description" => "Adds a configuration to use a properties file to load a users roles.",
"request-properties" => {
- "protocol" => {
+ "path" => {
"type" => STRING,
- "description" => "The protocol to use when creating the SSLContext.",
+ "description" => "The path of the properties file containing the users roles.",
"expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
+ "required" => true,
+ "nillable" => false,
"min-length" => 1L,
"max-length" => 2147483647L
},
- "keystore-relative-to" => {
+ "relative-to" => {
"type" => STRING,
"description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
"expressions-allowed" => false,
@@ -146058,42 +148151,6 @@
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L
- },
- "alias" => {
- "type" => STRING,
- "description" => "The alias of the entry to use from the keystore.",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
- },
- "key-password" => {
- "type" => STRING,
- "description" => "The password to obtain the key from the keystore.",
- "expressions-allowed" => true,
- "required" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
- },
- "keystore-password" => {
- "type" => STRING,
- "description" => "The password to open the keystore.",
- "expressions-allowed" => true,
- "required" => true,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L
- },
- "keystore-path" => {
- "type" => STRING,
- "description" => "The path of the keystore.",
- "expressions-allowed" => false,
- "required" => true,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L
}
},
"reply-properties" => {}
@@ -146226,18 +148283,18 @@
},
"children" => {}
},
- "secret" => {
- "description" => "Configuration of the secret/password-based identity of a server or host controller.",
- "attributes" => {"value" => {
+ "plug-in" => {
+ "description" => "Configuration of a user store plug-in for use by the realm.",
+ "attributes" => {"name" => {
"type" => STRING,
- "description" => "The secret / password - Base64 Encoded.",
- "expressions-allowed" => true,
+ "description" => "The short name of the plug-in (as registered) to use.",
+ "expressions-allowed" => false,
"nillable" => false,
"min-length" => 1L,
"max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
- "restart-required" => "no-services"
+ "restart-required" => "resource-services"
}},
"operations" => {
"read-children-names" => {
@@ -146278,7 +148335,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Removes a Adds a secret/password-based identity for a server or host controller.",
+ "description" => "Configuration of a user store plug-in for use by the realm.",
"request-properties" => {},
"reply-properties" => {}
},
@@ -146374,11 +148431,11 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Adds a secret/password-based identity for a server or host controller.",
- "request-properties" => {"value" => {
+ "description" => "Add the plug-in definition.",
+ "request-properties" => {"name" => {
"type" => STRING,
- "description" => "The secret / password - Base64 Encoded.",
- "expressions-allowed" => true,
+ "description" => "The short name of the plug-in (as registered) to use.",
+ "expressions-allowed" => false,
"required" => true,
"nillable" => false,
"min-length" => 1L,
@@ -146512,38 +148569,305 @@
}
}
},
- "children" => {}
+ "children" => {"property" => {
+ "description" => "A configuration property to be made available to the plug-in.",
+ "model-description" => {"*" => {
+ "description" => "A property within a security realm resource.",
+ "attributes" => {"value" => {
+ "type" => STRING,
+ "description" => "The optional value of the property.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ }},
+ "operations" => {
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
+ "type" => STRING,
+ "description" => "The name of the node under which to get the children names",
+ "nillable" => false
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
+ },
+ "remove" => {
+ "operation-name" => "remove",
+ "description" => "Remove the property definition.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "locale" => {
+ "type" => STRING,
+ "description" => "The locale to get the resource description in. If null, the default locale will be used",
+ "required" => false,
+ "nillable" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the resource"
+ }
+ },
+ "read-resource" => {
+ "operation-name" => "read-resource",
+ "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
+ "request-properties" => {
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The resource's attribute values along with information about any child resources"
+ }
+ },
+ "add" => {
+ "operation-name" => "add",
+ "description" => "Add a property definition.",
+ "request-properties" => {"value" => {
+ "type" => STRING,
+ "description" => "The optional value of the property.",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ }},
+ "reply-properties" => {}
+ },
+ "read-attribute" => {
+ "operation-name" => "read-attribute",
+ "description" => "Gets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to get the value for under the selected resource",
+ "nillable" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The value of the attribute. The type will be that of the attribute found"
+ }
+ },
+ "whoami" => {
+ "operation-name" => "whoami",
+ "description" => "Returns the identity of the currently authenticated user.",
+ "request-properties" => {"verbose" => {
+ "type" => BOOLEAN,
+ "description" => "If set to true whoami also returns the users roles.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ }},
+ "reply-properties" => {}
+ },
+ "read-children-types" => {
+ "operation-name" => "read-children-types",
+ "description" => "Gets the type names of all the children under the selected resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children types",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-names" => {
+ "operation-name" => "read-operation-names",
+ "description" => "Gets the names of all the operations for the given resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "value-type" => STRING,
+ "description" => "The operation names"
+ }
+ },
+ "undefine-attribute" => {
+ "operation-name" => "undefine-attribute",
+ "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which should be set to 'undefined'",
+ "nillable" => false
+ }}
+ },
+ "read-children-resources" => {
+ "operation-name" => "read-children-resources",
+ "description" => "Reads information about all of a resource's children that are of a given type",
+ "request-properties" => {
+ "child-type" => {
+ "type" => STRING,
+ "description" => "The name of the resource under which to get the child resources",
+ "nillable" => false
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to get the children recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children resources",
+ "value-type" => OBJECT
+ }
+ },
+ "write-attribute" => {
+ "operation-name" => "write-attribute",
+ "description" => "Sets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to set the value for under the selected resource",
+ "nillable" => false
+ },
+ "value" => {
+ "type" => STRING,
+ "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
+ "nillable" => true,
+ "required" => false
+ }
+ }
+ }
+ },
+ "children" => {}
+ }}
+ }}
}
}
},
- "authorization" => {
- "description" => "Configuration server side for loading additional user information such as roles to be used for subsequent authorization checks.",
- "model-description" => {"properties" => {
- "description" => "Configuration to use properties file to load a users roles. The entries within the properties file are username={roles} where roles is a comma separated list of users roles.",
- "attributes" => {
- "path" => {
- "type" => STRING,
- "description" => "The path of the properties file containing the users roles.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- },
- "relative-to" => {
- "type" => STRING,
- "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
- "expressions-allowed" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- }
- },
+ "plug-in" => {
+ "description" => "An extension to the security realm allowing additional authentication / authorization modules to be loaded.",
+ "model-description" => {"*" => {
+ "description" => "An extension to the security realm allowing additional authentication / authorization modules to be loaded.",
+ "attributes" => {},
"operations" => {
"read-children-names" => {
"operation-name" => "read-children-names",
@@ -146583,7 +148907,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Removes a configuration to use a properties file to load a users roles.",
+ "description" => "Remove a plug-in from the security realm.",
"request-properties" => {},
"reply-properties" => {}
},
@@ -146679,27 +149003,8 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Adds a configuration to use a properties file to load a users roles.",
- "request-properties" => {
- "path" => {
- "type" => STRING,
- "description" => "The path of the properties file containing the users roles.",
- "expressions-allowed" => false,
- "required" => true,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L
- },
- "relative-to" => {
- "type" => STRING,
- "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
- }
- },
+ "description" => "Add a plug-in to the security realm.",
+ "request-properties" => {},
"reply-properties" => {}
},
"read-attribute" => {
@@ -151074,7 +153379,7 @@
"nillable" => true
},
"boot-time" => {
- "type" => STRING,
+ "type" => BOOLEAN,
"description" => "If true the system property is passed on the command-line to the started server jvm. If false, it will be pushed to the server as part of the startup sequence.",
"required" => false,
"nillable" => true,
diff --git a/modules/plugins/jboss-as-7/json-api/standalone_full_ha.txt b/modules/plugins/jboss-as-7/json-api/standalone_full_ha.txt
index 1b45d0f..c7d5f1e 100644
--- a/modules/plugins/jboss-as-7/json-api/standalone_full_ha.txt
+++ b/modules/plugins/jboss-as-7/json-api/standalone_full_ha.txt
@@ -2683,13 +2683,14 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "vault-option" => {
- "description" => "Security Vault option.",
+ "vault-options" => {
+ "description" => "Security Vault options.",
"type" => OBJECT,
"value-type" => STRING,
"nillable" => true,
- "access-type" => "read-only",
- "storage" => "configuration"
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
}
},
"operations" => {
@@ -2834,8 +2835,8 @@
"description" => "Fully Qualified Name of the Security Vault Implementation.",
"required" => false
},
- "vault-option" => {
- "description" => "Security Vault option.",
+ "vault-options" => {
+ "description" => "Security Vault options.",
"type" => OBJECT,
"value-type" => STRING,
"required" => false
@@ -8970,71 +8971,25 @@
},
"children" => {}
},
- "ldap" => {
- "description" => "Configuration to use LDAP as the user repository.",
+ "local" => {
+ "description" => "Configuration of the local authentication mechanism.",
"attributes" => {
- "connection" => {
+ "default-user" => {
"type" => STRING,
- "description" => "The name of the connection to use to connect to LDAP.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- },
- "advanced-filter" => {
- "type" => STRING,
- "description" => "The fully defined filter to be used to search for the user based on their entered user ID. The filter should contain a variable in the form {0} - this will be replaced with the username supplied by the user.",
- "expressions-allowed" => false,
- "nillable" => false,
- "alternatives" => ["username-attribute"],
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- },
- "base-dn" => {
- "type" => STRING,
- "description" => "The base distinguished name to commence the search for the user.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- },
- "user-dn" => {
- "type" => STRING,
- "description" => "The name of the attribute which is the user's distinguished name.",
+ "description" => "The name of the default user to assume if no user specified by the remote client.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "dn",
"min-length" => 1L,
"max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "resource-services"
},
- "recursive" => {
- "type" => BOOLEAN,
- "description" => "Whether the search should be recursive.",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => false,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- },
- "username-attribute" => {
+ "allowed-users" => {
"type" => STRING,
- "description" => "The name of the attribute to search for the user. This filter will then perform a simple search where the username entered by the user matches the attribute specified here.",
+ "description" => "The comma separated list of users that will be accepted using the JBOSS-LOCAL-USER mechanism or '*' to accept all. If specified the default-user is always assumed allowed.",
"expressions-allowed" => false,
- "nillable" => false,
- "alternatives" => ["advanced-filter"],
+ "nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
"access-type" => "read-write",
@@ -9081,7 +9036,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Removes a configuration to use LDAP as the user repository.",
+ "description" => "Removes a configuration to use JBOSS-LOCAL-USER for authentication.",
"request-properties" => {},
"reply-properties" => {}
},
@@ -9177,59 +9132,23 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Adds a configuration to use LDAP as the user repository.",
+ "description" => "Adds a configuration to use the JBOSS-LOCAL-USER mechanism for authentication.",
"request-properties" => {
- "connection" => {
+ "default-user" => {
"type" => STRING,
- "description" => "The name of the connection to use to connect to LDAP.",
- "expressions-allowed" => false,
- "required" => true,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L
- },
- "advanced-filter" => {
- "type" => STRING,
- "description" => "The fully defined filter to be used to search for the user based on their entered user ID. The filter should contain a variable in the form {0} - this will be replaced with the username supplied by the user.",
- "expressions-allowed" => false,
- "required" => true,
- "nillable" => false,
- "alternatives" => ["username-attribute"],
- "min-length" => 1L,
- "max-length" => 2147483647L
- },
- "base-dn" => {
- "type" => STRING,
- "description" => "The base distinguished name to commence the search for the user.",
- "expressions-allowed" => false,
- "required" => true,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L
- },
- "user-dn" => {
- "type" => STRING,
- "description" => "The name of the attribute which is the user's distinguished name.",
+ "description" => "The name of the default user to assume if no user specified by the remote client.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L
},
- "recursive" => {
- "type" => BOOLEAN,
- "description" => "Whether the search should be recursive.",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true
- },
- "username-attribute" => {
+ "allowed-users" => {
"type" => STRING,
- "description" => "The name of the attribute to search for the user. This filter will then perform a simple search where the username entered by the user matches the attribute specified here.",
+ "description" => "The comma separated list of users that will be accepted using the JBOSS-LOCAL-USER mechanism or '*' to accept all. If specified the default-user is always assumed allowed.",
"expressions-allowed" => false,
- "required" => true,
- "nillable" => false,
- "alternatives" => ["advanced-filter"],
+ "required" => false,
+ "nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L
}
@@ -9364,9 +9283,36 @@
},
"children" => {}
},
- "user" => {
- "description" => "Configuration to use a list users stored directly within the standalone.xml or host.xml configuration file as the user repository.",
- "attributes" => {},
+ "plug-in" => {
+ "description" => "Configuration of a user store plug-in for use by the realm.",
+ "attributes" => {
+ "mechanism" => {
+ "type" => STRING,
+ "description" => "Allow the mechanism this plug-in is compatible with to be overridden from DIGEST.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "allowed" => [
+ "DIGEST",
+ "PLAIN"
+ ],
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "name" => {
+ "type" => STRING,
+ "description" => "The short name of the plug-in (as registered) to use.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ }
+ },
"operations" => {
"read-children-names" => {
"operation-name" => "read-children-names",
@@ -9406,7 +9352,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Removes a configuration to use a list users stored directly within the standalone.xml or host.xml configuration file as the user repository.",
+ "description" => "Configuration of a user store plug-in for use by the realm.",
"request-properties" => {},
"reply-properties" => {}
},
@@ -9502,8 +9448,31 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Adds a configuration to use a list users stored directly within the standalone.xml or host.xml configuration file as the user repository.",
- "request-properties" => {},
+ "description" => "Add the plug-in definition.",
+ "request-properties" => {
+ "mechanism" => {
+ "type" => STRING,
+ "description" => "Allow the mechanism this plug-in is compatible with to be overridden from DIGEST.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "allowed" => [
+ "DIGEST",
+ "PLAIN"
+ ]
+ },
+ "name" => {
+ "type" => STRING,
+ "description" => "The short name of the plug-in (as registered) to use.",
+ "expressions-allowed" => false,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ }
+ },
"reply-properties" => {}
},
"read-attribute" => {
@@ -9632,20 +9601,20 @@
}
}
},
- "children" => {"user" => {
- "description" => "An authorized user.",
+ "children" => {"property" => {
+ "description" => "A configuration property to be made available to the plug-in.",
"model-description" => {"*" => {
- "description" => "An authorized user.",
- "attributes" => {"password" => {
+ "description" => "A property within a security realm resource.",
+ "attributes" => {"value" => {
"type" => STRING,
- "description" => "The user's password.",
- "expressions-allowed" => false,
- "nillable" => false,
+ "description" => "The optional value of the property.",
+ "expressions-allowed" => true,
+ "nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
- "restart-required" => "no-services"
+ "restart-required" => "resource-services"
}},
"operations" => {
"read-children-names" => {
@@ -9686,7 +9655,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Removes an authorized user.",
+ "description" => "Remove the property definition.",
"request-properties" => {},
"reply-properties" => {}
},
@@ -9782,13 +9751,13 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Adds an authorized user.",
- "request-properties" => {"password" => {
+ "description" => "Add a property definition.",
+ "request-properties" => {"value" => {
"type" => STRING,
- "description" => "The user's password.",
- "expressions-allowed" => false,
- "required" => true,
- "nillable" => false,
+ "description" => "The optional value of the property.",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L
}},
@@ -9924,13 +9893,13 @@
}}
}}
},
- "truststore" => {
- "description" => "Configuration of a keystore to use to create a trust manager to verify clients.",
+ "ldap" => {
+ "description" => "Configuration to use LDAP as the user repository.",
"attributes" => {
- "keystore-password" => {
+ "connection" => {
"type" => STRING,
- "description" => "The password to open the keystore.",
- "expressions-allowed" => true,
+ "description" => "The name of the connection to use to connect to LDAP.",
+ "expressions-allowed" => false,
"nillable" => false,
"min-length" => 1L,
"max-length" => 2147483647L,
@@ -9938,22 +9907,57 @@
"storage" => "configuration",
"restart-required" => "resource-services"
},
- "keystore-path" => {
+ "advanced-filter" => {
"type" => STRING,
- "description" => "The path of the keystore.",
+ "description" => "The fully defined filter to be used to search for the user based on their entered user ID. The filter should contain a variable in the form {0} - this will be replaced with the username supplied by the user.",
"expressions-allowed" => false,
"nillable" => false,
+ "alternatives" => ["username-attribute"],
"min-length" => 1L,
"max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "resource-services"
},
- "keystore-relative-to" => {
+ "base-dn" => {
"type" => STRING,
- "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
+ "description" => "The base distinguished name to commence the search for the user.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "user-dn" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which is the user's distinguished name.",
"expressions-allowed" => false,
"nillable" => true,
+ "default" => "dn",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether the search should be recursive.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => false,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "username-attribute" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to search for the user. This filter will then perform a simple search where the username entered by the user matches the attribute specified here.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "alternatives" => ["advanced-filter"],
"min-length" => 1L,
"max-length" => 2147483647L,
"access-type" => "read-write",
@@ -10000,7 +10004,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Removes a keystore to use to create a trust manager to verify clients.",
+ "description" => "Removes a configuration to use LDAP as the user repository.",
"request-properties" => {},
"reply-properties" => {}
},
@@ -10096,29 +10100,388 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Adds a keystore to use to create a trust manager to verify clients.",
+ "description" => "Adds a configuration to use LDAP as the user repository.",
"request-properties" => {
- "keystore-password" => {
+ "connection" => {
"type" => STRING,
- "description" => "The password to open the keystore.",
- "expressions-allowed" => true,
+ "description" => "The name of the connection to use to connect to LDAP.",
+ "expressions-allowed" => false,
"required" => true,
"nillable" => false,
"min-length" => 1L,
"max-length" => 2147483647L
},
- "keystore-path" => {
+ "advanced-filter" => {
"type" => STRING,
- "description" => "The path of the keystore.",
+ "description" => "The fully defined filter to be used to search for the user based on their entered user ID. The filter should contain a variable in the form {0} - this will be replaced with the username supplied by the user.",
"expressions-allowed" => false,
"required" => true,
"nillable" => false,
+ "alternatives" => ["username-attribute"],
"min-length" => 1L,
"max-length" => 2147483647L
},
- "keystore-relative-to" => {
+ "base-dn" => {
"type" => STRING,
- "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
+ "description" => "The base distinguished name to commence the search for the user.",
+ "expressions-allowed" => false,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "user-dn" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which is the user's distinguished name.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether the search should be recursive.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true
+ },
+ "username-attribute" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to search for the user. This filter will then perform a simple search where the username entered by the user matches the attribute specified here.",
+ "expressions-allowed" => false,
+ "required" => true,
+ "nillable" => false,
+ "alternatives" => ["advanced-filter"],
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ }
+ },
+ "reply-properties" => {}
+ },
+ "read-attribute" => {
+ "operation-name" => "read-attribute",
+ "description" => "Gets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to get the value for under the selected resource",
+ "nillable" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The value of the attribute. The type will be that of the attribute found"
+ }
+ },
+ "whoami" => {
+ "operation-name" => "whoami",
+ "description" => "Returns the identity of the currently authenticated user.",
+ "request-properties" => {"verbose" => {
+ "type" => BOOLEAN,
+ "description" => "If set to true whoami also returns the users roles.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ }},
+ "reply-properties" => {}
+ },
+ "read-children-types" => {
+ "operation-name" => "read-children-types",
+ "description" => "Gets the type names of all the children under the selected resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children types",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-names" => {
+ "operation-name" => "read-operation-names",
+ "description" => "Gets the names of all the operations for the given resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "value-type" => STRING,
+ "description" => "The operation names"
+ }
+ },
+ "undefine-attribute" => {
+ "operation-name" => "undefine-attribute",
+ "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which should be set to 'undefined'",
+ "nillable" => false
+ }}
+ },
+ "read-children-resources" => {
+ "operation-name" => "read-children-resources",
+ "description" => "Reads information about all of a resource's children that are of a given type",
+ "request-properties" => {
+ "child-type" => {
+ "type" => STRING,
+ "description" => "The name of the resource under which to get the child resources",
+ "nillable" => false
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to get the children recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children resources",
+ "value-type" => OBJECT
+ }
+ },
+ "write-attribute" => {
+ "operation-name" => "write-attribute",
+ "description" => "Sets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to set the value for under the selected resource",
+ "nillable" => false
+ },
+ "value" => {
+ "type" => STRING,
+ "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
+ "nillable" => true,
+ "required" => false
+ }
+ }
+ }
+ },
+ "children" => {}
+ },
+ "truststore" => {
+ "description" => "Configuration of a keystore to use to create a trust manager to verify clients.",
+ "attributes" => {
+ "keystore-password" => {
+ "type" => STRING,
+ "description" => "The password to open the keystore.",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "keystore-path" => {
+ "type" => STRING,
+ "description" => "The path of the keystore.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "keystore-relative-to" => {
+ "type" => STRING,
+ "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ }
+ },
+ "operations" => {
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
+ "type" => STRING,
+ "description" => "The name of the node under which to get the children names",
+ "nillable" => false
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
+ },
+ "remove" => {
+ "operation-name" => "remove",
+ "description" => "Removes a keystore to use to create a trust manager to verify clients.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "locale" => {
+ "type" => STRING,
+ "description" => "The locale to get the resource description in. If null, the default locale will be used",
+ "required" => false,
+ "nillable" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the resource"
+ }
+ },
+ "read-resource" => {
+ "operation-name" => "read-resource",
+ "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
+ "request-properties" => {
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The resource's attribute values along with information about any child resources"
+ }
+ },
+ "add" => {
+ "operation-name" => "add",
+ "description" => "Adds a keystore to use to create a trust manager to verify clients.",
+ "request-properties" => {
+ "keystore-password" => {
+ "type" => STRING,
+ "description" => "The password to open the keystore.",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "keystore-path" => {
+ "type" => STRING,
+ "description" => "The path of the keystore.",
+ "expressions-allowed" => false,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "keystore-relative-to" => {
+ "type" => STRING,
+ "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -10584,6 +10947,566 @@
}
},
"children" => {}
+ },
+ "users" => {
+ "description" => "Configuration to use a list users stored directly within the standalone.xml or host.xml configuration file as the user repository.",
+ "attributes" => {},
+ "operations" => {
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
+ "type" => STRING,
+ "description" => "The name of the node under which to get the children names",
+ "nillable" => false
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
+ },
+ "remove" => {
+ "operation-name" => "remove",
+ "description" => "Removes a configuration to use a list users stored directly within the standalone.xml or host.xml configuration file as the user repository.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "locale" => {
+ "type" => STRING,
+ "description" => "The locale to get the resource description in. If null, the default locale will be used",
+ "required" => false,
+ "nillable" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the resource"
+ }
+ },
+ "read-resource" => {
+ "operation-name" => "read-resource",
+ "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
+ "request-properties" => {
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The resource's attribute values along with information about any child resources"
+ }
+ },
+ "add" => {
+ "operation-name" => "add",
+ "description" => "Adds a configuration to use a list users stored directly within the standalone.xml or host.xml configuration file as the user repository.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-attribute" => {
+ "operation-name" => "read-attribute",
+ "description" => "Gets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to get the value for under the selected resource",
+ "nillable" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The value of the attribute. The type will be that of the attribute found"
+ }
+ },
+ "whoami" => {
+ "operation-name" => "whoami",
+ "description" => "Returns the identity of the currently authenticated user.",
+ "request-properties" => {"verbose" => {
+ "type" => BOOLEAN,
+ "description" => "If set to true whoami also returns the users roles.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ }},
+ "reply-properties" => {}
+ },
+ "read-children-types" => {
+ "operation-name" => "read-children-types",
+ "description" => "Gets the type names of all the children under the selected resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children types",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-names" => {
+ "operation-name" => "read-operation-names",
+ "description" => "Gets the names of all the operations for the given resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "value-type" => STRING,
+ "description" => "The operation names"
+ }
+ },
+ "undefine-attribute" => {
+ "operation-name" => "undefine-attribute",
+ "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which should be set to 'undefined'",
+ "nillable" => false
+ }}
+ },
+ "read-children-resources" => {
+ "operation-name" => "read-children-resources",
+ "description" => "Reads information about all of a resource's children that are of a given type",
+ "request-properties" => {
+ "child-type" => {
+ "type" => STRING,
+ "description" => "The name of the resource under which to get the child resources",
+ "nillable" => false
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to get the children recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children resources",
+ "value-type" => OBJECT
+ }
+ },
+ "write-attribute" => {
+ "operation-name" => "write-attribute",
+ "description" => "Sets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to set the value for under the selected resource",
+ "nillable" => false
+ },
+ "value" => {
+ "type" => STRING,
+ "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
+ "nillable" => true,
+ "required" => false
+ }
+ }
+ }
+ },
+ "children" => {"user" => {
+ "description" => "An authorized user.",
+ "model-description" => {"*" => {
+ "description" => "An authorized user.",
+ "attributes" => {"password" => {
+ "type" => STRING,
+ "description" => "The user's password.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ }},
+ "operations" => {
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
+ "type" => STRING,
+ "description" => "The name of the node under which to get the children names",
+ "nillable" => false
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
+ },
+ "remove" => {
+ "operation-name" => "remove",
+ "description" => "Removes an authorized user.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "locale" => {
+ "type" => STRING,
+ "description" => "The locale to get the resource description in. If null, the default locale will be used",
+ "required" => false,
+ "nillable" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the resource"
+ }
+ },
+ "read-resource" => {
+ "operation-name" => "read-resource",
+ "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
+ "request-properties" => {
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The resource's attribute values along with information about any child resources"
+ }
+ },
+ "add" => {
+ "operation-name" => "add",
+ "description" => "Adds an authorized user.",
+ "request-properties" => {"password" => {
+ "type" => STRING,
+ "description" => "The user's password.",
+ "expressions-allowed" => false,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ }},
+ "reply-properties" => {}
+ },
+ "read-attribute" => {
+ "operation-name" => "read-attribute",
+ "description" => "Gets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to get the value for under the selected resource",
+ "nillable" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The value of the attribute. The type will be that of the attribute found"
+ }
+ },
+ "whoami" => {
+ "operation-name" => "whoami",
+ "description" => "Returns the identity of the currently authenticated user.",
+ "request-properties" => {"verbose" => {
+ "type" => BOOLEAN,
+ "description" => "If set to true whoami also returns the users roles.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ }},
+ "reply-properties" => {}
+ },
+ "read-children-types" => {
+ "operation-name" => "read-children-types",
+ "description" => "Gets the type names of all the children under the selected resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children types",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-names" => {
+ "operation-name" => "read-operation-names",
+ "description" => "Gets the names of all the operations for the given resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "value-type" => STRING,
+ "description" => "The operation names"
+ }
+ },
+ "undefine-attribute" => {
+ "operation-name" => "undefine-attribute",
+ "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which should be set to 'undefined'",
+ "nillable" => false
+ }}
+ },
+ "read-children-resources" => {
+ "operation-name" => "read-children-resources",
+ "description" => "Reads information about all of a resource's children that are of a given type",
+ "request-properties" => {
+ "child-type" => {
+ "type" => STRING,
+ "description" => "The name of the resource under which to get the child resources",
+ "nillable" => false
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to get the children recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children resources",
+ "value-type" => OBJECT
+ }
+ },
+ "write-attribute" => {
+ "operation-name" => "write-attribute",
+ "description" => "Sets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to set the value for under the selected resource",
+ "nillable" => false
+ },
+ "value" => {
+ "type" => STRING,
+ "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
+ "nillable" => true,
+ "required" => false
+ }
+ }
+ }
+ },
+ "children" => {}
+ }}
+ }}
}
}
},
@@ -11275,102 +12198,974 @@
},
"authorization" => {
"description" => "Configuration server side for loading additional user information such as roles to be used for subsequent authorization checks.",
- "model-description" => {"properties" => {
- "description" => "Configuration to use properties file to load a users roles. The entries within the properties file are username={roles} where roles is a comma separated list of users roles.",
- "attributes" => {
- "path" => {
- "type" => STRING,
- "description" => "The path of the properties file containing the users roles.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- },
- "relative-to" => {
- "type" => STRING,
- "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
- "expressions-allowed" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "resource-services"
- }
- },
- "operations" => {
- "read-children-names" => {
- "operation-name" => "read-children-names",
- "description" => "Gets the names of all children under the selected resource with the given type",
- "request-properties" => {"child-type" => {
+ "model-description" => {
+ "properties" => {
+ "description" => "Configuration to use properties file to load a users roles. The entries within the properties file are username={roles} where roles is a comma separated list of users roles.",
+ "attributes" => {
+ "path" => {
"type" => STRING,
- "description" => "The name of the node under which to get the children names",
- "nillable" => false
- }},
- "reply-properties" => {
- "type" => LIST,
- "description" => "The children names",
- "value-type" => STRING
+ "description" => "The path of the properties file containing the users roles.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ },
+ "relative-to" => {
+ "type" => STRING,
+ "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
}
},
- "read-operation-description" => {
- "operation-name" => "read-operation-description",
- "description" => "Gets the details of an operation on the given resource",
- "request-properties" => {
- "name" => {
+ "operations" => {
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
"type" => STRING,
- "description" => "The description of the operation. Undefined if not found",
- "required" => true,
+ "description" => "The name of the node under which to get the children names",
"nillable" => false
- },
- "locale" => {
- "type" => STRING,
- "required" => false,
- "nillable" => true,
- "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
}
},
- "reply-properties" => {
- "type" => OBJECT,
- "description" => "The description of the operation. Undefined if not found"
- }
- },
- "remove" => {
- "operation-name" => "remove",
- "description" => "Removes a configuration to use a properties file to load a users roles.",
- "request-properties" => {},
- "reply-properties" => {}
- },
- "read-resource-description" => {
- "operation-name" => "read-resource-description",
- "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
- "request-properties" => {
- "operations" => {
- "type" => BOOLEAN,
- "description" => "Whether to include descriptions of the resource's operations. Default is false",
- "required" => false,
- "nillable" => true
- },
- "inherited" => {
- "type" => BOOLEAN,
- "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
- "required" => false,
- "nillable" => true
- },
- "recursive" => {
- "type" => BOOLEAN,
- "description" => "Whether to include recursively descriptions of child resources. Default is false.",
- "required" => false,
- "nillable" => true
- },
- "proxies" => {
- "type" => BOOLEAN,
- "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
- "required" => false,
- "nillable" => true
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
+ },
+ "remove" => {
+ "operation-name" => "remove",
+ "description" => "Removes a configuration to use a properties file to load a users roles.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "locale" => {
+ "type" => STRING,
+ "description" => "The locale to get the resource description in. If null, the default locale will be used",
+ "required" => false,
+ "nillable" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the resource"
+ }
+ },
+ "read-resource" => {
+ "operation-name" => "read-resource",
+ "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
+ "request-properties" => {
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The resource's attribute values along with information about any child resources"
+ }
+ },
+ "add" => {
+ "operation-name" => "add",
+ "description" => "Adds a configuration to use a properties file to load a users roles.",
+ "request-properties" => {
+ "path" => {
+ "type" => STRING,
+ "description" => "The path of the properties file containing the users roles.",
+ "expressions-allowed" => false,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "relative-to" => {
+ "type" => STRING,
+ "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ }
+ },
+ "reply-properties" => {}
+ },
+ "read-attribute" => {
+ "operation-name" => "read-attribute",
+ "description" => "Gets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to get the value for under the selected resource",
+ "nillable" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The value of the attribute. The type will be that of the attribute found"
+ }
+ },
+ "whoami" => {
+ "operation-name" => "whoami",
+ "description" => "Returns the identity of the currently authenticated user.",
+ "request-properties" => {"verbose" => {
+ "type" => BOOLEAN,
+ "description" => "If set to true whoami also returns the users roles.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ }},
+ "reply-properties" => {}
+ },
+ "read-children-types" => {
+ "operation-name" => "read-children-types",
+ "description" => "Gets the type names of all the children under the selected resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children types",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-names" => {
+ "operation-name" => "read-operation-names",
+ "description" => "Gets the names of all the operations for the given resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "value-type" => STRING,
+ "description" => "The operation names"
+ }
+ },
+ "undefine-attribute" => {
+ "operation-name" => "undefine-attribute",
+ "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which should be set to 'undefined'",
+ "nillable" => false
+ }}
+ },
+ "read-children-resources" => {
+ "operation-name" => "read-children-resources",
+ "description" => "Reads information about all of a resource's children that are of a given type",
+ "request-properties" => {
+ "child-type" => {
+ "type" => STRING,
+ "description" => "The name of the resource under which to get the child resources",
+ "nillable" => false
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to get the children recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children resources",
+ "value-type" => OBJECT
+ }
+ },
+ "write-attribute" => {
+ "operation-name" => "write-attribute",
+ "description" => "Sets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to set the value for under the selected resource",
+ "nillable" => false
+ },
+ "value" => {
+ "type" => STRING,
+ "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
+ "nillable" => true,
+ "required" => false
+ }
+ }
+ }
+ },
+ "children" => {}
+ },
+ "plug-in" => {
+ "description" => "Configuration of a user store plug-in for use by the realm.",
+ "attributes" => {"name" => {
+ "type" => STRING,
+ "description" => "The short name of the plug-in (as registered) to use.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ }},
+ "operations" => {
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
+ "type" => STRING,
+ "description" => "The name of the node under which to get the children names",
+ "nillable" => false
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
+ },
+ "remove" => {
+ "operation-name" => "remove",
+ "description" => "Configuration of a user store plug-in for use by the realm.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "locale" => {
+ "type" => STRING,
+ "description" => "The locale to get the resource description in. If null, the default locale will be used",
+ "required" => false,
+ "nillable" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the resource"
+ }
+ },
+ "read-resource" => {
+ "operation-name" => "read-resource",
+ "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
+ "request-properties" => {
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The resource's attribute values along with information about any child resources"
+ }
+ },
+ "add" => {
+ "operation-name" => "add",
+ "description" => "Add the plug-in definition.",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The short name of the plug-in (as registered) to use.",
+ "expressions-allowed" => false,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ }},
+ "reply-properties" => {}
+ },
+ "read-attribute" => {
+ "operation-name" => "read-attribute",
+ "description" => "Gets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to get the value for under the selected resource",
+ "nillable" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The value of the attribute. The type will be that of the attribute found"
+ }
+ },
+ "whoami" => {
+ "operation-name" => "whoami",
+ "description" => "Returns the identity of the currently authenticated user.",
+ "request-properties" => {"verbose" => {
+ "type" => BOOLEAN,
+ "description" => "If set to true whoami also returns the users roles.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ }},
+ "reply-properties" => {}
+ },
+ "read-children-types" => {
+ "operation-name" => "read-children-types",
+ "description" => "Gets the type names of all the children under the selected resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children types",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-names" => {
+ "operation-name" => "read-operation-names",
+ "description" => "Gets the names of all the operations for the given resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "value-type" => STRING,
+ "description" => "The operation names"
+ }
+ },
+ "undefine-attribute" => {
+ "operation-name" => "undefine-attribute",
+ "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which should be set to 'undefined'",
+ "nillable" => false
+ }}
+ },
+ "read-children-resources" => {
+ "operation-name" => "read-children-resources",
+ "description" => "Reads information about all of a resource's children that are of a given type",
+ "request-properties" => {
+ "child-type" => {
+ "type" => STRING,
+ "description" => "The name of the resource under which to get the child resources",
+ "nillable" => false
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to get the children recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children resources",
+ "value-type" => OBJECT
+ }
+ },
+ "write-attribute" => {
+ "operation-name" => "write-attribute",
+ "description" => "Sets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to set the value for under the selected resource",
+ "nillable" => false
+ },
+ "value" => {
+ "type" => STRING,
+ "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
+ "nillable" => true,
+ "required" => false
+ }
+ }
+ }
+ },
+ "children" => {"property" => {
+ "description" => "A configuration property to be made available to the plug-in.",
+ "model-description" => {"*" => {
+ "description" => "A property within a security realm resource.",
+ "attributes" => {"value" => {
+ "type" => STRING,
+ "description" => "The optional value of the property.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "resource-services"
+ }},
+ "operations" => {
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
+ "type" => STRING,
+ "description" => "The name of the node under which to get the children names",
+ "nillable" => false
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
+ },
+ "remove" => {
+ "operation-name" => "remove",
+ "description" => "Remove the property definition.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "locale" => {
+ "type" => STRING,
+ "description" => "The locale to get the resource description in. If null, the default locale will be used",
+ "required" => false,
+ "nillable" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the resource"
+ }
+ },
+ "read-resource" => {
+ "operation-name" => "read-resource",
+ "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
+ "request-properties" => {
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The resource's attribute values along with information about any child resources"
+ }
+ },
+ "add" => {
+ "operation-name" => "add",
+ "description" => "Add a property definition.",
+ "request-properties" => {"value" => {
+ "type" => STRING,
+ "description" => "The optional value of the property.",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ }},
+ "reply-properties" => {}
+ },
+ "read-attribute" => {
+ "operation-name" => "read-attribute",
+ "description" => "Gets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to get the value for under the selected resource",
+ "nillable" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The value of the attribute. The type will be that of the attribute found"
+ }
+ },
+ "whoami" => {
+ "operation-name" => "whoami",
+ "description" => "Returns the identity of the currently authenticated user.",
+ "request-properties" => {"verbose" => {
+ "type" => BOOLEAN,
+ "description" => "If set to true whoami also returns the users roles.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ }},
+ "reply-properties" => {}
+ },
+ "read-children-types" => {
+ "operation-name" => "read-children-types",
+ "description" => "Gets the type names of all the children under the selected resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children types",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-names" => {
+ "operation-name" => "read-operation-names",
+ "description" => "Gets the names of all the operations for the given resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "value-type" => STRING,
+ "description" => "The operation names"
+ }
+ },
+ "undefine-attribute" => {
+ "operation-name" => "undefine-attribute",
+ "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which should be set to 'undefined'",
+ "nillable" => false
+ }}
+ },
+ "read-children-resources" => {
+ "operation-name" => "read-children-resources",
+ "description" => "Reads information about all of a resource's children that are of a given type",
+ "request-properties" => {
+ "child-type" => {
+ "type" => STRING,
+ "description" => "The name of the resource under which to get the child resources",
+ "nillable" => false
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to get the children recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children resources",
+ "value-type" => OBJECT
+ }
+ },
+ "write-attribute" => {
+ "operation-name" => "write-attribute",
+ "description" => "Sets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to set the value for under the selected resource",
+ "nillable" => false
+ },
+ "value" => {
+ "type" => STRING,
+ "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
+ "nillable" => true,
+ "required" => false
+ }
+ }
+ }
+ },
+ "children" => {}
+ }}
+ }}
+ }
+ }
+ },
+ "plug-in" => {
+ "description" => "An extension to the security realm allowing additional authentication / authorization modules to be loaded.",
+ "model-description" => {"*" => {
+ "description" => "An extension to the security realm allowing additional authentication / authorization modules to be loaded.",
+ "attributes" => {},
+ "operations" => {
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
+ "type" => STRING,
+ "description" => "The name of the node under which to get the children names",
+ "nillable" => false
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
+ },
+ "remove" => {
+ "operation-name" => "remove",
+ "description" => "Remove a plug-in from the security realm.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
},
"recursive-depth" => {
"type" => INT,
@@ -11436,27 +13231,8 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Adds a configuration to use a properties file to load a users roles.",
- "request-properties" => {
- "path" => {
- "type" => STRING,
- "description" => "The path of the properties file containing the users roles.",
- "expressions-allowed" => false,
- "required" => true,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L
- },
- "relative-to" => {
- "type" => STRING,
- "description" => "The name of another previously named path, or of one of the standard paths provided by the system. If 'relative-to' is provided, the value of the 'path' attribute is treated as relative to the path specified by this attribute.",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
- }
- },
+ "description" => "Add a plug-in to the security realm.",
+ "request-properties" => {},
"reply-properties" => {}
},
"read-attribute" => {
@@ -15068,6 +16844,7 @@
"description" => "Number of the port to which the socket should be bound.",
"expressions-allowed" => true,
"nillable" => true,
+ "default" => 0,
"min" => 0L,
"max" => 65535L,
"access-type" => "read-write",
@@ -16716,7 +18493,92 @@
"model-description" => {
"web" => {
"description" => "Runtime resources exposed by web components in the deployment.",
- "attributes" => {},
+ "attributes" => {
+ "expired-sessions" => {
+ "type" => INT,
+ "description" => "Number of sessions that have expired",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ },
+ "rejected-sessions" => {
+ "type" => INT,
+ "description" => "Number of rejected sessions",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ },
+ "max-active-sessions" => {
+ "type" => INT,
+ "description" => "Max number of concurrent active sessions",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ },
+ "session-max-alive-time" => {
+ "type" => INT,
+ "description" => "The longest time (in seconds) that an expired session had been alive",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ },
+ "sessions-created" => {
+ "type" => INT,
+ "description" => "Total sessions created",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ },
+ "session-avg-alive-time" => {
+ "type" => INT,
+ "description" => "Average time (in seconds) that expired sessions had been alive",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ },
+ "context-root" => {
+ "type" => STRING,
+ "description" => "The context root of the web application",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-only",
+ "storage" => "runtime"
+ },
+ "virtual-host" => {
+ "type" => STRING,
+ "description" => "The name of the virtual host on which the web application is served",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-only",
+ "storage" => "runtime"
+ },
+ "active-sessions" => {
+ "type" => INT,
+ "description" => "Number of active sessions",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ },
+ "duplicated-session-ids" => {
+ "type" => INT,
+ "description" => "Number of duplicated session IDs generated by the random source (anything bigger than 0 means problems)",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ }
+ },
"operations" => {
"whoami" => {
"operation-name" => "whoami",
@@ -17538,151 +19400,189 @@
"tail-comment-allowed" => true,
"attributes" => {
"xa-datasource-class" => {
- "description" => "The fully qualified name of the javax.sql.XADataSource implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified name of the javax.sql.XADataSource implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"jndi-name" => {
- "description" => "Specifies the JNDI name for the datasource",
"type" => STRING,
- "required" => true,
+ "description" => "Specifies the JNDI name for the datasource",
+ "expressions-allowed" => true,
+ "nillable" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"driver-name" => {
- "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
"type" => STRING,
- "required" => true,
+ "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"new-connection-sql" => {
- "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"url-delimiter" => {
- "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"url-selector-strategy-class-name" => {
- "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
"type" => STRING,
- "required" => false,
+ "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-java-context" => {
- "description" => "Setting this to false will bind the datasource into global JNDI",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Setting this to false will bind the datasource into global JNDI",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"max-pool-size" => {
- "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
"type" => INT,
- "required" => false,
- "default" => "20",
+ "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 20,
"access-type" => "read-only",
"storage" => "runtime"
},
"min-pool-size" => {
- "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
"type" => INT,
- "required" => false,
- "default" => "0",
+ "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 0,
"access-type" => "read-only",
"storage" => "runtime"
},
"pool-prefill" => {
- "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"pool-use-strict-min" => {
- "description" => "Specifies if the min-pool-size should be considered strictly",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Specifies if the min-pool-size should be considered strictly",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"interleaving" => {
- "description" => "An element to enable interleaving for XA connections",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "An element to enable interleaving for XA connections",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"no-tx-separate-pool" => {
- "description" => "Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different contexts",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different contexts",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"pad-xid" => {
- "description" => "Should the Xid be padded",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Should the Xid be padded",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"same-rm-override" => {
- "description" => "The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false",
"type" => BOOLEAN,
- "required" => false,
+ "description" => "The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"wrap-xa-resource" => {
- "description" => "Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"user-name" => {
- "description" => "Specify the user name used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specify the user name used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"password" => {
- "description" => "Specifies the password used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the password used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"security-domain" => {
- "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"reauth-plugin-class-name" => {
- "description" => "The fully qualified class name of the reauthentication plugin implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified class name of the reauthentication plugin implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -17695,104 +19595,136 @@
"storage" => "runtime"
},
"flush-strategy" => {
- "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
"type" => STRING,
- "required" => false,
- "default" => "\"FailingConnectionOnly\"",
+ "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "FailingConnectionOnly",
+ "access-type" => "read-only",
+ "storage" => "runtime"
+ },
+ "allow-multiple-users" => {
+ "type" => BOOLEAN,
+ "description" => "Specifies if multiple users will access the datasource through the getConnection(user, password) method and hence if the internal pool type should account for that",
+ "expressions-allowed" => false,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"prepared-statements-cache-size" => {
- "description" => "The number of prepared statements per connection in an LRU cache",
"type" => LONG,
- "required" => false,
+ "description" => "The number of prepared statements per connection in an LRU cache",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"share-prepared-statements" => {
- "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"track-statements" => {
- "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
"type" => STRING,
- "required" => false,
- "default" => "\"NOWARN\"",
+ "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "NOWARN",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"allocation-retry" => {
- "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
"type" => INT,
- "required" => false,
+ "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"allocation-retry-wait-millis" => {
- "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
"type" => LONG,
- "required" => false,
+ "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"blocking-timeout-wait-millis" => {
- "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
"type" => LONG,
- "required" => false,
+ "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
"access-type" => "read-only",
"storage" => "runtime"
},
"idle-timeout-minutes" => {
- "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => LONG,
- "required" => false,
+ "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MINUTES",
"access-type" => "read-only",
"storage" => "runtime"
},
"query-timeout" => {
- "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-try-lock" => {
- "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"set-tx-query-timeout" => {
- "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"transaction-isolation" => {
- "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
"type" => STRING,
- "required" => false,
+ "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"check-valid-connection-sql" => {
- "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"exception-sorter-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -17805,9 +19737,12 @@
"storage" => "runtime"
},
"stale-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -17820,9 +19755,12 @@
"storage" => "runtime"
},
"valid-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -17835,84 +19773,106 @@
"storage" => "runtime"
},
"background-validation-millis" => {
- "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
"type" => LONG,
- "required" => false,
+ "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
+ "min" => 1L,
+ "max" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"background-validation" => {
- "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-fast-fail" => {
- "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"validate-on-match" => {
- "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"xa-resource-timeout" => {
- "description" => "The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero",
"type" => INT,
- "required" => false,
+ "description" => "The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"spy" => {
- "description" => "Enable spying of SQL statements",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Enable spying of SQL statements",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-ccm" => {
- "description" => "Enable the use of a cached connection manager",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable the use of a cached connection manager",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"recovery-username" => {
- "description" => "The user name used for recovery",
"type" => STRING,
- "required" => false,
+ "description" => "The user name used for recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"recovery-password" => {
- "description" => "The password used for recovery",
"type" => STRING,
- "required" => false,
+ "description" => "The password used for recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"recovery-security-domain" => {
- "description" => "The security domain used for recovery",
"type" => STRING,
- "required" => false,
+ "description" => "The security domain used for recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"recovery-plugin-class-name" => {
- "description" => "The fully qualified class name of the recovery plugin implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified class name of the recovery plugin implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -17925,23 +19885,28 @@
"storage" => "runtime"
},
"no-recovery" => {
- "description" => "Specifies if the connection pool should be excluded from recovery",
"type" => BOOLEAN,
- "required" => false,
+ "description" => "Specifies if the connection pool should be excluded from recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"jta" => {
- "description" => "Enable JTA integration",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable JTA integration",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"enabled" => {
- "description" => "Specifies if the datasource should be enabled",
"type" => BOOLEAN,
+ "description" => "Specifies if the datasource should be enabled",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "configuration"
}
@@ -18492,134 +20457,174 @@
"tail-comment-allowed" => true,
"attributes" => {
"connection-url" => {
- "description" => "The JDBC driver connection URL",
"type" => STRING,
- "required" => true,
+ "description" => "The JDBC driver connection URL",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"driver-class" => {
- "description" => "The fully qualified name of the JDBC driver class",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified name of the JDBC driver class",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"datasource-class" => {
- "description" => "The fully qualified name of the JDBC datasource class",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified name of the JDBC datasource class",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"jndi-name" => {
- "description" => "Specifies the JNDI name for the datasource",
"type" => STRING,
- "required" => true,
+ "description" => "Specifies the JNDI name for the datasource",
+ "expressions-allowed" => true,
+ "nillable" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"driver-name" => {
- "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
"type" => STRING,
- "required" => true,
+ "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"new-connection-sql" => {
- "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"url-delimiter" => {
- "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"url-selector-strategy-class-name" => {
- "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
"type" => STRING,
- "required" => false,
+ "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-java-context" => {
- "description" => "Setting this to false will bind the datasource into global JNDI",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Setting this to false will bind the datasource into global JNDI",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"jta" => {
- "description" => "Enable JTA integration",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable JTA integration",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"max-pool-size" => {
- "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
"type" => INT,
- "required" => false,
- "default" => "20",
+ "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 20,
"access-type" => "read-only",
"storage" => "runtime"
},
"min-pool-size" => {
- "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
"type" => INT,
- "required" => false,
- "default" => "0",
+ "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 0,
"access-type" => "read-only",
"storage" => "runtime"
},
"pool-prefill" => {
- "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"pool-use-strict-min" => {
- "description" => "Specifies if the min-pool-size should be considered strictly",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Specifies if the min-pool-size should be considered strictly",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"user-name" => {
- "description" => "Specify the user name used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specify the user name used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"password" => {
- "description" => "Specifies the password used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the password used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"security-domain" => {
- "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"reauth-plugin-class-name" => {
- "description" => "The fully qualified class name of the reauthentication plugin implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified class name of the reauthentication plugin implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -18632,104 +20637,136 @@
"storage" => "runtime"
},
"flush-strategy" => {
- "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
"type" => STRING,
- "required" => false,
- "default" => "\"FailingConnectionOnly\"",
+ "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "FailingConnectionOnly",
+ "access-type" => "read-only",
+ "storage" => "runtime"
+ },
+ "allow-multiple-users" => {
+ "type" => BOOLEAN,
+ "description" => "Specifies if multiple users will access the datasource through the getConnection(user, password) method and hence if the internal pool type should account for that",
+ "expressions-allowed" => false,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"prepared-statements-cache-size" => {
- "description" => "The number of prepared statements per connection in an LRU cache",
"type" => LONG,
- "required" => false,
+ "description" => "The number of prepared statements per connection in an LRU cache",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"share-prepared-statements" => {
- "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"track-statements" => {
- "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
"type" => STRING,
- "required" => false,
- "default" => "\"NOWARN\"",
+ "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "NOWARN",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"allocation-retry" => {
- "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
"type" => INT,
- "required" => false,
+ "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"allocation-retry-wait-millis" => {
- "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
"type" => LONG,
- "required" => false,
+ "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"blocking-timeout-wait-millis" => {
- "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
"type" => LONG,
- "required" => false,
+ "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
"access-type" => "read-only",
"storage" => "runtime"
},
"idle-timeout-minutes" => {
- "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => LONG,
- "required" => false,
+ "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MINUTES",
"access-type" => "read-only",
"storage" => "runtime"
},
"query-timeout" => {
- "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-try-lock" => {
- "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"set-tx-query-timeout" => {
- "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"transaction-isolation" => {
- "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
"type" => STRING,
- "required" => false,
+ "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"check-valid-connection-sql" => {
- "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"exception-sorter-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -18742,9 +20779,12 @@
"storage" => "runtime"
},
"stale-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -18757,9 +20797,12 @@
"storage" => "runtime"
},
"valid-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -18772,55 +20815,67 @@
"storage" => "runtime"
},
"background-validation-millis" => {
- "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
"type" => LONG,
- "required" => false,
+ "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
+ "min" => 1L,
+ "max" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"background-validation" => {
- "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-fast-fail" => {
- "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"validate-on-match" => {
- "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"spy" => {
- "description" => "Enable spying of SQL statements",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Enable spying of SQL statements",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-ccm" => {
- "description" => "Enable the use of a cached connection manager",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable the use of a cached connection manager",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"enabled" => {
- "description" => "Specifies if the datasource should be enabled",
"type" => BOOLEAN,
+ "description" => "Specifies if the datasource should be enabled",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "configuration"
}
@@ -27814,7 +29869,92 @@
"model-description" => {
"web" => {
"description" => "Runtime resources exposed by web components in the deployment.",
- "attributes" => {},
+ "attributes" => {
+ "expired-sessions" => {
+ "type" => INT,
+ "description" => "Number of sessions that have expired",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ },
+ "rejected-sessions" => {
+ "type" => INT,
+ "description" => "Number of rejected sessions",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ },
+ "max-active-sessions" => {
+ "type" => INT,
+ "description" => "Max number of concurrent active sessions",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ },
+ "session-max-alive-time" => {
+ "type" => INT,
+ "description" => "The longest time (in seconds) that an expired session had been alive",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ },
+ "sessions-created" => {
+ "type" => INT,
+ "description" => "Total sessions created",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ },
+ "session-avg-alive-time" => {
+ "type" => INT,
+ "description" => "Average time (in seconds) that expired sessions had been alive",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ },
+ "context-root" => {
+ "type" => STRING,
+ "description" => "The context root of the web application",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-only",
+ "storage" => "runtime"
+ },
+ "virtual-host" => {
+ "type" => STRING,
+ "description" => "The name of the virtual host on which the web application is served",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-only",
+ "storage" => "runtime"
+ },
+ "active-sessions" => {
+ "type" => INT,
+ "description" => "Number of active sessions",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ },
+ "duplicated-session-ids" => {
+ "type" => INT,
+ "description" => "Number of duplicated session IDs generated by the random source (anything bigger than 0 means problems)",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "metric",
+ "storage" => "runtime"
+ }
+ },
"operations" => {
"whoami" => {
"operation-name" => "whoami",
@@ -28636,151 +30776,189 @@
"tail-comment-allowed" => true,
"attributes" => {
"xa-datasource-class" => {
- "description" => "The fully qualified name of the javax.sql.XADataSource implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified name of the javax.sql.XADataSource implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"jndi-name" => {
- "description" => "Specifies the JNDI name for the datasource",
"type" => STRING,
- "required" => true,
+ "description" => "Specifies the JNDI name for the datasource",
+ "expressions-allowed" => true,
+ "nillable" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"driver-name" => {
- "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
"type" => STRING,
- "required" => true,
+ "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"new-connection-sql" => {
- "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"url-delimiter" => {
- "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"url-selector-strategy-class-name" => {
- "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
"type" => STRING,
- "required" => false,
+ "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-java-context" => {
- "description" => "Setting this to false will bind the datasource into global JNDI",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Setting this to false will bind the datasource into global JNDI",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"max-pool-size" => {
- "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
"type" => INT,
- "required" => false,
- "default" => "20",
+ "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 20,
"access-type" => "read-only",
"storage" => "runtime"
},
"min-pool-size" => {
- "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
"type" => INT,
- "required" => false,
- "default" => "0",
+ "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 0,
"access-type" => "read-only",
"storage" => "runtime"
},
"pool-prefill" => {
- "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"pool-use-strict-min" => {
- "description" => "Specifies if the min-pool-size should be considered strictly",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Specifies if the min-pool-size should be considered strictly",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"interleaving" => {
- "description" => "An element to enable interleaving for XA connections",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "An element to enable interleaving for XA connections",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"no-tx-separate-pool" => {
- "description" => "Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different contexts",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different contexts",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"pad-xid" => {
- "description" => "Should the Xid be padded",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Should the Xid be padded",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"same-rm-override" => {
- "description" => "The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false",
"type" => BOOLEAN,
- "required" => false,
+ "description" => "The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"wrap-xa-resource" => {
- "description" => "Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"user-name" => {
- "description" => "Specify the user name used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specify the user name used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"password" => {
- "description" => "Specifies the password used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the password used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"security-domain" => {
- "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"reauth-plugin-class-name" => {
- "description" => "The fully qualified class name of the reauthentication plugin implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified class name of the reauthentication plugin implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -28793,104 +30971,136 @@
"storage" => "runtime"
},
"flush-strategy" => {
- "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
"type" => STRING,
- "required" => false,
- "default" => "\"FailingConnectionOnly\"",
+ "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "FailingConnectionOnly",
+ "access-type" => "read-only",
+ "storage" => "runtime"
+ },
+ "allow-multiple-users" => {
+ "type" => BOOLEAN,
+ "description" => "Specifies if multiple users will access the datasource through the getConnection(user, password) method and hence if the internal pool type should account for that",
+ "expressions-allowed" => false,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"prepared-statements-cache-size" => {
- "description" => "The number of prepared statements per connection in an LRU cache",
"type" => LONG,
- "required" => false,
+ "description" => "The number of prepared statements per connection in an LRU cache",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"share-prepared-statements" => {
- "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"track-statements" => {
- "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
"type" => STRING,
- "required" => false,
- "default" => "\"NOWARN\"",
+ "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "NOWARN",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"allocation-retry" => {
- "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
"type" => INT,
- "required" => false,
+ "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"allocation-retry-wait-millis" => {
- "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
"type" => LONG,
- "required" => false,
+ "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"blocking-timeout-wait-millis" => {
- "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
"type" => LONG,
- "required" => false,
+ "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
"access-type" => "read-only",
"storage" => "runtime"
},
"idle-timeout-minutes" => {
- "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => LONG,
- "required" => false,
+ "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MINUTES",
"access-type" => "read-only",
"storage" => "runtime"
},
"query-timeout" => {
- "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-try-lock" => {
- "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"set-tx-query-timeout" => {
- "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"transaction-isolation" => {
- "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
"type" => STRING,
- "required" => false,
+ "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"check-valid-connection-sql" => {
- "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"exception-sorter-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -28903,9 +31113,12 @@
"storage" => "runtime"
},
"stale-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -28918,9 +31131,12 @@
"storage" => "runtime"
},
"valid-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -28933,84 +31149,106 @@
"storage" => "runtime"
},
"background-validation-millis" => {
- "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
"type" => LONG,
- "required" => false,
+ "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
+ "min" => 1L,
+ "max" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"background-validation" => {
- "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-fast-fail" => {
- "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"validate-on-match" => {
- "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"xa-resource-timeout" => {
- "description" => "The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero",
"type" => INT,
- "required" => false,
+ "description" => "The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"spy" => {
- "description" => "Enable spying of SQL statements",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Enable spying of SQL statements",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-ccm" => {
- "description" => "Enable the use of a cached connection manager",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable the use of a cached connection manager",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"recovery-username" => {
- "description" => "The user name used for recovery",
"type" => STRING,
- "required" => false,
+ "description" => "The user name used for recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"recovery-password" => {
- "description" => "The password used for recovery",
"type" => STRING,
- "required" => false,
+ "description" => "The password used for recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"recovery-security-domain" => {
- "description" => "The security domain used for recovery",
"type" => STRING,
- "required" => false,
+ "description" => "The security domain used for recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"recovery-plugin-class-name" => {
- "description" => "The fully qualified class name of the recovery plugin implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified class name of the recovery plugin implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -29023,23 +31261,28 @@
"storage" => "runtime"
},
"no-recovery" => {
- "description" => "Specifies if the connection pool should be excluded from recovery",
"type" => BOOLEAN,
- "required" => false,
+ "description" => "Specifies if the connection pool should be excluded from recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"jta" => {
- "description" => "Enable JTA integration",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable JTA integration",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"enabled" => {
- "description" => "Specifies if the datasource should be enabled",
"type" => BOOLEAN,
+ "description" => "Specifies if the datasource should be enabled",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "configuration"
}
@@ -29590,134 +31833,174 @@
"tail-comment-allowed" => true,
"attributes" => {
"connection-url" => {
- "description" => "The JDBC driver connection URL",
"type" => STRING,
- "required" => true,
+ "description" => "The JDBC driver connection URL",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"driver-class" => {
- "description" => "The fully qualified name of the JDBC driver class",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified name of the JDBC driver class",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"datasource-class" => {
- "description" => "The fully qualified name of the JDBC datasource class",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified name of the JDBC datasource class",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"jndi-name" => {
- "description" => "Specifies the JNDI name for the datasource",
"type" => STRING,
- "required" => true,
+ "description" => "Specifies the JNDI name for the datasource",
+ "expressions-allowed" => true,
+ "nillable" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"driver-name" => {
- "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
"type" => STRING,
- "required" => true,
+ "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"new-connection-sql" => {
- "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"url-delimiter" => {
- "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"url-selector-strategy-class-name" => {
- "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
"type" => STRING,
- "required" => false,
+ "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-java-context" => {
- "description" => "Setting this to false will bind the datasource into global JNDI",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Setting this to false will bind the datasource into global JNDI",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"jta" => {
- "description" => "Enable JTA integration",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable JTA integration",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"max-pool-size" => {
- "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
"type" => INT,
- "required" => false,
- "default" => "20",
+ "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 20,
"access-type" => "read-only",
"storage" => "runtime"
},
"min-pool-size" => {
- "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
"type" => INT,
- "required" => false,
- "default" => "0",
+ "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 0,
"access-type" => "read-only",
"storage" => "runtime"
},
"pool-prefill" => {
- "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"pool-use-strict-min" => {
- "description" => "Specifies if the min-pool-size should be considered strictly",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Specifies if the min-pool-size should be considered strictly",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"user-name" => {
- "description" => "Specify the user name used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specify the user name used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"password" => {
- "description" => "Specifies the password used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the password used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"security-domain" => {
- "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"reauth-plugin-class-name" => {
- "description" => "The fully qualified class name of the reauthentication plugin implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified class name of the reauthentication plugin implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -29730,104 +32013,136 @@
"storage" => "runtime"
},
"flush-strategy" => {
- "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
"type" => STRING,
- "required" => false,
- "default" => "\"FailingConnectionOnly\"",
+ "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "FailingConnectionOnly",
+ "access-type" => "read-only",
+ "storage" => "runtime"
+ },
+ "allow-multiple-users" => {
+ "type" => BOOLEAN,
+ "description" => "Specifies if multiple users will access the datasource through the getConnection(user, password) method and hence if the internal pool type should account for that",
+ "expressions-allowed" => false,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"prepared-statements-cache-size" => {
- "description" => "The number of prepared statements per connection in an LRU cache",
"type" => LONG,
- "required" => false,
+ "description" => "The number of prepared statements per connection in an LRU cache",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"share-prepared-statements" => {
- "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"track-statements" => {
- "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
"type" => STRING,
- "required" => false,
- "default" => "\"NOWARN\"",
+ "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "NOWARN",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"allocation-retry" => {
- "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
"type" => INT,
- "required" => false,
+ "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"allocation-retry-wait-millis" => {
- "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
"type" => LONG,
- "required" => false,
+ "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"blocking-timeout-wait-millis" => {
- "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
"type" => LONG,
- "required" => false,
+ "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
"access-type" => "read-only",
"storage" => "runtime"
},
"idle-timeout-minutes" => {
- "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => LONG,
- "required" => false,
+ "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MINUTES",
"access-type" => "read-only",
"storage" => "runtime"
},
"query-timeout" => {
- "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-try-lock" => {
- "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"set-tx-query-timeout" => {
- "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"transaction-isolation" => {
- "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
"type" => STRING,
- "required" => false,
+ "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"check-valid-connection-sql" => {
- "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"exception-sorter-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -29840,9 +32155,12 @@
"storage" => "runtime"
},
"stale-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -29855,9 +32173,12 @@
"storage" => "runtime"
},
"valid-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
@@ -29870,55 +32191,67 @@
"storage" => "runtime"
},
"background-validation-millis" => {
- "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
"type" => LONG,
- "required" => false,
+ "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
+ "min" => 1L,
+ "max" => 2147483647L,
"access-type" => "read-only",
"storage" => "runtime"
},
"background-validation" => {
- "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-fast-fail" => {
- "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"validate-on-match" => {
- "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"spy" => {
- "description" => "Enable spying of SQL statements",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Enable spying of SQL statements",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "runtime"
},
"use-ccm" => {
- "description" => "Enable the use of a cached connection manager",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable the use of a cached connection manager",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-only",
"storage" => "runtime"
},
"enabled" => {
- "description" => "Specifies if the datasource should be enabled",
"type" => BOOLEAN,
+ "description" => "Specifies if the datasource should be enabled",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "configuration"
}
@@ -41705,21 +44038,47 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "queue-max" => {
+ "support-ssl" => {
+ "type" => STRING,
+ "description" => "Indicates whether SSL is to be supported (on) or not (off).",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "off",
+ "allowed" => [
+ "on",
+ "off"
+ ],
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "socket-binding" => {
+ "type" => STRING,
+ "description" => "The name of the socket binding configuration that specifies the ORB port.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "jacorb",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "pool-size" => {
"type" => INT,
- "description" => "The maximum number of requests that can be queued.",
+ "description" => "The size of the request processors thread-pool. Threads that finish processing a request are placed back in the pool if the pool is not full and discarded otherwise.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => 100,
+ "default" => 5,
"min" => 1L,
- "max" => 200L,
+ "max" => 100L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "support-ssl" => {
+ "cache-poa-names" => {
"type" => STRING,
- "description" => "Indicates whether SSL is to be supported (on) or not (off).",
+ "description" => "Indicates whether POA names should be cached (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
"default" => "off",
@@ -41731,12 +44090,12 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "print-version" => {
+ "add-component-via-interceptor" => {
"type" => STRING,
- "description" => "Indicates whether the version number should be printed during ORB startup (on) or not (off).",
+ "description" => "Indicates whether SSL components should be added by an IOR interceptor (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "off",
+ "default" => "on",
"allowed" => [
"on",
"off"
@@ -41745,9 +44104,21 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "server-timeout" => {
+ "max-managed-buf-size" => {
"type" => INT,
- "description" => "The server-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
+ "description" => "The log2 of maximum size managed by the internal buffer manager.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => 24,
+ "min" => 0L,
+ "max" => 64L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "client-timeout" => {
+ "type" => INT,
+ "description" => "The client-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
"expressions-allowed" => false,
"nillable" => true,
"default" => 0,
@@ -41757,9 +44128,25 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "security" => {
+ "server-supports" => {
"type" => STRING,
- "description" => "Indicates whether the security interceptors are to be installed (on) or not (off).",
+ "description" => "Value that indicates the server SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "MutualAuth",
+ "allowed" => [
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
+ ],
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "queue-wait" => {
+ "type" => STRING,
+ "description" => "Indicates whether requests that exceed the maximum queue size should wait (on) or not (off). When disabled, a TRANSIENT exception is thrown if the queue is full.",
"expressions-allowed" => false,
"nillable" => true,
"default" => "off",
@@ -41771,24 +44158,24 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "pool-size" => {
+ "giop-minor-version" => {
"type" => INT,
- "description" => "The size of the request processors thread-pool. Threads that finish processing a request are placed back in the pool if the pool is not full and discarded otherwise.",
+ "description" => "The GIOP minor version to be used.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => 5,
+ "default" => 2,
"min" => 1L,
- "max" => 100L,
+ "max" => 2L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "sun" => {
+ "monitoring" => {
"type" => STRING,
- "description" => "Indicates whether interoperability with Sun's ORB is enabled (on) or not (off).",
+ "description" => "Indicates whether the monitoring GUI should be displayed (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "on",
+ "default" => "off",
"allowed" => [
"on",
"off"
@@ -41797,37 +44184,63 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "lax-boolean-encoding" => {
+ "server-requires" => {
"type" => STRING,
- "description" => "Indicates whether any non-zero CDR encoded boolean value should be interpreted as true (on) or not (off).",
+ "description" => "Value that indicates the server SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "off",
+ "default" => "None",
"allowed" => [
- "on",
- "off"
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
],
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "cache-poa-names" => {
+ "client-supports" => {
"type" => STRING,
- "description" => "Indicates whether POA names should be cached (on) or not (off).",
+ "description" => "Value that indicates the client SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "off",
+ "default" => "MutualAuth",
"allowed" => [
- "on",
- "off"
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
],
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "strict-check-on-tc-creation" => {
+ "properties" => {
+ "type" => OBJECT,
+ "description" => "A list of generic key/value properties.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "value-type" => STRING,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
+ "root-context" => {
"type" => STRING,
- "description" => "Indicates whether the method create_abstract_interface_tc should perform a validation check on the name parameter (on) or not (off).",
+ "description" => "The naming service root context.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "JBoss/Naming/root",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "comet" => {
+ "type" => STRING,
+ "description" => "Indicates whether interoperability with Comet's ORB is enabled (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
"default" => "off",
@@ -41839,47 +44252,49 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "max-managed-buf-size" => {
- "type" => INT,
- "description" => "The log2 of maximum size managed by the internal buffer manager.",
+ "ssl-socket-binding" => {
+ "type" => STRING,
+ "description" => "The name of the socket binding configuration that specifies the ORB SSL port.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => 24,
- "min" => 0L,
- "max" => 64L,
+ "default" => "jacorb-ssl",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "add-component-via-interceptor" => {
+ "client-requires" => {
"type" => STRING,
- "description" => "Indicates whether SSL components should be added by an IOR interceptor (on) or not (off).",
+ "description" => "Value that indicates the client SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "on",
+ "default" => "None",
"allowed" => [
- "on",
- "off"
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
],
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "client-timeout" => {
+ "max-server-connections" => {
"type" => INT,
- "description" => "The client-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
+ "description" => "The maximum number of connections accepted by the server.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => 0,
+ "default" => 2147483647,
"min" => 0L,
"max" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "use-imr" => {
+ "iona" => {
"type" => STRING,
- "description" => "Indicates whether the implementation repository should be used (on) or not (off).",
+ "description" => "Indicates whether interoperability with IONA's ASP is enabled (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
"default" => "off",
@@ -41891,33 +44306,35 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "name" => {
+ "chunk-custom-rmi-valuetypes" => {
"type" => STRING,
- "description" => "The name of the running ORB.",
+ "description" => "Indicates whether custom RMI valuetypes should be encoded as chunks (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "JBoss",
- "min-length" => 1L,
- "max-length" => 2147483647L,
+ "default" => "on",
+ "allowed" => [
+ "on",
+ "off"
+ ],
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "max-threads" => {
+ "queue-max" => {
"type" => INT,
- "description" => "The maximum number of active request processor threads. Threads are first obtained from the pool and once the pool is exhausted new threads are created until the number of threads reaches this limit. New requests will wait until an active thread finishes its job.",
+ "description" => "The maximum number of requests that can be queued.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => 32,
- "min" => 5L,
- "max" => 150L,
+ "default" => 100,
+ "min" => 1L,
+ "max" => 200L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "use-bom" => {
+ "print-version" => {
"type" => STRING,
- "description" => "Indicates whether GIOP 1.2 byte order markers should be used (on) or not (off).",
+ "description" => "Indicates whether the version number should be printed during ORB startup (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
"default" => "off",
@@ -41929,25 +44346,21 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "server-supports" => {
- "type" => STRING,
- "description" => "Value that indicates the server SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "server-timeout" => {
+ "type" => INT,
+ "description" => "The server-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "MutualAuth",
- "allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
- ],
+ "default" => 0,
+ "min" => 0L,
+ "max" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "queue-wait" => {
+ "security" => {
"type" => STRING,
- "description" => "Indicates whether requests that exceed the maximum queue size should wait (on) or not (off). When disabled, a TRANSIENT exception is thrown if the queue is full.",
+ "description" => "Indicates whether the security interceptors are to be installed (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
"default" => "off",
@@ -41959,21 +44372,23 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "giop-minor-version" => {
- "type" => INT,
- "description" => "The GIOP minor version to be used.",
+ "sun" => {
+ "type" => STRING,
+ "description" => "Indicates whether interoperability with Sun's ORB is enabled (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
- "default" => 2,
- "min" => 1L,
- "max" => 2L,
+ "default" => "on",
+ "allowed" => [
+ "on",
+ "off"
+ ],
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "cache-typecodes" => {
+ "lax-boolean-encoding" => {
"type" => STRING,
- "description" => "Indicates whether typecodes should be cached (on) or not (off).",
+ "description" => "Indicates whether any non-zero CDR encoded boolean value should be interpreted as true (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
"default" => "off",
@@ -41985,9 +44400,9 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "monitoring" => {
+ "strict-check-on-tc-creation" => {
"type" => STRING,
- "description" => "Indicates whether the monitoring GUI should be displayed (on) or not (off).",
+ "description" => "Indicates whether the method create_abstract_interface_tc should perform a validation check on the name parameter (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
"default" => "off",
@@ -41999,108 +44414,106 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "server-requires" => {
+ "use-imr" => {
"type" => STRING,
- "description" => "Value that indicates the server SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "description" => "Indicates whether the implementation repository should be used (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "None",
+ "default" => "off",
"allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
+ "on",
+ "off"
],
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "indirection-encoding-disable" => {
+ "name" => {
"type" => STRING,
- "description" => "Indicates whether indirection encoding for repeated typecodes should be disabled (on) or not (off).",
+ "description" => "The name of the running ORB.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "off",
- "allowed" => [
- "on",
- "off"
- ],
+ "default" => "JBoss",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "queue-min" => {
+ "max-threads" => {
"type" => INT,
- "description" => "The size of the queue for notifying waiting requests. In other words, blocked requests are only notified when the queue has no more than queue-min requests.",
+ "description" => "The maximum number of active request processor threads. Threads are first obtained from the pool and once the pool is exhausted new threads are created until the number of threads reaches this limit. New requests will wait until an active thread finishes its job.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => 10,
- "min" => 1L,
- "max" => 100L,
+ "default" => 32,
+ "min" => 5L,
+ "max" => 150L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "client-supports" => {
+ "use-bom" => {
"type" => STRING,
- "description" => "Value that indicates the client SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "description" => "Indicates whether GIOP 1.2 byte order markers should be used (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "MutualAuth",
+ "default" => "off",
"allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
+ "on",
+ "off"
],
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "properties" => {
- "type" => OBJECT,
- "description" => "A list of generic key/value properties.",
+ "cache-typecodes" => {
+ "type" => STRING,
+ "description" => "Indicates whether typecodes should be cached (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
- "value-type" => STRING,
+ "default" => "off",
+ "allowed" => [
+ "on",
+ "off"
+ ],
"access-type" => "read-write",
"storage" => "configuration",
- "restart-required" => "no-services"
+ "restart-required" => "all-services"
},
- "root-context" => {
+ "indirection-encoding-disable" => {
"type" => STRING,
- "description" => "The naming service root context.",
+ "description" => "Indicates whether indirection encoding for repeated typecodes should be disabled (on) or not (off).",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "JBoss/Naming/root",
- "min-length" => 1L,
- "max-length" => 2147483647L,
+ "default" => "off",
+ "allowed" => [
+ "on",
+ "off"
+ ],
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "retry-interval" => {
+ "queue-min" => {
"type" => INT,
- "description" => "The interval in milliseconds between retries.",
+ "description" => "The size of the queue for notifying waiting requests. In other words, blocked requests are only notified when the queue has no more than queue-min requests.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => 500,
- "min" => 0L,
- "max" => 2147483647L,
+ "default" => 10,
+ "min" => 1L,
+ "max" => 100L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
},
- "comet" => {
- "type" => STRING,
- "description" => "Indicates whether interoperability with Comet's ORB is enabled (on) or not (off).",
+ "retry-interval" => {
+ "type" => INT,
+ "description" => "The interval in milliseconds between retries.",
"expressions-allowed" => false,
"nillable" => true,
- "default" => "off",
- "allowed" => [
- "on",
- "off"
- ],
+ "default" => 500,
+ "min" => 0L,
+ "max" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
@@ -42140,22 +44553,6 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "client-requires" => {
- "type" => STRING,
- "description" => "Value that indicates the client SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => "None",
- "allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
- ],
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
"retries" => {
"type" => INT,
"description" => "The number of retries if connections cannot be promptly established.",
@@ -42168,46 +44565,6 @@
"storage" => "configuration",
"restart-required" => "all-services"
},
- "max-server-connections" => {
- "type" => INT,
- "description" => "The maximum number of connections accepted by the server.",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => 2147483647,
- "min" => 0L,
- "max" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
- "iona" => {
- "type" => STRING,
- "description" => "Indicates whether interoperability with IONA's ASP is enabled (on) or not (off).",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => "off",
- "allowed" => [
- "on",
- "off"
- ],
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
- "chunk-custom-rmi-valuetypes" => {
- "type" => STRING,
- "description" => "Indicates whether custom RMI valuetypes should be encoded as chunks (on) or not (off).",
- "expressions-allowed" => false,
- "nillable" => true,
- "default" => "on",
- "allowed" => [
- "on",
- "off"
- ],
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
"export-corbaloc" => {
"type" => STRING,
"description" => "Indicates whether the root context should be exported as corbaloc::address:port/NameService (on) or not (off).",
@@ -42372,18 +44729,38 @@
"spec"
]
},
- "queue-max" => {
+ "support-ssl" => {
+ "type" => STRING,
+ "description" => "Indicates whether SSL is to be supported (on) or not (off).",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "allowed" => [
+ "on",
+ "off"
+ ]
+ },
+ "socket-binding" => {
+ "type" => STRING,
+ "description" => "The name of the socket binding configuration that specifies the ORB port.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "pool-size" => {
"type" => INT,
- "description" => "The maximum number of requests that can be queued.",
+ "description" => "The size of the request processors thread-pool. Threads that finish processing a request are placed back in the pool if the pool is not full and discarded otherwise.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"min" => 1L,
- "max" => 200L
+ "max" => 100L
},
- "support-ssl" => {
+ "cache-poa-names" => {
"type" => STRING,
- "description" => "Indicates whether SSL is to be supported (on) or not (off).",
+ "description" => "Indicates whether POA names should be cached (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -42392,9 +44769,9 @@
"off"
]
},
- "print-version" => {
+ "add-component-via-interceptor" => {
"type" => STRING,
- "description" => "Indicates whether the version number should be printed during ORB startup (on) or not (off).",
+ "description" => "Indicates whether SSL components should be added by an IOR interceptor (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -42403,18 +44780,40 @@
"off"
]
},
- "server-timeout" => {
+ "max-managed-buf-size" => {
"type" => INT,
- "description" => "The server-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
+ "description" => "The log2 of maximum size managed by the internal buffer manager.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min" => 0L,
+ "max" => 64L
+ },
+ "client-timeout" => {
+ "type" => INT,
+ "description" => "The client-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"min" => 0L,
"max" => 2147483647L
},
- "security" => {
+ "server-supports" => {
"type" => STRING,
- "description" => "Indicates whether the security interceptors are to be installed (on) or not (off).",
+ "description" => "Value that indicates the server SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "allowed" => [
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
+ ]
+ },
+ "queue-wait" => {
+ "type" => STRING,
+ "description" => "Indicates whether requests that exceed the maximum queue size should wait (on) or not (off). When disabled, a TRANSIENT exception is thrown if the queue is full.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -42423,18 +44822,18 @@
"off"
]
},
- "pool-size" => {
+ "giop-minor-version" => {
"type" => INT,
- "description" => "The size of the request processors thread-pool. Threads that finish processing a request are placed back in the pool if the pool is not full and discarded otherwise.",
+ "description" => "The GIOP minor version to be used.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"min" => 1L,
- "max" => 100L
+ "max" => 2L
},
- "sun" => {
+ "monitoring" => {
"type" => STRING,
- "description" => "Indicates whether interoperability with Sun's ORB is enabled (on) or not (off).",
+ "description" => "Indicates whether the monitoring GUI should be displayed (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -42443,31 +44842,52 @@
"off"
]
},
- "lax-boolean-encoding" => {
+ "server-requires" => {
"type" => STRING,
- "description" => "Indicates whether any non-zero CDR encoded boolean value should be interpreted as true (on) or not (off).",
+ "description" => "Value that indicates the server SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"allowed" => [
- "on",
- "off"
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
]
},
- "cache-poa-names" => {
+ "client-supports" => {
"type" => STRING,
- "description" => "Indicates whether POA names should be cached (on) or not (off).",
+ "description" => "Value that indicates the client SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"allowed" => [
- "on",
- "off"
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
]
},
- "strict-check-on-tc-creation" => {
+ "properties" => {
+ "type" => OBJECT,
+ "description" => "A list of generic key/value properties.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "value-type" => STRING
+ },
+ "root-context" => {
"type" => STRING,
- "description" => "Indicates whether the method create_abstract_interface_tc should perform a validation check on the name parameter (on) or not (off).",
+ "description" => "The naming service root context.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "comet" => {
+ "type" => STRING,
+ "description" => "Indicates whether interoperability with Comet's ORB is enabled (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -42476,38 +44896,40 @@
"off"
]
},
- "max-managed-buf-size" => {
- "type" => INT,
- "description" => "The log2 of maximum size managed by the internal buffer manager.",
+ "ssl-socket-binding" => {
+ "type" => STRING,
+ "description" => "The name of the socket binding configuration that specifies the ORB SSL port.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "min" => 0L,
- "max" => 64L
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
- "add-component-via-interceptor" => {
+ "client-requires" => {
"type" => STRING,
- "description" => "Indicates whether SSL components should be added by an IOR interceptor (on) or not (off).",
+ "description" => "Value that indicates the client SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"allowed" => [
- "on",
- "off"
+ "None",
+ "ServerAuth",
+ "ClientAuth",
+ "MutualAuth"
]
},
- "client-timeout" => {
+ "max-server-connections" => {
"type" => INT,
- "description" => "The client-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
+ "description" => "The maximum number of connections accepted by the server.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"min" => 0L,
"max" => 2147483647L
},
- "use-imr" => {
+ "iona" => {
"type" => STRING,
- "description" => "Indicates whether the implementation repository should be used (on) or not (off).",
+ "description" => "Indicates whether interoperability with IONA's ASP is enabled (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -42516,27 +44938,29 @@
"off"
]
},
- "name" => {
+ "chunk-custom-rmi-valuetypes" => {
"type" => STRING,
- "description" => "The name of the running ORB.",
+ "description" => "Indicates whether custom RMI valuetypes should be encoded as chunks (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
+ "allowed" => [
+ "on",
+ "off"
+ ]
},
- "max-threads" => {
+ "queue-max" => {
"type" => INT,
- "description" => "The maximum number of active request processor threads. Threads are first obtained from the pool and once the pool is exhausted new threads are created until the number of threads reaches this limit. New requests will wait until an active thread finishes its job.",
+ "description" => "The maximum number of requests that can be queued.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "min" => 5L,
- "max" => 150L
+ "min" => 1L,
+ "max" => 200L
},
- "use-bom" => {
+ "print-version" => {
"type" => STRING,
- "description" => "Indicates whether GIOP 1.2 byte order markers should be used (on) or not (off).",
+ "description" => "Indicates whether the version number should be printed during ORB startup (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -42545,22 +44969,18 @@
"off"
]
},
- "server-supports" => {
- "type" => STRING,
- "description" => "Value that indicates the server SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "server-timeout" => {
+ "type" => INT,
+ "description" => "The server-side connection timeout value in milliseconds. A value of zero indicates that the connection never times out.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
- ]
+ "min" => 0L,
+ "max" => 2147483647L
},
- "queue-wait" => {
+ "security" => {
"type" => STRING,
- "description" => "Indicates whether requests that exceed the maximum queue size should wait (on) or not (off). When disabled, a TRANSIENT exception is thrown if the queue is full.",
+ "description" => "Indicates whether the security interceptors are to be installed (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -42569,18 +44989,9 @@
"off"
]
},
- "giop-minor-version" => {
- "type" => INT,
- "description" => "The GIOP minor version to be used.",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "min" => 1L,
- "max" => 2L
- },
- "cache-typecodes" => {
+ "sun" => {
"type" => STRING,
- "description" => "Indicates whether typecodes should be cached (on) or not (off).",
+ "description" => "Indicates whether interoperability with Sun's ORB is enabled (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -42589,9 +45000,9 @@
"off"
]
},
- "monitoring" => {
+ "lax-boolean-encoding" => {
"type" => STRING,
- "description" => "Indicates whether the monitoring GUI should be displayed (on) or not (off).",
+ "description" => "Indicates whether any non-zero CDR encoded boolean value should be interpreted as true (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -42600,22 +45011,20 @@
"off"
]
},
- "server-requires" => {
+ "strict-check-on-tc-creation" => {
"type" => STRING,
- "description" => "Value that indicates the server SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "description" => "Indicates whether the method create_abstract_interface_tc should perform a validation check on the name parameter (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
+ "on",
+ "off"
]
},
- "indirection-encoding-disable" => {
+ "use-imr" => {
"type" => STRING,
- "description" => "Indicates whether indirection encoding for repeated typecodes should be disabled (on) or not (off).",
+ "description" => "Indicates whether the implementation repository should be used (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -42624,64 +45033,74 @@
"off"
]
},
- "queue-min" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the running ORB.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "max-threads" => {
"type" => INT,
- "description" => "The size of the queue for notifying waiting requests. In other words, blocked requests are only notified when the queue has no more than queue-min requests.",
+ "description" => "The maximum number of active request processor threads. Threads are first obtained from the pool and once the pool is exhausted new threads are created until the number of threads reaches this limit. New requests will wait until an active thread finishes its job.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "min" => 1L,
- "max" => 100L
+ "min" => 5L,
+ "max" => 150L
},
- "client-supports" => {
+ "use-bom" => {
"type" => STRING,
- "description" => "Value that indicates the client SSL supported parameters (None, ServerAuth, ClientAuth, MutualAuth).",
+ "description" => "Indicates whether GIOP 1.2 byte order markers should be used (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
"allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
+ "on",
+ "off"
]
},
- "properties" => {
- "type" => OBJECT,
- "description" => "A list of generic key/value properties.",
+ "cache-typecodes" => {
+ "type" => STRING,
+ "description" => "Indicates whether typecodes should be cached (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "value-type" => STRING
+ "allowed" => [
+ "on",
+ "off"
+ ]
},
- "root-context" => {
+ "indirection-encoding-disable" => {
"type" => STRING,
- "description" => "The naming service root context.",
+ "description" => "Indicates whether indirection encoding for repeated typecodes should be disabled (on) or not (off).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
+ "allowed" => [
+ "on",
+ "off"
+ ]
},
- "retry-interval" => {
+ "queue-min" => {
"type" => INT,
- "description" => "The interval in milliseconds between retries.",
+ "description" => "The size of the queue for notifying waiting requests. In other words, blocked requests are only notified when the queue has no more than queue-min requests.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "min" => 0L,
- "max" => 2147483647L
+ "min" => 1L,
+ "max" => 100L
},
- "comet" => {
- "type" => STRING,
- "description" => "Indicates whether interoperability with Comet's ORB is enabled (on) or not (off).",
+ "retry-interval" => {
+ "type" => INT,
+ "description" => "The interval in milliseconds between retries.",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
- "allowed" => [
- "on",
- "off"
- ]
+ "min" => 0L,
+ "max" => 2147483647L
},
"outbuf-cache-timeout" => {
"type" => INT,
@@ -42710,19 +45129,6 @@
"min-length" => 1L,
"max-length" => 2147483647L
},
- "client-requires" => {
- "type" => STRING,
- "description" => "Value that indicates the client SSL required parameters (None, ServerAuth, ClientAuth, MutualAuth).",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "allowed" => [
- "None",
- "ServerAuth",
- "ClientAuth",
- "MutualAuth"
- ]
- },
"retries" => {
"type" => INT,
"description" => "The number of retries if connections cannot be promptly established.",
@@ -42732,37 +45138,6 @@
"min" => 0L,
"max" => 50L
},
- "max-server-connections" => {
- "type" => INT,
- "description" => "The maximum number of connections accepted by the server.",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "min" => 0L,
- "max" => 2147483647L
- },
- "iona" => {
- "type" => STRING,
- "description" => "Indicates whether interoperability with IONA's ASP is enabled (on) or not (off).",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "allowed" => [
- "on",
- "off"
- ]
- },
- "chunk-custom-rmi-valuetypes" => {
- "type" => STRING,
- "description" => "Indicates whether custom RMI valuetypes should be encoded as chunks (on) or not (off).",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "allowed" => [
- "on",
- "off"
- ]
- },
"export-corbaloc" => {
"type" => STRING,
"description" => "Indicates whether the root context should be exported as corbaloc::address:port/NameService (on) or not (off).",
@@ -54588,18 +56963,6 @@
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L
- },
- "properties" => {
- "type" => LIST,
- "description" => "A list of properties for a protocol layer. Used to customize protocol behaviour.",
- "expressions-allowed" => false,
- "nillable" => true,
- "value-type" => {"property" => {
- "type" => PROPERTY,
- "description" => "A protocol property with name and value.",
- "expressions-allowed" => false,
- "nillable" => true
- }}
}
}
},
@@ -54630,18 +56993,6 @@
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L
- },
- "properties" => {
- "type" => LIST,
- "description" => "A list of properties for a protocol layer. Used to customize protocol behaviour.",
- "expressions-allowed" => false,
- "nillable" => true,
- "value-type" => {"property" => {
- "type" => PROPERTY,
- "description" => "A protocol property with name and value.",
- "expressions-allowed" => false,
- "nillable" => true
- }}
}
}
}}
@@ -59061,39 +61412,6 @@
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "all-services"
- },
- "site" => {
- "type" => STRING,
- "description" => "A site identifier for the transport",
- "expressions-allowed" => true,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
- "rack" => {
- "type" => STRING,
- "description" => "A rack identifier for the transport",
- "expressions-allowed" => true,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- },
- "machine" => {
- "type" => STRING,
- "description" => "A machine identifier for the transport",
- "expressions-allowed" => true,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
}
},
"operations" => {
@@ -59266,33 +61584,6 @@
"required" => false,
"nillable" => true,
"unit" => "MILLISECONDS"
- },
- "site" => {
- "type" => STRING,
- "description" => "A site identifier for the transport",
- "expressions-allowed" => true,
- "required" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
- },
- "rack" => {
- "type" => STRING,
- "description" => "A rack identifier for the transport",
- "expressions-allowed" => true,
- "required" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
- },
- "machine" => {
- "type" => STRING,
- "description" => "A machine identifier for the transport",
- "expressions-allowed" => true,
- "required" => false,
- "nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L
}
}
},
@@ -97172,13 +99463,13 @@
}
},
"osgi" => {
- "description" => "The OSGi subsystem configuration.",
+ "description" => "The OSGi subsystem configuration",
"head-comment-allowed" => true,
"tail-comment-allowed" => true,
"namespace" => "urn:jboss:domain:osgi:1.2",
"attributes" => {
"activation" => {
- "description" => "Activation flag for the OSGi subsystem. Possible values: lazy, eager.",
+ "description" => "Activation flag for the OSGi subsystem. Possible values: lazy, eager",
"type" => STRING,
"default" => "LAZY",
"access-type" => "read-write",
@@ -97186,7 +99477,7 @@
"storage" => "configuration"
},
"startlevel" => {
- "description" => "The current Start Level of the OSGi Framework. Changing this value will change the Start Level of the Framework accordingly.",
+ "description" => "The current Start Level of the OSGi Framework. Changing this value will change the Start Level of the Framework accordingly",
"type" => INT,
"access-type" => "read-write",
"restart-required" => "no-services",
@@ -97195,11 +99486,11 @@
},
"children" => {
"property" => {
- "description" => "A framework property. The identity of the resource defines the property name.",
+ "description" => "A framework property. The identity of the resource defines the property name",
"model-description" => {"*" => {
- "description" => "A framework property. The identity of the resource defines the property name.",
+ "description" => "A framework property. The identity of the resource defines the property name",
"attributes" => {"value" => {
- "description" => "The framework property value.",
+ "description" => "The framework property value",
"type" => STRING,
"required" => true,
"access-type" => "read-write",
@@ -97245,7 +99536,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Remove a framework property.",
+ "description" => "Remove a framework property",
"request-properties" => {},
"reply-properties" => {}
},
@@ -97341,9 +99632,9 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Add a framework property.",
+ "description" => "Add a framework property",
"request-properties" => {"value" => {
- "description" => "The framework property value.",
+ "description" => "The framework property value",
"type" => STRING,
"required" => true
}},
@@ -97478,16 +99769,16 @@
}}
},
"capability" => {
- "description" => "A framework capability. A capability maps to a JBoss Module in the modules directory or an OSGi bundle in the bundles directory. The identity maps to the resource identifier of the module or bundle.",
+ "description" => "A framework capability. A capability maps to a JBoss Module in the modules directory or an OSGi bundle in the bundles directory. The identity maps to the resource identifier of the module or bundle",
"model-description" => {"*" => {
- "description" => "A framework capability. A capability maps to a JBoss Module in the modules directory or an OSGi bundle in the bundles directory. The identity maps to the resource identifier of the module or bundle.",
+ "description" => "A framework capability. A capability maps to a JBoss Module in the modules directory or an OSGi bundle in the bundles directory. The identity maps to the resource identifier of the module or bundle",
"attributes" => {"startlevel" => {
- "description" => "The startlevel for the capability. Can only be specified for OSGi bundles.",
+ "description" => "The startlevel for the capability. Can only be specified for OSGi bundles",
"type" => INT,
"required" => false,
"access-type" => "read-only",
"restart-required" => "all-services",
- "storage" => "configuration"
+ "storage" => "runtime"
}},
"operations" => {
"read-children-names" => {
@@ -97528,7 +99819,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Remove a framework capability.",
+ "description" => "Remove a framework capability",
"request-properties" => {},
"reply-properties" => {}
},
@@ -97624,9 +99915,9 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Add a framework capability.",
+ "description" => "Add a framework capability",
"request-properties" => {"startlevel" => {
- "description" => "The startlevel for the capability. Can only be specified for OSGi bundles.",
+ "description" => "The startlevel for the capability. Can only be specified for OSGi bundles",
"type" => INT,
"required" => false
}},
@@ -97761,32 +100052,50 @@
}}
},
"bundle" => {
- "description" => "Runtime bundle information.",
+ "description" => "Runtime bundle information. The resource can be identified by bundle id or bundle location ",
"model-description" => {"*" => {
- "description" => "Runtime bundle information.",
+ "description" => "Runtime bundle information. The resource can be identified by bundle id or bundle location ",
"attributes" => {
"id" => {
"type" => LONG,
- "description" => "The bundle ID.",
+ "description" => "The bundle ID",
"access-type" => "read-only",
"storage" => "runtime"
},
"startlevel" => {
"type" => INT,
- "description" => "The bundle's start level.",
+ "description" => "The bundle's start level",
"access-type" => "read-only",
"required" => false,
"storage" => "runtime"
},
"symbolic-name" => {
"type" => STRING,
- "description" => "The bundle symbolic name.",
+ "description" => "The bundle symbolic name",
"access-type" => "read-only",
"storage" => "runtime"
},
"version" => {
"type" => STRING,
- "description" => "The bundle version.",
+ "description" => "The bundle version",
+ "access-type" => "read-only",
+ "storage" => "runtime"
+ },
+ "state" => {
+ "type" => STRING,
+ "description" => "State of bundle",
+ "access-type" => "read-only",
+ "storage" => "runtime"
+ },
+ "type" => {
+ "type" => STRING,
+ "description" => "Type of Bundle",
+ "access-type" => "read-only",
+ "storage" => "runtime"
+ },
+ "location" => {
+ "type" => STRING,
+ "description" => "The bundle location",
"access-type" => "read-only",
"storage" => "runtime"
}
@@ -97830,7 +100139,7 @@
},
"stop" => {
"operation-name" => "stop",
- "description" => "Stops the bundle.",
+ "description" => "Stops a bundle",
"request-properties" => {},
"reply-properties" => {}
},
@@ -98034,7 +100343,7 @@
},
"start" => {
"operation-name" => "start",
- "description" => "Starts the bundle.",
+ "description" => "Starts a bundle ",
"request-properties" => {},
"reply-properties" => {}
},
@@ -98098,7 +100407,7 @@
},
"remove" => {
"operation-name" => "remove",
- "description" => "Remove the OSGi subsystem configuration.",
+ "description" => "Remove the OSGi subsystem configuration",
"reply-properties" => {},
"request-properties" => {}
},
@@ -98194,9 +100503,9 @@
},
"add" => {
"operation-name" => "add",
- "description" => "Add the OSGi subsystem configuration.",
+ "description" => "Add the OSGi subsystem configuration",
"request-properties" => {"activation" => {
- "description" => "Activation flag for the OSGi subsystem. Possible values: lazy, eager.",
+ "description" => "Activation flag for the OSGi subsystem. Possible values: lazy, eager",
"type" => STRING,
"default" => "LAZY"
}},
@@ -98226,7 +100535,7 @@
},
"activate" => {
"operation-name" => "activate",
- "description" => "Activate the OSGi subsystem.",
+ "description" => "Activate the OSGi subsystem",
"request-properties" => {},
"reply-properties" => {}
},
@@ -103008,39 +105317,602 @@
"model-description" => {"log-store" => {
"description" => "Representation of the transaction logging storage mechanism.",
"attributes" => {"type" => {
- "description" => "Specifies the implementation type of the logging store.",
"type" => STRING,
- "access-type" => "read-only",
- "storage" => "configuration"
+ "description" => "Specifies the implementation type of the logging store.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "default" => "default",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
}},
+ "operations" => {
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
+ "type" => STRING,
+ "description" => "The name of the node under which to get the children names",
+ "nillable" => false
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
+ },
+ "remove" => {
+ "operation-name" => "remove",
+ "description" => "Remove a representation of the transaction logging storage mechanism.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "locale" => {
+ "type" => STRING,
+ "description" => "The locale to get the resource description in. If null, the default locale will be used",
+ "required" => false,
+ "nillable" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the resource"
+ }
+ },
+ "read-resource" => {
+ "operation-name" => "read-resource",
+ "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
+ "request-properties" => {
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The resource's attribute values along with information about any child resources"
+ }
+ },
+ "add" => {
+ "operation-name" => "add",
+ "description" => "Add a representation of the transaction logging storage mechanism.",
+ "request-properties" => {"type" => {
+ "type" => STRING,
+ "description" => "Specifies the implementation type of the logging store.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ }},
+ "reply-properties" => {}
+ },
+ "read-attribute" => {
+ "operation-name" => "read-attribute",
+ "description" => "Gets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to get the value for under the selected resource",
+ "nillable" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The value of the attribute. The type will be that of the attribute found"
+ }
+ },
+ "probe" => {
+ "operation-name" => "probe",
+ "description" => "Scan for new transaction logs. This operation will creates a child for each pending transaction.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "whoami" => {
+ "operation-name" => "whoami",
+ "description" => "Returns the identity of the currently authenticated user.",
+ "request-properties" => {"verbose" => {
+ "type" => BOOLEAN,
+ "description" => "If set to true whoami also returns the users roles.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ }},
+ "reply-properties" => {}
+ },
+ "read-children-types" => {
+ "operation-name" => "read-children-types",
+ "description" => "Gets the type names of all the children under the selected resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children types",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-names" => {
+ "operation-name" => "read-operation-names",
+ "description" => "Gets the names of all the operations for the given resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "value-type" => STRING,
+ "description" => "The operation names"
+ }
+ },
+ "undefine-attribute" => {
+ "operation-name" => "undefine-attribute",
+ "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which should be set to 'undefined'",
+ "nillable" => false
+ }}
+ },
+ "read-children-resources" => {
+ "operation-name" => "read-children-resources",
+ "description" => "Reads information about all of a resource's children that are of a given type",
+ "request-properties" => {
+ "child-type" => {
+ "type" => STRING,
+ "description" => "The name of the resource under which to get the child resources",
+ "nillable" => false
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to get the children recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children resources",
+ "value-type" => OBJECT
+ }
+ },
+ "write-attribute" => {
+ "operation-name" => "write-attribute",
+ "description" => "Sets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to set the value for under the selected resource",
+ "nillable" => false
+ },
+ "value" => {
+ "type" => STRING,
+ "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
+ "nillable" => true,
+ "required" => false
+ }
+ }
+ }
+ },
"children" => {"transactions" => {
"description" => "The persistent information that the transaction manager stores for the purpose of recovering a transaction in the event of failure. The probe operation will add and remove transactions from the model as the corresponding real transactions start and finish the prepare and commit phases. A stuck transaction will remain in the model until either it is completed or explicitly removed by the delete operation.",
"model-description" => {"*" => {
"description" => "The persistent information that the transaction manager stores for the purpose of recovering a transaction in the event of failure. The probe operation will add and remove transactions from the model as the corresponding real transactions start and finish the prepare and commit phases. A stuck transaction will remain in the model until either it is completed or explicitly removed by the delete operation.",
"attributes" => {
+ "id" => {
+ "type" => STRING,
+ "description" => "The id of this transaction.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
"jmx-name" => {
- "description" => "The JMX name of this transaction.",
"type" => STRING,
- "access-type" => "read-only",
- "storage" => "configuration"
+ "description" => "The JMX name of this transaction.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 0L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
},
- "id" => {
- "description" => "The id of this transaction.",
+ "type" => {
"type" => STRING,
- "access-type" => "read-only",
- "storage" => "configuration"
+ "description" => "The type name under which this record is stored.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
},
"age-in-seconds" => {
- "description" => "The time since this transaction was prepared or when the recovery system last tried to recover it.",
"type" => LONG,
- "access-type" => "read-only",
- "storage" => "configuration"
+ "description" => "The time since this transaction was prepared or when the recovery system last tried to recover it.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "unit" => "SECONDS",
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ }
+ },
+ "operations" => {
+ "whoami" => {
+ "operation-name" => "whoami",
+ "description" => "Returns the identity of the currently authenticated user.",
+ "request-properties" => {"verbose" => {
+ "type" => BOOLEAN,
+ "description" => "If set to true whoami also returns the users roles.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ }},
+ "reply-properties" => {}
},
- "type" => {
- "description" => "The type name under which this record is stored.",
- "type" => STRING,
- "access-type" => "read-only",
- "storage" => "configuration"
+ "read-children-names" => {
+ "operation-name" => "read-children-names",
+ "description" => "Gets the names of all children under the selected resource with the given type",
+ "request-properties" => {"child-type" => {
+ "type" => STRING,
+ "description" => "The name of the node under which to get the children names",
+ "nillable" => false
+ }},
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children names",
+ "value-type" => STRING
+ }
+ },
+ "read-operation-description" => {
+ "operation-name" => "read-operation-description",
+ "description" => "Gets the details of an operation on the given resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The description of the operation. Undefined if not found",
+ "required" => true,
+ "nillable" => false
+ },
+ "locale" => {
+ "type" => STRING,
+ "required" => false,
+ "nillable" => true,
+ "description" => "The locale to get the operation description in. If null, the default locale will be used"
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the operation. Undefined if not found"
+ }
+ },
+ "read-operation-names" => {
+ "operation-name" => "read-operation-names",
+ "description" => "Gets the names of all the operations for the given resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "value-type" => STRING,
+ "description" => "The operation names"
+ }
+ },
+ "read-children-types" => {
+ "operation-name" => "read-children-types",
+ "description" => "Gets the type names of all the children under the selected resource",
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children types",
+ "value-type" => STRING
+ }
+ },
+ "undefine-attribute" => {
+ "operation-name" => "undefine-attribute",
+ "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
+ "request-properties" => {"name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute which should be set to 'undefined'",
+ "nillable" => false
+ }}
+ },
+ "read-children-resources" => {
+ "operation-name" => "read-children-resources",
+ "description" => "Reads information about all of a resource's children that are of a given type",
+ "request-properties" => {
+ "child-type" => {
+ "type" => STRING,
+ "description" => "The name of the resource under which to get the child resources",
+ "nillable" => false
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to get the children recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
+ "required" => false,
+ "nillable" => true
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => LIST,
+ "description" => "The children resources",
+ "value-type" => OBJECT
+ }
+ },
+ "read-resource-description" => {
+ "operation-name" => "read-resource-description",
+ "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
+ "request-properties" => {
+ "operations" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include descriptions of the resource's operations. Default is false",
+ "required" => false,
+ "nillable" => true
+ },
+ "inherited" => {
+ "type" => BOOLEAN,
+ "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include recursively descriptions of child resources. Default is false.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
+ "required" => false,
+ "nillable" => true
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "locale" => {
+ "type" => STRING,
+ "description" => "The locale to get the resource description in. If null, the default locale will be used",
+ "required" => false,
+ "nillable" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The description of the resource"
+ }
+ },
+ "read-resource" => {
+ "operation-name" => "read-resource",
+ "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
+ "request-properties" => {
+ "recursive" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "recursive-depth" => {
+ "type" => INT,
+ "description" => "The depth to which information about child resources should be included.",
+ "required" => false,
+ "nillable" => true
+ },
+ "proxies" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-runtime" => {
+ "type" => BOOLEAN,
+ "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
+ "required" => false,
+ "nillable" => true,
+ "default" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The resource's attribute values along with information about any child resources"
+ }
+ },
+ "delete" => {
+ "operation-name" => "delete",
+ "description" => "Remove this transaction log. WARNING after this operation the transaction manager will have no knowledge of the transaction and will therefore never be able to recover it. If you are sure that the transaction is complete then the operation is safe. The representation of the transaction log is removed from the model too.",
+ "request-properties" => {},
+ "reply-properties" => {}
+ },
+ "read-attribute" => {
+ "operation-name" => "read-attribute",
+ "description" => "Gets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to get the value for under the selected resource",
+ "nillable" => false
+ },
+ "include-defaults" => {
+ "type" => BOOLEAN,
+ "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
+ "required" => false,
+ "nillable" => true,
+ "default" => true
+ }
+ },
+ "reply-properties" => {
+ "type" => OBJECT,
+ "description" => "The value of the attribute. The type will be that of the attribute found"
+ }
+ },
+ "write-attribute" => {
+ "operation-name" => "write-attribute",
+ "description" => "Sets the value of an attribute for the selected resource",
+ "request-properties" => {
+ "name" => {
+ "type" => STRING,
+ "description" => "The name of the attribute to set the value for under the selected resource",
+ "nillable" => false
+ },
+ "value" => {
+ "type" => STRING,
+ "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
+ "nillable" => true,
+ "required" => false
+ }
+ }
}
},
"children" => {"participants" => {
@@ -103049,38 +105921,67 @@
"description" => "The resources that did work in a transaction.",
"attributes" => {
"jmx-name" => {
- "description" => "The JMX name of this participant.",
"type" => STRING,
+ "description" => "The JMX name of this participant.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 0L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "configuration"
},
- "jndi-name" => {
- "description" => "JNDI name of this participant.",
+ "eis-product-name" => {
"type" => STRING,
+ "description" => "The JCA enterprise information system's product name.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 0L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "configuration"
},
"status" => {
- "description" => "Reports the commitment status of this participant (can be one of Pending, Prepared, Failed, Heuristic or Readonly).",
"type" => STRING,
+ "description" => "Reports the commitment status of this participant (can be one of Pending, Prepared, Failed, Heuristic or Readonly).",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "allowed" => [
+ "PENDING",
+ "PREPARED",
+ "FAILED",
+ "HEURISTIC",
+ "READONLY"
+ ],
"access-type" => "read-only",
"storage" => "configuration"
},
- "type" => {
- "description" => "The type name under which this record is stored.",
+ "eis-product-version" => {
"type" => STRING,
+ "description" => "The JCA enterprise information system's product version",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 0L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "configuration"
},
- "eis-product-name" => {
- "description" => "The JCA enterprise information system's product name.",
+ "jndi-name" => {
"type" => STRING,
+ "description" => "JNDI name of this participant.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "configuration"
},
- "eis-product-version" => {
- "description" => "The JCA enterprise information system's product version",
+ "type" => {
"type" => STRING,
+ "description" => "The type name under which this record is stored.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-only",
"storage" => "configuration"
}
@@ -103236,7 +106137,9 @@
},
"recover" => {
"operation-name" => "recover",
- "description" => "If this record is in a heuristic state then attempt to replay the commit phase of the 2PC transaction."
+ "description" => "If this record is in a heuristic state then attempt to replay the commit phase of the 2PC transaction.",
+ "request-properties" => {},
+ "reply-properties" => {}
},
"whoami" => {
"operation-name" => "whoami",
@@ -103326,7 +106229,9 @@
},
"refresh" => {
"operation-name" => "refresh",
- "description" => "Refresh the management view of the attributes of this participant record by querying the transaction log. (Note that the read-resource operaton only reads the model, hence the need for this refresh operation)."
+ "description" => "Refresh the management view of the attributes of this participant record by querying the transaction log. (Note that the read-resource operaton only reads the model, hence the need for this refresh operation).",
+ "request-properties" => {},
+ "reply-properties" => {}
},
"write-attribute" => {
"operation-name" => "write-attribute",
@@ -103345,539 +106250,12 @@
}
}
}
- }
- }}
- }},
- "operations" => {
- "whoami" => {
- "operation-name" => "whoami",
- "description" => "Returns the identity of the currently authenticated user.",
- "request-properties" => {"verbose" => {
- "type" => BOOLEAN,
- "description" => "If set to true whoami also returns the users roles.",
- "required" => false,
- "nillable" => true,
- "default" => false
- }},
- "reply-properties" => {}
- },
- "read-children-names" => {
- "operation-name" => "read-children-names",
- "description" => "Gets the names of all children under the selected resource with the given type",
- "request-properties" => {"child-type" => {
- "type" => STRING,
- "description" => "The name of the node under which to get the children names",
- "nillable" => false
- }},
- "reply-properties" => {
- "type" => LIST,
- "description" => "The children names",
- "value-type" => STRING
- }
- },
- "read-operation-description" => {
- "operation-name" => "read-operation-description",
- "description" => "Gets the details of an operation on the given resource",
- "request-properties" => {
- "name" => {
- "type" => STRING,
- "description" => "The description of the operation. Undefined if not found",
- "required" => true,
- "nillable" => false
- },
- "locale" => {
- "type" => STRING,
- "required" => false,
- "nillable" => true,
- "description" => "The locale to get the operation description in. If null, the default locale will be used"
- }
- },
- "reply-properties" => {
- "type" => OBJECT,
- "description" => "The description of the operation. Undefined if not found"
- }
- },
- "read-operation-names" => {
- "operation-name" => "read-operation-names",
- "description" => "Gets the names of all the operations for the given resource",
- "reply-properties" => {
- "type" => LIST,
- "value-type" => STRING,
- "description" => "The operation names"
- }
- },
- "read-children-types" => {
- "operation-name" => "read-children-types",
- "description" => "Gets the type names of all the children under the selected resource",
- "reply-properties" => {
- "type" => LIST,
- "description" => "The children types",
- "value-type" => STRING
- }
- },
- "undefine-attribute" => {
- "operation-name" => "undefine-attribute",
- "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
- "request-properties" => {"name" => {
- "type" => STRING,
- "description" => "The name of the attribute which should be set to 'undefined'",
- "nillable" => false
- }}
- },
- "read-children-resources" => {
- "operation-name" => "read-children-resources",
- "description" => "Reads information about all of a resource's children that are of a given type",
- "request-properties" => {
- "child-type" => {
- "type" => STRING,
- "description" => "The name of the resource under which to get the child resources",
- "nillable" => false
- },
- "recursive" => {
- "type" => BOOLEAN,
- "description" => "Whether to get the children recursively. If absent, false is the default",
- "required" => false,
- "nillable" => true
- },
- "recursive-depth" => {
- "type" => INT,
- "description" => "The depth to which information about child resources should be included.",
- "required" => false,
- "nillable" => true
- },
- "proxies" => {
- "type" => BOOLEAN,
- "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
- "required" => false,
- "nillable" => true
- },
- "include-runtime" => {
- "type" => BOOLEAN,
- "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
- "required" => false,
- "nillable" => true
- },
- "include-defaults" => {
- "type" => BOOLEAN,
- "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
- "required" => false,
- "nillable" => true,
- "default" => true
- }
- },
- "reply-properties" => {
- "type" => LIST,
- "description" => "The children resources",
- "value-type" => OBJECT
- }
- },
- "read-resource-description" => {
- "operation-name" => "read-resource-description",
- "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
- "request-properties" => {
- "operations" => {
- "type" => BOOLEAN,
- "description" => "Whether to include descriptions of the resource's operations. Default is false",
- "required" => false,
- "nillable" => true
- },
- "inherited" => {
- "type" => BOOLEAN,
- "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
- "required" => false,
- "nillable" => true
- },
- "recursive" => {
- "type" => BOOLEAN,
- "description" => "Whether to include recursively descriptions of child resources. Default is false.",
- "required" => false,
- "nillable" => true
- },
- "proxies" => {
- "type" => BOOLEAN,
- "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
- "required" => false,
- "nillable" => true
- },
- "recursive-depth" => {
- "type" => INT,
- "description" => "The depth to which information about child resources should be included.",
- "required" => false,
- "nillable" => true
- },
- "locale" => {
- "type" => STRING,
- "description" => "The locale to get the resource description in. If null, the default locale will be used",
- "required" => false,
- "nillable" => true
- }
- },
- "reply-properties" => {
- "type" => OBJECT,
- "description" => "The description of the resource"
- }
- },
- "read-resource" => {
- "operation-name" => "read-resource",
- "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
- "request-properties" => {
- "recursive" => {
- "type" => BOOLEAN,
- "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
- "required" => false,
- "nillable" => true,
- "default" => false
- },
- "recursive-depth" => {
- "type" => INT,
- "description" => "The depth to which information about child resources should be included.",
- "required" => false,
- "nillable" => true
- },
- "proxies" => {
- "type" => BOOLEAN,
- "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
- "required" => false,
- "nillable" => true,
- "default" => false
- },
- "include-runtime" => {
- "type" => BOOLEAN,
- "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
- "required" => false,
- "nillable" => true,
- "default" => false
- },
- "include-defaults" => {
- "type" => BOOLEAN,
- "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
- "required" => false,
- "nillable" => true,
- "default" => true
- }
- },
- "reply-properties" => {
- "type" => OBJECT,
- "description" => "The resource's attribute values along with information about any child resources"
- }
- },
- "delete" => {
- "operation-name" => "delete",
- "description" => "Remove this transaction log. WARNING after this operation the transaction manager will have no knowledge of the transaction and will therefore never be able to recover it. If you are sure that the transaction is complete then the operation is safe. The representation of the transaction log is removed from the model too."
- },
- "read-attribute" => {
- "operation-name" => "read-attribute",
- "description" => "Gets the value of an attribute for the selected resource",
- "request-properties" => {
- "name" => {
- "type" => STRING,
- "description" => "The name of the attribute to get the value for under the selected resource",
- "nillable" => false
- },
- "include-defaults" => {
- "type" => BOOLEAN,
- "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
- "required" => false,
- "nillable" => true,
- "default" => true
- }
},
- "reply-properties" => {
- "type" => OBJECT,
- "description" => "The value of the attribute. The type will be that of the attribute found"
- }
- },
- "write-attribute" => {
- "operation-name" => "write-attribute",
- "description" => "Sets the value of an attribute for the selected resource",
- "request-properties" => {
- "name" => {
- "type" => STRING,
- "description" => "The name of the attribute to set the value for under the selected resource",
- "nillable" => false
- },
- "value" => {
- "type" => STRING,
- "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
- "nillable" => true,
- "required" => false
- }
- }
- }
- }
- }}
- }},
- "operations" => {
- "read-children-names" => {
- "operation-name" => "read-children-names",
- "description" => "Gets the names of all children under the selected resource with the given type",
- "request-properties" => {"child-type" => {
- "type" => STRING,
- "description" => "The name of the node under which to get the children names",
- "nillable" => false
- }},
- "reply-properties" => {
- "type" => LIST,
- "description" => "The children names",
- "value-type" => STRING
- }
- },
- "read-operation-description" => {
- "operation-name" => "read-operation-description",
- "description" => "Gets the details of an operation on the given resource",
- "request-properties" => {
- "name" => {
- "type" => STRING,
- "description" => "The description of the operation. Undefined if not found",
- "required" => true,
- "nillable" => false
- },
- "locale" => {
- "type" => STRING,
- "required" => false,
- "nillable" => true,
- "description" => "The locale to get the operation description in. If null, the default locale will be used"
- }
- },
- "reply-properties" => {
- "type" => OBJECT,
- "description" => "The description of the operation. Undefined if not found"
- }
- },
- "remove" => {
- "operation-name" => "remove",
- "description" => "Remove a representation of the transaction logging storage mechanism."
- },
- "read-resource-description" => {
- "operation-name" => "read-resource-description",
- "description" => "Gets the description of a resource's attributes, types of children and, optionally, operations",
- "request-properties" => {
- "operations" => {
- "type" => BOOLEAN,
- "description" => "Whether to include descriptions of the resource's operations. Default is false",
- "required" => false,
- "nillable" => true
- },
- "inherited" => {
- "type" => BOOLEAN,
- "description" => "If 'operations' is true, whether to include descriptions of the resource's inherited operations. Default is true.",
- "required" => false,
- "nillable" => true
- },
- "recursive" => {
- "type" => BOOLEAN,
- "description" => "Whether to include recursively descriptions of child resources. Default is false.",
- "required" => false,
- "nillable" => true
- },
- "proxies" => {
- "type" => BOOLEAN,
- "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
- "required" => false,
- "nillable" => true
- },
- "recursive-depth" => {
- "type" => INT,
- "description" => "The depth to which information about child resources should be included.",
- "required" => false,
- "nillable" => true
- },
- "locale" => {
- "type" => STRING,
- "description" => "The locale to get the resource description in. If null, the default locale will be used",
- "required" => false,
- "nillable" => true
- }
- },
- "reply-properties" => {
- "type" => OBJECT,
- "description" => "The description of the resource"
- }
- },
- "read-resource" => {
- "operation-name" => "read-resource",
- "description" => "Reads a model resource's attribute values along with either basic or complete information about any child resources",
- "request-properties" => {
- "recursive" => {
- "type" => BOOLEAN,
- "description" => "Whether to include complete information about child resources, recursively. If absent, false is the default",
- "required" => false,
- "nillable" => true,
- "default" => false
- },
- "recursive-depth" => {
- "type" => INT,
- "description" => "The depth to which information about child resources should be included.",
- "required" => false,
- "nillable" => true
- },
- "proxies" => {
- "type" => BOOLEAN,
- "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default.",
- "required" => false,
- "nillable" => true,
- "default" => false
- },
- "include-runtime" => {
- "type" => BOOLEAN,
- "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default.",
- "required" => false,
- "nillable" => true,
- "default" => false
- },
- "include-defaults" => {
- "type" => BOOLEAN,
- "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
- "required" => false,
- "nillable" => true,
- "default" => true
- }
- },
- "reply-properties" => {
- "type" => OBJECT,
- "description" => "The resource's attribute values along with information about any child resources"
- }
- },
- "add" => {
- "operation-name" => "add",
- "description" => "Add a representation of the transaction logging storage mechanism.",
- "request-properties" => {"type" => {
- "description" => "Specifies the implementation type of the logging store.",
- "type" => STRING,
- "required" => false,
- "default" => "\"default\""
- }}
- },
- "read-attribute" => {
- "operation-name" => "read-attribute",
- "description" => "Gets the value of an attribute for the selected resource",
- "request-properties" => {
- "name" => {
- "type" => STRING,
- "description" => "The name of the attribute to get the value for under the selected resource",
- "nillable" => false
- },
- "include-defaults" => {
- "type" => BOOLEAN,
- "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
- "required" => false,
- "nillable" => true,
- "default" => true
- }
- },
- "reply-properties" => {
- "type" => OBJECT,
- "description" => "The value of the attribute. The type will be that of the attribute found"
- }
- },
- "probe" => {
- "operation-name" => "probe",
- "description" => "Scan for new transaction logs. This operation will creates a child for each pending transaction."
- },
- "whoami" => {
- "operation-name" => "whoami",
- "description" => "Returns the identity of the currently authenticated user.",
- "request-properties" => {"verbose" => {
- "type" => BOOLEAN,
- "description" => "If set to true whoami also returns the users roles.",
- "required" => false,
- "nillable" => true,
- "default" => false
- }},
- "reply-properties" => {}
- },
- "read-children-types" => {
- "operation-name" => "read-children-types",
- "description" => "Gets the type names of all the children under the selected resource",
- "reply-properties" => {
- "type" => LIST,
- "description" => "The children types",
- "value-type" => STRING
- }
- },
- "read-operation-names" => {
- "operation-name" => "read-operation-names",
- "description" => "Gets the names of all the operations for the given resource",
- "reply-properties" => {
- "type" => LIST,
- "value-type" => STRING,
- "description" => "The operation names"
- }
- },
- "undefine-attribute" => {
- "operation-name" => "undefine-attribute",
- "description" => "Sets the value of an attribute of the selected resource to 'undefined'",
- "request-properties" => {"name" => {
- "type" => STRING,
- "description" => "The name of the attribute which should be set to 'undefined'",
- "nillable" => false
+ "children" => {}
+ }}
}}
- },
- "read-children-resources" => {
- "operation-name" => "read-children-resources",
- "description" => "Reads information about all of a resource's children that are of a given type",
- "request-properties" => {
- "child-type" => {
- "type" => STRING,
- "description" => "The name of the resource under which to get the child resources",
- "nillable" => false
- },
- "recursive" => {
- "type" => BOOLEAN,
- "description" => "Whether to get the children recursively. If absent, false is the default",
- "required" => false,
- "nillable" => true
- },
- "recursive-depth" => {
- "type" => INT,
- "description" => "The depth to which information about child resources should be included.",
- "required" => false,
- "nillable" => true
- },
- "proxies" => {
- "type" => BOOLEAN,
- "description" => "Whether to include remote resources in a recursive query (i.e. host level resources in a query of the domain root; running server resources in a query of a host). If absent, false is the default",
- "required" => false,
- "nillable" => true
- },
- "include-runtime" => {
- "type" => BOOLEAN,
- "description" => "Whether to include runtime attributes (i.e. those whose value does not come from the persistent configuration) in the response. If absent, false is the default. Ignored if the 'recursive' parameter is set to 'true'; i.e. runtime attributes can only be read in non-recursive queries.",
- "required" => false,
- "nillable" => true
- },
- "include-defaults" => {
- "type" => BOOLEAN,
- "description" => "Boolean to enable/disable default reading. In case it is set to false only attribute set by user are returned ignoring undefined.",
- "required" => false,
- "nillable" => true,
- "default" => true
- }
- },
- "reply-properties" => {
- "type" => LIST,
- "description" => "The children resources",
- "value-type" => OBJECT
- }
- },
- "write-attribute" => {
- "operation-name" => "write-attribute",
- "description" => "Sets the value of an attribute for the selected resource",
- "request-properties" => {
- "name" => {
- "type" => STRING,
- "description" => "The name of the attribute to set the value for under the selected resource",
- "nillable" => false
- },
- "value" => {
- "type" => STRING,
- "description" => "The value of the attribute to set the value for under the selected resource. May be null if the underlying model supports null values.",
- "nillable" => true,
- "required" => false
- }
- }
- }
- }
+ }}
+ }}
}}
}}
},
@@ -104728,151 +107106,191 @@
"tail-comment-allowed" => true,
"attributes" => {
"connection-url" => {
- "description" => "The JDBC driver connection URL",
"type" => STRING,
- "required" => true,
+ "description" => "The JDBC driver connection URL",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"driver-class" => {
- "description" => "The fully qualified name of the JDBC driver class",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified name of the JDBC driver class",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"datasource-class" => {
- "description" => "The fully qualified name of the JDBC datasource class",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified name of the JDBC datasource class",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"jndi-name" => {
- "description" => "Specifies the JNDI name for the datasource",
"type" => STRING,
- "required" => true,
+ "description" => "Specifies the JNDI name for the datasource",
+ "expressions-allowed" => true,
+ "nillable" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"driver-name" => {
- "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
"type" => STRING,
- "required" => true,
+ "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"new-connection-sql" => {
- "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"url-delimiter" => {
- "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"url-selector-strategy-class-name" => {
- "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
"type" => STRING,
- "required" => false,
+ "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-java-context" => {
- "description" => "Setting this to false will bind the datasource into global JNDI",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Setting this to false will bind the datasource into global JNDI",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"jta" => {
- "description" => "Enable JTA integration",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable JTA integration",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"max-pool-size" => {
- "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
"type" => INT,
- "required" => false,
- "default" => "20",
+ "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 20,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"min-pool-size" => {
- "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
"type" => INT,
- "required" => false,
- "default" => "0",
+ "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 0,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"pool-prefill" => {
- "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"pool-use-strict-min" => {
- "description" => "Specifies if the min-pool-size should be considered strictly",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Specifies if the min-pool-size should be considered strictly",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"user-name" => {
- "description" => "Specify the user name used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specify the user name used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"password" => {
- "description" => "Specifies the password used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the password used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"security-domain" => {
- "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"reauth-plugin-class-name" => {
- "description" => "The fully qualified class name of the reauthentication plugin implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified class name of the reauthentication plugin implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -104887,117 +107305,150 @@
"restart-required" => "no-services"
},
"flush-strategy" => {
- "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
"type" => STRING,
- "required" => false,
- "default" => "\"FailingConnectionOnly\"",
+ "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "FailingConnectionOnly",
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
+ "allow-multiple-users" => {
+ "type" => BOOLEAN,
+ "description" => "Specifies if multiple users will access the datasource through the getConnection(user, password) method and hence if the internal pool type should account for that",
+ "expressions-allowed" => false,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"prepared-statements-cache-size" => {
- "description" => "The number of prepared statements per connection in an LRU cache",
"type" => LONG,
- "required" => false,
+ "description" => "The number of prepared statements per connection in an LRU cache",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"share-prepared-statements" => {
- "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"track-statements" => {
- "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
"type" => STRING,
- "required" => false,
- "default" => "\"NOWARN\"",
+ "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "NOWARN",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"allocation-retry" => {
- "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
"type" => INT,
- "required" => false,
+ "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"allocation-retry-wait-millis" => {
- "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
"type" => LONG,
- "required" => false,
+ "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"blocking-timeout-wait-millis" => {
- "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
"type" => LONG,
- "required" => false,
+ "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"idle-timeout-minutes" => {
- "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => LONG,
- "required" => false,
+ "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MINUTES",
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"query-timeout" => {
- "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-try-lock" => {
- "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"set-tx-query-timeout" => {
- "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"transaction-isolation" => {
- "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
"type" => STRING,
- "required" => false,
+ "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"check-valid-connection-sql" => {
- "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"exception-sorter-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -105012,9 +107463,12 @@
"restart-required" => "no-services"
},
"stale-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -105029,9 +107483,12 @@
"restart-required" => "no-services"
},
"valid-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -105046,61 +107503,73 @@
"restart-required" => "no-services"
},
"background-validation-millis" => {
- "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
"type" => LONG,
- "required" => false,
+ "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
+ "min" => 1L,
+ "max" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"background-validation" => {
- "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-fast-fail" => {
- "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"validate-on-match" => {
- "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"spy" => {
- "description" => "Enable spying of SQL statements",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Enable spying of SQL statements",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-ccm" => {
- "description" => "Enable the use of a cached connection manager",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable the use of a cached connection manager",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"enabled" => {
- "description" => "Specifies if the datasource should be enabled",
"type" => BOOLEAN,
+ "description" => "Specifies if the datasource should be enabled",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "configuration"
},
@@ -106204,100 +108673,152 @@
"description" => "Add a new data-source",
"request-properties" => {
"connection-url" => {
- "description" => "The JDBC driver connection URL",
"type" => STRING,
- "required" => true
+ "description" => "The JDBC driver connection URL",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"driver-class" => {
- "description" => "The fully qualified name of the JDBC driver class",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified name of the JDBC driver class",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"datasource-class" => {
- "description" => "The fully qualified name of the JDBC datasource class",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified name of the JDBC datasource class",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"jndi-name" => {
- "description" => "Specifies the JNDI name for the datasource",
"type" => STRING,
- "required" => true
+ "description" => "Specifies the JNDI name for the datasource",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false
},
"driver-name" => {
- "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
"type" => STRING,
- "required" => true
+ "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"new-connection-sql" => {
- "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
"type" => STRING,
- "required" => false
+ "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"url-delimiter" => {
- "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"url-selector-strategy-class-name" => {
- "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
"type" => STRING,
- "required" => false
+ "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"use-java-context" => {
- "description" => "Setting this to false will bind the datasource into global JNDI",
"type" => BOOLEAN,
+ "description" => "Setting this to false will bind the datasource into global JNDI",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
},
"jta" => {
- "description" => "Enable JTA integration",
"type" => BOOLEAN,
+ "description" => "Enable JTA integration",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
},
"max-pool-size" => {
- "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
"type" => INT,
+ "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "20"
+ "nillable" => true
},
"min-pool-size" => {
- "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
"type" => INT,
+ "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "0"
+ "nillable" => true
},
"pool-prefill" => {
- "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
+ "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"pool-use-strict-min" => {
- "description" => "Specifies if the min-pool-size should be considered strictly",
"type" => BOOLEAN,
+ "description" => "Specifies if the min-pool-size should be considered strictly",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"user-name" => {
- "description" => "Specify the user name used when creating a new connection",
"type" => STRING,
- "required" => false
+ "description" => "Specify the user name used when creating a new connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"password" => {
- "description" => "Specifies the password used when creating a new connection",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the password used when creating a new connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"security-domain" => {
- "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"reauth-plugin-class-name" => {
- "description" => "The fully qualified class name of the reauthentication plugin implementation",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified class name of the reauthentication plugin implementation",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"reauth-plugin-properties" => {
"description" => "The properties for the reauthentication plugin",
@@ -106306,78 +108827,119 @@
"required" => false
},
"flush-strategy" => {
- "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
"type" => STRING,
+ "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
+ },
+ "allow-multiple-users" => {
+ "type" => BOOLEAN,
+ "description" => "Specifies if multiple users will access the datasource through the getConnection(user, password) method and hence if the internal pool type should account for that",
+ "expressions-allowed" => false,
"required" => false,
- "default" => "\"FailingConnectionOnly\""
+ "nillable" => true
},
"prepared-statements-cache-size" => {
- "description" => "The number of prepared statements per connection in an LRU cache",
"type" => LONG,
- "required" => false
+ "description" => "The number of prepared statements per connection in an LRU cache",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"share-prepared-statements" => {
- "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
"type" => BOOLEAN,
+ "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"track-statements" => {
- "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
"type" => STRING,
+ "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "\"NOWARN\""
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"allocation-retry" => {
- "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
"type" => INT,
- "required" => false
+ "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"allocation-retry-wait-millis" => {
- "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
"type" => LONG,
- "required" => false
+ "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"blocking-timeout-wait-millis" => {
- "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
"type" => LONG,
- "required" => false
+ "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MILLISECONDS"
},
"idle-timeout-minutes" => {
- "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => LONG,
- "required" => false
+ "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MINUTES"
},
"query-timeout" => {
- "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
"type" => LONG,
- "required" => false
+ "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"use-try-lock" => {
- "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
"type" => LONG,
- "required" => false
+ "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"set-tx-query-timeout" => {
- "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
"type" => BOOLEAN,
+ "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"transaction-isolation" => {
- "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
"type" => STRING,
- "required" => false
+ "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"check-valid-connection-sql" => {
- "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
"type" => STRING,
- "required" => false
+ "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"exception-sorter-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"exception-sorter-properties" => {
"description" => "The exception sorter properties",
@@ -106386,9 +108948,13 @@
"required" => false
},
"stale-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"stale-connection-checker-properties" => {
"description" => "The stale connection checker properties",
@@ -106397,9 +108963,13 @@
"required" => false
},
"valid-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"valid-connection-checker-properties" => {
"description" => "The valid connection checker properties",
@@ -106408,39 +108978,49 @@
"required" => false
},
"background-validation-millis" => {
- "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
"type" => LONG,
- "required" => false
+ "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
+ "min" => 1L,
+ "max" => 2147483647L
},
"background-validation" => {
- "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
+ "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"use-fast-fail" => {
- "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
"type" => BOOLEAN,
+ "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"validate-on-match" => {
- "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
"type" => BOOLEAN,
+ "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"spy" => {
- "description" => "Enable spying of SQL statements",
"type" => BOOLEAN,
+ "description" => "Enable spying of SQL statements",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"use-ccm" => {
- "description" => "Enable the use of a cached connection manager",
"type" => BOOLEAN,
+ "description" => "Enable the use of a cached connection manager",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
}
}
},
@@ -106589,151 +109169,191 @@
"tail-comment-allowed" => true,
"attributes" => {
"connection-url" => {
- "description" => "The JDBC driver connection URL",
"type" => STRING,
- "required" => true,
+ "description" => "The JDBC driver connection URL",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"driver-class" => {
- "description" => "The fully qualified name of the JDBC driver class",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified name of the JDBC driver class",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"datasource-class" => {
- "description" => "The fully qualified name of the JDBC datasource class",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified name of the JDBC datasource class",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"jndi-name" => {
- "description" => "Specifies the JNDI name for the datasource",
"type" => STRING,
- "required" => true,
+ "description" => "Specifies the JNDI name for the datasource",
+ "expressions-allowed" => true,
+ "nillable" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"driver-name" => {
- "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
"type" => STRING,
- "required" => true,
+ "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"new-connection-sql" => {
- "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"url-delimiter" => {
- "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"url-selector-strategy-class-name" => {
- "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
"type" => STRING,
- "required" => false,
+ "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-java-context" => {
- "description" => "Setting this to false will bind the datasource into global JNDI",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Setting this to false will bind the datasource into global JNDI",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"jta" => {
- "description" => "Enable JTA integration",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable JTA integration",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"max-pool-size" => {
- "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
"type" => INT,
- "required" => false,
- "default" => "20",
+ "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 20,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"min-pool-size" => {
- "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
"type" => INT,
- "required" => false,
- "default" => "0",
+ "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 0,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"pool-prefill" => {
- "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"pool-use-strict-min" => {
- "description" => "Specifies if the min-pool-size should be considered strictly",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Specifies if the min-pool-size should be considered strictly",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"user-name" => {
- "description" => "Specify the user name used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specify the user name used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"password" => {
- "description" => "Specifies the password used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the password used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"security-domain" => {
- "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"reauth-plugin-class-name" => {
- "description" => "The fully qualified class name of the reauthentication plugin implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified class name of the reauthentication plugin implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -106748,117 +109368,150 @@
"restart-required" => "no-services"
},
"flush-strategy" => {
- "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
"type" => STRING,
- "required" => false,
- "default" => "\"FailingConnectionOnly\"",
+ "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "FailingConnectionOnly",
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
+ "allow-multiple-users" => {
+ "type" => BOOLEAN,
+ "description" => "Specifies if multiple users will access the datasource through the getConnection(user, password) method and hence if the internal pool type should account for that",
+ "expressions-allowed" => false,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"prepared-statements-cache-size" => {
- "description" => "The number of prepared statements per connection in an LRU cache",
"type" => LONG,
- "required" => false,
+ "description" => "The number of prepared statements per connection in an LRU cache",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"share-prepared-statements" => {
- "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"track-statements" => {
- "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
"type" => STRING,
- "required" => false,
- "default" => "\"NOWARN\"",
+ "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "NOWARN",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"allocation-retry" => {
- "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
"type" => INT,
- "required" => false,
+ "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"allocation-retry-wait-millis" => {
- "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
"type" => LONG,
- "required" => false,
+ "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"blocking-timeout-wait-millis" => {
- "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
"type" => LONG,
- "required" => false,
+ "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"idle-timeout-minutes" => {
- "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => LONG,
- "required" => false,
+ "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MINUTES",
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"query-timeout" => {
- "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-try-lock" => {
- "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"set-tx-query-timeout" => {
- "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"transaction-isolation" => {
- "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
"type" => STRING,
- "required" => false,
+ "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"check-valid-connection-sql" => {
- "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"exception-sorter-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -106873,9 +109526,12 @@
"restart-required" => "no-services"
},
"stale-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -106890,9 +109546,12 @@
"restart-required" => "no-services"
},
"valid-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -106907,61 +109566,73 @@
"restart-required" => "no-services"
},
"background-validation-millis" => {
- "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
"type" => LONG,
- "required" => false,
+ "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
+ "min" => 1L,
+ "max" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"background-validation" => {
- "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-fast-fail" => {
- "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"validate-on-match" => {
- "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"spy" => {
- "description" => "Enable spying of SQL statements",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Enable spying of SQL statements",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-ccm" => {
- "description" => "Enable the use of a cached connection manager",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable the use of a cached connection manager",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"enabled" => {
- "description" => "Specifies if the datasource should be enabled",
"type" => BOOLEAN,
+ "description" => "Specifies if the datasource should be enabled",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "configuration"
}
@@ -107404,100 +110075,152 @@
"description" => "Add a new data-source",
"request-properties" => {
"connection-url" => {
- "description" => "The JDBC driver connection URL",
"type" => STRING,
- "required" => true
+ "description" => "The JDBC driver connection URL",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"driver-class" => {
- "description" => "The fully qualified name of the JDBC driver class",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified name of the JDBC driver class",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"datasource-class" => {
- "description" => "The fully qualified name of the JDBC datasource class",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified name of the JDBC datasource class",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"jndi-name" => {
- "description" => "Specifies the JNDI name for the datasource",
"type" => STRING,
- "required" => true
+ "description" => "Specifies the JNDI name for the datasource",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false
},
"driver-name" => {
- "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
"type" => STRING,
- "required" => true
+ "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"new-connection-sql" => {
- "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
"type" => STRING,
- "required" => false
+ "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"url-delimiter" => {
- "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"url-selector-strategy-class-name" => {
- "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
"type" => STRING,
- "required" => false
+ "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"use-java-context" => {
- "description" => "Setting this to false will bind the datasource into global JNDI",
"type" => BOOLEAN,
+ "description" => "Setting this to false will bind the datasource into global JNDI",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
},
"jta" => {
- "description" => "Enable JTA integration",
"type" => BOOLEAN,
+ "description" => "Enable JTA integration",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
},
"max-pool-size" => {
- "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
"type" => INT,
+ "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "20"
+ "nillable" => true
},
"min-pool-size" => {
- "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
"type" => INT,
+ "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "0"
+ "nillable" => true
},
"pool-prefill" => {
- "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
+ "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"pool-use-strict-min" => {
- "description" => "Specifies if the min-pool-size should be considered strictly",
"type" => BOOLEAN,
+ "description" => "Specifies if the min-pool-size should be considered strictly",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"user-name" => {
- "description" => "Specify the user name used when creating a new connection",
"type" => STRING,
- "required" => false
+ "description" => "Specify the user name used when creating a new connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"password" => {
- "description" => "Specifies the password used when creating a new connection",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the password used when creating a new connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"security-domain" => {
- "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"reauth-plugin-class-name" => {
- "description" => "The fully qualified class name of the reauthentication plugin implementation",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified class name of the reauthentication plugin implementation",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"reauth-plugin-properties" => {
"description" => "The properties for the reauthentication plugin",
@@ -107506,78 +110229,119 @@
"required" => false
},
"flush-strategy" => {
- "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
"type" => STRING,
+ "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "\"FailingConnectionOnly\""
+ "nillable" => true
+ },
+ "allow-multiple-users" => {
+ "type" => BOOLEAN,
+ "description" => "Specifies if multiple users will access the datasource through the getConnection(user, password) method and hence if the internal pool type should account for that",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true
},
"prepared-statements-cache-size" => {
- "description" => "The number of prepared statements per connection in an LRU cache",
"type" => LONG,
- "required" => false
+ "description" => "The number of prepared statements per connection in an LRU cache",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"share-prepared-statements" => {
- "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
"type" => BOOLEAN,
+ "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"track-statements" => {
- "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
"type" => STRING,
+ "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "\"NOWARN\""
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"allocation-retry" => {
- "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
"type" => INT,
- "required" => false
+ "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"allocation-retry-wait-millis" => {
- "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
"type" => LONG,
- "required" => false
+ "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"blocking-timeout-wait-millis" => {
- "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
"type" => LONG,
- "required" => false
+ "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MILLISECONDS"
},
"idle-timeout-minutes" => {
- "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => LONG,
- "required" => false
+ "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MINUTES"
},
"query-timeout" => {
- "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
"type" => LONG,
- "required" => false
+ "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"use-try-lock" => {
- "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
"type" => LONG,
- "required" => false
+ "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"set-tx-query-timeout" => {
- "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
"type" => BOOLEAN,
+ "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"transaction-isolation" => {
- "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
"type" => STRING,
- "required" => false
+ "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"check-valid-connection-sql" => {
- "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
"type" => STRING,
- "required" => false
+ "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"exception-sorter-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"exception-sorter-properties" => {
"description" => "The exception sorter properties",
@@ -107586,9 +110350,13 @@
"required" => false
},
"stale-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"stale-connection-checker-properties" => {
"description" => "The stale connection checker properties",
@@ -107597,9 +110365,13 @@
"required" => false
},
"valid-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"valid-connection-checker-properties" => {
"description" => "The valid connection checker properties",
@@ -107608,39 +110380,49 @@
"required" => false
},
"background-validation-millis" => {
- "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
"type" => LONG,
- "required" => false
+ "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
+ "min" => 1L,
+ "max" => 2147483647L
},
"background-validation" => {
- "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
+ "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"use-fast-fail" => {
- "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
"type" => BOOLEAN,
+ "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"validate-on-match" => {
- "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
"type" => BOOLEAN,
+ "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"spy" => {
- "description" => "Enable spying of SQL statements",
"type" => BOOLEAN,
+ "description" => "Enable spying of SQL statements",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"use-ccm" => {
- "description" => "Enable the use of a cached connection manager",
"type" => BOOLEAN,
+ "description" => "Enable the use of a cached connection manager",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
}
}
},
@@ -107793,170 +110575,208 @@
"tail-comment-allowed" => true,
"attributes" => {
"xa-datasource-class" => {
- "description" => "The fully qualified name of the javax.sql.XADataSource implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified name of the javax.sql.XADataSource implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"jndi-name" => {
- "description" => "Specifies the JNDI name for the datasource",
"type" => STRING,
- "required" => true,
+ "description" => "Specifies the JNDI name for the datasource",
+ "expressions-allowed" => true,
+ "nillable" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"driver-name" => {
- "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
"type" => STRING,
- "required" => true,
+ "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"new-connection-sql" => {
- "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"url-delimiter" => {
- "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"url-selector-strategy-class-name" => {
- "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
"type" => STRING,
- "required" => false,
+ "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-java-context" => {
- "description" => "Setting this to false will bind the datasource into global JNDI",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Setting this to false will bind the datasource into global JNDI",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"max-pool-size" => {
- "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
"type" => INT,
- "required" => false,
- "default" => "20",
+ "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 20,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"min-pool-size" => {
- "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
"type" => INT,
- "required" => false,
- "default" => "0",
+ "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => 0,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"pool-prefill" => {
- "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"pool-use-strict-min" => {
- "description" => "Specifies if the min-pool-size should be considered strictly",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Specifies if the min-pool-size should be considered strictly",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"interleaving" => {
- "description" => "An element to enable interleaving for XA connections",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "An element to enable interleaving for XA connections",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"no-tx-separate-pool" => {
- "description" => "Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different contexts",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different contexts",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"pad-xid" => {
- "description" => "Should the Xid be padded",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Should the Xid be padded",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"same-rm-override" => {
- "description" => "The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false",
"type" => BOOLEAN,
- "required" => false,
+ "description" => "The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"wrap-xa-resource" => {
- "description" => "Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"user-name" => {
- "description" => "Specify the user name used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specify the user name used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"password" => {
- "description" => "Specifies the password used when creating a new connection",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the password used when creating a new connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"security-domain" => {
- "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"reauth-plugin-class-name" => {
- "description" => "The fully qualified class name of the reauthentication plugin implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified class name of the reauthentication plugin implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -107971,117 +110791,150 @@
"restart-required" => "no-services"
},
"flush-strategy" => {
- "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
"type" => STRING,
- "required" => false,
- "default" => "\"FailingConnectionOnly\"",
+ "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "FailingConnectionOnly",
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
+ "allow-multiple-users" => {
+ "type" => BOOLEAN,
+ "description" => "Specifies if multiple users will access the datasource through the getConnection(user, password) method and hence if the internal pool type should account for that",
+ "expressions-allowed" => false,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"prepared-statements-cache-size" => {
- "description" => "The number of prepared statements per connection in an LRU cache",
"type" => LONG,
- "required" => false,
+ "description" => "The number of prepared statements per connection in an LRU cache",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"share-prepared-statements" => {
- "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"track-statements" => {
- "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
"type" => STRING,
- "required" => false,
- "default" => "\"NOWARN\"",
+ "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => "NOWARN",
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"allocation-retry" => {
- "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
"type" => INT,
- "required" => false,
+ "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"allocation-retry-wait-millis" => {
- "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
"type" => LONG,
- "required" => false,
+ "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"blocking-timeout-wait-millis" => {
- "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
"type" => LONG,
- "required" => false,
+ "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"idle-timeout-minutes" => {
- "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => LONG,
- "required" => false,
+ "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MINUTES",
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"query-timeout" => {
- "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-try-lock" => {
- "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
"type" => LONG,
- "required" => false,
+ "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"set-tx-query-timeout" => {
- "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"transaction-isolation" => {
- "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
"type" => STRING,
- "required" => false,
+ "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"check-valid-connection-sql" => {
- "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
"type" => STRING,
- "required" => false,
+ "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"exception-sorter-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -108096,9 +110949,12 @@
"restart-required" => "no-services"
},
"stale-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -108113,9 +110969,12 @@
"restart-required" => "no-services"
},
"valid-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
"type" => STRING,
- "required" => false,
+ "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -108130,94 +110989,116 @@
"restart-required" => "no-services"
},
"background-validation-millis" => {
- "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
"type" => LONG,
- "required" => false,
+ "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
+ "min" => 1L,
+ "max" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"background-validation" => {
- "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-fast-fail" => {
- "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"validate-on-match" => {
- "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"xa-resource-timeout" => {
- "description" => "The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero",
"type" => INT,
- "required" => false,
+ "description" => "The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"spy" => {
- "description" => "Enable spying of SQL statements",
"type" => BOOLEAN,
- "required" => false,
- "default" => "false",
+ "description" => "Enable spying of SQL statements",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"use-ccm" => {
- "description" => "Enable the use of a cached connection manager",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable the use of a cached connection manager",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"recovery-username" => {
- "description" => "The user name used for recovery",
"type" => STRING,
- "required" => false,
+ "description" => "The user name used for recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"recovery-password" => {
- "description" => "The password used for recovery",
"type" => STRING,
- "required" => false,
+ "description" => "The password used for recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"recovery-security-domain" => {
- "description" => "The security domain used for recovery",
"type" => STRING,
- "required" => false,
+ "description" => "The security domain used for recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"recovery-plugin-class-name" => {
- "description" => "The fully qualified class name of the recovery plugin implementation",
"type" => STRING,
- "required" => false,
+ "description" => "The fully qualified class name of the recovery plugin implementation",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -108232,25 +111113,30 @@
"restart-required" => "no-services"
},
"no-recovery" => {
- "description" => "Specifies if the connection pool should be excluded from recovery",
"type" => BOOLEAN,
- "required" => false,
+ "description" => "Specifies if the connection pool should be excluded from recovery",
+ "expressions-allowed" => true,
+ "nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"jta" => {
- "description" => "Enable JTA integration",
"type" => BOOLEAN,
- "required" => false,
- "default" => "true",
+ "description" => "Enable JTA integration",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"enabled" => {
- "description" => "Specifies if the datasource should be enabled",
"type" => BOOLEAN,
+ "description" => "Specifies if the datasource should be enabled",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => false,
"access-type" => "read-only",
"storage" => "configuration"
}
@@ -108693,113 +111579,162 @@
"description" => "Add a new XA data-source",
"request-properties" => {
"xa-datasource-class" => {
- "description" => "The fully qualified name of the javax.sql.XADataSource implementation",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified name of the javax.sql.XADataSource implementation",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"jndi-name" => {
- "description" => "Specifies the JNDI name for the datasource",
"type" => STRING,
- "required" => true
+ "description" => "Specifies the JNDI name for the datasource",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false
},
"driver-name" => {
- "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
"type" => STRING,
- "required" => true
+ "description" => "Defines the JDBC driver the datasource should use. It is a symbolic name matching the the name of installed driver. In case the driver is deployed as jar, the name is the name of deployment unit",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"new-connection-sql" => {
- "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
"type" => STRING,
- "required" => false
+ "description" => "Specifies an SQL statement to execute whenever a connection is added to the connection pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"url-delimiter" => {
- "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the delimiter for URLs in connection-url for HA datasources",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"url-selector-strategy-class-name" => {
- "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
"type" => STRING,
- "required" => false
+ "description" => "A class that implements org.jboss.jca.adapters.jdbc.URLSelectorStrategy",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"use-java-context" => {
- "description" => "Setting this to false will bind the datasource into global JNDI",
"type" => BOOLEAN,
+ "description" => "Setting this to false will bind the datasource into global JNDI",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
},
"max-pool-size" => {
- "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
"type" => INT,
+ "description" => "The max-pool-size element specifies the maximum number of connections for a pool. No more connections will be created in each sub-pool",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "20"
+ "nillable" => true
},
"min-pool-size" => {
- "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
"type" => INT,
+ "description" => "The min-pool-size element specifies the minimum number of connections for a pool",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "0"
+ "nillable" => true
},
"pool-prefill" => {
- "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
+ "description" => "Should the pool be prefilled. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"pool-use-strict-min" => {
- "description" => "Specifies if the min-pool-size should be considered strictly",
"type" => BOOLEAN,
+ "description" => "Specifies if the min-pool-size should be considered strictly",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"interleaving" => {
- "description" => "An element to enable interleaving for XA connections",
"type" => BOOLEAN,
+ "description" => "An element to enable interleaving for XA connections",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"no-tx-separate-pool" => {
- "description" => "Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different contexts",
"type" => BOOLEAN,
+ "description" => "Oracle does not like XA connections getting used both inside and outside a JTA transaction. To workaround the problem you can create separate sub-pools for the different contexts",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"pad-xid" => {
- "description" => "Should the Xid be padded",
"type" => BOOLEAN,
+ "description" => "Should the Xid be padded",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"same-rm-override" => {
- "description" => "The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false",
"type" => BOOLEAN,
- "required" => false
+ "description" => "The is-same-rm-override element allows one to unconditionally set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns true or false",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"wrap-xa-resource" => {
- "description" => "Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance",
"type" => BOOLEAN,
+ "description" => "Should the XAResource instances be wrapped in a org.jboss.tm.XAResourceWrapper instance",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
},
"user-name" => {
- "description" => "Specify the user name used when creating a new connection",
"type" => STRING,
- "required" => false
+ "description" => "Specify the user name used when creating a new connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"password" => {
- "description" => "Specifies the password used when creating a new connection",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the password used when creating a new connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"security-domain" => {
- "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
"type" => STRING,
- "required" => false
+ "description" => "Specifies the security domain which defines the javax.security.auth.Subject that are used to distinguish connections in the pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"reauth-plugin-class-name" => {
- "description" => "The fully qualified class name of the reauthentication plugin implementation",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified class name of the reauthentication plugin implementation",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"reauth-plugin-properties" => {
"description" => "The properties for the reauthentication plugin",
@@ -108808,78 +111743,119 @@
"required" => false
},
"flush-strategy" => {
- "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
"type" => STRING,
+ "description" => "Specifies how the pool should be flush in case of an error. Valid values are: FailingConnectionOnly (default), IdleConnections and EntirePool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
+ },
+ "allow-multiple-users" => {
+ "type" => BOOLEAN,
+ "description" => "Specifies if multiple users will access the datasource through the getConnection(user, password) method and hence if the internal pool type should account for that",
+ "expressions-allowed" => false,
"required" => false,
- "default" => "\"FailingConnectionOnly\""
+ "nillable" => true
},
"prepared-statements-cache-size" => {
- "description" => "The number of prepared statements per connection in an LRU cache",
"type" => LONG,
- "required" => false
+ "description" => "The number of prepared statements per connection in an LRU cache",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"share-prepared-statements" => {
- "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
"type" => BOOLEAN,
+ "description" => "Whether to share prepared statements, i.e. whether asking for same statement twice without closing uses the same underlying prepared statement",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"track-statements" => {
- "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
"type" => STRING,
+ "description" => "Whether to check for unclosed statements when a connection is returned to the pool, result sets are closed, a statement is closed or return to the prepared statement cache. Valid values are: \"false\" - do not track statements, \"true\" - track statements and result sets and warn when they are not closed, \"nowarn\" - track statements but do not warn about them being unclosed",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "\"NOWARN\""
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"allocation-retry" => {
- "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
"type" => INT,
- "required" => false
+ "description" => "The allocation retry element indicates the number of times that allocating a connection should be tried before throwing an exception",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"allocation-retry-wait-millis" => {
- "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
"type" => LONG,
- "required" => false
+ "description" => "The allocation retry wait millis element specifies the amount of time, in milliseconds, to wait between retrying to allocate a connection",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"blocking-timeout-wait-millis" => {
- "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
"type" => LONG,
- "required" => false
+ "description" => "The blocking-timeout-millis element specifies the maximum time, in milliseconds, to block while waiting for a connection before throwing an exception. Note that this blocks only while waiting for locking a connection, and will never throw an exception if creating a new connection takes an inordinately long time",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MILLISECONDS"
},
"idle-timeout-minutes" => {
- "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => LONG,
- "required" => false
+ "description" => "The idle-timeout-minutes elements specifies the maximum time, in minutes, a connection may be idle before being closed. The actual maximum time depends also on the IdleRemover scan time, which is half of the smallest idle-timeout-minutes value of any pool. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MINUTES"
},
"query-timeout" => {
- "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
"type" => LONG,
- "required" => false
+ "description" => "Any configured query timeout in seconds. If not provided no timeout will be set",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"use-try-lock" => {
- "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
"type" => LONG,
- "required" => false
+ "description" => "Any configured timeout for internal locks on the resource adapter objects in seconds",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"set-tx-query-timeout" => {
- "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
"type" => BOOLEAN,
+ "description" => "Whether to set the query timeout based on the time remaining until transaction timeout. Any configured query timeout will be used if there is no transaction",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"transaction-isolation" => {
- "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
"type" => STRING,
- "required" => false
+ "description" => "Set the java.sql.Connection transaction isolation level. Valid values are: TRANSACTION_READ_UNCOMMITTED, TRANSACTION_READ_COMMITTED, TRANSACTION_REPEATABLE_READ, TRANSACTION_SERIALIZABLE and TRANSACTION_NONE",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"check-valid-connection-sql" => {
- "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
"type" => STRING,
- "required" => false
+ "description" => "Specify an SQL statement to check validity of a pool connection. This may be called when managed connection is obtained from the pool",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"exception-sorter-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.ExceptionSorter that provides an isExceptionFatal(SQLException) method to validate if an exception should broadcast an error",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"exception-sorter-properties" => {
"description" => "The exception sorter properties",
@@ -108888,9 +111864,13 @@
"required" => false
},
"stale-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.StaleConnectionChecker that provides an isStaleConnection(SQLException) method which if it returns true will wrap the exception in an org.jboss.jca.adapters.jdbc.StaleConnectionException",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"stale-connection-checker-properties" => {
"description" => "The stale connection checker properties",
@@ -108899,9 +111879,13 @@
"required" => false
},
"valid-connection-checker-class-name" => {
- "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
"type" => STRING,
- "required" => false
+ "description" => "An org.jboss.jca.adapters.jdbc.ValidConnectionChecker that provides an isValidConnection(Connection) method to validate a connection. If an exception is returned that means the connection is invalid. This overrides the check-valid-connection-sql element",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"valid-connection-checker-properties" => {
"description" => "The valid connection checker properties",
@@ -108910,64 +111894,92 @@
"required" => false
},
"background-validation-millis" => {
- "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
"type" => LONG,
- "required" => false
+ "description" => "The background-validation-millis element specifies the amount of time, in milliseconds, that background validation will run. Changing this value can be done only on disabled datasource, requires a server restart otherwise",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "unit" => "MILLISECONDS",
+ "min" => 1L,
+ "max" => 2147483647L
},
"background-validation" => {
- "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
"type" => BOOLEAN,
+ "description" => "An element to specify that connections should be validated on a background thread versus being validated prior to use. Changing this value can be done only on disabled datasource, requires a server restart otherwise.",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"use-fast-fail" => {
- "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
"type" => BOOLEAN,
+ "description" => "Whether to fail a connection allocation on the first try if it is invalid (true) or keep trying until the pool is exhausted of all potential connections (false)",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"validate-on-match" => {
- "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
"type" => BOOLEAN,
+ "description" => "The validate-on-match element specifies if connection validation should be done when a connection factory attempts to match a managed connection. This is typically exclusive to the use of background validation",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"xa-resource-timeout" => {
- "description" => "The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero",
"type" => INT,
- "required" => false
+ "description" => "The value is passed to XAResource.setTransactionTimeout(), in seconds. Default is zero",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"spy" => {
- "description" => "Enable spying of SQL statements",
"type" => BOOLEAN,
+ "description" => "Enable spying of SQL statements",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "false"
+ "nillable" => true
},
"use-ccm" => {
- "description" => "Enable the use of a cached connection manager",
"type" => BOOLEAN,
+ "description" => "Enable the use of a cached connection manager",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
},
"recovery-username" => {
- "description" => "The user name used for recovery",
"type" => STRING,
- "required" => false
+ "description" => "The user name used for recovery",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"recovery-password" => {
- "description" => "The password used for recovery",
"type" => STRING,
- "required" => false
+ "description" => "The password used for recovery",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"recovery-security-domain" => {
- "description" => "The security domain used for recovery",
"type" => STRING,
- "required" => false
+ "description" => "The security domain used for recovery",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"recovery-plugin-class-name" => {
- "description" => "The fully qualified class name of the recovery plugin implementation",
"type" => STRING,
- "required" => false
+ "description" => "The fully qualified class name of the recovery plugin implementation",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"recovery-plugin-properties" => {
"description" => "The properties for the recovery plugin",
@@ -108976,15 +111988,18 @@
"required" => false
},
"no-recovery" => {
- "description" => "Specifies if the connection pool should be excluded from recovery",
"type" => BOOLEAN,
- "required" => false
+ "description" => "Specifies if the connection pool should be excluded from recovery",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
},
"jta" => {
- "description" => "Enable JTA integration",
"type" => BOOLEAN,
+ "description" => "Enable JTA integration",
+ "expressions-allowed" => true,
"required" => false,
- "default" => "true"
+ "nillable" => true
}
}
},
@@ -115112,16 +118127,6 @@
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
- },
- "category" => {
- "type" => STRING,
- "description" => "Specifies the category for the logger.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-only",
- "storage" => "configuration"
}
},
"operations" => {
@@ -116629,16 +119634,6 @@
"model-description" => {"*" => {
"description" => "Defines a handler which writes to the sub-handlers in an asynchronous thread. Used for handlers which introduce a substantial amount of lag.",
"attributes" => {
- "name" => {
- "type" => STRING,
- "description" => "The handler's name.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-only",
- "storage" => "configuration"
- },
"level" => {
"type" => STRING,
"description" => "The log level specifying which message levels will be logged by this. Message levels lower than this value will be discarded.",
@@ -117846,6 +120841,17 @@
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
+ },
+ "encoding" => {
+ "type" => STRING,
+ "description" => "The character encoding used by this Handler.",
+ "expressions-allowed" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
}
},
"operations" => {
@@ -120590,16 +123596,6 @@
"model-description" => {"*" => {
"description" => "Defines a handler which writes to the console.",
"attributes" => {
- "name" => {
- "type" => STRING,
- "description" => "The handler's name.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-only",
- "storage" => "configuration"
- },
"encoding" => {
"type" => STRING,
"description" => "The character encoding used by this Handler.",
@@ -124502,16 +127498,6 @@
"model-description" => {"*" => {
"description" => "Defines a handler which writes to a file.",
"attributes" => {
- "name" => {
- "type" => STRING,
- "description" => "The handler's name.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-only",
- "storage" => "configuration"
- },
"encoding" => {
"type" => STRING,
"description" => "The character encoding used by this Handler.",
@@ -128482,16 +131468,6 @@
"model-description" => {"*" => {
"description" => "Defines a handler which writes to a file, rotating the log after a time period derived from the given suffix string, which should be in a format understood by java.text.SimpleDateFormat.",
"attributes" => {
- "name" => {
- "type" => STRING,
- "description" => "The handler's name.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-only",
- "storage" => "configuration"
- },
"encoding" => {
"type" => STRING,
"description" => "The character encoding used by this Handler.",
@@ -132485,16 +135461,6 @@
"model-description" => {"*" => {
"description" => "Defines a handler which writes to a file, rotating the log after a the size of the file grows beyond a certain point and keeping a fixed number of backups.",
"attributes" => {
- "name" => {
- "type" => STRING,
- "description" => "The handler's name.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-only",
- "storage" => "configuration"
- },
"encoding" => {
"type" => STRING,
"description" => "The character encoding used by this Handler.",
@@ -136519,16 +139485,6 @@
"model-description" => {"*" => {
"description" => "Defines a custom logging handler. The custom handler must extend java.util.logging.Handler.",
"attributes" => {
- "name" => {
- "type" => STRING,
- "description" => "The handler's name.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-only",
- "storage" => "configuration"
- },
"encoding" => {
"type" => STRING,
"description" => "The character encoding used by this Handler.",
@@ -142622,15 +145578,24 @@
"description" => "Defines a way in which in-VM connections can be made to the HornetQ server.",
"model-description" => {"*" => {
"description" => "Defines a way in which in-VM connections can be made to the HornetQ server.",
- "attributes" => {"server-id" => {
- "type" => INT,
- "description" => "The server id.",
- "expressions-allowed" => false,
- "nillable" => false,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- }},
+ "attributes" => {
+ "server-id" => {
+ "type" => INT,
+ "description" => "The server id.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "started" => {
+ "description" => "Whether this acceptor is started.",
+ "type" => BOOLEAN,
+ "nillable" => false,
+ "access-type" => "read-only",
+ "storage" => "runtime"
+ }
+ },
"children" => {"param" => {
"description" => "A key-value pair understood by the acceptor factory-class and used to configure it.",
"min-occurs" => 0,
@@ -148902,7 +151867,7 @@
"attributes" => {
"connector" => {
"type" => OBJECT,
- "description" => "Defines the connectors. These are stored in a map by connector name, with the backup connectors stored as the value, or an undefined value if there is no backup connector.",
+ "description" => "Defines the connectors. These are stored in a map by connector name (with an undefined value).",
"expressions-allowed" => false,
"nillable" => true,
"value-type" => STRING,
@@ -149497,7 +152462,7 @@
"request-properties" => {
"connector" => {
"type" => OBJECT,
- "description" => "Defines the connectors. These are stored in a map by connector name, with the backup connectors stored as the value, or an undefined value if there is no backup connector.",
+ "description" => "Defines the connectors. These are stored in a map by connector name (with an undefined value).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -150572,17 +153537,26 @@
"description" => "Defines a way in which remote connections can be made to the HornetQ server.",
"model-description" => {"*" => {
"description" => "Defines a way in which remote connections can be made to the HornetQ server.",
- "attributes" => {"socket-binding" => {
- "type" => STRING,
- "description" => "The socket binding reference.",
- "expressions-allowed" => false,
- "nillable" => false,
- "min-length" => 1L,
- "max-length" => 2147483647L,
- "access-type" => "read-write",
- "storage" => "configuration",
- "restart-required" => "all-services"
- }},
+ "attributes" => {
+ "socket-binding" => {
+ "type" => STRING,
+ "description" => "The socket binding reference.",
+ "expressions-allowed" => false,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "all-services"
+ },
+ "started" => {
+ "description" => "Whether this acceptor is started.",
+ "type" => BOOLEAN,
+ "nillable" => false,
+ "access-type" => "read-only",
+ "storage" => "runtime"
+ }
+ },
"children" => {"param" => {
"description" => "A key-value pair understood by the acceptor factory-class and used to configure it.",
"min-occurs" => 0,
@@ -151932,6 +154906,13 @@
"access-type" => "read-only",
"storage" => "runtime"
},
+ "topology" => {
+ "description" => "The topology of the nodes that this cluster connection is aware of.",
+ "type" => STRING,
+ "nillable" => false,
+ "access-type" => "read-only",
+ "storage" => "runtime"
+ },
"started" => {
"description" => "Whether the cluster connection is started.",
"type" => BOOLEAN,
@@ -152377,7 +155358,7 @@
"attributes" => {
"connector" => {
"type" => OBJECT,
- "description" => "Defines the connectors. These are stored in a map by connector name, with the backup connectors stored as the value, or an undefined value if there is no backup connector.",
+ "description" => "Defines the connectors. These are stored in a map by connector name (with an undefined value).",
"expressions-allowed" => false,
"nillable" => true,
"value-type" => STRING,
@@ -152916,7 +155897,7 @@
"request-properties" => {
"connector" => {
"type" => OBJECT,
- "description" => "Defines the connectors. These are stored in a map by connector name, with the backup connectors stored as the value, or an undefined value if there is no backup connector.",
+ "description" => "Defines the connectors. These are stored in a map by connector name (with an undefined value).",
"expressions-allowed" => false,
"required" => false,
"nillable" => true,
@@ -158200,6 +161181,26 @@
"storage" => "configuration",
"restart-required" => "no-services"
},
+ "spec-descriptor-property-replacement" => {
+ "type" => BOOLEAN,
+ "description" => "Flag indicating whether descriptors defined by the Java EE specification will have property replacements applied",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
+ "jboss-descriptor-property-replacement" => {
+ "type" => BOOLEAN,
+ "description" => "Flag indicating whether JBoss specific deployment descriptors will have property replacements applied",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "default" => true,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
"ear-subdeployments-isolated" => {
"type" => BOOLEAN,
"description" => "Flag indicating whether each of the subdeployments within a .ear can access classes belonging to another subdeployment within the same .ear. A value of false means the subdeployments can see classes belonging to other subdeployments within the .ear.",
@@ -158368,6 +161369,20 @@
}
}
},
+ "spec-descriptor-property-replacement" => {
+ "type" => BOOLEAN,
+ "description" => "Flag indicating whether descriptors defined by the Java EE specification will have property replacements applied",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
+ },
+ "jboss-descriptor-property-replacement" => {
+ "type" => BOOLEAN,
+ "description" => "Flag indicating whether JBoss specific deployment descriptors will have property replacements applied",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true
+ },
"ear-subdeployments-isolated" => {
"type" => BOOLEAN,
"description" => "Flag indicating whether each of the subdeployments within a .ear can access classes belonging to another subdeployment within the same .ear. A value of false means the subdeployments can see classes belonging to other subdeployments within the .ear.",
@@ -158792,7 +161807,7 @@
},
"debug" => {
"type" => BOOLEAN,
- "description" => "Enables javamail debugging",
+ "description" => "Enables JavaMail debugging",
"expressions-allowed" => true,
"nillable" => true,
"default" => false,
@@ -158960,7 +161975,7 @@
},
"debug" => {
"type" => BOOLEAN,
- "description" => "Enables javamail debugging",
+ "description" => "Enables JavaMail debugging",
"expressions-allowed" => true,
"required" => false,
"nillable" => true
@@ -159111,7 +162126,7 @@
"attributes" => {
"outbound-socket-binding-ref" => {
"type" => STRING,
- "description" => "Outbound Socket binding to POP3 server",
+ "description" => "Outbound Socket binding to mail server",
"expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
@@ -159122,7 +162137,7 @@
},
"ssl" => {
"type" => BOOLEAN,
- "description" => "Does server requires SSL?",
+ "description" => "Does server require SSL?",
"expressions-allowed" => true,
"nillable" => true,
"default" => false,
@@ -159288,11 +162303,11 @@
},
"add" => {
"operation-name" => "add",
- "description" => "adds smtp server",
+ "description" => "adds mail server",
"request-properties" => {
"outbound-socket-binding-ref" => {
"type" => STRING,
- "description" => "Outbound Socket binding to POP3 server",
+ "description" => "Outbound Socket binding to mail server",
"expressions-allowed" => true,
"required" => false,
"nillable" => true,
@@ -159301,7 +162316,7 @@
},
"ssl" => {
"type" => BOOLEAN,
- "description" => "Does server requires SSL?",
+ "description" => "Does server require SSL?",
"expressions-allowed" => true,
"required" => false,
"nillable" => true
@@ -159460,7 +162475,7 @@
"attributes" => {
"outbound-socket-binding-ref" => {
"type" => STRING,
- "description" => "Outbound Socket binding to POP3 server",
+ "description" => "Outbound Socket binding to mail server",
"expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
@@ -159471,7 +162486,7 @@
},
"ssl" => {
"type" => BOOLEAN,
- "description" => "Does server requires SSL?",
+ "description" => "Does server require SSL?",
"expressions-allowed" => true,
"nillable" => true,
"default" => false,
@@ -159637,11 +162652,11 @@
},
"add" => {
"operation-name" => "add",
- "description" => "adds smtp server",
+ "description" => "adds mail server",
"request-properties" => {
"outbound-socket-binding-ref" => {
"type" => STRING,
- "description" => "Outbound Socket binding to POP3 server",
+ "description" => "Outbound Socket binding to mail server",
"expressions-allowed" => true,
"required" => false,
"nillable" => true,
@@ -159650,7 +162665,7 @@
},
"ssl" => {
"type" => BOOLEAN,
- "description" => "Does server requires SSL?",
+ "description" => "Does server require SSL?",
"expressions-allowed" => true,
"required" => false,
"nillable" => true
@@ -159809,7 +162824,7 @@
"attributes" => {
"outbound-socket-binding-ref" => {
"type" => STRING,
- "description" => "Outbound Socket binding to POP3 server",
+ "description" => "Outbound Socket binding to mail server",
"expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
@@ -159820,7 +162835,7 @@
},
"ssl" => {
"type" => BOOLEAN,
- "description" => "Does server requires SSL?",
+ "description" => "Does server require SSL?",
"expressions-allowed" => true,
"nillable" => true,
"default" => false,
@@ -159986,11 +163001,11 @@
},
"add" => {
"operation-name" => "add",
- "description" => "adds smtp server",
+ "description" => "adds mail server",
"request-properties" => {
"outbound-socket-binding-ref" => {
"type" => STRING,
- "description" => "Outbound Socket binding to POP3 server",
+ "description" => "Outbound Socket binding to mail server",
"expressions-allowed" => true,
"required" => false,
"nillable" => true,
@@ -159999,7 +163014,7 @@
},
"ssl" => {
"type" => BOOLEAN,
- "description" => "Does server requires SSL?",
+ "description" => "Does server require SSL?",
"expressions-allowed" => true,
"required" => false,
"nillable" => true
@@ -164584,7 +167599,7 @@
"key-alias" => {
"type" => STRING,
"description" => "The key alias.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"nillable" => true,
"default" => "jboss",
"min-length" => 1L,
@@ -164899,7 +167914,7 @@
"key-alias" => {
"type" => STRING,
"description" => "The key alias.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"required" => false,
"nillable" => true,
"min-length" => 1L,
@@ -166466,32 +169481,56 @@
"description" => "resource-adapter",
"attributes" => {
"archive" => {
- "description" => "Specifies the resource adapter archive",
"type" => STRING,
- "required" => true,
+ "description" => "Specifies the resource adapter archive",
+ "expressions-allowed" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"transaction-support" => {
- "description" => "Specifies the transaction support level of the resource adapter",
"type" => STRING,
- "required" => true,
+ "description" => "Specifies the transaction support level of the resource adapter",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "allowed" => [
+ "NoTransaction",
+ "LocalTransaction",
+ "XATransaction"
+ ],
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"bootstrap-context" => {
+ "type" => STRING,
"description" => "Specifies the unique name of the bootstrap context that should be used",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
+ "access-type" => "read-write",
+ "storage" => "configuration",
+ "restart-required" => "no-services"
+ },
+ "config-properties" => {
"type" => STRING,
- "required" => false,
+ "description" => "Custom defined config properties",
+ "expressions-allowed" => true,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
"beanvalidationgroups" => {
"description" => "Specifies the bean validation groups that should be used",
- "type" => STRING,
+ "type" => LIST,
+ "value-type" => STRING,
"required" => false,
"access-type" => "read-write",
"storage" => "configuration",
@@ -168739,23 +171778,48 @@
"description" => "Add a new resource adapter",
"request-properties" => {
"archive" => {
- "description" => "Specifies the resource adapter archive",
"type" => STRING,
- "required" => true
+ "description" => "Specifies the resource adapter archive",
+ "expressions-allowed" => true,
+ "required" => true,
+ "nillable" => false,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"transaction-support" => {
- "description" => "Specifies the transaction support level of the resource adapter",
"type" => STRING,
- "required" => true
+ "description" => "Specifies the transaction support level of the resource adapter",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "allowed" => [
+ "NoTransaction",
+ "LocalTransaction",
+ "XATransaction"
+ ]
},
"bootstrap-context" => {
+ "type" => STRING,
"description" => "Specifies the unique name of the bootstrap context that should be used",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
+ },
+ "config-properties" => {
"type" => STRING,
- "required" => false
+ "description" => "Custom defined config properties",
+ "expressions-allowed" => true,
+ "required" => false,
+ "nillable" => true,
+ "min-length" => 1L,
+ "max-length" => 2147483647L
},
"beanvalidationgroups" => {
"description" => "Specifies the bean validation groups that should be used",
- "type" => STRING,
+ "type" => LIST,
+ "value-type" => STRING,
"required" => false
}
}
@@ -170447,6 +173511,22 @@
"nillable" => false,
"min-length" => 1
},
+ "flag" => {
+ "description" => "The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.",
+ "type" => STRING,
+ "nillable" => true,
+ "allowed" => [
+ "required",
+ "requisite",
+ "sufficient",
+ "optional"
+ ]
+ },
+ "module" => {
+ "type" => STRING,
+ "nillable" => true,
+ "description" => "Name of JBoss Module where the auth module code is located."
+ },
"module-options" => {
"description" => "List of module options containing a name/value pair.",
"type" => OBJECT,
@@ -170613,6 +173693,22 @@
"nillable" => false,
"min-length" => 1
},
+ "flag" => {
+ "description" => "The flag controls how the module participates in the overall procedure. Allowed values are requisite, required, sufficient or optional.",
+ "type" => STRING,
+ "nillable" => true,
+ "allowed" => [
+ "required",
+ "requisite",
+ "sufficient",
+ "optional"
+ ]
+ },
+ "module" => {
+ "type" => STRING,
+ "nillable" => true,
+ "description" => "Name of JBoss Module where the auth module code is located."
+ },
"module-options" => {
"description" => "List of module options containing a name/value pair.",
"type" => OBJECT,
@@ -172100,7 +175196,7 @@
"client-auth" => {
"type" => BOOLEAN,
"description" => "Boolean attribute to indicate if client's certificates should also be authenticated on the server side.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"nillable" => true,
"access-type" => "read-write",
"storage" => "configuration",
@@ -172109,7 +175205,7 @@
"protocols" => {
"type" => STRING,
"description" => "Comma separated list of protocols to enable on SSLSockets.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
@@ -172126,27 +175222,32 @@
"password" => {
"description" => "Sets the password of the truststore. Either this or 'keystore-password' must be present otherwise the security domain will be useless.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"type" => {
"description" => "Type of the truststore. If not set, type defaults to 'JKS'.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"url" => {
"description" => "URL of the truststore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the truststore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider-argument" => {
"description" => "String argument to pass to the truststore Provider constructor when instantiating it.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
},
"access-type" => "read-write",
@@ -172162,12 +175263,14 @@
"algorithm" => {
"description" => "Algorithm to use when creating the TrustManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the TrustManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
},
"access-type" => "read-write",
@@ -172183,12 +175286,14 @@
"algorithm" => {
"description" => "Algorithm to use when creating the KeyManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the KeyManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
},
"access-type" => "read-write",
@@ -172198,7 +175303,7 @@
"service-auth-token" => {
"type" => STRING,
"description" => "Token to retrieve PrivateKeys from the KeyStore.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
@@ -172215,27 +175320,32 @@
"password" => {
"description" => "Sets the password of the keystore. Either this or 'truststore-password' must be present otherwise the security domain will be useless.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"type" => {
"description" => "Type of the keystore. If not set, type defaults to 'JKS'.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"url" => {
"description" => "URL of the keystore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the KeyStore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider-argument" => {
"description" => "String argument to pass to the keystore Provider constructor when instantiating it.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
},
"access-type" => "read-write",
@@ -172255,7 +175365,7 @@
"server-alias" => {
"type" => STRING,
"description" => "Preferred alias to use when the KeyManager chooses the server alias.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
@@ -172266,7 +175376,7 @@
"client-alias" => {
"type" => STRING,
"description" => "Preferred alias to use when the KeyManager chooses the client alias.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
@@ -172277,7 +175387,7 @@
"cipher-suites" => {
"type" => STRING,
"description" => "Comma separated list of cipher suites to enable on SSLSockets.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L,
@@ -172426,14 +175536,14 @@
"client-auth" => {
"type" => BOOLEAN,
"description" => "Boolean attribute to indicate if client's certificates should also be authenticated on the server side.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"required" => false,
"nillable" => true
},
"protocols" => {
"type" => STRING,
"description" => "Comma separated list of protocols to enable on SSLSockets.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"required" => false,
"nillable" => true,
"min-length" => 1L,
@@ -172449,27 +175559,32 @@
"password" => {
"description" => "Sets the password of the truststore. Either this or 'keystore-password' must be present otherwise the security domain will be useless.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"type" => {
"description" => "Type of the truststore. If not set, type defaults to 'JKS'.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"url" => {
"description" => "URL of the truststore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the truststore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider-argument" => {
"description" => "String argument to pass to the truststore Provider constructor when instantiating it.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
}
},
@@ -172483,12 +175598,14 @@
"algorithm" => {
"description" => "Algorithm to use when creating the TrustManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the TrustManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
}
},
@@ -172502,19 +175619,21 @@
"algorithm" => {
"description" => "Algorithm to use when creating the KeyManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the KeyManagerFactory.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
}
},
"service-auth-token" => {
"type" => STRING,
"description" => "Token to retrieve PrivateKeys from the KeyStore.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"required" => false,
"nillable" => true,
"min-length" => 1L,
@@ -172530,27 +175649,32 @@
"password" => {
"description" => "Sets the password of the keystore. Either this or 'truststore-password' must be present otherwise the security domain will be useless.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"type" => {
"description" => "Type of the keystore. If not set, type defaults to 'JKS'.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"url" => {
"description" => "URL of the keystore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider" => {
"description" => "Provider class name to use when creating the KeyStore.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
},
"provider-argument" => {
"description" => "String argument to pass to the keystore Provider constructor when instantiating it.",
"type" => STRING,
- "nillable" => true
+ "nillable" => true,
+ "expressions-allowed" => true
}
}
},
@@ -172565,7 +175689,7 @@
"server-alias" => {
"type" => STRING,
"description" => "Preferred alias to use when the KeyManager chooses the server alias.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"required" => false,
"nillable" => true,
"min-length" => 1L,
@@ -172574,7 +175698,7 @@
"client-alias" => {
"type" => STRING,
"description" => "Preferred alias to use when the KeyManager chooses the client alias.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"required" => false,
"nillable" => true,
"min-length" => 1L,
@@ -172583,7 +175707,7 @@
"cipher-suites" => {
"type" => STRING,
"description" => "Comma separated list of cipher suites to enable on SSLSockets.",
- "expressions-allowed" => false,
+ "expressions-allowed" => true,
"required" => false,
"nillable" => true,
"min-length" => 1L,
@@ -173076,23 +176200,23 @@
"model-description" => {"classic" => {
"description" => "Security Vault for attributes.",
"attributes" => {
- "code" => {
- "type" => STRING,
- "description" => "Fully Qualified Name of the Security Vault Implementation.",
+ "vault-options" => {
+ "type" => OBJECT,
+ "description" => "Security Vault options.",
"expressions-allowed" => false,
"nillable" => true,
- "min-length" => 1L,
- "max-length" => 2147483647L,
+ "value-type" => STRING,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
},
- "options" => {
- "type" => OBJECT,
- "description" => "Security Vault options.",
+ "code" => {
+ "type" => STRING,
+ "description" => "Fully Qualified Name of the Security Vault Implementation.",
"expressions-allowed" => false,
"nillable" => true,
- "value-type" => STRING,
+ "min-length" => 1L,
+ "max-length" => 2147483647L,
"access-type" => "read-write",
"storage" => "configuration",
"restart-required" => "no-services"
@@ -173235,6 +176359,14 @@
"operation-name" => "add",
"description" => "Adds a security vault configuration",
"request-properties" => {
+ "vault-options" => {
+ "type" => OBJECT,
+ "description" => "Security Vault options.",
+ "expressions-allowed" => false,
+ "required" => false,
+ "nillable" => true,
+ "value-type" => STRING
+ },
"code" => {
"type" => STRING,
"description" => "Fully Qualified Name of the Security Vault Implementation.",
@@ -173243,14 +176375,6 @@
"nillable" => true,
"min-length" => 1L,
"max-length" => 2147483647L
- },
- "options" => {
- "type" => OBJECT,
- "description" => "Security Vault options.",
- "expressions-allowed" => false,
- "required" => false,
- "nillable" => true,
- "value-type" => STRING
}
},
"reply-properties" => {}
commit 01b7c4cbe31426bb19e859f4205d1562e61162dc
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Sep 26 22:26:12 2012 +0200
Making sure the integration-tests profile can build (still the apache tests
don't succeed but that is another problem ;) ).
diff --git a/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java b/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java
index f6697ce..315c835 100644
--- a/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java
+++ b/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java
@@ -28,9 +28,13 @@ import org.apache.commons.logging.LogFactory;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.ProcessScan;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.pluginapi.availability.AvailabilityCollectorRunnable;
+import org.rhq.core.pluginapi.availability.AvailabilityContext;
+import org.rhq.core.pluginapi.availability.AvailabilityFacet;
import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
import org.rhq.core.pluginapi.inventory.PluginContainerDeployment;
import org.rhq.core.pluginapi.inventory.ProcessScanResult;
@@ -104,7 +108,31 @@ public class ApacheExecutionUtil {
Resource resource = new Resource(result.getResourceKey(), null, apacheServerResourceType);
resource.setPluginConfiguration(config);
resourceContext = new ResourceContext<PlatformComponent>(resource, null, null, discoveryComponent, systemInfo,
- null, null, null, null, null, null, null, null, null);
+ null, null, null, null, null, null, new AvailabilityContext() {
+
+ @Override
+ public void requestAvailabilityCheck() {
+ }
+
+ @Override
+ public AvailabilityType getLastReportedAvailability() {
+ return AvailabilityType.UP;
+ }
+
+ @Override
+ public void enable() {
+ }
+
+ @Override
+ public void disable() {
+ }
+
+ @Override
+ public AvailabilityCollectorRunnable createAvailabilityCollectorRunnable(
+ AvailabilityFacet availChecker, long interval) {
+ return null;
+ }
+ }, null, null);
serverComponent.start(resourceContext);
}
diff --git a/modules/pom.xml b/modules/pom.xml
index bf9c606..c2c5087 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -162,11 +162,14 @@
<module>enterprise/agent</module>
<module>enterprise/comm</module>
- <!-- These 6 are needed for the JNDI intergration tests -->
+ <!-- These are needed for the JNDI intergration tests -->
<module>enterprise/server/container-lib</module>
<module>enterprise/server/xml-schemas</module>
<module>enterprise/server/safe-invoker</module>
<module>enterprise/server/jar</module>
+ <module>enterprise/scripting/api</module>
+ <module>enterprise/scripting/javascript</module>
+ <module>enterprise/scripting/python</module>
<module>enterprise/binding</module>
<module>enterprise/server/client-api</module>
commit c15c285fd8e482b20a584b1ebb319e61bef2a98a
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Sep 26 15:35:38 2012 +0200
Apache plugin integration test compiles again.
diff --git a/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java b/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java
index 752b421..f6697ce 100644
--- a/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java
+++ b/modules/integration-tests/apache-plugin-test/src/test/java/org/rhq/plugins/apache/util/ApacheExecutionUtil.java
@@ -103,8 +103,8 @@ public class ApacheExecutionUtil {
Resource resource = new Resource(result.getResourceKey(), null, apacheServerResourceType);
resource.setPluginConfiguration(config);
- resourceContext = new ResourceContext<PlatformComponent>(resource, null, null,
- discoveryComponent, systemInfo, null, null, null, null, null, null, null, null);
+ resourceContext = new ResourceContext<PlatformComponent>(resource, null, null, discoveryComponent, systemInfo,
+ null, null, null, null, null, null, null, null, null);
serverComponent.start(resourceContext);
}
@@ -138,10 +138,12 @@ public class ApacheExecutionUtil {
++i;
- LOG.warn("Could not detect the httpd process after invoking the start operation but the operation didn't throw any exception. I will retry at most ten times and then fail loudly. This has been attempt no. " + i);
+ LOG.warn("Could not detect the httpd process after invoking the start operation but the operation didn't throw any exception. I will retry at most ten times and then fail loudly. This has been attempt no. "
+ + i);
}
- throw new IllegalStateException("Failed to start the httpd process even after 10 retries without the apache component complaining. This is super strange.");
+ throw new IllegalStateException(
+ "Failed to start the httpd process even after 10 retries without the apache component complaining. This is super strange.");
}
public ResourceContext<PlatformComponent> getResourceContext() {
commit 225ae4d705905b66ba323b62046bc8cf30359027
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Sep 26 15:34:57 2012 +0200
[BZ 846292] - The directory component no longer blows up on updating
directory entries in other files than the main Apache config file.
Also slightly improved the error reporting during the
updateResourceConfiguration() call so that the error is more apparent
from the log entry.
diff --git a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java
index 661f556..47814af 100644
--- a/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java
+++ b/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheDirectoryComponent.java
@@ -39,6 +39,7 @@ import org.rhq.core.pluginapi.inventory.DeleteResourceFacet;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
import org.rhq.core.pluginapi.inventory.ResourceContext;
+import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.plugins.apache.mapping.ApacheAugeasMapping;
import org.rhq.plugins.apache.util.AugeasNodeSearch;
@@ -74,17 +75,14 @@ public class ApacheDirectoryComponent implements ResourceComponent<ApacheVirtual
throw new IllegalStateException(ApacheServerComponent.CONFIGURATION_NOT_SUPPORTED_ERROR_MESSAGE);
}
- ApacheVirtualHostServiceComponent parentVirtualHost = resourceContext.getParentResourceComponent();
-
AugeasComponent comp = getAugeas();
try {
AugeasTree tree = comp.getAugeasTree(ApacheServerComponent.AUGEAS_HTTP_MODULE_NAME);
ConfigurationDefinition resourceConfigDef =
resourceContext.getResourceType().getResourceConfigurationDefinition();
- AugeasNode virtualHostNode = parentVirtualHost.getNode(tree);
ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree);
- return mapping.updateConfiguration(getNode(virtualHostNode), resourceConfigDef);
+ return mapping.updateConfiguration(getNode(tree), resourceConfigDef);
} finally {
comp.close();
}
@@ -104,7 +102,7 @@ public class ApacheDirectoryComponent implements ResourceComponent<ApacheVirtual
ConfigurationDefinition resourceConfigDef =
resourceContext.getResourceType().getResourceConfigurationDefinition();
ApacheAugeasMapping mapping = new ApacheAugeasMapping(tree);
- AugeasNode directoryNode = getNode(tree.getRootNode());
+ AugeasNode directoryNode = getNode(tree);
mapping.updateAugeas(directoryNode, report.getConfiguration(), resourceConfigDef);
tree.save();
@@ -114,10 +112,12 @@ public class ApacheDirectoryComponent implements ResourceComponent<ApacheVirtual
resourceContext.getParentResourceComponent().finishConfigurationUpdate(report);
} catch (Exception e) {
if (tree != null)
- log.error("Augeas failed to save configuration " + tree.summarizeAugeasError());
+ log.error("Augeas failed to save configuration " + tree.summarizeAugeasError(), e);
else
log.error("Augeas failed to save configuration", e);
report.setStatus(ConfigurationUpdateStatus.FAILURE);
+ report.setErrorMessage("Augeas failed to save the configuration. "
+ + ThrowableUtil.getStackAsString(e));
} finally {
comp.close();
}
@@ -128,15 +128,12 @@ public class ApacheDirectoryComponent implements ResourceComponent<ApacheVirtual
throw new IllegalStateException(ApacheServerComponent.CONFIGURATION_NOT_SUPPORTED_ERROR_MESSAGE);
}
- ApacheVirtualHostServiceComponent parentVirtualHost = resourceContext.getParentResourceComponent();
-
AugeasComponent comp = getAugeas();
try {
AugeasTree tree = comp.getAugeasTree(ApacheServerComponent.AUGEAS_HTTP_MODULE_NAME);
- AugeasNode virtualHostNode = parentVirtualHost.getNode(tree);
- AugeasNode myNode = getNode(virtualHostNode);
+ AugeasNode myNode = getNode(tree);
if (myNode != null) {
tree.removeNode(myNode, true);
@@ -156,24 +153,27 @@ public class ApacheDirectoryComponent implements ResourceComponent<ApacheVirtual
}
/**
- * Gets the node from under given node corresponding to the Directory this
- * component is managing.
+ * @deprecated do not use this unless you're absolutely sure you're passing in the right virtual host
+ * node. If you're not sure, use {@link #getNode(AugeasTree)} instead.
*
* @param virtualHost
- * the node of the parent virtualHost (or root node of the augeas
- * tree)
* @return
*/
+ @Deprecated
public AugeasNode getNode(AugeasNode virtualHost) {
AugeasNode directory = AugeasNodeSearch.findNodeById(virtualHost, resourceContext.getResourceKey());
return directory;
}
+ /**
+ * Gets the node of the Directory this component is managing from the augeas tree.
+ *
+ * @param tree the augeas tree of the whole apache configuration
+ */
public AugeasNode getNode(AugeasTree tree) {
- ApacheVirtualHostServiceComponent virtHost = resourceContext.getParentResourceComponent();
AugeasNode virtHostNode = resourceContext.getParentResourceComponent().getNode(tree);
- return getNode(virtHostNode);
+ return AugeasNodeSearch.findNodeById(virtHostNode, resourceContext.getResourceKey());
}
public AugeasComponent getAugeas() {
commit c39e2fabda3fd6629df9cf9d7045bb15dd54e78e
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Sep 26 15:25:54 2012 -0500
[BZ 803737] Update difference type.
diff --git a/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml b/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml
index c857b44..8c5e293 100644
--- a/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml
+++ b/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml
@@ -1,7 +1,7 @@
<differences>
<difference>
<className>org/rhq/modules/plugins/jbossas7/BaseServerComponent</className>
- <differenceType>7011</differenceType>
+ <differenceType>7013</differenceType>
<method>java.lang.String getBaseDirAttributeName()</method>
<justification>Functionality enhancements</justification>
</difference>
commit d891b56fa5275ed36d1e7be303d2aa98f5150f3f
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Sep 26 14:38:59 2012 -0500
[BZ 803737] - Update the ignore rules for AS7 plugin to use path expressions for class names.
diff --git a/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml b/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml
index 13e6809..c857b44 100644
--- a/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml
+++ b/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml
@@ -1,49 +1,49 @@
<differences>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.BaseServerComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/BaseServerComponent</className>
<differenceType>7011</differenceType>
<method>java.lang.String getBaseDirAttributeName()</method>
<justification>Functionality enhancements</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.BaseServerComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/BaseServerComponent</className>
<differenceType>7004</differenceType>
<method>boolean waitUntilDown(org.rhq.core.pluginapi.operation.OperationResult)</method>
<justification>Functionality enhancements</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.helper.HostConfiguration</className>
+ <className>org/rhq/modules/plugins/jbossas7/helper/HostConfiguration</className>
<differenceType>7002</differenceType>
<method>org.rhq.modules.plugins.jbossas7.helper.HostPort getHostPort(org.rhq.modules.plugins.jbossas7.AS7CommandLine)</method>
<justification>Method no longer needed</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.IspnCContainerComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/IspnCContainerComponent</className>
<differenceType>8001</differenceType>
<justification>Class no longer needed, functionality already implemented in other classes.</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.IspnCacheComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/IspnCacheComponent</className>
<differenceType>8001</differenceType>
<justification>Class no longer needed, functionality already implemented in other classes.</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.IspnComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/IspnComponent</className>
<differenceType>8001</differenceType>
<justification>Class no longer needed, functionality already implemented in other classes.</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.ThreadPoolComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/ThreadPoolComponent</className>
<differenceType>8001</differenceType>
<justification>Class no longer needed, functionality already implemented in other classes.</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.ThreadsComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/ThreadsComponent</className>
<differenceType>8001</differenceType>
<justification>Class no longer needed, functionality already implemented in other classes.</justification>
</difference>
<difference>
- <className>org.rhq.modules.plugins.jbossas7.WebservicesComponent</className>
+ <className>org/rhq/modules/plugins/jbossas7/WebservicesComponent</className>
<differenceType>8001</differenceType>
<justification>Class no longer needed, functionality already implemented in other classes.</justification>
</difference>
commit 83d01eaf0eecc246bb519497376706dad0dd978b
Merge: 623736e 463e7a7
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Sep 26 14:40:46 2012 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit 623736eb9931fae27d9c305ca9dd7c722e27c698
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Sep 26 14:40:30 2012 -0400
[BZ 860807] have the else statement actually do something
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
index 8b26cb2..f4066f0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
@@ -453,7 +453,7 @@ public abstract class AbstractOperationScheduleDetailsView extends
this.operationParameters = (defaultTemplate != null) ? defaultTemplate.createConfiguration()
: new Configuration();
} else {
-
+ this.operationParameters = new Configuration();
}
ConfigurationGWTServiceAsync configurationService = GWTServiceLookup.getConfigurationService();
commit 463e7a7994b95b9533891960a9d4a0e5dc46a2aa
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Wed Sep 26 11:24:39 2012 -0500
[BZ 803737] - Adding the ignore rules for intentional API changes in AS7 plugin.
diff --git a/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml b/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml
new file mode 100644
index 0000000..13e6809
--- /dev/null
+++ b/modules/plugins/jboss-as-7/intentional-api-changes-since-4.4.0.xml
@@ -0,0 +1,50 @@
+<differences>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.BaseServerComponent</className>
+ <differenceType>7011</differenceType>
+ <method>java.lang.String getBaseDirAttributeName()</method>
+ <justification>Functionality enhancements</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.BaseServerComponent</className>
+ <differenceType>7004</differenceType>
+ <method>boolean waitUntilDown(org.rhq.core.pluginapi.operation.OperationResult)</method>
+ <justification>Functionality enhancements</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.helper.HostConfiguration</className>
+ <differenceType>7002</differenceType>
+ <method>org.rhq.modules.plugins.jbossas7.helper.HostPort getHostPort(org.rhq.modules.plugins.jbossas7.AS7CommandLine)</method>
+ <justification>Method no longer needed</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.IspnCContainerComponent</className>
+ <differenceType>8001</differenceType>
+ <justification>Class no longer needed, functionality already implemented in other classes.</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.IspnCacheComponent</className>
+ <differenceType>8001</differenceType>
+ <justification>Class no longer needed, functionality already implemented in other classes.</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.IspnComponent</className>
+ <differenceType>8001</differenceType>
+ <justification>Class no longer needed, functionality already implemented in other classes.</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.ThreadPoolComponent</className>
+ <differenceType>8001</differenceType>
+ <justification>Class no longer needed, functionality already implemented in other classes.</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.ThreadsComponent</className>
+ <differenceType>8001</differenceType>
+ <justification>Class no longer needed, functionality already implemented in other classes.</justification>
+ </difference>
+ <difference>
+ <className>org.rhq.modules.plugins.jbossas7.WebservicesComponent</className>
+ <differenceType>8001</differenceType>
+ <justification>Class no longer needed, functionality already implemented in other classes.</justification>
+ </difference>
+</differences>
commit d41955c0175c795668d8e51ea7b742453a30b5ee
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Sep 24 16:44:28 2012 +0200
[BZ 859982] - Resetting the custom blur event handling before and after a popup dialog is shown in the configuration editor.
This prevents unhandled errors when for example entering an entry into the
list of maps multiple times.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
index 5687ded..bfddfcc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
@@ -1727,6 +1727,10 @@ public class ConfigurationEditor extends LocatableVLayout {
summaryTable.redraw();
}
+ //reset the custom blur event handling - we're destroying the new form here
+ blurUnsetItem = null;
+ blurValueItem = null;
+
layout.destroy();
popup.destroy();
}
@@ -1755,6 +1759,10 @@ public class ConfigurationEditor extends LocatableVLayout {
buttonBar.addMember(cancelButton);
}
+ //reset the custom blur event handling - we're creating a new form here
+ blurUnsetItem = null;
+ blurValueItem = null;
+
layout.addMember(buttonBar);
popup.addItem(layout);
popup.show();
commit 9e966129a566562bba0e6e0db8b5c0f7e029c29b
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Sep 25 10:31:58 2012 +0200
Remove to-be-removed webservices from the build.
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index 6de50d0..9c2f61d 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -29,11 +29,12 @@
<jdk>1.6</jdk>
</activation>
- <modules>
+ <modules>
<module>cli</module>
</modules>
</profile>
+<!--
<profile>
<id>enterprise</id>
@@ -47,6 +48,7 @@
<module>webservices</module>
</modules>
</profile>
+-->
</profiles>
commit 0b3703348583e70aa53cbaea9a4661a2fde49e1f
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Sep 25 10:30:03 2012 +0200
Add a script that creates a confluence-version of the git shortlog between two tags. Includes a mapping file for committers and their multiple accounts they commit from.
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..67f51f8
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,74 @@
+Adam Young <ayoung(a)redhat.com>
+Asaf Shakarchi <ashakarc(a)redhat.com>
+Bryan Kearney <bkearney(a)redhat.com> <bkearney(a)localhost.localdomain>
+Charles Crouch <ccrouch(a)redhat.com>
+Denis Krusko <kruskod(a)gmail.com>
+Devan Goodwin <dgoodwin(a)redhat.com>
+Elias Ross <elias_ross(a)apple.com>
+Elias Ross <elias_ross(a)apple.com> <genman(a)noderunner.net>
+Fady Matar <fmatar(a)redhat.com>
+Filip Drabek <fdrabek(a)redhat.com> <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
+Fusayuki Minamoto <fminamot(a)redhat.com>
+Galder Zamarreno <rnd(a)zamarreno.com>
+Greg Hinkle <ghinkle(a)redhat.com>
+Heiko W. Rupp <hwr(a)redhat.com> <hrupp(a)snert.(none)>
+Heiko W. Rupp <hwr(a)redhat.com> <hwr(a)pilhuhn.de>
+Heiko W. Rupp <hwr(a)redhat.com> <hrupp(a)pintsize.home.pilhuhn.de>
+Heiko W. Rupp <hwr(a)redhat.com> <pilhuhn(a)fedorapeople.org>
+Heiko W. Rupp <hwr(a)redhat.com> <pilhuhn(a)fedoraproject.org>
+Heiko W. Rupp <hwr(a)redhat.com> <hrupp(a)redhat.com>
+Heiko W. Rupp <hwr(a)redhat.com>
+Hudson <jboss-qa-internal(a)redhat.com>
+Ian P. Springer <ian.springer(a)redhat.com> <ips(a)jetengine.(none)>
+Ian P. Springer <ian.springer(a)redhat.com> <ips(a)jetengine.springer.net>
+Ian P. Springer <ian.springer(a)redhat.com> <ispringe(a)redhat.com>
+Ian P. Springer <ian.springer(a)redhat.com> <ips@.(none)>
+Ian P. Springer <ian.springer(a)redhat.com> <ips(a)fedoraproject.org>
+James Livingston <jlivings(a)redhat.com>
+Jan Martiška <jmartisk(a)redhat.com>
+Jason Dobies <jason.dobies(a)redhat.com> <jdobies(a)redhat.com>
+Jay Shaughnessy <jshaughn(a)redhat.com>
+Jay Shaughnessy <jshaughn(a)redhat.com> <jshaughnessy@jshaughnessy-PC>
+Jay Shaughnessy <jshaughn(a)redhat.com> <jshaughnessy@.(none)>
+Jeff Ortel <jortel(a)redhat.com>
+Jessica Sant <jsant(a)redhat.com>
+Jijun Liu <lxjijun(a)gmail.com>
+Jirka Kremser <jkremser(a)redhat.com> <jkremser(a)jkremser-tp520.(none)>
+Jirka Kremser <jkremser(a)redhat.com>
+John Matthews <jmatthews(a)redhat.com>
+John Mazzitelli <mazz(a)redhat.com>
+John Sanda <jsanda(a)redhat.com> <john(a)John-Sandas-iMac.local>
+John Sanda <jsanda(a)redhat.com> <jsanda(a)localhost.localdomain>
+John Sanda <jsanda(a)redhat.com> <jsanda(a)Johns-MacBook-Pro.local>
+John Sanda <jsanda(a)redhat.com> <john(a)localhost.localdomain>
+John Sanda <jsanda(a)redhat.com>
+Joseph Marques <jmarques(a)redhat.com> <joseph(a)redhat.com>
+Justin Harris <jharris(a)redhat.com>
+Larry O'Leary <loleary(a)redhat.com>
+Lukas Krejci <lkrejci(a)redhat.com>
+Mark Spritzler <mspritzl(a)redhat.com>
+Mattias Nilsson Grip <matn(a)redpill-linpro.com>
+Mike McCune <mmccune(a)gibson.pdx.redhat.com>
+Mike Thompson <mithomps(a)redhat.com>
+Mike Thompson <mithomps(a)redhat.com> <mikecthompson(a)gmail.com>
+Mohamed Hamza Ben Mansour <>
+Noam Malki <nmalki(a)redhat.com>
+Partha Aji <paji(a)redhat.com>
+Pradeep Kilambi <pkilambi(a)redhat.com>
+Rafael Soares <rafaelcba(a)gmail.com> <rsoares(a)redhat.com>
+Richard Hensman <richard(a)onevisionconsulting.co.uk>
+Robert Buck <buck.robert.j(a)gmail.com> <rbuck(a)redhat.com>
+Sayli Karmarkar <skarmark(a)redhat.com>
+Shannon Hughes <shughes(a)redhat.com> <shughes(a)scooby.rdu.redhat.com>
+Shannon Hughes <shughes(a)redhat.com> <shughes(a)fred.hughes.lan>
+Simeon Pinder <spinder(a)redhat.com> <simeonpinder(a)gmail.com>
+Simeon Pinder <spinder(a)redhat.com> <spinder(a)cacaphonix.conchfritter.com>
+Simeon Pinder <spinder(a)redhat.com> <spinder(a)fulliautomatix.conchfritter.com>
+Simeon Pinder <spinder(a)redhat.com>
+Stefan Negrea <snegrea(a)redhat.com>
+Steve Millidge <smillidge(a)c2b2.co.uk>
+Ted Won 원종석 <tedd824(a)gmail.com>
+Test JON User <test_jon(a)jon01.qa.atl2.redhat.com>
+Todd B Sanders <tsanders(a)dhcp231-67.rdu.redhat.com>
+Torben Jäger <torben(a)jit-central.com>
+hudson auto <wnstb(a)yahoo.com>
diff --git a/etc/scripts/createRelasenotes.pl b/etc/scripts/createRelasenotes.pl
new file mode 100644
index 0000000..7984d8f
--- /dev/null
+++ b/etc/scripts/createRelasenotes.pl
@@ -0,0 +1,38 @@
+#!/usr/bin/perl
+
+#
+# Small script to create release notes from the git short log.
+# Parameters are old and new tag. If the new tag is omitted,
+# HEAD is used
+#
+# Output of the script can be pasted into the markup
+# release notes of confluence
+#
+# Sample command line:
+# $ perl etc/scripts/createRelasenotes.pl RHQ_4_4_0 RHQ_4_5_0
+#
+# Author: Heiko W. Rupp
+#
+
+
+die "Usage createReleasenotes FROM_TAG [TO_TAG]" unless $#ARGV>-1;
+$OLD_TAG=$ARGV[0];
+$TO_TAG=$ARGV[1];
+
+$COMMAND="git shortlog -e $OLD_TAG..$TO_TAG |";
+
+open(GIT,$COMMAND);
+
+while(<GIT>) {
+
+# print "IN: ", $_;
+ next if /^$/;
+ s/^[\s\[]*BZ\s([0-9]{5,7})(\]? .*)$/ [BZ $1|https:\/\/bugzilla.redhat.com\/show_bug.cgi\?id\=$1] $2/;
+ s/^[\s\[]*Bug\s([0-9]{5,7})(\]? .*)$/ [BZ $1|https:\/\/bugzilla.redhat.com\/show_bug.cgi\?id\=$1] $2/;
+ if (/ .*/) {
+ s/^ (.*)/** $1/;
+ } else {
+ s/(.*)/* $1/;
+ }
+ print $_;
+}
commit a12de7e6234039a99b68497505fe350bceda7eed
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Sep 25 10:26:16 2012 +0200
Remove unused webdav source code.
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index ba83687..985ae9d 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -31,7 +31,6 @@
<module>installer-war</module>
<module>base-perspective-jar</module>
<module>base-perspective-war</module>
- <!--<module>webdav-war</module>-->
<module>content_http-war</module>
<module>coregui</module>
<module>rest-war</module>
diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml
deleted file mode 100644
index 3ab00df..0000000
--- a/modules/enterprise/gui/webdav-war/pom.xml
+++ /dev/null
@@ -1,286 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-parent</artifactId>
- <version>4.3.0-SNAPSHOT</version>
- <relativePath>../../../../pom.xml</relativePath>
- </parent>
-
- <artifactId>rhq-webdav</artifactId>
- <packaging>war</packaging>
-
- <name>RHQ Enterprise WebDav</name>
- <description>The RHQ WebDav inventory access</description>
-
- <dependencies>
-
- <!-- Internal Deps -->
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-domain</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope> <!-- by rhq.ear (as ejb-jar) -->
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-gui</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-enterprise-server</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope> <!-- by rhq.ear (as ejb-jar) -->
- </dependency>
-
- <dependency>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-core-util</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope> <!-- by rhq.ear -->
- </dependency>
-
- <!-- 3rd Party Deps -->
- <dependency>
- <groupId>com.ettrema</groupId>
- <artifactId>milton-api</artifactId>
- <version>1.4.1</version>
- </dependency>
-
- <dependency>
- <groupId>com.ettrema</groupId>
- <artifactId>milton-servlet</artifactId>
- <version>1.4.1</version>
- </dependency>
-
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.4.3</version>
- </dependency>
-
-
- <dependency>
- <groupId>hibernate</groupId>
- <artifactId>hibernate3</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- used by a test JSP -->
- <dependency>
- <groupId>hibernate-entitymanager</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <!-- needed for referenced domain entities that use Hibernate annotations (due to JDK5 bug) -->
- <dependency>
- <groupId>hibernate-annotations</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
-
- <!-- needed for referenced domain entities that use JPA annotations (due to JDK5 bug) -->
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
-
- <!-- needed for EJB3 annotations (e.g. ApplicationException) -->
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-ejb3x</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-j2ee</artifactId>
- <!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
-
-
-
-
-
-
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.1</version>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>provided</scope> <!-- by JBossAS -->
- </dependency>
-
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.1.4</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>rhq-webdav</finalName>
- <plugins>
-
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1-alpha-1</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Build-Number>${buildNumber}</Build-Number>
- </manifestEntries>
- </archive>
- <webResources>
- <resource>
- <filtering>false</filtering>
- <directory>${basedir}/src/main/webapp</directory>
- </resource>
- </webResources>
- </configuration>
- </plugin>
-
- </plugins>
-
- </build>
-
- <profiles>
-
- <profile>
- <id>dev</id>
-
- <properties>
- <rhq.rootDir>../../../..</rhq.rootDir>
- <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir>
- <rhq.deploymentName>${project.build.finalName}.war</rhq.deploymentName>
- <rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/${rhq.deploymentName}</rhq.deploymentDir>
- </properties>
-
- <build>
- <plugins>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
-
- <execution>
- <id>deploy-classes</id>
- <phase>compile</phase>
- <configuration>
- <target>
- <property name="classes.dir" location="${rhq.deploymentDir}/WEB-INF/classes" />
- <echo>*** Copying updated files from target/classes to ${classes.dir}...</echo>
- <copy todir="${classes.dir}" verbose="${rhq.verbose}">
- <fileset dir="target/classes" />
- </copy>
- <property name="deployment.dir" location="${rhq.deploymentDir}" />
- <echo>*** Copying updated files from src${file.separator}main${file.separator}webapp${file.separator} to ${deployment.dir}${file.separator}...</echo>
- <copy todir="${deployment.dir}" verbose="${rhq.verbose}">
- <fileset dir="${basedir}/src/main/webapp" />
- </copy>
- <!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. -->
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>deploy</id>
- <phase>package</phase>
- <configuration>
- <target>
- <property name="deployment.dir" location="${rhq.deploymentDir}" />
- <echo>*** Copying updated files from target${file.separator}${project.build.finalName}${file.separator} to ${deployment.dir}${file.separator}...</echo>
- <copy todir="${deployment.dir}" verbose="${rhq.verbose}">
- <fileset dir="${basedir}/target/${project.build.finalName}" />
- </copy>
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>undeploy</id>
- <phase>clean</phase>
- <configuration>
- <target>
- <property name="deployment.dir" location="${rhq.deploymentDir}" />
- <echo>*** Deleting ${deployment.dir}${file.separator}...</echo>
- <delete dir="${deployment.dir}" />
- </target>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
- <repositories>
- <repository>
- <id>ettrema</id>
- <url>http://www.ettrema.com/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
-</project>
diff --git a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/AuthenticatedCollectionResource.java b/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/AuthenticatedCollectionResource.java
deleted file mode 100644
index 5a86620..0000000
--- a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/AuthenticatedCollectionResource.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 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.gui.webdav;
-
-import java.util.List;
-
-import com.bradmcevoy.http.CollectionResource;
-import com.bradmcevoy.http.Resource;
-
-import org.rhq.core.domain.auth.Subject;
-
-/**
- * This is the {@link CollectionResource} interface with an additional ability
- * to obtain the collection given a specific subject.
- *
- * @author John Mazzitelli
- */
-public interface AuthenticatedCollectionResource extends CollectionResource {
- List<? extends Resource> getChildren(Subject subject);
-}
diff --git a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/Authenticator.java b/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/Authenticator.java
deleted file mode 100644
index cb61cc42..0000000
--- a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/Authenticator.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 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.gui.webdav;
-
-import javax.security.auth.login.LoginException;
-
-import com.bradmcevoy.http.Resource;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.enterprise.server.util.LookupUtil;
-
-/**
- * Provides a utility object to perform user authentication.
- *
- * @author John Mazzitelli
- */
-public class Authenticator {
- private static final Log LOG = LogFactory.getLog(Authenticator.class);
-
- private Subject subject = null;
-
- public Authenticator(Subject subject) {
- this.subject = subject;
- }
-
- /**
- * If the user has successfully authenticated himself, this will return the Subject for that login.
- * If the user never logged in or failed to authenticate successfully, this will be <code>null</code>.
- *
- * @return the authenticated subject, or <code>null</code> if user is not authenticated
- */
- public Subject getSubject() {
- return this.subject;
- }
-
- /**
- * For those times when a user does not need to be authenticated to obtain data, use
- * the overlord user, which provides full superuser authentication.
- *
- * @return the overlord user
- */
- public Subject getOverlord() {
- return LookupUtil.getSubjectManager().getOverlord();
- }
-
- /**
- * Logs the user in with the given credentials.
- *
- * <i>This signature must match that of {@link Resource#authenticate(String, String)}</i>
- *
- * @param username
- * @param password
- *
- * @return the {@link Subject} of the authenticated user
- */
- public Object authenticate(String username, String password) {
- try {
- this.subject = LookupUtil.getSubjectManager().login(username, password);
- LOG.debug("User [" + username + "] logged into the webdav server");
- } catch (LoginException e) {
- LOG.warn("User [" + username + "] failed to log into the webdav server");
- this.subject = null;
- }
- return this.subject;
- }
-
- /**
- * Returns the security realm that the user must authenticate with.
- *
- * <i>This signature must match that of {@link Resource#getRealm()}</i>
- *
- * @return security realm name
- */
- public String getRealm() {
- return "Jopr Management Environment";
- }
-}
diff --git a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/AvailabilityResource.java b/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/AvailabilityResource.java
deleted file mode 100644
index 31eaf11..0000000
--- a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/AvailabilityResource.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 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.gui.webdav;
-
-import java.util.Date;
-
-import com.bradmcevoy.http.PropFindableResource;
-
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.measurement.Availability;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.enterprise.server.measurement.AvailabilityManagerLocal;
-import org.rhq.enterprise.server.util.LookupUtil;
-
-/**
- * The property to indicate if the resource is up or down.
- *
- * @author Greg Hinkle
- * @author John Mazzitelli
- */
-public class AvailabilityResource extends BasicResource implements PropFindableResource {
- private Availability availability;
-
- public AvailabilityResource(Subject subject, Resource managedResource) {
- super(subject, managedResource);
- }
-
- public String getUniqueId() {
- return "avail_" + getAvailability().getId();
- }
-
- public String getName() {
- return "availability_is_" + getAvailability().getAvailabilityType().getName();
- }
-
- /**
- * The modified date is that when the current availability took effect.
- * This is the same as {@link #getCreateDate()}.
- */
- public Date getModifiedDate() {
- return getAvailability().getStartTime();
- }
-
- /**
- * The created date is that when the current availability took effect.
- * This is the same as {@link #getModifiedDate()}.
- */
- public Date getCreateDate() {
- return getModifiedDate();
- }
-
- private Availability getAvailability() {
- if (this.availability == null) {
- AvailabilityManagerLocal am = LookupUtil.getAvailabilityManager();
- this.availability = am.getCurrentAvailabilityForResource(getSubject(), getManagedResource().getId());
- }
- return this.availability;
- }
-}
diff --git a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/BasicResource.java b/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/BasicResource.java
deleted file mode 100644
index e21f026..0000000
--- a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/BasicResource.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 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.gui.webdav;
-
-import com.bradmcevoy.http.Auth;
-import com.bradmcevoy.http.PropFindableResource;
-import com.bradmcevoy.http.Request;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.enterprise.server.authz.AuthorizationManagerLocal;
-import org.rhq.enterprise.server.util.LookupUtil;
-
-/**
- * Represents a basic managed resource. Provides some hooks to the authentication subsystem to
- * ensure the user is allowed to see the resource.
- *
- * @see ResourceFolder
- *
- * @author Greg Hinkle
- * @author John Mazzitelli
- */
-public abstract class BasicResource extends Authenticator implements PropFindableResource {
-
- private static final Log LOG = LogFactory.getLog(BasicResource.class);
-
- private final Resource managedResource;
-
- public BasicResource(Subject subject, Resource managedResource) {
- super(subject);
-
- if (managedResource == null) {
- throw new NullPointerException("managedResource == null");
- }
- this.managedResource = managedResource;
- }
-
- protected Resource getManagedResource() {
- return this.managedResource;
- }
-
- /**
- * This implementation of authorise simply assures that the user has authenticated himself
- * and the user is allowed to view the managed resource. Subclasses may wish to further
- * restrict the authorization (e.g. deny access if the configuration of the resource
- * is to be edited but the user is not allowed to change the configuration).
- */
- public boolean authorise(Request request, Request.Method method, Auth auth) {
- boolean authorized = false;
-
- if (auth != null) {
- Subject subject = (Subject) auth.getTag();
- if (subject != null) {
- AuthorizationManagerLocal authorizationManager = LookupUtil.getAuthorizationManager();
- authorized = authorizationManager.canViewResource(subject, getManagedResource().getId());
- }
-
- if (LOG.isDebugEnabled()) {
- LOG.debug("BasicResource [" + getManagedResource() + "], auth=[" + auth.getTag() + "], isAuthorized="
- + authorized);
- }
- }
-
- return authorized;
- }
-
- public String checkRedirect(Request request) {
- return null; // no-op
- }
-}
diff --git a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/ConfigResource.java b/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/ConfigResource.java
deleted file mode 100644
index 1fc7ad5..0000000
--- a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/ConfigResource.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 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.gui.webdav;
-
-import java.io.ByteArrayOutputStream;
-import java.util.Date;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.Property;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal;
-import org.rhq.enterprise.server.util.LookupUtil;
-
-/**
- * Provides the resource configuration XML for a given resource.
- *
- * @author Greg Hinkle
- * @author John Mazzitelli
- */
-public class ConfigResource extends GetableBasicResource {
-
- private Configuration configuration;
- private String content;
-
- public ConfigResource(Subject subject, Resource managedResource) {
- super(subject, managedResource);
- }
-
- public String getUniqueId() {
- return "config_" + getConfiguration().getId();
- }
-
- public String getName() {
- return "resource_configuration.xml";
- }
-
- /**
- * The modified date is that of the last time the configuration changed.
- */
- public Date getModifiedDate() {
- return new Date(getConfiguration().getModifiedTime());
- }
-
- /**
- * The creation date is that of the configuration itself, not of the managed resource.
- */
- public Date getCreateDate() {
- return new Date(getConfiguration().getCreatedTime());
- }
-
- protected String loadContent() {
- if (this.content == null) {
- try {
- JAXBContext context = JAXBContext.newInstance(Configuration.class, Property.class);
- Marshaller marshaller = context.createMarshaller();
- marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- marshaller.marshal(getConfiguration(), baos);
- this.content = baos.toString();
- } catch (JAXBException e) {
- throw new RuntimeException("Failed to translate configuration to XML", e);
- }
- }
- return this.content;
- }
-
- private Configuration getConfiguration() {
- if (this.configuration == null) {
- ConfigurationManagerLocal cm = LookupUtil.getConfigurationManager();
- this.configuration = cm.getResourceConfiguration(getManagedResource().getId());
- }
- return this.configuration;
- }
-}
diff --git a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/GetableBasicResource.java b/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/GetableBasicResource.java
deleted file mode 100644
index 870f52f..0000000
--- a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/GetableBasicResource.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 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.gui.webdav;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-
-import com.bradmcevoy.http.Auth;
-import com.bradmcevoy.http.GetableResource;
-import com.bradmcevoy.http.Range;
-import com.bradmcevoy.http.exceptions.NotAuthorizedException;
-
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.core.util.stream.StreamUtil;
-
-/**
- * Extends the {@link BasicResource} by providing hooks to stream file content to the user.
- *
- * @author John Mazzitelli
- */
-public abstract class GetableBasicResource extends BasicResource implements GetableResource {
-
- public GetableBasicResource(Subject subject, Resource managedResource) {
- super(subject, managedResource);
- }
-
- /**
- * This implementation assumes the content will be of type "text/xml".
- * Subclasses are free to override this behavior if they are returning content
- * other than XML data.
- */
- public String getContentType(String accepts) {
- return "text/xml";
- }
-
- public Long getContentLength() {
- return Long.valueOf(loadContent().length());
- }
-
- public void sendContent(OutputStream out, Range range, Map<String, String> params, String str) throws IOException,
- NotAuthorizedException {
-
- byte[] bytes = loadContent().getBytes();
- long start = (range != null) ? range.getStart() : 0L;
- long length = (range != null) ? ((range.getFinish() - start) + 1) : bytes.length;
-
- InputStream in = new ByteArrayInputStream(bytes);
- StreamUtil.copy(in, out, start, length);
- }
-
- /**
- * This implementation assumes the user client should not cache the content.
- * Subclasses are free to override this if they allow the content to be cached
- * on the client side.
- */
- public Long getMaxAgeSeconds(Auth auth) {
- return Long.valueOf(0L);
- }
-
- /**
- * Subclasses must implement this to return the content as a String. Note that this really
- * only supports small content since you don't want to load large files in memory. If you need
- * content that is large, implement {@link GetableResource} directly; do not use this abstract class.
- *
- * @return the content as a string, must never be <code>null</code>
- */
- protected abstract String loadContent();
-}
diff --git a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/MeasurementDataResource.java b/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/MeasurementDataResource.java
deleted file mode 100644
index 8f095b8..0000000
--- a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/MeasurementDataResource.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 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.gui.webdav;
-
-import java.util.Date;
-import java.util.List;
-
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.measurement.DataType;
-import org.rhq.core.domain.measurement.MeasurementSchedule;
-import org.rhq.core.domain.measurement.ui.MetricDisplaySummary;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.enterprise.server.measurement.MeasurementChartsManagerLocal;
-import org.rhq.enterprise.server.measurement.MeasurementPreferences;
-import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal;
-import org.rhq.enterprise.server.measurement.MeasurementPreferences.MetricRangePreferences;
-import org.rhq.enterprise.server.util.LookupUtil;
-
-/**
- * The measurement data WebDAV resource that provides information on metrics of a managed resource.
- *
- * @author John Mazzitelli
- */
-public class MeasurementDataResource extends GetableBasicResource {
-
- private String content;
- private List<MetricDisplaySummary> measurements;
-
- public MeasurementDataResource(Subject subject, Resource managedResource) {
- super(subject, managedResource);
- }
-
- public String getUniqueId() {
- return "metrics_" + getManagedResource().getId();
- }
-
- public String getName() {
- return "measurement_data.xml";
- }
-
- /**
- * We do not reply with any relevent date. The only way for a relevent date to
- * be calculated is for us to actually query the database for the measurement data.
- * To avoid querying the DB t(which is expensive), we simply return the current
- * date, since the majority of the time, a new measurement collection interval
- * will have triggered in the time the user took between getting the measurement data.
- */
- public Date getModifiedDate() {
- return new Date();
- }
-
- /**
- * The created date is the date of the resource itself was created.
- */
- public Date getCreateDate() {
- return new Date(getManagedResource().getCtime());
- }
-
- protected String loadContent() {
- if (this.content == null) {
- StringBuilder str = new StringBuilder();
- str.append("<?xml version=\"1.0\"?>\n");
- str.append("<measurements>\n");
- for (MetricDisplaySummary meas : getMeasurements()) {
- str.append(" <measurement>\n");
- str.append(" <name>").append(meas.getLabel()).append("</name>\n");
- str.append(" <description>").append(meas.getDescription()).append("</description>\n");
- str.append(" <alert-count>").append(meas.getAlertCount()).append("</alert-count>\n");
- str.append(" <min-value>").append(meas.getMinMetric().getValue()).append("</min-value>\n");
- str.append(" <max-value>").append(meas.getMaxMetric().getValue()).append("</max-value>\n");
- str.append(" <avg-value>").append(meas.getAvgMetric().getValue()).append("</avg-value>\n");
- str.append(" <last-value>").append(meas.getLastMetric().getValue()).append("</last-value>\n");
- str.append(" <units>").append(meas.getUnits()).append("</units>\n");
- str.append(" <begin-time>").append(new Date(meas.getBeginTimeFrame())).append("</begin-time>\n");
- str.append(" <end-time>").append(new Date(meas.getEndTimeFrame())).append("</end-time>\n");
- str.append(" <schedule-id>").append(meas.getScheduleId()).append("</schedule-id>\n");
- str.append(" </measurement>\n");
- }
- str.append("</measurements>\n");
- this.content = str.toString();
- }
- return this.content;
- }
-
- private List<MetricDisplaySummary> getMeasurements() {
- if (this.measurements == null) {
-
- int resourceId = getManagedResource().getId();
-
- // determine the user's preferences so we know how far back to get the measurement data
- MeasurementPreferences measurementPrefs = new MeasurementPreferences(getSubject());
- MetricRangePreferences range = measurementPrefs.getMetricRangePreferences();
-
- // get all the enabled measurement schedules
- MeasurementScheduleManagerLocal sm = LookupUtil.getMeasurementScheduleManager();
- List<MeasurementSchedule> measurementSchedules = sm.findSchedulesForResourceAndType(getSubject(),
- resourceId, DataType.MEASUREMENT, null, true);
- int[] scheduleIds = new int[measurementSchedules.size()];
- int i = 0;
- for (MeasurementSchedule sched : measurementSchedules) {
- scheduleIds[i++] = sched.getId();
- }
-
- // now get the measurement data for all the scheduled as far back as the user's range preferences says so
- MeasurementChartsManagerLocal chartManager = LookupUtil.getMeasurementChartsManager();
- this.measurements = chartManager.getMetricDisplaySummariesForResource(getSubject(), resourceId,
- scheduleIds, range.begin, range.end);
- }
-
- return this.measurements;
- }
-}
diff --git a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/ResourceFolder.java b/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/ResourceFolder.java
deleted file mode 100644
index 73f55f1..0000000
--- a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/ResourceFolder.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 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.gui.webdav;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import com.bradmcevoy.http.Resource;
-
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.resource.InventoryStatus;
-import org.rhq.core.domain.resource.composite.ResourceFacets;
-import org.rhq.core.domain.util.PageControl;
-import org.rhq.core.domain.util.PageList;
-import org.rhq.enterprise.server.resource.ResourceManagerLocal;
-import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal;
-import org.rhq.enterprise.server.util.LookupUtil;
-
-/**
- * Represents a managed resource along with its children resources.
- *
- * @see BasicResource
- *
- * @author Greg Hinkle
- * @author John Mazzitelli
- */
-public class ResourceFolder extends BasicResource implements AuthenticatedCollectionResource {
-
- private List<Resource> children;
-
- public ResourceFolder(Subject subject, org.rhq.core.domain.resource.Resource managedResource) {
- super(subject, managedResource);
- }
-
- public String getUniqueId() {
- return String.valueOf(getManagedResource().getId());
- }
-
- public String getName() {
- String name = getManagedResource().getName();
- return SafeEncoder.encode(name);
- }
-
- public Date getModifiedDate() {
- return new Date(getManagedResource().getMtime());
- }
-
- public Date getCreateDate() {
- return new Date(getManagedResource().getCtime());
- }
-
- public Resource child(String childName) {
- List<? extends Resource> children = getChildren();
- for (Resource child : children) {
- if (childName.equals(child.getName())) {
- return child;
- }
- }
- return null;
- }
-
- public List<? extends Resource> getChildren() {
- return getChildren(getSubject());
- }
-
- public List<? extends Resource> getChildren(Subject subject) {
- if (this.children == null) {
- PageList<org.rhq.core.domain.resource.Resource> childs;
- ResourceManagerLocal rm = LookupUtil.getResourceManager();
- childs = rm.findChildResources(subject, getManagedResource().getId(), PageControl.getUnlimitedInstance());
-
- // inventory
- this.children = new ArrayList<Resource>(childs.size());
- for (org.rhq.core.domain.resource.Resource child : childs) {
- if (child.getInventoryStatus() == InventoryStatus.COMMITTED) {
- this.children.add(new ResourceFolder(subject, child));
- }
- }
-
- ResourceTypeManagerLocal rtm = LookupUtil.getResourceTypeManager();
- ResourceFacets facets = rtm.getResourceFacets(getManagedResource().getResourceType().getId());
-
- // availability
- this.children.add(new AvailabilityResource(subject, getManagedResource()));
-
- // resource configuration
- if (facets.isConfiguration()) {
- this.children.add(new ConfigResource(subject, getManagedResource()));
- }
-
- // traits
- if (facets.isMeasurement()) {
- this.children.add(new TraitsResource(subject, getManagedResource()));
- }
-
- // measurement data
- if (facets.isMeasurement()) {
- this.children.add(new MeasurementDataResource(subject, getManagedResource()));
- }
- }
- return this.children;
- }
-}
diff --git a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/RootFolder.java b/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/RootFolder.java
deleted file mode 100644
index 89c78fd..0000000
--- a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/RootFolder.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 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.gui.webdav;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import com.bradmcevoy.http.Auth;
-import com.bradmcevoy.http.PropFindableResource;
-import com.bradmcevoy.http.Request;
-import com.bradmcevoy.http.Resource;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.resource.ResourceCategory;
-import org.rhq.core.domain.resource.composite.ResourceComposite;
-import org.rhq.core.domain.util.PageControl;
-import org.rhq.enterprise.server.resource.ResourceManagerLocal;
-import org.rhq.enterprise.server.util.LookupUtil;
-
-/**
- * This represents the top of the managed environment (i.e. all of the top-level platforms being managed).
- *
- * @author Greg Hinkle
- * @author John Mazzitelli
- */
-public class RootFolder extends Authenticator implements AuthenticatedCollectionResource, PropFindableResource {
-
- private static final Log LOG = LogFactory.getLog(RootFolder.class);
-
- private List<ResourceFolder> roots;
-
- public RootFolder() {
- super(null);
- }
-
- public String getUniqueId() {
- return "/";
- }
-
- public String getName() {
- return "/";
- }
-
- public Date getModifiedDate() {
- return new Date();
- }
-
- public Date getCreateDate() {
- return new Date();
- }
-
- /**
- * This implementation of authorise simply assures that the user has authenticated himself.
- * If the user is logged in, <code>true</code> is returned; otherwise, <code>false</code> is returned.
- */
- public boolean authorise(Request request, Request.Method method, Auth auth) {
- boolean authorized = (auth != null) && (auth.getTag() != null);
- if (LOG.isDebugEnabled()) {
- LOG.debug("RootFolder auth=[" + ((auth != null) ? auth.getTag() : auth) + "], isAuthorized=" + authorized);
- }
- return authorized;
- }
-
- public String checkRedirect(Request request) {
- return null; // no-op
- }
-
- public Resource child(String childName) {
- List<? extends Resource> children = getChildren();
- for (Resource child : children) {
- if (childName.equals(child.getName())) {
- return child;
- }
- }
- return null;
- }
-
- public List<? extends Resource> getChildren() {
- return getChildren(getSubject());
- }
-
- public List<? extends Resource> getChildren(Subject subject) {
- if (this.roots == null) {
- ResourceManagerLocal rm = LookupUtil.getResourceManager();
-
- List<ResourceComposite> foundRoots = rm.findResourceComposites(subject, ResourceCategory.PLATFORM, null,
- null, null, null, true, PageControl.getUnlimitedInstance());
-
- if (foundRoots != null) {
- this.roots = new ArrayList<ResourceFolder>(foundRoots.size());
- for (ResourceComposite comp : foundRoots) {
- this.roots.add(new ResourceFolder(subject, comp.getResource()));
- }
- } else {
- this.roots = new ArrayList<ResourceFolder>();
- }
- }
- return this.roots;
- }
-}
diff --git a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/SafeEncoder.java b/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/SafeEncoder.java
deleted file mode 100644
index 8805335..0000000
--- a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/SafeEncoder.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 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.gui.webdav;
-
-/**
- * Seems like some of our resource names aren't able to safely become URLs that contain characters
- * like \ or /. This utility will attempt to change names so they can safely be handled.
- *
- * @author John Mazzitelli
- */
-public abstract class SafeEncoder {
- // pick things that are at least half-sane, even if they doesn't look perfect
- private static final String[][] REPLACEMENTS = new String[][] { { "\\", "||" }, { "/", "|" } };
-
- public static String encode(String name) {
- for (String[] replacement : REPLACEMENTS) {
- name = name.replace(replacement[0], replacement[1]);
- }
- return name;
- }
-
- public static String decode(String name) {
- for (String[] replacement : REPLACEMENTS) {
- name = name.replace(replacement[1], replacement[0]);
- }
- return name;
- }
-}
diff --git a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/TraitsResource.java b/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/TraitsResource.java
deleted file mode 100644
index 9293127..0000000
--- a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/TraitsResource.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 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.gui.webdav;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.measurement.MeasurementDataTrait;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal;
-import org.rhq.enterprise.server.util.LookupUtil;
-
-/**
- * The measurement traits resource that provides information on all traits of a managed resource.
- *
- * @author John Mazzitelli
- */
-public class TraitsResource extends GetableBasicResource {
-
- private List<MeasurementDataTrait> traits;
- private String content;
-
- public TraitsResource(Subject subject, Resource managedResource) {
- super(subject, managedResource);
- }
-
- public String getUniqueId() {
- return "traits_" + getManagedResource().getId();
- }
-
- public String getName() {
- return "measurement_traits.xml";
- }
-
- /**
- * The modified date is that of the last time a trait changed.
- */
- public Date getModifiedDate() {
- long latestTimestamp = 0L;
- for (MeasurementDataTrait trait : getTraits()) {
- if (latestTimestamp < trait.getTimestamp()) {
- latestTimestamp = trait.getTimestamp();
- }
- }
- return new Date(latestTimestamp);
- }
-
- /**
- * The created date is the date of the resource itself was created.
- */
- public Date getCreateDate() {
- return new Date(getManagedResource().getCtime());
- }
-
- protected String loadContent() {
- if (this.content == null) {
- StringBuilder str = new StringBuilder();
- str.append("<?xml version=\"1.0\"?>\n");
- str.append("<traits>\n");
- for (MeasurementDataTrait trait : getTraits()) {
- str.append(" <trait>\n");
- str.append(" <name>").append(trait.getName()).append("</name>\n");
- str.append(" <value>").append(trait.getValue()).append("</value>\n");
- str.append(" <last-changed>").append(new Date(trait.getTimestamp())).append("</last-changed>\n");
- str.append(" <schedule-id>").append(trait.getScheduleId()).append("</schedule-id>\n");
- str.append(" </trait>\n");
- }
- str.append("</traits>\n");
- this.content = str.toString();
- }
- return this.content;
- }
-
- private List<MeasurementDataTrait> getTraits() {
- if (this.traits == null) {
- MeasurementDataManagerLocal mdm = LookupUtil.getMeasurementDataManager();
- List<MeasurementDataTrait> traits = mdm.findCurrentTraitsForResource(getSubject(), getManagedResource()
- .getId(), null);
- if (traits != null) {
- this.traits = traits;
- } else {
- this.traits = new ArrayList<MeasurementDataTrait>();
- }
- }
- return this.traits;
- }
-}
diff --git a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/WebDAVResourceFactory.java b/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/WebDAVResourceFactory.java
deleted file mode 100644
index bf1a584..0000000
--- a/modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/WebDAVResourceFactory.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2008 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.gui.webdav;
-
-import java.util.List;
-
-import com.bradmcevoy.http.Resource;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.util.collection.ArrayUtils;
-import org.rhq.enterprise.server.util.LookupUtil;
-
-/**
- * The main entry point when a WebDAV request comes in. This will examine
- * the URL being requested and convert that URL into a series of WebDAV
- * resources for the user to see.
- *
- * @author Greg Hinkle
- * @author John Mazzitelli
- */
-public class WebDAVResourceFactory implements com.bradmcevoy.http.ResourceFactory {
-
- private static final Log LOG = LogFactory.getLog(WebDAVResourceFactory.class);
-
- public Resource getResource(String host, String url) {
- Resource foundResource = null;
-
- // URL == /webdav/resource/<parent-resource-name>/<child-resource-name>/...
- // paths[] = [, webdav, resource, <parent-resource-name>, <child-resource-name>, ...]
- String[] paths = url.split("/");
-
- if (paths.length >= 3) {
- String webdavResourceType = paths[2];
- if ("resource".equals(webdavResourceType)) {
- foundResource = getResourceResource(getSubarray(paths, 3));
- }
- // TODO: some ideas for addition resource types
- // else if "group".equals(webdavResourceType)
- // else if "user".equals(webdavResourceType)
- // else if "role".equals(webdavResourceType)
- // else if "plugin".equals(webdavResourceType)
- // else if "systemconfig".equals(webdavResourceType)
- // else if "agentupdate/download".equals(webdavResourceType)
- // else if "agentupdate/version".equals(webdavResourceType)
- }
-
- if (foundResource == null) {
- LOG.warn("Couldn't find resource associated with webdav url [" + url + "]");
- }
-
- return foundResource;
- }
-
- public String getSupportedLevels() {
- return "1";
- }
-
- private String[] getSubarray(String[] full, int index) {
- return ArrayUtils.copyOfRange(full, index, full.length);
- }
-
- public Subject getOverlord() {
- return LookupUtil.getSubjectManager().getOverlord();
- }
-
- private Resource getResourceResource(String[] paths) {
- if (paths.length == 0 || paths[0] == null || paths[0].length() == 0) {
- return new RootFolder();
- } else {
- Resource resourceFolder = new RootFolder();
- for (int i = 0; i < paths.length; i++) {
- boolean found = false;
- if (resourceFolder instanceof AuthenticatedCollectionResource) {
- List<? extends Resource> children;
- children = ((AuthenticatedCollectionResource) resourceFolder).getChildren(getOverlord());
- for (Resource child : children) {
- String childName = child.getName();
- if (childName.equals(paths[i])) {
- resourceFolder = child;
- found = true;
- }
- }
- }
- if (!found) {
- return null;
- }
- }
- return resourceFolder;
- }
- }
-}
diff --git a/modules/enterprise/gui/webdav-war/src/main/webapp/WEB-INF/jboss-web.xml b/modules/enterprise/gui/webdav-war/src/main/webapp/WEB-INF/jboss-web.xml
deleted file mode 100644
index 0e4fa0f..0000000
--- a/modules/enterprise/gui/webdav-war/src/main/webapp/WEB-INF/jboss-web.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-
-<jboss-web>
- <context-root>webdav</context-root>
-</jboss-web>
diff --git a/modules/enterprise/gui/webdav-war/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/webdav-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 2a445aa..0000000
--- a/modules/enterprise/gui/webdav-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- version="2.5">
-
- <display-name>RHQ WebDav</display-name>
-
-
- <!-- WebDAV support -->
- <servlet>
- <servlet-name>WebDAV</servlet-name>
- <servlet-class>com.bradmcevoy.http.MiltonServlet</servlet-class>
- <init-param>
- <param-name>resource.factory.class</param-name>
- <param-value>org.rhq.gui.webdav.WebDAVResourceFactory</param-value>
- </init-param>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>WebDAV</servlet-name>
- <url-pattern>/</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
commit cfa24e72aa2c403985e6f32eeee913dfa93a9e41
Author: Hudson <jboss-qa-internal(a)redhat.com>
Date: Mon Sep 24 11:49:32 2012 -0400
development RHQ_4.6.0-SNAPSHOT
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index e1b5521..1de27c1 100644
--- a/modules/cli-tests/pom.xml
+++ b/modules/cli-tests/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 4da4ece..e7416c4 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml
index cd0c979..92a62cb 100644
--- a/modules/common/drift/pom.xml
+++ b/modules/common/drift/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-common-drift</artifactId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 74480d7..930b7e1 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-filetemplate-bundle-common</artifactId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 6600791..10b3663 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-jboss-as-common</artifactId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index f364ae9..0831c51 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml
index edf6add..2e9dc48 100644
--- a/modules/core/arquillian-integration/archive/pom.xml
+++ b/modules/core/arquillian-integration/archive/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-arquillian-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<!-- Model Version -->
diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml
index 16b7bdb..590a475 100644
--- a/modules/core/arquillian-integration/container/pom.xml
+++ b/modules/core/arquillian-integration/container/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-arquillian-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<!-- Model Version -->
diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml
index 36d5fd5..a6a9cab 100644
--- a/modules/core/arquillian-integration/pom.xml
+++ b/modules/core/arquillian-integration/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index 6f6a937..a988ab6 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index bf501fc..e732fb8 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index eee04da..c971f80 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 8061224..e9db3de 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-domain</artifactId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 51781ce..2490d00 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index 934b13f..336e33c 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index 556a182..922855c 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml
index fe4e9cf..f439dab 100644
--- a/modules/core/plugin-container-itest/pom.xml
+++ b/modules/core/plugin-container-itest/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-plugin-container-itest</artifactId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index b9c19a4..c6ce32d 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-plugin-container</artifactId>
diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml
index f693831..0307c46 100644
--- a/modules/core/plugin-test-api/pom.xml
+++ b/modules/core/plugin-test-api/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-plugin-test-api</artifactId>
diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml
index 784f68b..40d29ec 100644
--- a/modules/core/plugin-test-util/pom.xml
+++ b/modules/core/plugin-test-util/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 2ecee24..aff829f 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml
index c35c001..f5f4b45 100644
--- a/modules/core/plugindoc/pom.xml
+++ b/modules/core/plugindoc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 7fc1288..a154988 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 9045533..145bf2b 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-core-util</artifactId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 892a1c0..53c13c7 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 6069aaf..f060517 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 37959d2..f3587e0 100644
--- a/modules/enterprise/binding/pom.xml
+++ b/modules/enterprise/binding/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>rhq-enterprise-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Script Bindings</name>
<description>Abstraction of different facilities and default configurations for script bindings</description>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index f784d42..47be0b5 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 576b18e..73b6795 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index e4acd89..e5ea8e6 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index 78f8982..0e25194 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 82292eb..08fb745 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index e26a864..48127b8 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index ae67384..ba83687 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index 5e034ef..f075f43 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml
index 4c18901..93c2544 100644
--- a/modules/enterprise/gui/rest-war/pom.xml
+++ b/modules/enterprise/gui/rest-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index e572daf..f2356ec 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index e0e4243..b263f29 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index eed1ac4..aea4f04 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml
index b8863d3..88bcb81 100644
--- a/modules/enterprise/remoting/client-deps/pom.xml
+++ b/modules/enterprise/remoting/client-deps/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index 8da6180..6de50d0 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index fe1c3e7..e2a48c4 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml
index 0bdc28b..e14a164 100644
--- a/modules/enterprise/scripting/api/pom.xml
+++ b/modules/enterprise/scripting/api/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>rhq-scripting-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-scripting-api</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Scripting API</name>
<description>Provides API for adding scripting support to RHQ using different javax.scripting - based interpreters</description>
diff --git a/modules/enterprise/scripting/javascript/pom.xml b/modules/enterprise/scripting/javascript/pom.xml
index adbe85a..a76e987 100644
--- a/modules/enterprise/scripting/javascript/pom.xml
+++ b/modules/enterprise/scripting/javascript/pom.xml
@@ -4,10 +4,10 @@
<parent>
<artifactId>rhq-scripting-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-scripting-javascript</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Javascript support</name>
<description>Provides RHQ scripting in Javascript using Rhino</description>
diff --git a/modules/enterprise/scripting/pom.xml b/modules/enterprise/scripting/pom.xml
index f439f11..d6faff8 100644
--- a/modules/enterprise/scripting/pom.xml
+++ b/modules/enterprise/scripting/pom.xml
@@ -3,12 +3,12 @@
<parent>
<artifactId>rhq-enterprise-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-scripting-parent</artifactId>
<packaging>pom</packaging>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Scripting Parent Module</name>
<modules>
diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml
index 4b34699..66a7814 100644
--- a/modules/enterprise/scripting/python/pom.xml
+++ b/modules/enterprise/scripting/python/pom.xml
@@ -3,10 +3,10 @@
<parent>
<artifactId>rhq-scripting-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-scripting-python</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Python support</name>
<description>Provides RHQ scripting in Python using Jython</description>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index 1810ecb..0fcbdae 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -5,13 +5,13 @@
<parent>
<artifactId>rhq-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Client API</name>
<description>The implementation of the client API when accessing the server locally</description>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index 8a5f9dd..243bda8 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 2f0dcbd..c956183 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 0bed079..dc5f82a 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index d16253a..337f003 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 0a067fe..dbcaac4 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml
index 0977465..06da1ea 100644
--- a/modules/enterprise/server/plugins/alert-cli/pom.xml
+++ b/modules/enterprise/server/plugins/alert-cli/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Enterprise Server CLI Script Alert Plugin</name>
<description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index a7db8c7..3998439 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Email Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index 53b67dd..da035f6 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Enterprise Server IRC Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml
index 5f01f19..2baa5b5 100644
--- a/modules/enterprise/server/plugins/alert-log4j/pom.xml
+++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Log4J Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index ceb88ad..768f3f1 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Microblog Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index 01e8ed2..784f469 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Mobicents Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 032030c..5e369b5 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,14 +2,14 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Opertions Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index e1b2b68..10d99df 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Roles Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index 5e272f6..1339180 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Enterprise Server SNMP Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index 1e168a0..c4dae00 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 5cb7d9d..8bd965d 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index db45a30..da27dd9 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,14 +4,14 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Enterprise Server Cobbler Plugin</name>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index f695434..0f9eb80 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/drift-mongodb/pom.xml b/modules/enterprise/server/plugins/drift-mongodb/pom.xml
index 985cd67..33af23c 100644
--- a/modules/enterprise/server/plugins/drift-mongodb/pom.xml
+++ b/modules/enterprise/server/plugins/drift-mongodb/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml
index 141b792..419ab6f 100644
--- a/modules/enterprise/server/plugins/drift-rhq/pom.xml
+++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index 1d3afe9..db8855d 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index ba40c46..47f4d12 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
index 523a7b8..7171409 100644
--- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml
+++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index 601d777..3449ffd 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index ceb56d7..fdf9a5f 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 11f3b5c..d6ac758 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index 56877dd..cbe8f64 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index 1f996f5..9e4c296 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index 4d91ffd..c95e71e 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index 84d4348..bd3e77b 100644
--- a/modules/enterprise/server/pom.xml
+++ b/modules/enterprise/server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index 1a515f3..7b66f19 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index e2ae626..b412a88 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index b52363c..57da4c1 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 8e4bc21..f4dd08c 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index 6476dc0..7be4429 100644
--- a/modules/helpers/bundleGen/pom.xml
+++ b/modules/helpers/bundleGen/pom.xml
@@ -3,13 +3,13 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<build>
<plugins>
diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml
index 9891667..14530ff 100644
--- a/modules/helpers/jeeGen/pom.xml
+++ b/modules/helpers/jeeGen/pom.xml
@@ -9,7 +9,7 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index 55e7c37..37ae750 100644
--- a/modules/helpers/perftest-support/pom.xml
+++ b/modules/helpers/perftest-support/pom.xml
@@ -3,11 +3,11 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<name>Performance Testing Support</name>
<description>To support performance testing, this is a basic tool to support extracting and later reimporting of
data from/to a database.
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 7e30969..e036910 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/rest-docs-generator/pom.xml b/modules/helpers/rest-docs-generator/pom.xml
index b6be916..6bf8167 100644
--- a/modules/helpers/rest-docs-generator/pom.xml
+++ b/modules/helpers/rest-docs-generator/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml
index b2c43d1..b037aed 100644
--- a/modules/helpers/rtfilter-subsystem/pom.xml
+++ b/modules/helpers/rtfilter-subsystem/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index 821df29..7e619d8 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml
index 7219146..4f57361 100644
--- a/modules/integration-tests/apache-plugin-test/pom.xml
+++ b/modules/integration-tests/apache-plugin-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
index 4351b11..f3c5eea 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>jndi-access-test-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml
index 0e45a4b..8dfe58e 100644
--- a/modules/integration-tests/jndi-access/pom.xml
+++ b/modules/integration-tests/jndi-access/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-integration-tests</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml
index f93fa6f..453687f 100644
--- a/modules/integration-tests/jndi-access/remote-server/pom.xml
+++ b/modules/integration-tests/jndi-access/remote-server/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>jndi-access-test-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index 82f32cd..982dfca 100644
--- a/modules/integration-tests/pom.xml
+++ b/modules/integration-tests/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 17cd506..9bb0064 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 35bad6b..5aaf36b 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 92b0521..46ed194 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index ce670b8..117ae7f 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index c6fbfed..3a96cb4 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index 840b4b6..30cf1f7 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index fa4f7d3..c7bcc0e 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 7305db5..5c98a63 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index 8c0a155..dee59ab 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index 5c56712..50f902c 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index 7aae62d..1e46384 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index e7a1349..f60b3c0 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 4794d78..364d33f 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index e50de4e..9ecab0b 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,12 +6,12 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 60c3f2c..34e14a0 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index 0750d4b..c7dd0eb 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 5cc08b5..60601e7 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index a02c9f3..10b0ad2 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 13ea4ad..b7e854b 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 1519908..ad60365 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index 1079417..26ffe85 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index eba28da..2548445 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index 8ee8062..2985077 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index 11ef595..4a3493f 100644
--- a/modules/plugins/mod-cluster/pom.xml
+++ b/modules/plugins/mod-cluster/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index fb018ca..1d34979 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 748cc07..895bdbb 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml
index cc31433..b274860 100644
--- a/modules/plugins/noop/pom.xml
+++ b/modules/plugins/noop/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 60fdb03..c8bdc71 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index 28d63d4..63e684d 100644
--- a/modules/plugins/pattern-generator/pom.xml
+++ b/modules/plugins/pattern-generator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 9f93a29..725c803 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index b098b14..28744ea 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 350c11e..036d610 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index a40b63d..1f5c297 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 46c873e..d76f60c 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index 46b0171..134d18d 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index c3af4c6..0f44105 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 0f7bd3d..0762aa5 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 9a1370b..584604f 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 0c0bee5..05e604a 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 4f60a52..99babba 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index c3db44f..d947395 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 4aed11b..afb9cd2 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index ca0576f..0a64aed 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index daf4755..54a7c4d 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index df2b0e8..d5bf6fc 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index e9fbb43..ba660e3 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index fc72aa6..bf9c606 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index ba3e023..55add04 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index b1a59d4..a66acb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.5.0-SNAPSHOT</version>
+ <version>4.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RHQ</name>
commit 7f0fd6111408fbe4fb6643e7646cb86d679d37ec
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Sep 21 12:53:46 2012 -0500
[BZ 859512] Execute :read-resource if whoami fails to correctly detect the server state. :whoami exists for the majority of the resources, the only exceptions are resources that do not have the security context established by AS7.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
index a4e99b4..080c60f 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
@@ -280,6 +280,14 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone
// Read server state
Operation op = new Operation("whoami", getAddress());
Result res = getASConnection().execute(op);
+
+ //:whoami might fail host controller resources, in that case use :read-resource operation
+ //which is slower due to larger content returned but more reliable since every resource has it.
+ if (!res.isSuccess()) {
+ op = new Operation("read-resource", getAddress());
+ res = getASConnection().execute(op);
+ }
+
if (res.isReloadRequired()) {
PropertySimple oobMessage = new PropertySimple("__OOB","The server needs a reload for the latest changes to come effective.");
configuration.put(oobMessage);
commit 965b08b1e2f8a16f33206001d8f8ac19d0bec51b
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Sep 21 12:20:25 2012 -0500
Update test priority to match other integration tests for host controllers.
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java
index 7be0689..99f6fa6 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/SecurityModuleOptionsTest.java
@@ -64,8 +64,8 @@ import org.rhq.modules.plugins.jbossas7.json.Result;
import org.rhq.test.arquillian.RunDiscovery;
/**
- * Test exercising the subsystem=security/SecurityDomain/[Authentication(Classic|Jaspi),
- * Authorization, Mapping, Audit, Acl,
+ * Test exercising the subsystem=security/SecurityDomain/[Authentication(Classic|Jaspi),
+ * Authorization, Mapping, Audit, Acl,
* Identity-Trust]
* @author Simeon Pinder
*/
@@ -130,7 +130,7 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest {
/* This first discovery is only so that we can leverage existing code to install the management user needed
* in next test.
*/
- @Test(priority = 10, groups = "discovery")
+ @Test(priority = 1040, groups = "discovery")
@RunDiscovery(discoverServices = true, discoverServers = true)
public void firstDiscovery() throws Exception {
Resource platform = this.pluginContainer.getInventoryManager().getPlatform();
@@ -142,16 +142,16 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest {
installManagementUsers();
}
- /** This method mass loads all the supported Module Option Types(Excluding authentication=jaspi, cannot co-exist with
+ /** This method mass loads all the supported Module Option Types(Excluding authentication=jaspi, cannot co-exist with
* authentication=classic) into a single SecurityDomain. This is done as
- * -i)creating all of the related hierarchy of types needed to exercise N Module Options Types and their associated
+ * -i)creating all of the related hierarchy of types needed to exercise N Module Options Types and their associated
* Module Options instances would take too long to setup(N creates would signal N discovery runs before test could complete).
- * -ii)setting the priority of this method lower than the discovery method means that we'll get all the same types in much
+ * -ii)setting the priority of this method lower than the discovery method means that we'll get all the same types in much
* less time.
- *
+ *
* @throws Exception
*/
- @Test(priority = 11)
+ @Test(priority = 1041)
public void loadStandardModuleOptionTypes() throws Exception {
mapper = new ObjectMapper();
mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -226,10 +226,10 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest {
}
/** Runs the second discovery run to load all the new types added.
- *
+ *
* @throws Exception
*/
- @Test(priority = 12, groups = "discovery")
+ @Test(priority = 1042, groups = "discovery")
@RunDiscovery(discoverServices = true, discoverServers = true)
public void secondDiscovery() throws Exception {
Resource platform = this.pluginContainer.getInventoryManager().getPlatform();
@@ -243,14 +243,14 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest {
/** This test method exercises a number of things:
* - that the security-domain children loaded have been created successfully
- * - that all of the supported Module Option Type children(excluding 'authentication=jaspi') have been
+ * - that all of the supported Module Option Type children(excluding 'authentication=jaspi') have been
* discovered as AS7 types successfully.
* - that the correct child attribute was specified for each type //Ex. acl=classic -> acl-modules
- * -
- *
+ * -
+ *
* @throws Exception
*/
- @Test(priority = 13)
+ @Test(priority = 1043)
public void testDiscoveredSecurityNodes() throws Exception {
//lazy-load configurationManager
if (testConfigurationManager == null) {
@@ -338,7 +338,7 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest {
Configuration loadedOptionsConfiguration = testConfigurationManager
.loadResourceConfiguration(moduleOptionsResource.getId());
for (String key : loadedOptionsConfiguration.getAllProperties().keySet()) {
- //retrieve the open map of Module Options
+ //retrieve the open map of Module Options
PropertyMap map = ((PropertyMap) loadedOptionsConfiguration.getAllProperties().get(key));
LinkedHashMap<String, Object> options = moduleOptionType.getOptions();
for (String optionKey : map.getMap().keySet()) {
@@ -359,7 +359,7 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest {
}
}
- @Test(priority = 14)
+ @Test(priority = 1044)
public void testCreateSecurityDomain() throws Exception {
//get the root security resource
securityResource = getResource();
@@ -387,7 +387,7 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest {
+ response.getErrorMessage();
}
- @Test(priority = 15)
+ @Test(priority = 1045)
public void testAuthenticationClassic() throws Exception {
//get the root security resource
securityResource = getResource();
@@ -426,7 +426,7 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest {
+ response.getErrorMessage();
}
- @Test(priority = 16)
+ @Test(priority = 1046)
public void testDeleteSecurityDomain() throws Exception {
//get the root security resource
securityResource = getResource();
@@ -477,7 +477,7 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest {
}
/** Automates hierarchy creation for Module Option type resources and their parents
- *
+ *
* @param optionAttributeType
* @return
*/
@@ -553,7 +553,7 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest {
}
/** Automates hierarchy creation for Module Option type resources and their parents
- *
+ *
* @param optionAttributeType
* @return
*/
@@ -624,10 +624,10 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest {
return created;
}
- /** For each operation
+ /** For each operation
* - will write verbose json and operation details to system.out if verboseOutput = true;
* - will execute the operation against running server if execute = true.
- *
+ *
* @param op
* @param execute
* @param verboseOutput
@@ -664,7 +664,7 @@ public class SecurityModuleOptionsTest extends AbstractJBossAS7PluginTest {
}
}
if (verboseOutput) {
- //result wrapper details
+ //result wrapper details
System.out.println("\tResult:" + result);
//detailed results
System.out.println("\tValue:" + result.getResult());
commit 313c627fe8e0015faf4c978c71801584bb2b3afa
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Sep 21 12:19:52 2012 -0500
Add generic unit tests for loading and updating resource configuration and executing noarg operations for AS7 host controllers.
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/ResourcesDomainServerTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/ResourcesDomainServerTest.java
new file mode 100644
index 0000000..1714b64
--- /dev/null
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/ResourcesDomainServerTest.java
@@ -0,0 +1,139 @@
+/*
+ * 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.modules.plugins.jbossas7.itest.domain;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.resource.InventoryStatus;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.pc.inventory.InventoryManager;
+import org.rhq.core.pc.inventory.ResourceContainer;
+import org.rhq.modules.plugins.jbossas7.itest.AbstractJBossAS7PluginTest;
+import org.rhq.test.arquillian.RunDiscovery;
+
+/**
+ * @author Stefan Negrea
+ *
+ */
+@Test(groups = { "integration", "pc", "domain" }, singleThreaded = true)
+public class ResourcesDomainServerTest extends AbstractJBossAS7PluginTest {
+ private Log log = LogFactory.getLog(this.getClass());
+
+ @Test(priority = 1030, groups = "discovery")
+ @RunDiscovery(discoverServices = true, discoverServers = true)
+ public void discoverPlatform() throws Exception {
+ InventoryManager inventoryManager = this.pluginContainer.getInventoryManager();
+
+ Resource platform = inventoryManager.getPlatform();
+ assertNotNull(platform);
+ assertEquals(platform.getInventoryStatus(), InventoryStatus.COMMITTED);
+
+ Thread.sleep(20 * 1000L);
+
+ ResourceContainer platformContainer = inventoryManager.getResourceContainer(platform);
+ Resource server = getResourceByTypeAndKey(platform, DomainServerComponentTest.RESOURCE_TYPE,
+ DomainServerComponentTest.RESOURCE_KEY);
+ inventoryManager.activateResource(server, platformContainer, false);
+
+ Thread.sleep(80 * 1000L);
+ }
+
+
+ @Test(priority = 1031)
+ public void loadUpdateResourceConfiguration() throws Exception {
+ List<String> ignoredResources = new ArrayList<String>();
+
+ //ignored because of differences between test plugin container and real application
+ //works well with real agent
+ ignoredResources.add("VHost (Profile)");
+ ignoredResources.add("VHost (Managed Server)");
+
+ //created JIRA AS7-5011
+ //server is started with the configuration but unable to write it back as is
+ //due to marshaling error
+ ignoredResources.add("Network Interface");
+
+ //created JIRA AS7-5012
+ //default value for is float but the resource only accepts integers
+ ignoredResources.add("Domain Load Metric");
+
+ //will revisit after BZ 826542 is resolved
+ //ignoredResources.add("Authentication (Classic)");
+
+ //tested separately
+ ignoredResources.add("SocketBindingGroup");
+
+ //Update requirements validate separately
+ ignoredResources.add("Pooled Connection Factory (Profile)");
+ ignoredResources.add("Connection Factory (Profile)");
+ ignoredResources.add("Pooled Connection Factory (Managed Server)");
+ ignoredResources.add("Connection Factory (Managed Server)");
+
+ ignoredResources.add("Memory Pool");
+ ignoredResources.add("Periodic Rotating File Handler");
+ ignoredResources.add("Console Handler");
+
+ Resource platform = this.pluginContainer.getInventoryManager().getPlatform();
+ Resource server = getResourceByTypeAndKey(platform, DomainServerComponentTest.RESOURCE_TYPE,
+ DomainServerComponentTest.RESOURCE_KEY);
+
+ int errorCount = loadUpdateConfigChildResources(server, ignoredResources);
+ Assert.assertEquals(errorCount, 0);
+ }
+
+ @Test(priority = 1032)
+ public void executeNoArgOperations() throws Exception {
+ List<String> ignoredSubsystems = new ArrayList<String>();
+
+ List<String> ignoredOperations = new ArrayList<String>();
+ //ignored because there is no other server to fail-over to
+ ignoredOperations.add("subsystem:force-failover");
+ //ignored because this is not a true operation, it is handled
+ //internally by a configuration property change
+ ignoredOperations.add("enable");
+ //ignored because the Osgi subsystem not configured out of box
+ ignoredOperations.add("subsystem:activate");
+
+ //ignored operations because they will stop the managed server and
+ //the domain controller itself
+ ignoredOperations.add("stop");
+ ignoredOperations.add("restart");
+ ignoredOperations.add("shutdown");
+ ignoredOperations.add("stop-servers");
+ ignoredOperations.add("restart-servers");
+
+ Resource platform = this.pluginContainer.getInventoryManager().getPlatform();
+ Resource server = getResourceByTypeAndKey(platform, DomainServerComponentTest.RESOURCE_TYPE,
+ DomainServerComponentTest.RESOURCE_KEY);
+
+ executeNoArgOperations(server, ignoredSubsystems, ignoredOperations);
+ }
+
+}
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/ResourcesStandaloneServerTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/ResourcesStandaloneServerTest.java
index 824162a..8d391a1 100644
--- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/ResourcesStandaloneServerTest.java
+++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/ResourcesStandaloneServerTest.java
@@ -67,7 +67,7 @@ public class ResourcesStandaloneServerTest extends AbstractJBossAS7PluginTest {
@Test(priority = 12)
- public void loadUpdateTemplatedResourceConfiguration() throws Exception {
+ public void loadUpdateResourceConfiguration() throws Exception {
List<String> ignoredResources = new ArrayList<String>();
//ignored because of differences between test plugin container and real application
commit 6ab817044c8480a02eb82798c75a40e1a0bd4649
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Fri Sep 21 17:04:01 2012 +0200
Tests for MeasurementDataManagerBean testing adding and finding the MeasurementTraitData (in particular methods: MeasurementDataManagerBean.addTraitData(), MeasurementDataManagerBean.findTraits(), MeasurementDataManagerBean.findTraitsByCriteria(), and MeasurementDataManagerBean.findCurrentTraitsForResource())
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementDataManagerTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementDataManagerTest.java
index a6abea9..80f0cd2 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementDataManagerTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/MeasurementDataManagerTest.java
@@ -41,6 +41,7 @@ import org.testng.annotations.Test;
import org.rhq.core.clientapi.agent.measurement.MeasurementAgentService;
import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.criteria.MeasurementDataTraitCriteria;
import org.rhq.core.domain.measurement.DataType;
import org.rhq.core.domain.measurement.DisplayType;
import org.rhq.core.domain.measurement.MeasurementCategory;
@@ -88,7 +89,7 @@ public class MeasurementDataManagerTest extends AbstractEJB3Test {
private MeasurementSchedule schedule1, schedule2, schedule3;
private ResourceType theResourceType;
private Agent theAgent;
- private Set<MeasurementData> expectedResult1, expectedResult2, expectedResult3;
+ private Set<MeasurementData> expectedResult1, expectedResult2, expectedResult3, expectedResult4;
@BeforeMethod
public void beforeMethod() {
@@ -363,12 +364,15 @@ public class MeasurementDataManagerTest extends AbstractEJB3Test {
long time1 = System.currentTimeMillis();
long time2 = time1 + 1;
long time3 = time2 + 1;
+ long time4 = time3 + 1;
String name1 = "a";
String name2 = "b";
String name3 = "c";
+ String name4 = "d";
String value1 = "test-value1";
String value2 = "test-value2";
String value3 = "test-value3";
+ String value4 = "test-value4";
// method findLiveDataForGroup adds prefix with resource id which is part of equals
MeasurementData expectedData1 = makeMeasurement(time1, schedule1.getId(), value1, name1);
@@ -377,6 +381,8 @@ public class MeasurementDataManagerTest extends AbstractEJB3Test {
expectedData2.setName(resource2.getId() + ":" + name2);
MeasurementData expectedData3 = makeMeasurement(time3, schedule3.getId(), value3, name3);
expectedData3.setName(resource2.getId() + ":" + name3);
+ MeasurementData expectedData4 = makeMeasurement(time4, schedule2.getId(), value4, name4);
+ expectedData4.setName(resource2.getId() + ":" + name4);
expectedResult1 = new HashSet<MeasurementData>(1);
expectedResult1.add(expectedData1);
@@ -386,6 +392,9 @@ public class MeasurementDataManagerTest extends AbstractEJB3Test {
expectedResult3 = new HashSet<MeasurementData>(3);
expectedResult3.addAll(expectedResult1);
expectedResult3.addAll(expectedResult2);
+ expectedResult4 = new HashSet<MeasurementData>(2);
+ expectedResult4.add(expectedData2);
+ expectedResult4.add(expectedData4);
// mock the MeasurementAgentService
MeasurementAgentService mockedMeasurementService = mock(MeasurementAgentService.class);
@@ -475,6 +484,238 @@ public class MeasurementDataManagerTest extends AbstractEJB3Test {
// ok, it was expected
}
}
+
+ @Test
+ public void testAddAndFindTrait1() throws Exception {
+ // prepare DB
+ EntityManager em = beginTx();
+ setupGroupOfResources(em);
+ commitAndClose(em);
+ try {
+ Set<MeasurementDataTrait> expectedResult = new HashSet<MeasurementDataTrait>();
+ for (MeasurementData data : expectedResult1) {
+ data.setName(null);
+ expectedResult.add((MeasurementDataTrait) data);
+ }
+ // add the trait data (it stores it in db (without name field))
+ measurementDataManager.addTraitData(expectedResult);
+
+ // get back the trait data
+ List<MeasurementDataTrait> actualResult = measurementDataManager.findTraits(overlord, resource1.getId(), definitionCt1.getId());
+
+ Set<MeasurementData> actualResultSet = new HashSet<MeasurementData>(actualResult);
+ assertEquals(expectedResult, actualResultSet);
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ throw e;
+ }
+ }
+
+ @Test
+ public void testAddAndFindTrait2() throws Exception {
+ // prepare DB
+ EntityManager em = beginTx();
+ setupGroupOfResources(em);
+ commitAndClose(em);
+ try {
+ Set<MeasurementDataTrait> expectedResult = new HashSet<MeasurementDataTrait>();
+ for (MeasurementData data : expectedResult4) {
+ data.setName(null);
+ expectedResult.add((MeasurementDataTrait) data);
+ }
+ // add the trait data (it stores it in db (without name field))
+ measurementDataManager.addTraitData(expectedResult);
+
+ // get back the trait data
+ List<MeasurementDataTrait> actualResult = measurementDataManager.findTraits(overlord, resource2.getId(), definitionCt2.getId());
+
+ Set<MeasurementData> actualResultSet = new HashSet<MeasurementData>(actualResult);
+ assertEquals(expectedResult, actualResultSet);
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ throw e;
+ }
+ }
+
+ @Test
+ public void testAddAndFindTrait3() throws Exception {
+ // prepare DB
+ EntityManager em = beginTx();
+ setupGroupOfResources(em);
+ commitAndClose(em);
+ try {
+ Set<MeasurementDataTrait> traitsData = new HashSet<MeasurementDataTrait>();
+ Set<MeasurementDataTrait> expectedResult = new HashSet<MeasurementDataTrait>();
+ for (MeasurementData data : expectedResult2) {
+ data.setName(null);
+ traitsData.add((MeasurementDataTrait) data);
+ if (data.getScheduleId() == schedule2.getId()){
+ expectedResult.add((MeasurementDataTrait) data);
+ }
+ }
+
+ // add the trait data (it stores it in db (without name field))
+ measurementDataManager.addTraitData(traitsData);
+
+ // get back the trait data
+ List<MeasurementDataTrait> actualResult = measurementDataManager.findTraits(overlord, resource2.getId(), definitionCt2.getId());
+
+ Set<MeasurementData> actualResultSet = new HashSet<MeasurementData>(actualResult);
+ assertEquals(expectedResult, actualResultSet);
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ throw e;
+ }
+ }
+
+ @Test
+ public void testFindNonExistentTraitByResourceId() throws Exception {
+ // prepare DB
+ EntityManager em = beginTx();
+ setupGroupOfResources(em);
+ commitAndClose(em);
+ try {
+ // get back the trait data
+ List<MeasurementDataTrait> actualResult = measurementDataManager.findTraits(overlord, resource2.getId(), definitionCt2.getId());
+
+ Set<MeasurementData> actualResultSet = new HashSet<MeasurementData>(actualResult);
+ assertEquals(Collections.<MeasurementData> emptySet(), actualResultSet);
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ throw e;
+ }
+ }
+
+
+ /**
+ * This test tests more combination of criteria
+ * @throws Exception
+ */
+ @Test
+ public void testAddAndFindByCriteria() throws Exception {
+ // prepare DB
+ EntityManager em = beginTx();
+ setupGroupOfResources(em);
+ commitAndClose(em);
+ try {
+ Set<MeasurementDataTrait> expectedResult = new HashSet<MeasurementDataTrait>();
+ for (MeasurementData data : expectedResult1) {
+ data.setName(null);
+ expectedResult.add((MeasurementDataTrait) data);
+ }
+ // add the trait data (it stores it in db (without name field))
+ measurementDataManager.addTraitData(expectedResult);
+
+ // get back the trait data by schedule id
+ MeasurementDataTraitCriteria criteria = new MeasurementDataTraitCriteria();
+ criteria.addFilterScheduleId(schedule1.getId());
+ List<MeasurementDataTrait> actualResult = measurementDataManager.findTraitsByCriteria(overlord, criteria);
+ Set<MeasurementData> actualResultSet = new HashSet<MeasurementData>(actualResult);
+ assertEquals(expectedResult, actualResultSet);
+
+ // get back the trait data by resource id
+ criteria = new MeasurementDataTraitCriteria();
+ criteria.addFilterResourceId(resource1.getId());
+ actualResult = measurementDataManager.findTraitsByCriteria(overlord, criteria);
+ actualResultSet = new HashSet<MeasurementData>(actualResult);
+ assertEquals(expectedResult, actualResultSet);
+
+ // get back the trait data by schedule id and resource id
+ criteria = new MeasurementDataTraitCriteria();
+ criteria.addFilterScheduleId(schedule1.getId());
+ criteria.addFilterResourceId(resource1.getId());
+ actualResult = measurementDataManager.findTraitsByCriteria(overlord, criteria);
+ actualResultSet = new HashSet<MeasurementData>(actualResult);
+ assertEquals(expectedResult, actualResultSet);
+
+ // get back the trait data by wrong schedule id
+ criteria = new MeasurementDataTraitCriteria();
+ criteria.addFilterScheduleId(Integer.MIN_VALUE);
+ actualResult = measurementDataManager.findTraitsByCriteria(overlord, criteria);
+ assertTrue(actualResult.isEmpty());
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ throw e;
+ }
+ }
+
+ @Test
+ public void testAddAndFindCurrentTraitByResourceId() throws Exception {
+ // prepare DB
+ EntityManager em = beginTx();
+ setupGroupOfResources(em);
+ commitAndClose(em);
+ try {
+ // get back the trait data
+ List<MeasurementDataTrait> actualResult = measurementDataManager.findCurrentTraitsForResource(overlord, resource1.getId(), null);
+ assertTrue(actualResult.isEmpty());
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ throw e;
+ }
+ }
+
+
+ @Test
+ public void testAddAndFindCurrentTraitByResourceIdAcrossMoreSchedules() throws Exception {
+ // prepare DB
+ EntityManager em = beginTx();
+ setupGroupOfResources(em);
+ commitAndClose(em);
+ try {
+ Set<MeasurementDataTrait> expectedResult = new HashSet<MeasurementDataTrait>();
+ for (MeasurementData data : expectedResult2) {
+ data.setName(null);
+ expectedResult.add((MeasurementDataTrait) data);
+ }
+ // add the trait data (it stores it in db (without name field))
+ measurementDataManager.addTraitData(expectedResult);
+
+ // get back the trait data
+ List<MeasurementDataTrait> actualResult = measurementDataManager.findCurrentTraitsForResource(overlord, resource2.getId(), null);
+
+ Set<MeasurementData> actualResultSet = new HashSet<MeasurementData>(actualResult);
+ assertEquals(expectedResult, actualResultSet);
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ throw e;
+ }
+ }
+
+ @Test
+ public void testFindNonExistentCurrentTraitByResourceId() throws Exception {
+ // prepare DB
+ EntityManager em = beginTx();
+ setupGroupOfResources(em);
+ commitAndClose(em);
+ try {
+ Set<MeasurementDataTrait> expectedResult = new HashSet<MeasurementDataTrait>();
+ for (MeasurementData data : expectedResult2) {
+ data.setName(null);
+ expectedResult.add((MeasurementDataTrait) data);
+ }
+ // add the trait data (it stores it in db (without name field))
+ measurementDataManager.addTraitData(expectedResult);
+
+ // get back the trait data
+ List<MeasurementDataTrait> actualResult = measurementDataManager.findCurrentTraitsForResource(overlord, resource2.getId(), null);
+
+ Set<MeasurementData> actualResultSet = new HashSet<MeasurementData>(actualResult);
+ assertEquals(expectedResult, actualResultSet);
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail();
+ throw e;
+ }
+ }
+
private MeasurementData makeMeasurement(long time, int scheduleId, String value, String name) {
MeasurementData measurement = new MeasurementDataTrait(new MeasurementDataPK(time, scheduleId), value);
commit 8cdbab3e33cbeb42ce8ef30a863c9d5e3420bd80
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Sep 21 14:46:44 2012 +0200
[BZ 803737] - Adding API difference justification for code change introduced
by commit bf4b25f421769909e886eb42f7b99c66b207b200.
diff --git a/modules/core/util/intentional-api-changes-since-4.4.0.xml b/modules/core/util/intentional-api-changes-since-4.4.0.xml
new file mode 100644
index 0000000..bcbe4e5
--- /dev/null
+++ b/modules/core/util/intentional-api-changes-since-4.4.0.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<differences>
+ <difference>
+ <className>org/rhq/core/util/exec/ProcessExecutor</className>
+ <differenceType>7006</differenceType><!-- method return type changed -->
+ <method>void redirectStreams(*)</method>
+ <to>org.rhq.core.util.exec.ProcessExecutor$RedirectThreads</to>
+ <justification>
+ This is a protected method and thus accessible only to subclasses. No known subclasses exist.
+ This is a source-compatible change though (this method used to be void so no caller could have
+ used the return type) so if there exists a subclass in the 3rd party code, it is going to
+ be enough for that code to be recompiled to start working again.
+ </justification>
+ </difference>
+</differences>
commit 9f7142e9d8f5e7dd816f2dadfb92cc4f638a7296
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Sep 21 14:43:58 2012 +0200
Adding generic signature and @Override to get rid of code-style warnings.
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/exec/ProcessExecutor.java b/modules/core/util/src/main/java/org/rhq/core/util/exec/ProcessExecutor.java
index 308d9bd..390bb5e 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/exec/ProcessExecutor.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/exec/ProcessExecutor.java
@@ -104,7 +104,8 @@ public class ProcessExecutor {
// wait if told to - note that the default is not to wait
if (process.getWaitForExit().intValue() > 0) {
- Callable<Integer> call = new Callable() {
+ Callable<Integer> call = new Callable<Integer>() {
+ @Override
public Integer call() throws Exception {
Thread.currentThread().setName("ExecuteProcess-" + process.getProgramTitle());
try {
commit dad63bee36143bd4619e62c924cf34b0d65f4f8e
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Sep 20 15:28:13 2012 +0200
[BZ 803737] - Adding the ignore rules for intentional API changes (apart from AS7 plugin that I leave for other to investigate and fill in).
diff --git a/modules/core/domain/intentional-api-changes-since-4.4.0.xml b/modules/core/domain/intentional-api-changes-since-4.4.0.xml
new file mode 100644
index 0000000..6d70888
--- /dev/null
+++ b/modules/core/domain/intentional-api-changes-since-4.4.0.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<differences>
+ <difference>
+ <className>org/rhq/core/domain/configuration/ObfuscatedPropertySimple</className>
+ <differenceType>7004</differenceType><!-- number of args changed -->
+ <method>void *obfuscate()</method>
+ <justification>Protected methods used only by JPA and other internal logic. It is not visible or supposed to be used outside of this class.</justification>
+ </difference>
+ <difference>
+ <className>org/rhq/core/domain/configuration/ObfuscatedPropertySimple</className>
+ <differenceType>7006</differenceType><!-- return type changed -->
+ <method>void *obfuscate()</method>
+ <to>java.lang.String</to>
+ <justification>Protected methods used only by JPA and other internal logic. It is not visible or supposed to be used outside of this class.</justification>
+ </difference>
+ <difference>
+ <className>**/*</className>
+ <differenceType>6003</differenceType><!-- value of compile-time constant changed -->
+ <field>*</field>
+ <justification>The constants we declare on the domain objects are not supposed for public consumption.</justification>
+ </difference>
+</differences>
diff --git a/modules/core/plugin-api/intentional-api-changes-since-4.4.0.xml b/modules/core/plugin-api/intentional-api-changes-since-4.4.0.xml
new file mode 100644
index 0000000..33dd783
--- /dev/null
+++ b/modules/core/plugin-api/intentional-api-changes-since-4.4.0.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<differences>
+ <difference>
+ <className>org/rhq/core/pluginapi/inventory/ResourceContext</className>
+ <differenceType>7004</differenceType><!-- number of args changed -->
+ <method>ResourceContext(*)</method>
+ <justification>Instances of this class are provided by the API, it is not supposed to be instantiated by users.</justification>
+ </difference>
+ <difference>
+ <className>org/rhq/core/pluginapi/upgrade/ResourceUpgradeContext</className>
+ <differenceType>7004</differenceType><!-- number of args changed -->
+ <method>ResourceUpgradeContext(*)</method>
+ <justification>Instances of this class are provided by the API, it is not supposed to be instantiated by users.</justification>
+ </difference>
+</differences>
diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.4.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.4.0.xml
new file mode 100644
index 0000000..743c970
--- /dev/null
+++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.4.0.xml
@@ -0,0 +1,14 @@
+<differences>
+ <difference>
+ <className>org/rhq/enterprise/server/content/RepoManagerRemote</className>
+ <differenceType>7012</differenceType><!-- method added to an interface -->
+ <method>byte[] getPackageVersionBytes(org.rhq.core.domain.auth.Subject, int, int)</method>
+ <justification>Adding a method to a remote API interface is safe. This class is never to be implemented by users.</justification>
+ </difference>
+ <difference>
+ <className>org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote</className>
+ <differenceType>7012</differenceType><!-- method added to an interface -->
+ <method>java.util.Set findLiveDataForGroup(org.rhq.core.domain.auth.Subject, int, int[], int[])</method>
+ <justification>Adding a method to a remote API interface is safe. This class is never to be implemented by users.</justification>
+ </difference>
+</differences>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 4efad25..0a067fe 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -916,6 +916,16 @@
<include>**/*Remote</include>
<include>**/ServerVersion</include>
</includes>
+ <ignored>
+ <!-- This is intentionally ignored in any version of RHQ. We never
+ even report it. -->
+ <difference>
+ <className>**/ServerVersion</className>
+ <differenceType>6003</differenceType> <!-- Constant field value changed -->
+ <field>namespace</field>
+ <justification>The namespace changes with every version, so this is definitely an intentional change.</justification>
+ </difference>
+ </ignored>
</configuration>
</plugin>
</plugins>
diff --git a/modules/plugins/database/intentional-api-changes-since-4.4.0.xml b/modules/plugins/database/intentional-api-changes-since-4.4.0.xml
new file mode 100644
index 0000000..d1f007a
--- /dev/null
+++ b/modules/plugins/database/intentional-api-changes-since-4.4.0.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<differences>
+ <difference>
+ <className>org/rhq/plugins/database/DatabaseQueryUtility</className>
+ <differenceType>7009</differenceType><!-- decreased visibility -->
+ <method>DatabaseQueryUtility()</method>
+ <justification>This is a static utility class, so holding a reference to it doesn't make sense. People should correct their code if they did so.</justification>
+ </difference>
+ <difference>
+ <className>org/rhq/plugins/database/DatabaseQueryUtility$StatementParameter</className>
+ <differenceType>8001</differenceType><!-- class removed -->
+ <justification>Removed an unused class.</justification>
+ </difference>
+</differences>
diff --git a/modules/plugins/jboss-as-5/intentional-api-changes-since-4.4.0.xml b/modules/plugins/jboss-as-5/intentional-api-changes-since-4.4.0.xml
new file mode 100644
index 0000000..a6fa4c9
--- /dev/null
+++ b/modules/plugins/jboss-as-5/intentional-api-changes-since-4.4.0.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<differences>
+ <difference>
+ <className>org/rhq/plugins/jbossas5/Ejb2BeanComponent</className>
+ <differenceType>7004</differenceType><!-- number of arguments changed -->
+ <method>org.jboss.managed.api.ManagedComponent getManagedComponent()</method>
+ <justification>
+ This difference is due to fixes applied for bug 835113. The old method signature cannot be added back because it would re-introduce the problem fixed by bug 835113.
+ This method is just protected so it is not visible (or available for use) outside of inheriting classes.
+ Also, this method is just an override for a base method from ManagedComponentComponent. The base class, ManagedComponentComponent, still has both methods available for use.
+ The fix for bug 835113 had the Ejb2BeanComponent override a different base method.
+
+ Based on this, no action to be taken for this difference.
+ </justification>
+ </difference>
+</differences>
diff --git a/pom.xml b/pom.xml
index 61343ef..b1a59d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,6 +191,10 @@
<!-- a default value for the child modules indicating that the module is not
part of our public API and is therefore not API-checked. -->
<rhq.internal>true</rhq.internal>
+
+ <!-- The name of the file in the module's root dir that contains the intentional
+ api changes to be ignored by Clirr api checks -->
+ <intentional-api-changes-file>intentional-api-changes-since-${signature-check-base-version}.xml</intentional-api-changes-file>
</properties>
@@ -1373,8 +1377,12 @@
</comparisonArtifacts>
<logResults>true</logResults>
<xmlOutputFile>${project.build.directory}/${project.build.finalName}.signature-check.xml</xmlOutputFile>
- <failOnError>false</failOnError>
+ <failOnError>true</failOnError>
+ <failOnWarning>true</failOnWarning>
<skip>${rhq.internal}</skip>
+ <!-- note that this is only available in clirr maven plugin 2.5, but internally we use a patched version for our CI builds.
+ Once new Clirr maven plugin is released, this will work for you, too. -->
+ <ignoredDifferencesFile>${intentional-api-changes-file}</ignoredDifferencesFile>
</configuration>
</execution>
</executions>
commit 26b37482f90fb01a6771c5c51471e2754dc3cdb4
Author: Elias Ross <elias_ross(a)apple.com>
Date: Thu Aug 16 14:08:58 2012 -0700
Bug 848938 - JMX Plugin - Leaking connector thread
Ensure connectors are closed during discovery; e.g.
"Thread-2461" daemon prio=10 tid=0x000000006103c800 nid=0x5fc0 waiting on condition [0x00002aab178bb000]
java.lang.Thread.State: TIMED_WAITING (sleeping)
at java.lang.Thread.sleep(Native Method)
at com.sun.jmx.remote.internal.ClientCommunicatorAdmin$Checker.run(ClientCommunicatorAdmin.java:154)
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
index e8072ea..1068bb5 100644
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
@@ -119,27 +119,27 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
@Override
public Set<DiscoveredResourceDetails> discoverResources(ResourceDiscoveryContext context) {
- Set<DiscoveredResourceDetails> discoveredResources = new LinkedHashSet<DiscoveredResourceDetails>();
+ Set<DiscoveredResourceDetails> discoveredResources = new LinkedHashSet<DiscoveredResourceDetails>();
Map<String, List<DiscoveredResourceDetails>> duplicatesByKey = new LinkedHashMap<String, List<DiscoveredResourceDetails>>();
// Filter out JBoss, Tomcat, etc. processes, which will be represented by more specific types of Resources
// discovered by other plugins.
- List<ProcessScanResult> nonExcludedProcesses = getNonExcludedJavaProcesses(context);
+ List<ProcessScanResult> nonExcludedProcesses = getNonExcludedJavaProcesses(context);
for (ProcessScanResult process : nonExcludedProcesses) {
try {
ProcessInfo processInfo = process.getProcessInfo();
DiscoveredResourceDetails details = discoverResourceDetails(context, processInfo);
if (details != null) {
- //detect discovered jmx resources that are erroneously using the same key
- if (discoveredResources.contains(details)) {
+ //detect discovered jmx resources that are erroneously using the same key
+ if (discoveredResources.contains(details)) {
List<DiscoveredResourceDetails> duplicates = duplicatesByKey.get(details.getResourceKey());
if (duplicates == null) {
duplicates = new ArrayList<DiscoveredResourceDetails>();
duplicatesByKey.put(details.getResourceKey(), duplicates);
}
- duplicates.add(details);
- }
+ duplicates.add(details);
+ }
discoveredResources.add(details);
}
} catch (RuntimeException re) {
@@ -151,7 +151,7 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
}
}
}
-
+
//Log the erroneous collisions and take them out of the discoveredResource list.
for (String duplicateKey : duplicatesByKey.keySet()) {
List<DiscoveredResourceDetails> duplicates = duplicatesByKey.get(duplicateKey);
@@ -168,7 +168,7 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
private List<ProcessScanResult> getNonExcludedJavaProcesses(ResourceDiscoveryContext context) {
// This is the list of all currently running java processes.
List<ProcessScanResult> javaProcesses = context.getAutoDiscoveredProcesses();
-
+
List<ProcessScanResult> nonExcludedJavaProcesses = new ArrayList<ProcessScanResult>();
Set<String> processExcludes = getProcessExcludes();
for (ProcessScanResult javaProcess : javaProcesses) {
@@ -199,7 +199,7 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
return false;
}
- protected Set<String> getProcessExcludes() {
+ protected Set<String> getProcessExcludes() {
Set<String> processExcludes;
String overrideProcessExcludes = System.getProperty(SYSPROP_RHQ_JMXPLUGIN_PROCESS_FILTERS);
if (overrideProcessExcludes != null) {
@@ -240,7 +240,7 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
}
throw new RuntimeException("Failed to connect to JVM with connector address [" + connectorAddress + "].", e);
}
-
+
String key = connectorAddress;
String name = connectorAddress;
@@ -321,9 +321,17 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
throw new RuntimeException("Failed to parse connector address: " + connectorAddress, e);
}
- JMXConnector jmxConnector;
+ JMXConnector jmxConnector = null;
+ Long pid;
try {
jmxConnector = connect(jmxServiceURL);
+ MBeanServerConnection mbeanServerConnection = jmxConnector.getMBeanServerConnection();
+ RuntimeMXBean runtimeMXBean = ManagementFactory.newPlatformMXBeanProxy(mbeanServerConnection,
+ ManagementFactory.RUNTIME_MXBEAN_NAME, RuntimeMXBean.class);
+ pid = getJvmPid(runtimeMXBean);
+ if (pid == null) {
+ throw new RuntimeException("Failed to determine JVM pid by parsing JVM name.");
+ }
} catch (SecurityException e) {
// Authentication failed, which most likely means the username and password are not set correctly in
// the Resource's plugin config. This is not an error, so return null.
@@ -337,19 +345,8 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
log.debug("Unable to upgrade key of JVM Resource with key [" + inventoriedResource.getResourceKey()
+ "], since connecting to its JMX service URL [" + jmxServiceURL + "] failed: " + e);
return null;
- }
-
- Long pid;
- try {
- MBeanServerConnection mbeanServerConnection = jmxConnector.getMBeanServerConnection();
- RuntimeMXBean runtimeMXBean = ManagementFactory.newPlatformMXBeanProxy(mbeanServerConnection,
- ManagementFactory.RUNTIME_MXBEAN_NAME, RuntimeMXBean.class);
- pid = getJvmPid(runtimeMXBean);
- if (pid == null) {
- throw new RuntimeException("Failed to determine JVM pid by parsing JVM name.");
- }
- } catch (Exception e) {
- throw new RuntimeException("Failed to determine pid of JVM at [" + jmxServiceURL + "].", e);
+ } finally {
+ close(jmxConnector);
}
List<ProcessInfo> processes = inventoriedResource.getSystemInformation().getProcesses(
@@ -378,6 +375,13 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
return null;
}
+ private void close(JMXConnector jmxConnector) {
+ try {
+ if (jmxConnector != null)
+ jmxConnector.close();
+ } catch (Exception e) {}
+ }
+
private static Long getJvmPid(RuntimeMXBean runtimeMXBean) {
Long pid;
String jvmName = runtimeMXBean.getName();
@@ -431,8 +435,8 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
pluginConfig.put(new PropertySimple(CONNECTION_TYPE, J2SE5ConnectionTypeDescriptor.class.getName()));
if (jmxRemotingPort != null) {
pluginConfig.put(new PropertySimple(CONNECTOR_ADDRESS_CONFIG_PROPERTY, jmxServiceURL));
- }
-
+ }
+
return new DiscoveredResourceDetails(context.getResourceType(), key.toString(), name, version, description,
pluginConfig, process);
}
@@ -463,30 +467,29 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
JMXConnector jmxConnector = null;
try {
jmxConnector = connect(jmxServiceURL);
+ return getJavaVersion(jmxConnector);
} catch (SecurityException e) {
log.warn("Unable to to authenticate to JMX service URL [" + jmxServiceURL + "]: " + e.getMessage());
} catch (IOException e) {
log.error("Failed to connect to JMX service URL [" + jmxServiceURL + "].", e);
+ } catch (Exception e) {
+ log.error("Failed to determine JVM version for process [" + process.getPid() + "] with command line [" +
+ Arrays.asList(process.getCommandLine()) + "].", e);
+ } finally {
+ close(jmxConnector);
}
- String version;
- if (jmxConnector != null) {
- try {
+ // TODO: We could exec "java -version" here.
+ return null;
+ }
- MBeanServerConnection mbeanServerConnection = jmxConnector.getMBeanServerConnection();
- RuntimeMXBean runtimeMXBean = ManagementFactory.newPlatformMXBeanProxy(mbeanServerConnection,
- ManagementFactory.RUNTIME_MXBEAN_NAME, RuntimeMXBean.class);
- version = runtimeMXBean.getSystemProperties().get(SYSPROP_JAVA_VERSION);
- if (version == null) {
- throw new IllegalStateException("System property [" + SYSPROP_JAVA_VERSION + "] is not defined.");
- }
- } catch (Exception e) {
- log.error("Failed to determine JVM version for process [" + process.getPid() + "] with command line [" +
- Arrays.asList(process.getCommandLine()) + "].", e);
- version = null;
- }
- } else {
- // TODO: We could exec "java -version" here.
- version = null;
+ protected String getJavaVersion(JMXConnector jmxConnector) throws Exception {
+ String version;
+ MBeanServerConnection mbeanServerConnection = jmxConnector.getMBeanServerConnection();
+ RuntimeMXBean runtimeMXBean = ManagementFactory.newPlatformMXBeanProxy(mbeanServerConnection,
+ ManagementFactory.RUNTIME_MXBEAN_NAME, RuntimeMXBean.class);
+ version = runtimeMXBean.getSystemProperties().get(SYSPROP_JAVA_VERSION);
+ if (version == null) {
+ throw new IllegalStateException("System property [" + SYSPROP_JAVA_VERSION + "] is not defined.");
}
return version;
}
@@ -540,7 +543,7 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
String className = null;
for (int i = 1; i < process.getCommandLine().length; i++) {
String arg = process.getCommandLine()[i];
-
+
if (!arg.startsWith("-")) {
className = arg;
break;
@@ -575,4 +578,4 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
return null;
}
-}
\ No newline at end of file
+}
commit 9f1758393926e3a980b7148938aa358430762053
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Sep 19 13:29:01 2012 +0200
[BZ 858533 - Global uncaught exception with 'New' group creation from 'All groups'] NPE was thrown, it was regression of b54ce46
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 fd617c2..dd5cadc 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
@@ -212,7 +212,8 @@ public class ResourceGroupListView extends Table<ResourceGroupCompositeDataSourc
Permission.MANAGE_INVENTORY) {
public void executeAction(ListGridRecord[] selection, Object actionValue) {
GroupCategory category = null;
- String categoryString = getInitialCriteria().getAttribute(ResourceGroupDataSourceField.CATEGORY.propertyName());
+ String categoryString = getInitialCriteria() == null ? null : getInitialCriteria().getAttribute(
+ ResourceGroupDataSourceField.CATEGORY.propertyName());
if (categoryString != null) {
category = GroupCategory.COMPATIBLE.name().equals(categoryString) ? GroupCategory.COMPATIBLE : GroupCategory.MIXED;
}
commit 6887631b55d273e017257eea610dc5b0df8af1fa
Author: Elias Ross <elias_ross(a)apple.com>
Date: Tue Jul 10 14:19:49 2012 -0700
Bug 839080 - ProcessInfoQuery does not properly handle pidfile with line ending or whitespace
diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/pquery/Attribute.java b/modules/core/native-system/src/main/java/org/rhq/core/system/pquery/Attribute.java
index 5c06b66..b9962ea 100644
--- a/modules/core/native-system/src/main/java/org/rhq/core/system/pquery/Attribute.java
+++ b/modules/core/native-system/src/main/java/org/rhq/core/system/pquery/Attribute.java
@@ -35,7 +35,7 @@ class Attribute {
name, basename, pidfile, pid
}
- private String attributeValue;
+ private final String attributeValue;
Attribute(String attributeValue, Category category) {
validate(attributeValue, category);
diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/pquery/Conditional.java b/modules/core/native-system/src/main/java/org/rhq/core/system/pquery/Conditional.java
index 3867fe2..cb7a48d 100644
--- a/modules/core/native-system/src/main/java/org/rhq/core/system/pquery/Conditional.java
+++ b/modules/core/native-system/src/main/java/org/rhq/core/system/pquery/Conditional.java
@@ -33,7 +33,7 @@ package org.rhq.core.system.pquery;
* @author John Mazzitelli
*/
class Conditional {
- char separator = '|';
+ private char separator = '|';
enum Category {
process, arg
@@ -47,10 +47,10 @@ class Conditional {
unspecified, parent
}
- private Category category;
- private Attribute attribute;
- private Operator operator;
- private Qualifier qualifier;
+ private final Category category;
+ private final Attribute attribute;
+ private final Operator operator;
+ private final Qualifier qualifier;
Conditional(String conditional) {
char possibleSeparator = conditional.charAt(0);
@@ -74,9 +74,6 @@ class Conditional {
try {
this.category = Category.valueOf(categoryString);
} catch (Exception e) {
- }
-
- if (this.category == null) {
throw new IllegalArgumentException("Invalid category: " + conditional);
}
@@ -85,9 +82,6 @@ class Conditional {
try {
this.operator = Operator.valueOf(operatorString);
} catch (Exception e) {
- }
-
- if (this.operator == null) {
throw new IllegalArgumentException("Invalid operator: " + conditional);
}
@@ -95,10 +89,7 @@ class Conditional {
try {
this.qualifier = Qualifier.valueOf(qualifierString);
} catch (Exception e) {
- }
-
- if (this.qualifier == null) {
- throw new IllegalArgumentException("Invalid qualifier: " + conditional);
+ throw new IllegalArgumentException("Invalid qualifier: " + qualifierString);
}
} else {
this.qualifier = Qualifier.unspecified;
diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/pquery/ProcessInfoQuery.java b/modules/core/native-system/src/main/java/org/rhq/core/system/pquery/ProcessInfoQuery.java
index 1e9eeb3..0a05df3 100644
--- a/modules/core/native-system/src/main/java/org/rhq/core/system/pquery/ProcessInfoQuery.java
+++ b/modules/core/native-system/src/main/java/org/rhq/core/system/pquery/ProcessInfoQuery.java
@@ -22,13 +22,20 @@
*/
package org.rhq.core.system.pquery;
+import java.io.BufferedReader;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.ArrayList;
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;
+import org.apache.commons.logging.LogFactory;
import org.rhq.core.system.NativeSystemInfo;
import org.rhq.core.system.ProcessInfo;
import org.rhq.core.system.pquery.Conditional.Qualifier;
@@ -182,10 +189,13 @@ import org.rhq.core.system.pquery.Conditional.Qualifier;
* @author John Mazzitelli
*/
public class ProcessInfoQuery {
+
+ private static final Log log = LogFactory.getLog(ProcessInfoQuery.class);
+
/**
* The map of all processes keyed on their pids.
*/
- private Map<Long, ProcessInfo> allProcesses;
+ private final Map<Long, ProcessInfo> allProcesses;
/**
* Constructor for {@link ProcessInfoQuery} given an collection of process information that represents the processes
@@ -458,16 +468,22 @@ public class ProcessInfoQuery {
String contents;
try {
- byte[] bytes = new byte[64]; // a pid file should never come close to being 64 bytes big
FileInputStream fis = new FileInputStream(pidfileName);
+ BufferedReader br = new BufferedReader(new InputStreamReader(fis));
try {
- int count = fis.read(bytes);
- contents = new String(bytes, 0, count);
+ contents = br.readLine();
+ if (contents == null) {
+ throw new IOException("empty pid");
+ }
} finally {
fis.close();
}
- } catch (Exception e) {
- contents = "";
+ } catch (FileNotFoundException e) {
+ log.trace("pid not found");
+ return "";
+ } catch (IOException e) {
+ log.warn("unable to read pid file " + pidfileName, e);
+ return "";
}
return contents.trim();
diff --git a/modules/core/native-system/src/test/java/org/rhq/core/system/pquery/ProcessInfoQueryTest.java b/modules/core/native-system/src/test/java/org/rhq/core/system/pquery/ProcessInfoQueryTest.java
index 466983a..a894a73 100644
--- a/modules/core/native-system/src/test/java/org/rhq/core/system/pquery/ProcessInfoQueryTest.java
+++ b/modules/core/native-system/src/test/java/org/rhq/core/system/pquery/ProcessInfoQueryTest.java
@@ -24,8 +24,11 @@ package org.rhq.core.system.pquery;
import java.io.File;
import java.io.FileOutputStream;
+import java.io.FileWriter;
import java.util.ArrayList;
import java.util.List;
+import java.util.UUID;
+
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.core.system.ProcessInfo;
@@ -262,16 +265,13 @@ public class ProcessInfoQueryTest {
/**
* Test PID files.
- *
- * @throws Exception
*/
public void testPIQLPidfile() throws Exception {
File pidfile = File.createTempFile("test", ".pid");
try {
- FileOutputStream fos = new FileOutputStream(pidfile);
- fos.write("3".getBytes());
- fos.flush();
- fos.close();
+ FileWriter fw = new FileWriter(pidfile);
+ fw.write("3");
+ fw.close();
results = query.query("process|pidfile|match=" + pidfile.getCanonicalPath());
assert results.size() == 1 : results;
@@ -346,6 +346,30 @@ public class ProcessInfoQueryTest {
}
/**
+ * Test PID files with whitespace or empty files.
+ */
+ public void testPIQLPidfileWhitespace() throws Exception {
+ File pidfile = File.createTempFile("test", ".pid");
+ try {
+ results = query.query("process|pidfile|match=" + pidfile.getCanonicalPath());
+ assert results.size() == 0 : results;
+
+ FileWriter fw = new FileWriter(pidfile);
+ fw.write(" 3\r\n");
+ fw.close();
+
+ results = query.query("process|pidfile|match=" + pidfile.getCanonicalPath());
+ assert results.size() == 1 : results;
+ } finally {
+ pidfile.delete();
+ }
+ results = query.query("process|pidfile|match=" + pidfile.getCanonicalPath());
+ assert results.size() == 0 : results;
+ results = query.query("process|pidfile|match=" + UUID.randomUUID());
+ assert results.size() == 0 : results;
+ }
+
+ /**
* Test regular expressions.
*/
public void testPIQLProcessNameRegularExpression() {
@@ -660,4 +684,4 @@ public class ProcessInfoQueryTest {
// do nothing
}
}
-}
\ No newline at end of file
+}
commit bf4b25f421769909e886eb42f7b99c66b207b200
Author: Elias Ross <elias_ross(a)apple.com>
Date: Sat Aug 18 23:03:34 2012 -0700
rhq-script-plugin does not always capture process output
Ensure output thread completes before exiting startProgram()
Use concurrent library to clean up exit code processing.
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/exec/ProcessExecutor.java b/modules/core/util/src/main/java/org/rhq/core/util/exec/ProcessExecutor.java
index ccbe045..308d9bd 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/exec/ProcessExecutor.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/exec/ProcessExecutor.java
@@ -33,6 +33,12 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import org.rhq.core.util.UtilI18NResourceKeys;
@@ -45,6 +51,9 @@ import org.rhq.core.util.UtilI18NResourceKeys;
* @author John Mazzitelli
*/
public class ProcessExecutor {
+
+ private static ExecutorService threadPool = Executors.newCachedThreadPool();
+
/**
* This executes any operating system process as described in the given start command. When this method returns, it
* can be assumed that the process was launched but not necessarily finished. The caller can ask this method to
@@ -78,7 +87,6 @@ public class ProcessExecutor {
*
* @return process exit code (if the method waited for it to exit) or <code>null</code> if this method was to only
* start the process but not wait or was to wait and the wait time expired before the process exited
- *
* @throws Exception if any error occurs while trying to start the child process
*/
protected Integer startProgram(final ProcessToStart process) throws Exception {
@@ -91,47 +99,77 @@ public class ProcessExecutor {
final Process childProcess = Runtime.getRuntime().exec(cmdline, environment, workingDir);
// redirect the program's streams
- // WARNING:
- // It seems there is no way to get around a possible race condition - what if the process
- // was so fast that it exited already? We didn't get a chance to capture its output.
- // I see a unit test that periodically fails because it doesn't get any captured output when
- // it should - I think it is because of this race condition. But there is no Java API that
- // let's me redirect a process' streams before the process is told to start.
- redirectStreams(process, childProcess);
-
- final Integer[] retExitCode = new Integer[1];
+ final RedirectThreads redirect = redirectStreams(process, childProcess);
+ Integer exitCode = null;
// wait if told to - note that the default is not to wait
if (process.getWaitForExit().intValue() > 0) {
- Thread waitThread = new Thread("ExecuteProcess-" + process.getProgramTitle()) {
- public void run() {
+ Callable<Integer> call = new Callable() {
+ public Integer call() throws Exception {
+ Thread.currentThread().setName("ExecuteProcess-" + process.getProgramTitle());
try {
- int exitCode = childProcess.waitFor();
- retExitCode[0] = new Integer(exitCode);
- } catch (InterruptedException e) {
+ return childProcess.waitFor();
+ } finally {
+ // wait for I/O to finish
+ redirect.join();
}
}
};
-
- waitThread.setDaemon(true);
- waitThread.start();
+ Future<Integer> future = threadPool.submit(call);
try {
- waitThread.join(process.getWaitForExit().intValue());
+ exitCode = future.get(process.getWaitForExit().intValue(), TimeUnit.MILLISECONDS);
} catch (InterruptedException ie) {
// this might happen if the launching thread got interrupted
+ Thread.currentThread().interrupt();
+ } catch (TimeoutException e) {
+ // the documentation requires we return null
} finally {
- waitThread.interrupt();
+ future.cancel(true);
}
- if (retExitCode[0] == null) {
+ if (exitCode == null) {
// never got the exit code so the wait time must have expired, kill the process if configured to do so
if (process.isKillOnTimeout().booleanValue()) {
childProcess.destroy();
}
+ // cancel the output threads
+ redirect.interrupt();
}
}
- return retExitCode[0];
+ return exitCode;
+ }
+
+ /**
+ * Wrapper for threads used for capturing output.
+ * Call {@link #join} to wait for output to be fully captured.
+ */
+ protected static class RedirectThreads {
+
+ private final StreamRedirector stdout;
+ private final StreamRedirector stderr;
+
+ private RedirectThreads(StreamRedirector stdout, StreamRedirector stderr) {
+ this.stdout = stdout;
+ this.stderr = stderr;
+ }
+
+ /**
+ * Waits for output to be fully captured.
+ */
+ public void join() throws InterruptedException {
+ stderr.join();
+ stdout.join();
+ }
+
+ /**
+ * Interrupts these threads.
+ */
+ public void interrupt() {
+ stderr.interrupt();
+ stdout.interrupt();
+ }
+
}
/**
@@ -146,8 +184,9 @@ public class ProcessExecutor {
* @param childProcess the newly spawned child process
*
* @throws IOException if failed to pipe data to/from stdin/stdout
+ * @return RedirectThreads containing a handle to the threads redirecting output
*/
- protected void redirectStreams(ProcessToStart process, Process childProcess) throws IOException {
+ protected RedirectThreads redirectStreams(ProcessToStart process, Process childProcess) throws IOException {
// Process.getInputStream is actually the process's stdout output
// Process.getOutputStream is actually the process's stdin intput
// Process.getErrorStream is the process's stderr output
@@ -175,7 +214,6 @@ public class ProcessExecutor {
}
StreamRedirector stdoutThread = new StreamRedirector(threadNamePrefix + "-stdout", stdout, fileOutputStream);
-
StreamRedirector stderrThread = new StreamRedirector(threadNamePrefix + "-stderr", stderr, fileOutputStream);
stdoutThread.start();
@@ -201,7 +239,7 @@ public class ProcessExecutor {
stdin.close();
- return;
+ return new RedirectThreads(stdoutThread, stderrThread);
}
/**
@@ -372,7 +410,7 @@ public class ProcessExecutor {
String result = progFile.getPath();
// If executable verification has been turned off then assume the caller wants his executable "as-is".
- // Otherwise, validate and ensure a full path.
+ // Otherwise, validate and ensure a full path.
if (Boolean.TRUE.equals(process.isCheckExecutableExists())) {
if (!progFile.exists()) {
throw new FileNotFoundException(UtilI18NResourceKeys.MSG.getMsg(
@@ -453,4 +491,4 @@ public class ProcessExecutor {
String newFileName = file.getCanonicalPath() + timestamp;
file.renameTo(new File(newFileName));
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/util/src/test/java/org/rhq/core/util/exec/ProcessExecTest.java b/modules/core/util/src/test/java/org/rhq/core/util/exec/ProcessExecTest.java
index 97dcdaa..49ab3f5 100644
--- a/modules/core/util/src/test/java/org/rhq/core/util/exec/ProcessExecTest.java
+++ b/modules/core/util/src/test/java/org/rhq/core/util/exec/ProcessExecTest.java
@@ -34,10 +34,8 @@ import org.testng.annotations.Test;
@Test
public class ProcessExecTest {
public void testProcessExecOutputStream() {
- int tries = 0;
-
- while (true) {
- tries++;
+ // run multiple times to ensure race condition fixed
+ for (int i = 0; i < 100; i++) {
ProcessToStart start = new ProcessToStart();
setupProgram(start);
@@ -52,16 +50,8 @@ public class ProcessExecTest {
assert results.getError() == null : "Should not have failed: " + results;
assert results.getExitCode() != null : "Should have had exit code: " + results;
- // there are some times when we can't get the output - see comments in ProcessExecutor.startProgram
- // if we failed to get the output this time, let's try again. This is just allowing that rare
- // condition to occur in our test - I know of no way via the Java API to avoid it, so let's not
- // fail our test just because it happened once (but do fail if we can't get the output after so many tries)
byte[] output = baos.toByteArray();
- if (output.length > 0) {
- return; // we did get output so everything succeeded! we can pass the test now and just return
- }
-
- if (tries >= 3) {
+ if (output.length == 0) {
assert false : "Should have had some output: " + results;
}
}
@@ -116,4 +106,4 @@ public class ProcessExecTest {
start.setArguments(new String[] { "/bin" });
}
}
-}
\ No newline at end of file
+}
commit 6314bfb9675380bd8d4194800b54f608bf00acda
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Sep 18 14:53:48 2012 +0200
[BZ 848494 - Metric graphs on dashboards uses the client's time for obtaining the data] System.currentTimeMillis() is now invoked on the server side for the metric graphs
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
index f0a2cab..96fd3d3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
@@ -87,6 +87,8 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti
protected boolean currentlyLoading = false;
protected long start = -1;
protected long end = -1;
+ protected int lastN = -1;
+ protected int units = -1;
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "GroupMetrics";
@@ -222,8 +224,10 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti
column.setHeight(10);//pack
//initialize to defaults
- end = System.currentTimeMillis();
- start = end - (1000L * 60 * 60 * 8);//last 8 hrs
+ end = -1;
+ start = -1;
+ lastN = -1;
+ units = -1;
//result timeframe if enabled
PropertySimple property = portletConfig.getSimple(Constant.METRIC_RANGE_ENABLE);
@@ -244,13 +248,10 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti
//Simple time settings
property = portletConfig.getSimple(Constant.METRIC_RANGE_LASTN);
if (property != null) {
- int lastN = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_LASTN,
+ lastN = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_LASTN,
Constant.METRIC_RANGE_LASTN_DEFAULT));
- int units = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_UNIT,
+ units = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_UNIT,
Constant.METRIC_RANGE_UNIT_DEFAULT));
- ArrayList<Long> beginEnd = MeasurementUtility.calculateTimeFrame(lastN, units);
- start = Long.valueOf(beginEnd.get(0));
- end = Long.valueOf(beginEnd.get(1));
}
}
}
@@ -323,141 +324,150 @@ public class GroupMetricsPortlet extends LocatableVLayout implements CustomSetti
.getId();
}
- //make the asynchronous call for all the measurement data
- GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroup(
- groupId, definitionArrayIds, start, end, 60,
- new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
- @Override
- public void onFailure(Throwable caught) {
- Log.debug("Error retrieving recent metrics charting data for group ["
- + groupId + "]:" + caught.getMessage());
- setRefreshing(false);
- }
-
- @Override
- public void onSuccess(
- List<List<MeasurementDataNumericHighLowComposite>> results) {
- if (!results.isEmpty()) {
- boolean someChartedData = false;
- //iterate over the retrieved charting data
- for (int index = 0; index < displayOrder.length; index++) {
- //retrieve the correct measurement definition
- MeasurementDefinition md = measurementDefMap
- .get(displayOrder[index]);
-
- //load the data results for the given metric definition
- List<MeasurementDataNumericHighLowComposite> data = results
- .get(index);
-
- //locate last and minimum values.
- double lastValue = -1;
- double minValue = Double.MAX_VALUE;//
- for (MeasurementDataNumericHighLowComposite d : data) {
- if ((!Double.isNaN(d.getValue()))
- && (String.valueOf(d.getValue()).indexOf("NaN") == -1)) {
- if (d.getValue() < minValue) {
- minValue = d.getValue();
- }
- lastValue = d.getValue();
+ AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>> callback = new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ Log.debug("Error retrieving recent metrics charting data for group ["
+ + groupId + "]:" + caught.getMessage());
+ setRefreshing(false);
+ }
+
+ @Override
+ public void onSuccess(
+ List<List<MeasurementDataNumericHighLowComposite>> results) {
+ if (!results.isEmpty()) {
+ boolean someChartedData = false;
+ //iterate over the retrieved charting data
+ for (int index = 0; index < displayOrder.length; index++) {
+ //retrieve the correct measurement definition
+ MeasurementDefinition md = measurementDefMap
+ .get(displayOrder[index]);
+
+ //load the data results for the given metric definition
+ List<MeasurementDataNumericHighLowComposite> data = results
+ .get(index);
+
+ //locate last and minimum values.
+ double lastValue = -1;
+ double minValue = Double.MAX_VALUE;//
+ for (MeasurementDataNumericHighLowComposite d : data) {
+ if ((!Double.isNaN(d.getValue()))
+ && (String.valueOf(d.getValue()).indexOf("NaN") == -1)) {
+ if (d.getValue() < minValue) {
+ minValue = d.getValue();
}
+ lastValue = d.getValue();
}
+ }
- //collapse the data into comma delimited list for consumption by third party javascript library(jquery.sparkline)
- String commaDelimitedList = "";
+ //collapse the data into comma delimited list for consumption by third party javascript library(jquery.sparkline)
+ String commaDelimitedList = "";
- for (MeasurementDataNumericHighLowComposite d : data) {
- if ((!Double.isNaN(d.getValue()))
- && (String.valueOf(d.getValue()).indexOf("NaN") == -1)) {
- commaDelimitedList += d.getValue() + ",";
- }
- }
- LocatableDynamicForm row = new LocatableDynamicForm(
- recentMeasurementsContent.extendLocatorId(md.getName()));
- row.setNumCols(3);
- HTMLFlow graph = new HTMLFlow();
- // String contents = "<span id='sparkline_" + index + "' class='dynamicsparkline' width='0'>"
- // + commaDelimitedList + "</span>";
- String contents = "<span id='sparkline_" + index
- + "' class='dynamicsparkline' width='0' " + "values='"
- + commaDelimitedList + "'>...</span>";
- graph.setContents(contents);
- graph.setContentsType(ContentsType.PAGE);
- //diable scrollbars on span
- graph.setScrollbarSize(0);
-
- CanvasItem graphContainer = new CanvasItem();
- graphContainer.setShowTitle(false);
- graphContainer.setHeight(16);
- graphContainer.setWidth(60);
- graphContainer.setCanvas(graph);
-
- //Link/title element
- final String title = md.getDisplayName();
- // String destination = "/resource/common/monitor/Visibility.do?mode=chartSingleMetricSingleResource&id="
- // + resourceId + "&m=" + md.getId();
- final String destination = "/resource/common/monitor/Visibility.do?mode=chartSingleMetricMultiResource&groupId="
- + groupId + "&m=" + md.getId();
- LinkItem link = AbstractActivityView.newLinkItem(title,
- destination);
- link.addClickHandler(new ClickHandler() {
- @Override
- public void onClick(ClickEvent event) {
- ChartViewWindow window = new ChartViewWindow(
- recentMeasurementsContent
- .extendLocatorId("ChartWindow"), title);
- //generate and include iframed content
- FullHTMLPane iframe = new FullHTMLPane(
- recentMeasurementsContent
- .extendLocatorId("View"), destination);
- // .extendLocatorId("View"),
- // AbstractActivityView.iframeLink(destination));
- window.addItem(iframe);
- window.show();
- }
- });
-
- //Value
- String convertedValue = lastValue + " " + md.getUnits();
- convertedValue = AbstractActivityView
- .convertLastValueForDisplay(lastValue, md);
- StaticTextItem value = AbstractActivityView
- .newTextItem(convertedValue);
-
- row.setItems(graphContainer, link, value);
- //if graph content returned
- if ((md.getName().trim().indexOf("Trait.") == -1)
- && (lastValue != -1)) {
- column.addMember(row);
- someChartedData = true;
+ for (MeasurementDataNumericHighLowComposite d : data) {
+ if ((!Double.isNaN(d.getValue()))
+ && (String.valueOf(d.getValue()).indexOf("NaN") == -1)) {
+ commaDelimitedList += d.getValue() + ",";
}
}
- if (!someChartedData) {// when there are results but no chartable entries.
- LocatableDynamicForm row = AbstractActivityView.createEmptyDisplayRow(
- recentMeasurementsContent.extendLocatorId("None"),
- AbstractActivityView.RECENT_MEASUREMENTS_GROUP_NONE);
+ LocatableDynamicForm row = new LocatableDynamicForm(
+ recentMeasurementsContent.extendLocatorId(md.getName()));
+ row.setNumCols(3);
+ HTMLFlow graph = new HTMLFlow();
+ // String contents = "<span id='sparkline_" + index + "' class='dynamicsparkline' width='0'>"
+ // + commaDelimitedList + "</span>";
+ String contents = "<span id='sparkline_" + index
+ + "' class='dynamicsparkline' width='0' " + "values='"
+ + commaDelimitedList + "'>...</span>";
+ graph.setContents(contents);
+ graph.setContentsType(ContentsType.PAGE);
+ //diable scrollbars on span
+ graph.setScrollbarSize(0);
+
+ CanvasItem graphContainer = new CanvasItem();
+ graphContainer.setShowTitle(false);
+ graphContainer.setHeight(16);
+ graphContainer.setWidth(60);
+ graphContainer.setCanvas(graph);
+
+ //Link/title element
+ final String title = md.getDisplayName();
+ // String destination = "/resource/common/monitor/Visibility.do?mode=chartSingleMetricSingleResource&id="
+ // + resourceId + "&m=" + md.getId();
+ final String destination = "/resource/common/monitor/Visibility.do?mode=chartSingleMetricMultiResource&groupId="
+ + groupId + "&m=" + md.getId();
+ LinkItem link = AbstractActivityView.newLinkItem(title,
+ destination);
+ link.addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ ChartViewWindow window = new ChartViewWindow(
+ recentMeasurementsContent
+ .extendLocatorId("ChartWindow"), title);
+ //generate and include iframed content
+ FullHTMLPane iframe = new FullHTMLPane(
+ recentMeasurementsContent
+ .extendLocatorId("View"), destination);
+ // .extendLocatorId("View"),
+ // AbstractActivityView.iframeLink(destination));
+ window.addItem(iframe);
+ window.show();
+ }
+ });
+
+ //Value
+ String convertedValue = lastValue + " " + md.getUnits();
+ convertedValue = AbstractActivityView
+ .convertLastValueForDisplay(lastValue, md);
+ StaticTextItem value = AbstractActivityView
+ .newTextItem(convertedValue);
+
+ row.setItems(graphContainer, link, value);
+ //if graph content returned
+ if ((md.getName().trim().indexOf("Trait.") == -1)
+ && (lastValue != -1)) {
column.addMember(row);
- } else {
- //insert see more link
- LocatableDynamicForm row = new LocatableDynamicForm(
- recentMeasurementsContent
- .extendLocatorId("RecentMeasurementsContentSeeMore"));
- String link = LinkManager
- .getGroupMonitoringGraphsLink(EntityContext
- .forGroup(groupId));
- AbstractActivityView.addSeeMoreLink(row, link, column);
+ someChartedData = true;
}
- //call out to 3rd party javascript lib
- BrowserUtility.graphSparkLines();
- } else {
- LocatableDynamicForm row = AbstractActivityView
- .createEmptyDisplayRow(
- recentMeasurementsContent.extendLocatorId("None"),
- AbstractActivityView.RECENT_MEASUREMENTS_GROUP_NONE);
+ }
+ if (!someChartedData) {// when there are results but no chartable entries.
+ LocatableDynamicForm row = AbstractActivityView.createEmptyDisplayRow(
+ recentMeasurementsContent.extendLocatorId("None"),
+ AbstractActivityView.RECENT_MEASUREMENTS_GROUP_NONE);
column.addMember(row);
+ } else {
+ //insert see more link
+ LocatableDynamicForm row = new LocatableDynamicForm(
+ recentMeasurementsContent
+ .extendLocatorId("RecentMeasurementsContentSeeMore"));
+ String link = LinkManager
+ .getGroupMonitoringGraphsLink(EntityContext
+ .forGroup(groupId));
+ AbstractActivityView.addSeeMoreLink(row, link, column);
}
- setRefreshing(false);
+ //call out to 3rd party javascript lib
+ BrowserUtility.graphSparkLines();
+ } else {
+ LocatableDynamicForm row = AbstractActivityView
+ .createEmptyDisplayRow(
+ recentMeasurementsContent.extendLocatorId("None"),
+ AbstractActivityView.RECENT_MEASUREMENTS_GROUP_NONE);
+ column.addMember(row);
}
- });
+ setRefreshing(false);
+ }
+ };
+
+ //make the asynchronous call for all the measurement data
+ if (end != -1 && start != -1) {
+ GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroup(
+ groupId, definitionArrayIds, start, end, 60, callback);
+ } else if (lastN != -1 && units != -1) {
+ GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroupForLast(
+ groupId, definitionArrayIds, lastN, units, 60, callback);
+ } else {
+ GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroupForLast(
+ groupId, definitionArrayIds, 8, MeasurementUtility.UNIT_HOURS, 60, callback);
+ }
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
index 16869ff..a2a9494 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
@@ -18,6 +18,12 @@
*/
package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.ContentsType;
@@ -31,6 +37,7 @@ import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
import com.smartgwt.client.widgets.layout.VLayout;
+
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
@@ -57,8 +64,6 @@ import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
-import java.util.*;
-
/**This portlet allows the end user to customize the metric display
*
* @author Simeon Pinder
@@ -104,8 +109,10 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
column.setWidth100();
//initialize to defaults
- end = System.currentTimeMillis();
- start = end - (1000L * 60 * 60 * 8);//last 8 hrs
+ end = -1;
+ start = -1;
+ lastN = -1;
+ units = -1;
//result timeframe if enabled
PropertySimple property = portletConfig.getSimple(Constant.METRIC_RANGE_ENABLE);
@@ -126,13 +133,10 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
//Simple time settings
property = portletConfig.getSimple(Constant.METRIC_RANGE_LASTN);
if (property != null) {
- int lastN = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_LASTN,
+ lastN = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_LASTN,
Constant.METRIC_RANGE_LASTN_DEFAULT));
- int units = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_UNIT,
+ units = Integer.valueOf(portletConfig.getSimpleValue(Constant.METRIC_RANGE_UNIT,
Constant.METRIC_RANGE_UNIT_DEFAULT));
- ArrayList<Long> beginEnd = MeasurementUtility.calculateTimeFrame(lastN, units);
- start = Long.valueOf(beginEnd.get(0));
- end = Long.valueOf(beginEnd.get(1));
}
}
}
@@ -189,153 +193,162 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
definitionArrayIds[index++] = measurementDefMap.get(definitionToDisplay)
.getId();
}
-
- //make the asynchronous call for all the measurement data
- GWTServiceLookup.getMeasurementDataService().findDataForResource(resourceId,
- definitionArrayIds, start, end, 60,
- new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
- @Override
- public void onFailure(Throwable caught) {
- Log.debug("Error retrieving recent metrics charting data for resource ["
- + resourceId + "]:" + caught.getMessage());
- setRefreshing(false);
- }
-
- @Override
- public void onSuccess(
- List<List<MeasurementDataNumericHighLowComposite>> results) {
- if (!results.isEmpty()) {
- boolean someChartedData = false;
- //iterate over the retrieved charting data
- for (int index = 0; index < displayOrder.length; index++) {
- //retrieve the correct measurement definition
- MeasurementDefinition md = measurementDefMap
- .get(displayOrder[index]);
-
- //load the data results for the given metric definition
- List<MeasurementDataNumericHighLowComposite> data = results
- .get(index);
-
- //locate last and minimum values.
- double lastValue = -1;
- double minValue = Double.MAX_VALUE;//
- for (MeasurementDataNumericHighLowComposite d : data) {
- if ((!Double.isNaN(d.getValue()))
- && (String.valueOf(d.getValue()).indexOf("NaN") == -1)) {
- if (d.getValue() < minValue) {
- minValue = d.getValue();
- }
- lastValue = d.getValue();
+
+ AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>> callback = new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ Log.debug("Error retrieving recent metrics charting data for resource ["
+ + resourceId + "]:" + caught.getMessage());
+ setRefreshing(false);
+ }
+
+ @Override
+ public void onSuccess(
+ List<List<MeasurementDataNumericHighLowComposite>> results) {
+ if (!results.isEmpty()) {
+ boolean someChartedData = false;
+ //iterate over the retrieved charting data
+ for (int index = 0; index < displayOrder.length; index++) {
+ //retrieve the correct measurement definition
+ MeasurementDefinition md = measurementDefMap
+ .get(displayOrder[index]);
+
+ //load the data results for the given metric definition
+ List<MeasurementDataNumericHighLowComposite> data = results
+ .get(index);
+
+ //locate last and minimum values.
+ double lastValue = -1;
+ double minValue = Double.MAX_VALUE;//
+ for (MeasurementDataNumericHighLowComposite d : data) {
+ if ((!Double.isNaN(d.getValue()))
+ && (String.valueOf(d.getValue()).indexOf("NaN") == -1)) {
+ if (d.getValue() < minValue) {
+ minValue = d.getValue();
}
+ lastValue = d.getValue();
}
+ }
- //collapse the data into comma delimited list for consumption by third party javascript library(jquery.sparkline)
- String commaDelimitedList = "";
+ //collapse the data into comma delimited list for consumption by third party javascript library(jquery.sparkline)
+ String commaDelimitedList = "";
- for (MeasurementDataNumericHighLowComposite d : data) {
- if ((!Double.isNaN(d.getValue()))
- && (String.valueOf(d.getValue()).indexOf("NaN") == -1)) {
- commaDelimitedList += d.getValue() + ",";
- }
- }
- LocatableDynamicForm row = new LocatableDynamicForm(
- recentMeasurementsContent.extendLocatorId(md.getName()));
- row.setNumCols(3);
- row.setColWidths(65, "*", 100);
- row.setWidth100();
- row.setAutoHeight();
- row.setOverflow(Overflow.VISIBLE);
- HTMLFlow graph = new HTMLFlow();
- String contents = "<span id='sparkline_" + index
- + "' class='dynamicsparkline' width='0' " + "values='"
- + commaDelimitedList + "'>...</span>";
- graph.setContents(contents);
- graph.setContentsType(ContentsType.PAGE);
- //disable scrollbars on span
- graph.setScrollbarSize(0);
-
- CanvasItem graphContainer = new CanvasItem();
- graphContainer.setShowTitle(false);
- graphContainer.setHeight(16);
- graphContainer.setWidth(60);
- graphContainer.setCanvas(graph);
-
- //Link/title element
- final String title = md.getDisplayName();
- final String destination = "/resource/common/monitor/Visibility.do?mode=chartSingleMetricSingleResource&id="
- + resourceId + "&m=" + md.getId();
-
- //have link launch modal window on click
- LinkItem link = AbstractActivityView.newLinkItem(title,
- destination);
- link.setTooltip(title);
- link.setTitleVAlign(VerticalAlignment.TOP);
- link.setAlign(Alignment.LEFT);
- link.setClipValue(true);
- link.setWrap(true);
- link.setHeight(26);
- link.setWidth("100%");
- link.addClickHandler(new ClickHandler() {
- @Override
- public void onClick(ClickEvent event) {
- ChartViewWindow window = new ChartViewWindow(
- recentMeasurementsContent
- .extendLocatorId("ChartWindow"), title);
- //generate and include iframed content
- FullHTMLPane iframe = new FullHTMLPane(
- recentMeasurementsContent.extendLocatorId("View"),
- destination);
- window.addItem(iframe);
- window.show();
- }
- });
-
- //Value
- String convertedValue;
- convertedValue = AbstractActivityView
- .convertLastValueForDisplay(lastValue, md);
- StaticTextItem value = AbstractActivityView
- .newTextItem(convertedValue);
- value.setVAlign(VerticalAlignment.TOP);
- value.setAlign(Alignment.RIGHT);
-
- row.setItems(graphContainer, link, value);
- row.setWidth100();
-
- //if graph content returned
- if ((md.getName().trim().indexOf("Trait.") == -1)
- && (lastValue != -1)) {
- column.addMember(row);
- someChartedData = true;
+ for (MeasurementDataNumericHighLowComposite d : data) {
+ if ((!Double.isNaN(d.getValue()))
+ && (String.valueOf(d.getValue()).indexOf("NaN") == -1)) {
+ commaDelimitedList += d.getValue() + ",";
}
}
- if (!someChartedData) {// when there are results but no chartable entries.
- LocatableDynamicForm row = AbstractActivityView
- .createEmptyDisplayRow(
- recentMeasurementsContent.extendLocatorId("None"),
- AbstractActivityView.RECENT_MEASUREMENTS_NONE);
+ LocatableDynamicForm row = new LocatableDynamicForm(
+ recentMeasurementsContent.extendLocatorId(md.getName()));
+ row.setNumCols(3);
+ row.setColWidths(65,"*",100);
+ row.setWidth100();
+ row.setAutoHeight();
+ row.setOverflow(Overflow.VISIBLE);
+ HTMLFlow graph = new HTMLFlow();
+ String contents = "<span id='sparkline_" + index
+ + "' class='dynamicsparkline' width='0' " + "values='"
+ + commaDelimitedList + "'>...</span>";
+ graph.setContents(contents);
+ graph.setContentsType(ContentsType.PAGE);
+ //disable scrollbars on span
+ graph.setScrollbarSize(0);
+
+ CanvasItem graphContainer = new CanvasItem();
+ graphContainer.setShowTitle(false);
+ graphContainer.setHeight(16);
+ graphContainer.setWidth(60);
+ graphContainer.setCanvas(graph);
+
+ //Link/title element
+ final String title = md.getDisplayName();
+ final String destination = "/resource/common/monitor/Visibility.do?mode=chartSingleMetricSingleResource&id="
+ + resourceId + "&m=" + md.getId();
+
+ //have link launch modal window on click
+ LinkItem link = AbstractActivityView.newLinkItem(title,
+ destination);
+ link.setTooltip(title);
+ link.setTitleVAlign(VerticalAlignment.TOP);
+ link.setAlign(Alignment.LEFT);
+ link.setClipValue(true);
+ link.setWrap(true);
+ link.setHeight(26);
+ link.setWidth("100%");
+ link.addClickHandler(new ClickHandler() {
+ @Override
+ public void onClick(ClickEvent event) {
+ ChartViewWindow window = new ChartViewWindow(
+ recentMeasurementsContent
+ .extendLocatorId("ChartWindow"), title);
+ //generate and include iframed content
+ FullHTMLPane iframe = new FullHTMLPane(
+ recentMeasurementsContent.extendLocatorId("View"),
+ destination);
+ window.addItem(iframe);
+ window.show();
+ }
+ });
+
+ //Value
+ String convertedValue;
+ convertedValue = AbstractActivityView
+ .convertLastValueForDisplay(lastValue, md);
+ StaticTextItem value = AbstractActivityView
+ .newTextItem(convertedValue);
+ value.setVAlign(VerticalAlignment.TOP);
+ value.setAlign(Alignment.RIGHT);
+
+ row.setItems(graphContainer, link, value);
+ row.setWidth100();
+
+ //if graph content returned
+ if ((md.getName().trim().indexOf("Trait.") == -1)
+ && (lastValue != -1)) {
column.addMember(row);
- } else {
- //insert see more link
- LocatableDynamicForm row = new LocatableDynamicForm(
- recentMeasurementsContent
- .extendLocatorId("RecentMeasurementsContentSeeMore"));
- String link = LinkManager
- .getResourceMonitoringGraphsLink(resourceId);
- AbstractActivityView.addSeeMoreLink(row, link, column);
+ someChartedData = true;
}
- //call out to 3rd party javascript lib
- BrowserUtility.graphSparkLines();
- } else {
+ }
+ if (!someChartedData) {// when there are results but no chartable entries.
LocatableDynamicForm row = AbstractActivityView
.createEmptyDisplayRow(
recentMeasurementsContent.extendLocatorId("None"),
AbstractActivityView.RECENT_MEASUREMENTS_NONE);
column.addMember(row);
+ } else {
+ //insert see more link
+ LocatableDynamicForm row = new LocatableDynamicForm(
+ recentMeasurementsContent
+ .extendLocatorId("RecentMeasurementsContentSeeMore"));
+ String link = LinkManager
+ .getResourceMonitoringGraphsLink(resourceId);
+ AbstractActivityView.addSeeMoreLink(row, link, column);
}
- setRefreshing(false);
+ //call out to 3rd party javascript lib
+ BrowserUtility.graphSparkLines();
+ } else {
+ LocatableDynamicForm row = AbstractActivityView
+ .createEmptyDisplayRow(
+ recentMeasurementsContent.extendLocatorId("None"),
+ AbstractActivityView.RECENT_MEASUREMENTS_NONE);
+ column.addMember(row);
}
- });
+ setRefreshing(false);
+ }
+ };
+
+ //make the asynchronous call for all the measurement data
+ if (end != -1 && start != -1) {
+ GWTServiceLookup.getMeasurementDataService().findDataForResource(
+ resourceId, definitionArrayIds, start, end, 60, callback);
+ } else if (lastN != -1 && units != -1) {
+ GWTServiceLookup.getMeasurementDataService().findDataForResourceForLast(
+ resourceId, definitionArrayIds, lastN, units, 60, callback);
+ } else {
+ GWTServiceLookup.getMeasurementDataService().findDataForResourceForLast(
+ resourceId, definitionArrayIds, 8, MeasurementUtility.UNIT_HOURS, 60, callback);
+ }
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java
index 0488b0c..d056e97 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java
@@ -54,9 +54,15 @@ public interface MeasurementDataGWTService extends RemoteService {
List<List<MeasurementDataNumericHighLowComposite>> findDataForResource(int resourceId, int[] definitionIds,
long beginTime, long endTime, int numPoints) throws RuntimeException;
+
+ List<List<MeasurementDataNumericHighLowComposite>> findDataForResourceForLast(int resourceId, int[] definitionIds,
+ int lastN, int unit, int numPoints) throws RuntimeException;
List<List<MeasurementDataNumericHighLowComposite>> findDataForCompatibleGroup(int groupId, int[] definitionIds,
long beginTime, long endTime, int numPoints) throws RuntimeException;
+
+ List<List<MeasurementDataNumericHighLowComposite>> findDataForCompatibleGroupForLast(int groupId, int[] definitionIds,
+ int lastN, int unit, int numPoints) throws RuntimeException;
PageList<MeasurementDefinition> findMeasurementDefinitionsByCriteria(MeasurementDefinitionCriteria criteria)
throws RuntimeException;
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 8445a46..385e557 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
@@ -323,12 +323,9 @@ public abstract class AbstractMetricGraphView extends LocatableVLayout {
}
}));
- long max = System.currentTimeMillis();
- long min = max - (1000L * 60 * 60 * 8);
-
int xTicks = getDefaultWidth() / 140;
- plotOptions.addXAxisOptions(new AxisOptions().setTicks(xTicks).setMinimum(min).setMaximum(max)
+ plotOptions.addXAxisOptions(new AxisOptions().setTicks(xTicks)
.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/groups/detail/monitoring/ResourceGroupMetricGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricGraphView.java
index 23f84ea..fe8b398 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricGraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricGraphView.java
@@ -36,6 +36,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricGraphView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
+import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
@@ -95,10 +96,9 @@ public class ResourceGroupMetricGraphView extends AbstractMetricGraphView {
if (def.getId() == getDefinitionId()) {
setDefinition(def);
- GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroup(
- getEntityId(), new int[] { getDefinitionId() },
- System.currentTimeMillis() - (1000L * 60 * 60 * 8),
- System.currentTimeMillis(), 60,
+ GWTServiceLookup.getMeasurementDataService().findDataForCompatibleGroupForLast(
+ getEntityId(), new int[] { getDefinitionId() }, 8,
+ MeasurementUtility.UNIT_HOURS, 60,
new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java
index 7a68ba2..1e99fb5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/GraphListView.java
@@ -42,6 +42,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSelectLi
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.avail.AvailabilityBarView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
+import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
/**
* @author Greg Hinkle
@@ -101,8 +102,8 @@ public class GraphListView extends LocatableVLayout implements ResourceSelectLis
measDefIdArray[i] = measurementDefinitions.get(i).getId();
}
- GWTServiceLookup.getMeasurementDataService().findDataForResource(resource.getId(), measDefIdArray,
- System.currentTimeMillis() - (1000L * 60 * 60 * 8), System.currentTimeMillis(), 60,
+ GWTServiceLookup.getMeasurementDataService().findDataForResourceForLast(resource.getId(), measDefIdArray,
+ 8, MeasurementUtils.UNIT_HOURS, 60,
new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_loadFailed(),
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 330eaf0..11d7b55 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
@@ -246,14 +246,6 @@ public class LiveGraphView extends LocatableVLayout {
handler.add(new DataPoint(d.getTimestamp(), d.getValue()));
plot.redraw();
-
- if (d.getTimestamp() > max) {
- max = System.currentTimeMillis();
- min = max - (1000L * 60);
-
- // plotOptions.setXAxisOptions(new AxisOptions().setMinimum(min).setMaximum(max));
- }
-
}
});
}
@@ -268,9 +260,6 @@ public class LiveGraphView extends LocatableVLayout {
}
}));
- min = System.currentTimeMillis();
- max = System.currentTimeMillis() + (1000L * 60);
-
plotOptions.addXAxisOptions(new AxisOptions().setTicks(8).setTickFormatter(new TickFormatter() {
public String formatTickValue(double tickValue, Axis axis) {
DateTimeFormat dateFormat = DateTimeFormat.getFormat(PredefinedFormat.DATE_TIME_MEDIUM);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java
index d051b92..76f2d1e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java
@@ -40,6 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricGrap
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
+import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
/**
* @author Greg Hinkle
@@ -109,10 +110,8 @@ public class ResourceMetricGraphView extends AbstractMetricGraphView {
if (def.getId() == getDefinitionId()) {
setDefinition(def);
- GWTServiceLookup.getMeasurementDataService().findDataForResource(getEntityId(),
- new int[] { getDefinitionId() },
- System.currentTimeMillis() - (1000L * 60 * 60 * 8),
- System.currentTimeMillis(), 60,
+ GWTServiceLookup.getMeasurementDataService().findDataForResourceForLast(getEntityId(),
+ new int[] { getDefinitionId() }, 8, MeasurementUtils.UNIT_HOURS, 60,
new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java
index f014c94..5e40890 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java
@@ -39,11 +39,11 @@ import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTService;
import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
-import org.rhq.enterprise.server.measurement.CallTimeDataManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementDefinitionManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementOOBManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal;
+import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
import org.rhq.enterprise.server.util.LookupUtil;
/**
@@ -55,7 +55,6 @@ public class MeasurementDataGWTServiceImpl extends AbstractGWTServiceImpl implem
private static final long serialVersionUID = 1L;
private MeasurementDataManagerLocal dataManager = LookupUtil.getMeasurementDataManager();
- private CallTimeDataManagerLocal callTimeDataManager = LookupUtil.getCallTimeDataManager();
private MeasurementOOBManagerLocal measurementOOBManager = LookupUtil.getOOBManager();
private MeasurementScheduleManagerLocal scheduleManager = LookupUtil.getMeasurementScheduleManager();
@@ -99,6 +98,12 @@ public class MeasurementDataGWTServiceImpl extends AbstractGWTServiceImpl implem
throw getExceptionToThrowToClient(t);
}
}
+
+ public List<List<MeasurementDataNumericHighLowComposite>> findDataForResourceForLast(int resourceId, int[] definitionIds,
+ int lastN, int unit, int numPoints) throws RuntimeException {
+ List<Long> beginEnd = MeasurementUtils.calculateTimeFrame(lastN, unit);
+ return findDataForResource(resourceId, definitionIds, beginEnd.get(0), beginEnd.get(1), numPoints);
+ }
public List<List<MeasurementDataNumericHighLowComposite>> findDataForCompatibleGroup(int groupId,
int[] definitionIds, long beginTime, long endTime, int numPoints) throws RuntimeException {
@@ -114,7 +119,13 @@ public class MeasurementDataGWTServiceImpl extends AbstractGWTServiceImpl implem
throw getExceptionToThrowToClient(t);
}
}
-
+
+ public List<List<MeasurementDataNumericHighLowComposite>> findDataForCompatibleGroupForLast(int groupId,
+ int[] definitionIds, int lastN, int unit, int numPoints) throws RuntimeException {
+ List<Long> beginEnd = MeasurementUtils.calculateTimeFrame(lastN, unit);
+ return findDataForCompatibleGroup(groupId, definitionIds, beginEnd.get(0), beginEnd.get(1), numPoints);
+ }
+
public PageList<MeasurementDefinition> findMeasurementDefinitionsByCriteria(MeasurementDefinitionCriteria criteria)
throws RuntimeException {
try {
commit 9b454ae51add16d4ec25b85833ce2875e542da36
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Sep 18 11:44:29 2012 +0200
Make the rest-docs processor also output the value classes used in the REST api.
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index c567be7..4efad25 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -804,9 +804,12 @@
<processors>
<processor>org.rhq.helpers.rest_docs_generator.ClassLevelProcessor</processor>
</processors>
- <compilerArguments>-AtargetDirectory=${project.build.directory}/docs/xml</compilerArguments>
- <!-- Comment the next line in to get more verbose output for debugging -->
- <!--<compilerArguments>-Averbose=true</compilerArguments>-->
+ <compilerArguments>
+ -AtargetDirectory=${project.build.directory}/docs/xml
+ -AmodelPkg=org.rhq.enterprise.server.rest.domain
+ </compilerArguments>
+ <!-- Add the next line in to get more verbose output for debugging -->
+ <!-- -Averbose=true -->
</configuration>
<executions>
<execution>
diff --git a/modules/enterprise/server/jar/src/main/xsl/apiout2docbook.xsl b/modules/enterprise/server/jar/src/main/xsl/apiout2docbook.xsl
index d97645a..97e0598 100644
--- a/modules/enterprise/server/jar/src/main/xsl/apiout2docbook.xsl
+++ b/modules/enterprise/server/jar/src/main/xsl/apiout2docbook.xsl
@@ -50,10 +50,13 @@
</xsl:element>
</xsl:for-each>
</toc>
- <xsl:apply-templates>
+ <xsl:apply-templates select="class">
<xsl:sort select="@basePath"/>
<xsl:sort select="@path"/>
</xsl:apply-templates>
+ <xsl:apply-templates select="data">
+ <xsl:sort select="@name"/>
+ </xsl:apply-templates>
</xsl:element>
</xsl:template>
@@ -228,5 +231,42 @@
</xsl:template>
+ <xsl:template match="data">
+ <xsl:element name="section">
+ <title>Data-Class: <xsl:value-of select="@name"/></title>
+ <xsl:if test="@abstract">
+ <subtitle><xsl:value-of select="@abstract"/></subtitle>
+ </xsl:if>
+ <xsl:if test="@description">
+ <simpara>
+ Description: <xsl:value-of select="@description"/>
+ </simpara>
+ </xsl:if>
+
+ <table>
+ <title>Properties</title>
+ <tr>
+ <th>Name</th>
+ <th>Type</th>
+ <th>Description</th>
+ </tr>
+ <xsl:apply-templates/>
+ </table>
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="property">
+ <tr>
+ <td>
+ <xsl:value-of select="@name"/>
+ </td>
+ <td>
+ <xsl:value-of select="@type"/>
+ </td>
+ <td>
+ <xsl:value-of select="@description"/>
+ </td>
+ </tr>
+ </xsl:template>
</xsl:stylesheet>
\ No newline at end of file
diff --git a/modules/helpers/rest-docs-generator/src/main/java/org/rhq/helpers/rest_docs_generator/ClassLevelProcessor.java b/modules/helpers/rest-docs-generator/src/main/java/org/rhq/helpers/rest_docs_generator/ClassLevelProcessor.java
index a3a6ddf..1d6c913 100644
--- a/modules/helpers/rest-docs-generator/src/main/java/org/rhq/helpers/rest_docs_generator/ClassLevelProcessor.java
+++ b/modules/helpers/rest-docs-generator/src/main/java/org/rhq/helpers/rest_docs_generator/ClassLevelProcessor.java
@@ -27,6 +27,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
+import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.OutputKeys;
@@ -41,6 +42,7 @@ import com.wordnik.swagger.annotations.ApiError;
import com.wordnik.swagger.annotations.ApiErrors;
import com.wordnik.swagger.annotations.ApiOperation;
import com.wordnik.swagger.annotations.ApiParam;
+import com.wordnik.swagger.annotations.ApiProperty;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -54,9 +56,9 @@ import org.jboss.resteasy.annotations.GZIP;
* @author Heiko W. Rupp
*/
-(a)SupportedOptions({ClassLevelProcessor.TARGET_DIRECTORY,ClassLevelProcessor.VERBOSE})
+(a)SupportedOptions({ClassLevelProcessor.TARGET_DIRECTORY,ClassLevelProcessor.VERBOSE,ClassLevelProcessor.MODEL_PACKAGE_KEY})
@SupportedSourceVersion(SourceVersion.RELEASE_6)
-@SupportedAnnotationTypes(value = {"com.wordnik.swagger.annotations.*","javax.ws.rs.*"})
+@SupportedAnnotationTypes(value = {"com.wordnik.swagger.annotations.*","javax.ws.rs.*","javax.xml.bind.annotation.XmlRootElement"})
public class ClassLevelProcessor extends AbstractProcessor {
private static final String JAVAX_WS_RS = "javax.ws.rs";
@@ -66,6 +68,8 @@ public class ClassLevelProcessor extends AbstractProcessor {
public static final String TARGET_DIRECTORY = "targetDirectory";
public static final String VERBOSE = "verbose";
private static final String BODY_INDICATOR = "-body-";
+ public static final String MODEL_PACKAGE_KEY = "modelPkg";
+ public String modelPackage = "org.rhq.enterprise.server.rest.domain";
Log log = LogFactory.getLog(getClass().getName());
@@ -78,9 +82,14 @@ public class ClassLevelProcessor extends AbstractProcessor {
Map<String,String>options = processingEnv.getOptions();
if (options.containsKey(TARGET_DIRECTORY)) {
targetDirectory = options.get(TARGET_DIRECTORY);
+ System.out.println("== Target directory is set to " + targetDirectory);
}
if (options.containsKey(VERBOSE))
verbose=true;
+ if (options.containsKey(MODEL_PACKAGE_KEY)) {
+ modelPackage = options.get(MODEL_PACKAGE_KEY);
+ System.out.println("== Found a model package of " + modelPackage);
+ }
}
@Override
@@ -160,6 +169,13 @@ public class ClassLevelProcessor extends AbstractProcessor {
private void processClass(Document doc, Element xmlRoot, TypeElement classElementIn) {
log.debug("Looking at " + classElementIn.getQualifiedName().toString());
+ // Process the data classes
+ if (classElementIn.getAnnotation(XmlRootElement.class)!=null) {
+ processDataClass(doc, classElementIn, xmlRoot);
+ return;
+ }
+
+ // NO data class, so it is the api.
Path basePath = classElementIn.getAnnotation(Path.class);
if (basePath==null || basePath.value().isEmpty()) {
log.debug("No @Path found on " + classElementIn.getQualifiedName() + " - skipping");
@@ -339,6 +355,65 @@ public class ClassLevelProcessor extends AbstractProcessor {
element.setAttribute("reason",ae.reason());
}
+ private void processDataClass(Document doc, TypeElement classElementIn, Element xmlRoot) {
+
+ String pkg = classElementIn.toString();
+ log.debug("Looking at " + pkg);
+ if (!pkg.startsWith(modelPackage)) {
+ log.debug(" skipping as it does not meet the required package");
+ return;
+ }
+
+ Element elem = doc.createElement("data");
+ xmlRoot.appendChild(elem);
+ elem.setAttribute("name",classElementIn.getSimpleName().toString());
+ Api api = classElementIn.getAnnotation(Api.class);
+ if (api!=null) {
+ elem.setAttribute("abstract",api.value());
+ if (api.description()!=null && !api.description().isEmpty()) {
+ elem.setAttribute("description",api.description());
+ }
+ }
+ processDataClassProperties(doc, classElementIn, elem);
+
+ }
+
+ private void processDataClassProperties(Document doc, TypeElement classElementIn, Element elem) {
+ // Now look at the properties by processing the getters
+ for (ExecutableElement m : ElementFilter.methodsIn(classElementIn.getEnclosedElements())) {
+
+ String mName = m.getSimpleName().toString();
+ if (mName.startsWith("get") || mName.startsWith("is")) {
+ Element mElem = doc.createElement("property");
+ elem.appendChild(mElem);
+ String pName;
+ if (mName.startsWith("get")) {
+ pName = mName.substring(3);
+ } else {
+ pName = mName.substring(2);
+ }
+ pName = pName.substring(0,1).toLowerCase() + pName.substring(1);
+
+ mElem.setAttribute("name",pName);
+ ApiProperty ap = m.getAnnotation(ApiProperty.class);
+ if (ap!=null) {
+ mElem.setAttribute("description",ap.value());
+ }
+ TypeMirror returnTypeMirror = m.getReturnType();
+ // for types in the modelPackage or java.lang, remove the fqdn
+ String typeName = returnTypeMirror.toString();
+ if (typeName.startsWith(modelPackage)) {
+ typeName = typeName.substring(modelPackage.length()+1);
+ }
+ else if (typeName.startsWith("java.lang")) {
+ typeName = typeName.substring("java.lang".length()+1);
+ }
+ // TODO for collection<type> remove the collection expression and set some collection attribute
+ mElem.setAttribute("type", typeName);
+ }
+ }
+ }
+
/**
* Determine if the passed mirror belongs to an annotation that denotes a parameter to be skipped
* @param t Type to analyze
commit b8a43f237ca0fb8d0c004b3c07f7477f1c1b4eee
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Sep 18 11:42:40 2012 +0200
Add support for events in the REST api.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java
index 3967b2e..3bf0a28 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java
@@ -53,6 +53,7 @@ public class EventCriteria extends Criteria {
private Integer filterResourceGroupId; // requires overrides
private Integer filterAutoGroupResourceTypeId; // requires overrides
private Integer filterAutoGroupParentResourceId; // requires overrides
+ private Integer filterSourceId; // requires overrides
private boolean fetchSource;
@@ -61,6 +62,7 @@ public class EventCriteria extends Criteria {
public EventCriteria() {
filterOverrides.put("sourceName", "source.location like ?");
+ filterOverrides.put("sourceId","source.id = ?");
filterOverrides.put("startTime", "timestamp >= ?");
filterOverrides.put("endTime", "timestamp <= ?");
filterOverrides.put("resourceId", "source.resourceId = ?");
@@ -99,6 +101,10 @@ public class EventCriteria extends Criteria {
this.filterSourceName = filterSourceName;
}
+ public void addFilterSourceId(Integer sourceId) {
+ this.filterSourceId = sourceId;
+ }
+
public void addFilterStartTime(Long filterStartTime) {
this.filterStartTime = filterStartTime;
}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/event/Event.java b/modules/core/domain/src/main/java/org/rhq/core/domain/event/Event.java
index e66e06b..eb27ca8 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/event/Event.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/event/Event.java
@@ -183,6 +183,17 @@ public class Event implements Serializable {
this.detail = this.detail.substring(0, DETAIL_MAX_LENGTH);
}
+ public Event(@NotNull long timestamp, @NotNull EventSeverity severity, @NotNull EventSource source, @NotNull String detail) {
+ if(source==null)
+ throw new IllegalArgumentException("Source must not be null.");
+ this.timestamp = timestamp;
+ this.severity = severity;
+ this.detail = detail;
+ this.sourceLocation = source.getLocation();
+ this.source = source;
+ }
+
+
/** NOTE: This method is not intended to be called by plugins or the Plugin Container. */
public int getId() {
return this.id;
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml
index 11597bb..a07456d 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml
@@ -7,7 +7,7 @@
<context-param>
<param-name>resteasy.jndi.resources</param-name>
- <param-value>rhq/StatusHandlerBean/local,rhq/ResourceHandlerBean/local,rhq/MetricHandlerBean/local,rhq/UserHandlerBean/local,rhq/AlertHandlerBean/local,rhq/OperationsHandlerBean/local,rhq/GroupHandlerBean/local</param-value>
+ <param-value>rhq/StatusHandlerBean/local,rhq/ResourceHandlerBean/local,rhq/MetricHandlerBean/local,rhq/UserHandlerBean/local,rhq/AlertHandlerBean/local,rhq/OperationsHandlerBean/local,rhq/GroupHandlerBean/local,rhq/EventHandlerBean/local</param-value>
<description>List of jndi names of EJBs local interfaces that define REST stuff</description>
</context-param>
<context-param>
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerBean.java
new file mode 100644
index 0000000..e189c34
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerBean.java
@@ -0,0 +1,269 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.server.rest;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.interceptor.Interceptors;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import javax.ws.rs.core.GenericEntity;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
+
+import org.rhq.core.domain.criteria.EventCriteria;
+import org.rhq.core.domain.event.Event;
+import org.rhq.core.domain.event.EventDefinition;
+import org.rhq.core.domain.event.EventSeverity;
+import org.rhq.core.domain.event.EventSource;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.util.PageControl;
+import org.rhq.enterprise.server.RHQConstants;
+import org.rhq.enterprise.server.event.EventManagerLocal;
+import org.rhq.enterprise.server.rest.domain.EventRest;
+import org.rhq.enterprise.server.rest.domain.EventSourceRest;
+
+/**
+ * Handle event related things
+ * @author Heiko W. Rupp
+ */
+@Stateless
+(a)Interceptors(SetCallerInterceptor.class)
+public class EventHandlerBean extends AbstractRestBean implements EventHandlerLocal {
+
+ @EJB
+ EventManagerLocal eventManager;
+
+ @PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME)
+ EntityManager em;
+
+ @Override
+ public Response listEventSourcesForResource( int resourceId, Request request,
+ HttpHeaders headers) {
+
+ Resource res = fetchResource(resourceId);
+ Set<EventSource> eventSources = res.getEventSources();
+
+ List<EventSourceRest> restSources = new ArrayList<EventSourceRest>(eventSources.size());
+ for (EventSource source : eventSources) {
+ EventSourceRest esr = convertEventSource(source);
+ restSources.add(esr);
+ }
+
+
+ Response.ResponseBuilder builder;
+ MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
+ if (mediaType.equals(MediaType.APPLICATION_XML_TYPE)) {
+ GenericEntity<List<EventSourceRest>> list = new GenericEntity<List<EventSourceRest>>(restSources) {};
+ builder = Response.ok(list, mediaType);
+ }
+ else {
+ builder = Response.ok(restSources, mediaType);
+ }
+ return builder.build();
+ }
+
+ @Override
+ public EventSourceRest getEventSource(int sourceId) {
+
+ EventSource source = findEventSourceById(sourceId);
+ EventSourceRest esr = convertEventSource(source);
+
+ return esr;
+ }
+
+ public EventSourceRest addEventSource(int resourceId, EventSourceRest esr) {
+
+ Resource resource = fetchResource(resourceId);
+ ResourceType rt = resource.getResourceType();
+ Set<EventDefinition> eventDefinitions = rt.getEventDefinitions();
+ EventDefinition eventDefinition=null;
+ for (EventDefinition ed : eventDefinitions) {
+ if (ed.getName().equals(esr.getName())) {
+ eventDefinition = ed;
+ break;
+ }
+ }
+ if (eventDefinition==null) {
+ throw new StuffNotFoundException("eventDefinition with name " + esr.getName());
+ }
+ // check if a source with the given location already exists for the definition and resource
+ Query q = em.createQuery("SELECT es FROM EventSource es WHERE es.location = :location AND es.eventDefinition = :definition AND es.resourceId = :resourceId");
+ q.setParameter("location",esr.getLocation());
+ q.setParameter("definition",eventDefinition);
+ q.setParameter("resourceId",resourceId);
+ List<EventSource> sources = q.getResultList();
+
+ EventSource source;
+ if (sources.isEmpty()) {
+ source = new EventSource(esr.getLocation(),eventDefinition,resource);
+ em.persist(source);
+ } else if (sources.size()==1) {
+ source = sources.get(0);
+ } else {
+ throw new IllegalStateException("We have more than one EventSource on the same Definition with the same location - must not happen");
+ }
+
+ EventSourceRest result = convertEventSource(source);
+ return result;
+ }
+
+ @Override
+ public Response deleteEventSource(int sourceId) {
+
+ EventSource source = findEventSourceById(sourceId);
+ em.remove(source); // We have a cascade delete on the events TODO make operation async ?
+
+ return Response.ok().build();
+ }
+
+ @Override
+ public Response getEventsForSource(int sourceId, long startTime,
+ long endTime, String severity, Request request,
+ HttpHeaders headers) {
+
+ EventSource source = findEventSourceById(sourceId);
+
+ EventCriteria criteria = new EventCriteria();
+ criteria.addFilterSourceId(source.getId());
+ if (startTime>0) {
+ criteria.addFilterStartTime(startTime);
+ }
+ if (endTime>0) {
+ criteria.addFilterEndTime(endTime);
+ }
+ if (startTime==0 && endTime==0) {
+ PageControl pageControl = new PageControl();
+ pageControl.setPageSize(200);
+ criteria.setPageControl(pageControl);
+ }
+
+ Response.ResponseBuilder builder = getEventsAsBuilderForCriteria(headers, criteria);
+
+ return builder.build();
+ }
+
+
+ @Override
+ public Response getEventsForResource(int resourceId,
+ long startTime,
+ long endTime, String severity, Request request,
+ HttpHeaders headers) {
+
+ EventCriteria criteria = new EventCriteria();
+ criteria.addFilterResourceId(resourceId);
+ if (startTime>0) {
+ criteria.addFilterStartTime(startTime);
+ }
+ if (endTime>0) {
+ criteria.addFilterEndTime(endTime);
+ }
+ if (startTime==0 && endTime==0) {
+ PageControl pageControl = new PageControl();
+ pageControl.setPageSize(200);
+ criteria.setPageControl(pageControl);
+ }
+
+ Response.ResponseBuilder builder = getEventsAsBuilderForCriteria(headers, criteria);
+
+ return builder.build();
+
+ }
+
+ public Response addEventsToSource(int sourceId, List<EventRest> eventRest) {
+
+ EventSource source = findEventSourceById(sourceId);
+ Map<EventSource,Set<Event>> eventMap = new HashMap<EventSource, Set<Event>>();
+ Set<Event> events = new HashSet<Event>(eventRest.size());
+ for (EventRest eRest : eventRest) {
+ EventSeverity eventSeverity = EventSeverity.valueOf(eRest.getSeverity());
+ Event event = new Event(eRest.getTimestamp(),eventSeverity,source,eRest.getDetail());
+ events.add(event);
+ }
+ eventMap.put(source,events);
+ eventManager.addEventData(eventMap);
+
+ return Response.noContent().build();
+ }
+
+
+ private Response.ResponseBuilder getEventsAsBuilderForCriteria(HttpHeaders headers, EventCriteria criteria) {
+ List<Event> eventList = eventManager.findEventsByCriteria(caller,criteria);
+ List<EventRest> restEvents = new ArrayList<EventRest>(eventList.size());
+ for (Event event : eventList) {
+ restEvents.add(convertEvent(event));
+ }
+
+ MediaType mediaType = headers.getAcceptableMediaTypes().get(0);
+ Response.ResponseBuilder builder;
+ if (mediaType.equals(MediaType.APPLICATION_XML_TYPE)) {
+ GenericEntity<List<EventRest>> list = new GenericEntity<List<EventRest>>(restEvents) {};
+ builder = Response.ok(list, mediaType);
+ }
+ else {
+ builder = Response.ok(restEvents, mediaType);
+ }
+ return builder;
+ }
+
+ private EventSourceRest convertEventSource(EventSource source) {
+ EventSourceRest esr = new EventSourceRest();
+ esr.setId(source.getId());
+ esr.setDescription(source.getEventDefinition().getDescription());
+ esr.setDisplayName(source.getEventDefinition().getDisplayName());
+ esr.setName(source.getEventDefinition().getName());
+ esr.setLocation(source.getLocation());
+ esr.setResourceId(source.getResourceId());
+
+ return esr;
+ }
+
+ private EventRest convertEvent(Event event) {
+ EventRest er = new EventRest();
+ er.setDetail(event.getDetail());
+ er.setId(event.getId());
+ er.setSeverity(event.getSeverity().toString());
+ er.setTimestamp(event.getTimestamp());
+ er.setSourceId(event.getSource().getId());
+
+ return er;
+ }
+
+ private EventSource findEventSourceById(int sourceId) {
+
+ EventSource source = em.find(EventSource.class,sourceId);
+ if (source==null)
+ throw new StuffNotFoundException("Event source with id " + sourceId);
+ return source;
+
+ }
+
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerLocal.java
new file mode 100644
index 0000000..276312a
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/EventHandlerLocal.java
@@ -0,0 +1,121 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.server.rest;
+
+import java.util.List;
+
+import javax.ejb.Local;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.Response;
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+import com.wordnik.swagger.annotations.ApiParam;
+
+import org.jboss.resteasy.annotations.GZIP;
+
+import org.rhq.enterprise.server.rest.domain.EventRest;
+import org.rhq.enterprise.server.rest.domain.EventSourceRest;
+
+/**
+ * Class that deals with events
+ * @author Heiko W. Rupp
+ */
+@Local
+@Path("/event")
+@Api("Api that deals with Events (e.g snmp traps, logfile lines)")
+(a)Produces({MediaType.APPLICATION_JSON,MediaType.APPLICATION_XML,MediaType.TEXT_HTML})
+public interface EventHandlerLocal {
+
+
+
+ @GET
+ @Path("/{id}/sources")
+ @ApiOperation(value = "List the defined event sources for the resource", responseClass = "EventSourceRest", multiValueResponse = true)
+ Response listEventSourcesForResource(
+ @ApiParam("id of the resource") @PathParam("id") int resourceId,
+ @Context Request request,
+ @Context HttpHeaders headers);
+
+
+
+ @POST
+ @Path("/{id}/sources")
+ @ApiOperation("Add a new event source for a resource. This can e.g. be a different logfile. " +
+ "The source.name must match an existing definition fo this resource. " +
+ "If an event source for the definition name and resource with the same location already exists, no new source is created. " +
+ "NOTE: An Event source added this way will not sow up in the connection properties.")
+ EventSourceRest addEventSource(
+ @ApiParam("id of the resource") @PathParam("id") int resourceId,
+ EventSourceRest source);
+
+ @DELETE
+ @Path("/source/{id}")
+ @ApiOperation(value = "Delete the event source with the passed id")
+ Response deleteEventSource(
+ @ApiParam("Id of the source to delete") @PathParam("id") int sourceId);
+
+ @GET
+ @Path("/source/{id}")
+ @ApiOperation(value = "Retrieve the event source with the passed id", responseClass = "EventSourceRest")
+ EventSourceRest getEventSource(
+ @ApiParam("Id of the source to retrieve") @PathParam("id") int sourceId);
+
+ @POST
+ @Path("/source/{id}/events")
+ @ApiOperation("Submit multiple events for one given event source; the event source in the passed Events is ignored.")
+ Response addEventsToSource(
+ @ApiParam("Id of the source to add data to") @PathParam("id") int sourceId, List<EventRest> event);
+
+ @GET @GZIP
+ @Path("/source/{id}/events")
+ @ApiOperation(value = "List the events for the event source with the passed id. If no time range is given, the last 200 entries will be displayed",
+ responseClass = "EventRest", multiValueResponse = true)
+ Response getEventsForSource(@PathParam("id") int sourceId,
+ @QueryParam("startTime") long startTime,
+ @QueryParam("endTime") long endTime,
+ @ApiParam(value="Select the severity to display. Default is to show all",
+ allowableValues = "DEBUG, INFO, WARN, ERROR, FATAL") @QueryParam("severity") String severity,
+ @Context Request request,
+ @Context HttpHeaders headers);
+
+ @GET @GZIP
+ @Path("/{id}/events")
+ @ApiOperation(value="List the events for the resource with the passed id. If no time range is given, the last 200 entries will be displayed",
+ responseClass = "EventRest", multiValueResponse = true)
+ Response getEventsForResource(@PathParam("id") int resourceId,
+ @QueryParam("startTime") long startTime,
+ @QueryParam("endTime") long endTime,
+ @QueryParam("severity") String severity,
+ @Context Request request,
+ @Context HttpHeaders headers);
+
+
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/EventRest.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/EventRest.java
new file mode 100644
index 0000000..666b0dc
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/EventRest.java
@@ -0,0 +1,89 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.server.rest.domain;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiProperty;
+
+/**
+ * An event
+ * @author Heiko W. Rupp
+ */
+@Api("This class represents one event.")
+@XmlRootElement(name = "event")
+public class EventRest {
+
+ int id;
+ String detail;
+ int sourceId;
+ long timestamp;
+ String severity;
+
+
+ public EventRest() {
+ }
+
+ @ApiProperty("RHQ-Internal Id of the event")
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ @ApiProperty("The message to be transmited")
+ public String getDetail() {
+ return detail;
+ }
+
+ public void setDetail(String detail) {
+ this.detail = detail;
+ }
+
+ @ApiProperty("Id of the source on retrieval. When adding new events, this parameter is ignored.")
+ public int getSourceId() {
+ return sourceId;
+ }
+
+ public void setSourceId(int sourceId) {
+ this.sourceId = sourceId;
+ }
+
+ @ApiProperty("Time in millis since epoch when the event occurred")
+ public long getTimestamp() {
+ return timestamp;
+ }
+
+ public void setTimestamp(long timestamp) {
+ this.timestamp = timestamp;
+ }
+
+ @ApiProperty("Severity of the event. Allowed values are DEBUG, INFO, WARN, ERROR, FATAL" )
+ public String getSeverity() {
+ return severity;
+ }
+
+ public void setSeverity(String severity) {
+ this.severity = severity;
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/EventSourceRest.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/EventSourceRest.java
new file mode 100644
index 0000000..5cfa3c9
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/domain/EventSourceRest.java
@@ -0,0 +1,98 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.server.rest.domain;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiProperty;
+
+/**
+ * An EventSource
+ * @author Heiko W. Rupp
+ */
+@Api("This class represents an EventSource - e.g. a logfile.")
+@XmlRootElement(name="source")
+public class EventSourceRest {
+
+ int id;
+ String name;
+ String displayName;
+ String location;
+ int resourceId;
+ String description;
+
+ public EventSourceRest() {
+ }
+
+ @ApiProperty("Id of the EventSource")
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ @ApiProperty("Name of the EventSource - defined in the definition. This is required when adding a new EventSource")
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @ApiProperty("Display name of the EventSource - defined in the definition")
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
+
+ @ApiProperty("'Location' of the EventSource. This is e.g. the path to the logfile being monitored. This is required when adding a new EventSource")
+ public String getLocation() {
+ return location;
+ }
+
+ public void setLocation(String location) {
+ this.location = location;
+ }
+
+ @ApiProperty("Id of the resource this ")
+ public int getResourceId() {
+ return resourceId;
+ }
+
+ public void setResourceId(int resourceId) {
+ this.resourceId = resourceId;
+ }
+
+ @ApiProperty("A description of this EventSource")
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+}
commit a493f41c90723a6464d5ddb1eafa3a0723f829cc
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Mon Sep 17 14:06:52 2012 -0700
[BZ 852223] IE8 rendering of resource measurement time overlaid on the actual metric name.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
index 8a0898d..16869ff 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
@@ -21,6 +21,7 @@ package org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.ContentsType;
+import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.VerticalAlignment;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.HTMLFlow;
@@ -240,8 +241,10 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
LocatableDynamicForm row = new LocatableDynamicForm(
recentMeasurementsContent.extendLocatorId(md.getName()));
row.setNumCols(3);
- row.setColWidths(65,"*","*");
+ row.setColWidths(65, "*", 100);
row.setWidth100();
+ row.setAutoHeight();
+ row.setOverflow(Overflow.VISIBLE);
HTMLFlow graph = new HTMLFlow();
String contents = "<span id='sparkline_" + index
+ "' class='dynamicsparkline' width='0' " + "values='"
@@ -265,9 +268,13 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
//have link launch modal window on click
LinkItem link = AbstractActivityView.newLinkItem(title,
destination);
+ link.setTooltip(title);
link.setTitleVAlign(VerticalAlignment.TOP);
link.setAlign(Alignment.LEFT);
- link.setClipValue(false);
+ link.setClipValue(true);
+ link.setWrap(true);
+ link.setHeight(26);
+ link.setWidth("100%");
link.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
@@ -284,7 +291,7 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
});
//Value
- String convertedValue = lastValue + " " + md.getUnits();
+ String convertedValue;
convertedValue = AbstractActivityView
.convertLastValueForDisplay(lastValue, md);
StaticTextItem value = AbstractActivityView
commit 7880800def42dbcd7dfa3d51309fd7fcc5cffef1
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Mon Sep 17 12:09:35 2012 -0700
Remove deprecated GWT Search classes that are no longer used as they were replaced by smartGWT search classes. Deprecated classes can be retrieved from history.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/AbstractSearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/AbstractSearchBar.java
deleted file mode 100644
index d26913a..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/AbstractSearchBar.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.search;
-
-import com.google.gwt.user.client.ui.Composite;
-import org.rhq.core.domain.search.SearchSubsystem;
-
-/**
- * Abstract class for SearchBar, so that a separate implementation can be written alongside the original.
- * @author Joseph Marques
- */
-@Deprecated
-public abstract class AbstractSearchBar extends Composite {
-
- public abstract SearchSubsystem getSearchSubsystem();
-
- public abstract String getSelectedTab();
-
- public abstract void activateSavedSearch(String savedSearchName);
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java
deleted file mode 100644
index 4875c92..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java
+++ /dev/null
@@ -1,550 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.search;
-
-import com.google.gwt.event.dom.client.*;
-import com.google.gwt.event.logical.shared.CloseEvent;
-import com.google.gwt.event.logical.shared.CloseHandler;
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.*;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.criteria.SavedSearchCriteria;
-import org.rhq.core.domain.search.SavedSearch;
-import org.rhq.core.domain.search.SearchSubsystem;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.Messages;
-import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchGrid;
-import org.rhq.enterprise.gui.coregui.client.search.favorites.SavedSearchGrid.SavedSearchSelectionHandler;
-import org.rhq.enterprise.gui.coregui.client.search.suggest.SuggestTextBox_v3;
-import org.rhq.enterprise.gui.coregui.client.util.Log;
-import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
-
-import java.util.List;
-
-/**
- * @author Joseph Marques
- */
-@Deprecated
-public class FlexSearchBar extends AbstractSearchBar {
-
- private static final Messages MSG = CoreGUI.getMessages();
-
- public static final String DEFAULT_PATTERN_NAME = MSG.view_searchBar_defaultPattern();
-
- private static final String IMAGE_DIR = "/coregui/images/search/";
-
- private static final String STAR_OFF_URL = IMAGE_DIR + "star1.png";
- private static final String STAR_ACTIVE_URL = IMAGE_DIR + "star2.png";
- private static final String STAR_ON_URL = IMAGE_DIR + "star3.png";
-
- private static final String ARROW_WHITE_URL = IMAGE_DIR + "menu_arrow.png";
- private static final String ARROW_GRAY_URL = IMAGE_DIR + "menu_arrow_down.png";
-
- public static final String TRASH = IMAGE_DIR + "trash.png";
-
- private final TextBox patternField = new TextBox();
- private final SuggestTextBox_v3 autoCompletePatternField = new SuggestTextBox_v3(this, patternField);
- private final TextBox patternNameField = new TextBox();
- private final Label patternNameLabel = new Label();
-
- private final Image starImage = new Image(STAR_OFF_URL);
- private final Image arrowImage = new Image(ARROW_WHITE_URL);
-
- private final PopupPanel savedSearchesPanel = new PopupPanel(true);
- private SavedSearchGrid savedSearchesGrid;
-
- private int currentSearchId = 0;
-
- private SearchSubsystem searchSubsystem;
- private String defaultSearchText;
- private String defaultSavedSearchPatternId;
-
- HorizontalPanel sbc;
- HorizontalPanel sbc_sbbgc;
- HorizontalPanel sbc_sbbgc_sbcc;
- HorizontalPanel sbc_sbbgc_sbcc_sbclhs_pfc;
- HorizontalPanel sbc_sbbgc_sbcc_sbcrhs_aic;
- HorizontalPanel sbc_sbbgc_sbcc_sbcrhs_sic;
- HorizontalPanel sbc_sbbgc_sbcc_sbcrhs_pnfc;
- HorizontalPanel sbc_sbbgc_sbcc_sbcrhs_pnlc;
- HorizontalPanel sbc_sbbc;
- HorizontalPanel sbc_pfsc;
- HorizontalPanel sbc_ssc;
-
- private HorizontalPanel createHPanel(Panel parent, String className, String id) {
- HorizontalPanel panel = new HorizontalPanel();
- if (parent != null) {
- parent.add(panel);
- }
- if (className != null) {
- panel.setStyleName(className);
- }
- if (id != null) {
- panel.getElement().setId(id);
- }
- return panel;
- }
-
- public FlexSearchBar(SearchSubsystem searchSubsystem) {
- this(searchSubsystem, null);
- }
-
- public FlexSearchBar(SearchSubsystem searchSubsystem, String initialSearchText) {
- Log.info("Loading SearchBar...");
-
- this.searchSubsystem = searchSubsystem;
- this.savedSearchesGrid = new SavedSearchGrid(searchSubsystem);
- // TODO: load default saved search pattern, if user has selected one
- // populate default search text
- // ensure that search subsystem is selected, probably want to force it to be a ctor argument
-
- sbc = createHPanel(null, "searchBarContainer", null);
- sbc_sbbgc = createHPanel(sbc, "searchBarBackgroundContainer", null);
- sbc_sbbgc_sbcc = createHPanel(sbc_sbbgc, "searchBarComponentsContainer", null);
- sbc_sbbgc_sbcc_sbclhs_pfc = createHPanel(sbc_sbbgc_sbcc, "searchBarComponentLHS", "patternFieldContainer");
- sbc_sbbgc_sbcc_sbcrhs_aic = createHPanel(sbc_sbbgc_sbcc, "searchBarComponentRHS", "arrowImageContainer");
- sbc_sbbgc_sbcc_sbcrhs_sic = createHPanel(sbc_sbbgc_sbcc, "searchBarComponentRHS", "starImageContainer");
- sbc_sbbgc_sbcc_sbcrhs_pnfc = createHPanel(sbc_sbbgc_sbcc, "searchBarComponentRHS", "patternNameFieldContainer");
- sbc_sbbgc_sbcc_sbcrhs_pnlc = createHPanel(sbc_sbbgc_sbcc, "searchBarComponentRHS", "patternNameLabelContainer");
- sbc_pfsc = createHPanel(sbc, null, "patternFieldSuggestionsContainer");
- sbc_ssc = createHPanel(sbc, null, "savedSearchesContainer");
-
- sbc_sbbgc_sbcc_sbclhs_pfc.add(autoCompletePatternField);
- sbc_sbbgc_sbcc_sbcrhs_sic.add(starImage);
- sbc_sbbgc_sbcc_sbcrhs_aic.add(arrowImage);
- sbc_sbbgc_sbcc_sbcrhs_pnfc.add(patternNameField);
- sbc_sbbgc_sbcc_sbcrhs_pnlc.add(patternNameLabel);
- sbc_ssc.add(savedSearchesPanel);
-
- initWidget(sbc);
-
- setupAutoCompletingPatternField();
- setupPatternNameField();
- setupPatternNameLabel();
- setupStarImage();
- setupArrowImage();
- setupSavedSearches();
-
- setDefaultSearchText(initialSearchText);
- if (getDefaultSearchText() != null) {
- this.autoCompletePatternField.setText(getDefaultSearchText());
- } else if (getDefaultSavedSearchPatternId() != null) {
- try {
- Integer savedSearchId = Integer.valueOf(getDefaultSavedSearchPatternId());
- activateSavedSearch(savedSearchId);
- } catch (Exception e) {
- this.autoCompletePatternField.setText(MSG
- .view_searchBar_savedSearch_failFind(getDefaultSavedSearchPatternId()));
- }
- }
- }
-
- public SearchSubsystem getSearchSubsystem() {
- return searchSubsystem;
- }
-
- public void setDefaultSearchText(String defaultSearchText) {
- if (defaultSearchText == null || defaultSearchText.trim().equals("")) {
- return; // do nothing
- }
-
- this.defaultSearchText = defaultSearchText;
- }
-
- public String getDefaultSearchText() {
- return defaultSearchText;
- }
-
- public void setDefaultSavedSearchPatternId(String defaultSavedSearchPatternId) {
- if (defaultSavedSearchPatternId == null || defaultSavedSearchPatternId.trim().equals("")) {
- return; // do nothing
- }
-
- this.defaultSavedSearchPatternId = defaultSavedSearchPatternId;
- }
-
- public String getDefaultSavedSearchPatternId() {
- return defaultSavedSearchPatternId;
- }
-
- private void setupAutoCompletingPatternField() {
- autoCompletePatternField.getElement().setId("patternField");
- autoCompletePatternField.setStyleName("patternField");
-
- AutoCompletePatternFieldEventHandler handler = new AutoCompletePatternFieldEventHandler();
- autoCompletePatternField.getTextBox().addFocusHandler(handler);
- autoCompletePatternField.getTextBox().addBlurHandler(handler);
- autoCompletePatternField.addKeyPressHandler(handler);
- }
-
- private void setupPatternNameField() {
- patternNameField.setStyleName("patternNameField");
- patternNameField.setVisible(false);
-
- PatternNameFieldEventHandler handler = new PatternNameFieldEventHandler();
- patternNameField.addKeyPressHandler(handler);
- patternNameField.addClickHandler(handler);
- patternNameField.addBlurHandler(handler);
- }
-
- private void setupPatternNameLabel() {
- patternNameLabel.setStyleName("patternNameLabel");
- patternNameLabel.setVisible(false);
-
- PatternNameLabelEventHandler handler = new PatternNameLabelEventHandler();
- patternNameLabel.addClickHandler(handler);
- }
-
- private void setupStarImage() {
- StarImageEventHandler handler = new StarImageEventHandler();
- starImage.addClickHandler(handler);
- starImage.addMouseOverHandler(handler);
- starImage.addMouseOutHandler(handler);
- }
-
- private void setupArrowImage() {
- ArrowImageEventHandler handler = new ArrowImageEventHandler();
- arrowImage.addClickHandler(handler);
- }
-
- private void setupSavedSearches() {
- savedSearchesPanel.add(savedSearchesGrid);
- savedSearchesPanel.setStyleName("savedSearchesPanel");
- savedSearchesGrid.addStyleName("savedSearchesPanel");
-
- // panel position will be re-calculated on down-arrow click
- //savedSearchesPanel.show();
- savedSearchesPanel.hide();
-
- SavedSearchesEventHandler handler = new SavedSearchesEventHandler();
- savedSearchesPanel.addCloseHandler(handler);
- savedSearchesGrid.setSavedSearchSelectionHandler(handler);
- }
-
- private void turnNameFieldIntoLabel(boolean nameJustUpdated) {
- String name = patternNameField.getText();
-
- if (name.equalsIgnoreCase(DEFAULT_PATTERN_NAME)) {
- name = "";
- }
-
- arrowImage.setVisible(true);
- patternNameField.setVisible(false);
-
- if ("".equals(name)) {
- starImage.setUrl(STAR_OFF_URL);
- } else {
- // NOTE: currently do not support updated a saved search pattern
- if (0 == currentSearchId) {
- String pattern = autoCompletePatternField.getText();
- createSavedSearch(name, pattern);
- } else if (nameJustUpdated) {
- updateSavedSearchName(currentSearchId, name);
- }
-
- starImage.setUrl(STAR_ON_URL);
- patternNameLabel.setText(elipse(name));
- patternNameLabel.setVisible(true);
- autoCompletePatternField.setFocus(true);
- }
- }
-
- private void turnNameLabelIntoField() {
- patternNameField.setText(patternNameLabel.getText());
- patternNameField.setVisible(true);
- patternNameLabel.setVisible(false);
- patternNameField.setFocus(true);
- }
-
- private String elipse(String data) {
- if (data.length() > 14) {
- return data.substring(0, 20) + "...";
- }
- return data;
- }
-
- private void createSavedSearch(final String name, final String pattern) {
- Subject subject = UserSessionManager.getSessionSubject();
- SavedSearch newSavedSearch = new SavedSearch(searchSubsystem, name, pattern, subject);
- GWTServiceLookup.getSearchService().createSavedSearch(newSavedSearch, new AsyncCallback<Integer>() {
- @Override
- public void onSuccess(Integer newSavedSearchId) {
- CoreGUI.getMessageCenter()
- .notify(new Message(MSG.view_searchBar_savedSearch_save(name), Severity.Info));
- currentSearchId = newSavedSearchId;
- }
-
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_searchBar_savedSearch_failSave(name), caught);
- }
- });
- }
-
- private void updateSavedSearchName(final int savedSearchId, final String newName) {
- GWTServiceLookup.getSearchService().updateSavedSearchName(savedSearchId, newName, new AsyncCallback<Boolean>() {
- @Override
- public void onSuccess(Boolean hadUpdates) {
- if (hadUpdates) {
- CoreGUI.getMessageCenter().notify(
- new Message(MSG.view_searchBar_savedSearch_rename(newName), Severity.Info));
- }
- }
-
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_searchBar_savedSearch_failRename(newName), caught);
- }
- });
- }
-
- /*
- * Event Handlers
- */
- class AutoCompletePatternFieldEventHandler implements KeyPressHandler, FocusHandler, BlurHandler {
- public void onKeyPress(KeyPressEvent event) {
- // hide pattern field/label, turn off star
- if (event.getCharCode() == KeyCodes.KEY_ENTER) {
- return;
- }
-
- patternNameLabel.setText("");
- patternNameLabel.setVisible(false);
- patternNameField.setValue("", true);
- patternNameField.setVisible(false);
- currentSearchId = 0;
- starImage.setUrl(STAR_OFF_URL);
-
- if (event.getCharCode() == KeyCodes.KEY_ESCAPE) {
- autoCompletePatternField.hideSuggestionList();
- event.preventDefault();
- event.stopPropagation();
- }
- }
-
- public void onFocus(FocusEvent event) {
- autoCompletePatternField.showSuggestionList();
- savedSearchesPanel.hide();
- }
-
- public void onBlur(BlurEvent event) {
- savedSearchesPanel.hide();
- }
- }
-
- class PatternNameFieldEventHandler implements KeyPressHandler, ClickHandler, BlurHandler {
- public void onKeyPress(KeyPressEvent event) {
- if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_ENTER) {
- Log.debug("key press pattern name field");
- turnNameFieldIntoLabel(true);
- }
- }
-
- public void onClick(ClickEvent event) {
- if (patternNameField.getText().equals(DEFAULT_PATTERN_NAME)) {
- patternNameField.setValue("", false);
- }
- }
-
- public void onBlur(BlurEvent event) {
- // If this is a name change update (star on) then return to displaying the unchanged label.
- // otherwise, abort the creation of the new saved search.
- if (starImage.getUrl().endsWith(STAR_ON_URL)) {
- patternNameField.setVisible(false);
- patternNameLabel.setVisible(true);
-
- } else {
- patternNameField.setVisible(false);
- patternNameLabel.setVisible(false);
- }
- }
- }
-
- class PatternNameLabelEventHandler implements ClickHandler {
- public void onClick(ClickEvent event) {
- turnNameLabelIntoField();
- }
- }
-
- class StarImageEventHandler implements ClickHandler, MouseOverHandler, MouseOutHandler {
- public void onClick(ClickEvent event) {
-
- // note - since hover changes off to active, we never have the star off case here
- if (starImage.getUrl().endsWith(STAR_ACTIVE_URL)) {
- if (patternNameField.isVisible()) {
- patternNameField.setVisible(false);
-
- } else {
- patternNameField.setText(DEFAULT_PATTERN_NAME);
- patternNameField.setVisible(true);
- patternNameField.selectAll();
- patternNameField.setFocus(true);
- patternNameLabel.setVisible(false);
-
- }
- } else if (starImage.getUrl().endsWith(STAR_ON_URL)) {
- starImage.setUrl(STAR_ACTIVE_URL);
- patternNameField.setVisible(false);
- patternNameLabel.setVisible(false);
- }
- }
-
- public void onMouseOver(MouseOverEvent event) {
- if (starImage.getUrl().endsWith(STAR_OFF_URL) && !"".equals(getValue().trim())) {
-
- starImage.setUrl(STAR_ACTIVE_URL);
- }
- }
-
- public void onMouseOut(MouseOutEvent event) {
- if (starImage.getUrl().endsWith(STAR_ACTIVE_URL) && !patternNameField.isVisible()) {
- starImage.setUrl(STAR_OFF_URL);
- }
- }
- }
-
- class ArrowImageEventHandler implements ClickHandler {
- public void onClick(ClickEvent event) {
- savedSearchesGrid.updateModel(new AsyncCallback<List<SavedSearch>>() {
- @Override
- public void onFailure(Throwable caught) {
- // nothing needs to be done
- }
-
- @Override
- public void onSuccess(List<SavedSearch> updatedGridData) {
- int left = autoCompletePatternField.getAbsoluteLeft();
- int top = autoCompletePatternField.getAbsoluteTop() + autoCompletePatternField.getOffsetHeight();
- savedSearchesPanel.setPopupPosition(left, top + 5);
- savedSearchesPanel.show();
- arrowImage.setUrl(ARROW_GRAY_URL);
- }
- });
- }
- }
-
- class SavedSearchesEventHandler implements CloseHandler<PopupPanel>, SavedSearchSelectionHandler {
- public void onClose(CloseEvent<PopupPanel> event) {
- arrowImage.setUrl(ARROW_WHITE_URL);
- }
-
- public void handleSelection(final int rowIndex, final int columnIndex, final SavedSearch savedSearch) {
- Log.debug("SavedSearchesEventHandler.handleSelection(" + rowIndex + "," + columnIndex + "," + savedSearch
- + ")");
- if (columnIndex == 1) {
- GWTServiceLookup.getSearchService().deleteSavedSearch(savedSearch.getId(), new AsyncCallback<Void>() {
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(
- MSG.view_searchBar_savedSearch_failDelete(savedSearch.getName()), caught);
- }
-
- @Override
- public void onSuccess(Void result) {
- // handle deletion of current saved search
- if (currentSearchId == savedSearch.getId()) {
- currentSearchId = 0;
- patternNameField.setValue("", true);
- patternNameField.setVisible(false);
- patternNameLabel.setText("");
- patternNameLabel.setVisible(false);
- autoCompletePatternField.setFocus(true);
- starImage.setUrl(STAR_OFF_URL);
- savedSearchesPanel.hide();
- }
-
- // handle deletion of the one and only element in the list
- if (savedSearchesGrid.size() == 1) {
- savedSearchesPanel.hide();
- }
-
- savedSearchesGrid.removeRow(rowIndex);
-
- CoreGUI.getMessageCenter().notify(
- new Message(MSG.view_searchBar_savedSearch_delete(savedSearch.getName()), Severity.Info));
- }
- });
- } else {
- activateSavedSearch(savedSearch); // activating the saved search also clicks the button
- }
- }
- }
-
- public void activateSavedSearch(Integer savedSearchId) {
- activeSavedSearchByIdOrName(savedSearchId, null);
- }
-
- public void activateSavedSearch(String savedSearchName) {
- activeSavedSearchByIdOrName(null, savedSearchName);
- }
-
- private void activeSavedSearchByIdOrName(Integer savedSearchId, final String savedSearchName) {
- Subject subject = UserSessionManager.getSessionSubject();
- SavedSearchCriteria criteria = new SavedSearchCriteria();
- criteria.addFilterSubjectId(subject.getId());
- criteria.addFilterId(savedSearchId); // null OK
- criteria.addFilterName(savedSearchName); // null OK
- criteria.setStrict(true);
-
- GWTServiceLookup.getSearchService().findSavedSearchesByCriteria(criteria,
- new AsyncCallback<List<SavedSearch>>() {
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_searchBar_savedSearch_failFind(savedSearchName),
- caught);
- }
-
- @Override
- public void onSuccess(List<SavedSearch> results) {
- if (results.size() == 0) {
- CoreGUI.getMessageCenter().notify(
- new Message(MSG.view_searchBar_savedSearch_failFind(savedSearchName), Severity.Error));
- } else {
- SavedSearch savedSearch = results.get(0);
- activateSavedSearch(savedSearch);
- }
- }
- });
- }
-
- public void activateSavedSearch(SavedSearch savedSearch) {
- currentSearchId = savedSearch.getId();
- autoCompletePatternField.setValue(savedSearch.getPattern(), true);
- patternNameField.setValue(savedSearch.getName(), true);
- Log.debug("search results change: [" + savedSearch.getName() + "," + savedSearch.getPattern() + "]");
- turnNameFieldIntoLabel(false);
- savedSearchesPanel.hide();
- }
-
- public String getSelectedTab() {
- return null;
- }
-
- public void addKeyPressHandler(KeyPressHandler handler) {
- autoCompletePatternField.addKeyPressHandler(handler);
- }
-
- public String getValue() {
- return autoCompletePatternField.getText();
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java
deleted file mode 100644
index 3845a27..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.search.favorites;
-
-import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.Element;
-import com.google.gwt.user.client.Event;
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.Grid;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.criteria.SavedSearchCriteria;
-import org.rhq.core.domain.search.SavedSearch;
-import org.rhq.core.domain.search.SearchSubsystem;
-import org.rhq.core.domain.util.PageOrdering;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author Joseph Marques
- */
-@Deprecated
-public class SavedSearchGrid extends Grid {
-
- private SavedSearchSelectionHandler patternSelectionHandler;
- private SearchSubsystem searchSubsystem;
- private List<SavedSearch> data = new ArrayList<SavedSearch>();
-
- public interface SavedSearchSelectionHandler {
- public void handleSelection(int rowIndex, int columnIndex, SavedSearch savedSearch);
- }
-
- public void setSavedSearchSelectionHandler(SavedSearchSelectionHandler handler) {
- this.patternSelectionHandler = handler;
- }
-
- class SavedSearchRowFormatter extends RowFormatter {
- private int savedSearchCount;
-
- public SavedSearchRowFormatter() {
- this(0);
- }
-
- public SavedSearchRowFormatter(int savedSearchCount) {
- this.savedSearchCount = savedSearchCount;
- }
-
- @Override
- public String getStyleName(int row) {
- // add -bottom decoration for all rows except last
- if (row < savedSearchCount) {
- return " savedSearchesPanel-row";
- }
- return "";
- }
-
- @Override
- public String getStylePrimaryName(int row) {
- return getStyleName(row);
- }
- }
-
- public SavedSearchGrid(SearchSubsystem searchSubsystem) {
- super(0, 2); // assume no rows to start, but we'll always have 2 columns
-
- setRowFormatter(new SavedSearchRowFormatter());
- sinkEvents(Event.ONMOUSEOVER | Event.ONMOUSEOUT | Event.ONCLICK);
- setCellSpacing(0);
- setCellPadding(5);
- setStyleName("savedSearchesGrid");
-
- this.searchSubsystem = searchSubsystem;
- }
-
- @Override
- public void onBrowserEvent(Event event) {
- Element td = getEventTargetCell(event);
- if (td == null) {
- return;
- }
- Element tr = DOM.getParent(td);
- Element table = DOM.getParent(tr);
- switch (DOM.eventGetType(event)) {
- case Event.ONCLICK: {
- int columnIndex = DOM.getChildIndex(tr, td);
- int rowIndex = DOM.getChildIndex(table, tr);
- SavedSearch savedSearch = data.get(rowIndex); // get request-cached element that should be in that row
- patternSelectionHandler.handleSelection(rowIndex, columnIndex, savedSearch);
- if (columnIndex == 0) {
- onRowOut(tr);
- }
- break;
- }
- case Event.ONMOUSEOVER: {
- onRowOver(tr);
- break;
- }
- case Event.ONMOUSEOUT: {
- onRowOut(tr);
- break;
- }
- }
- }
-
- protected void onRowOut(Element row) {
- Element actionCell = DOM.getChild(row, 1);
- DOM.setStyleAttribute(actionCell, "background", "");
- DOM.setStyleAttribute(row, "backgroundColor", "white");
- }
-
- protected void onRowOver(Element row) {
- Element actionCell = DOM.getChild(row, 1);
- //DOM.setStyleAttribute(actionCell, "backgroundImage", "url(" + SearchBar.TRASH + ")");
- DOM.setStyleAttribute(actionCell, "backgroundRepeat", "no-repeat");
- DOM.setStyleAttribute(actionCell, "backgroundPosition", "center");
- DOM.setStyleAttribute(actionCell, "width", "24px");
- DOM.setStyleAttribute(actionCell, "height", "24px");
- DOM.setStyleAttribute(row, "backgroundColor", "rgb(222,222,222)");
- }
-
- public void updateModel(final AsyncCallback<List<SavedSearch>> callback) {
- Subject subject = UserSessionManager.getSessionSubject();
- SavedSearchCriteria criteria = new SavedSearchCriteria();
- criteria.addFilterSubjectId(subject.getId());
- criteria.addFilterSearchSubsystem(searchSubsystem);
- criteria.addSortName(PageOrdering.ASC);
-
- GWTServiceLookup.getSearchService().findSavedSearchesByCriteria(criteria,
- new AsyncCallback<List<SavedSearch>>() {
- @Override
- public void onSuccess(List<SavedSearch> userSavedSearches) {
- data = userSavedSearches; // cache for correct client-side lookup on selection event
- clear(true);
- resizeRows(userSavedSearches.size());
-
- int i = 0;
- SavedSearchRowFormatter rowFormatter = new SavedSearchRowFormatter(data.size());
- for (SavedSearch nextSavedSearch : userSavedSearches) {
- setHTML(i, 0, stylize(nextSavedSearch));
- setHTML(i, 1, trashify());
- i++;
- }
- setRowFormatter(rowFormatter);
-
- callback.onSuccess(userSavedSearches);
- }
-
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(
- CoreGUI.getMessages().view_searchBar_savedSearch_failFind("*"), caught);
-
- callback.onFailure(caught);
- }
- });
- }
-
- private static String stylize(SavedSearch savedSearch) {
- String name = savedSearch.getName();
- String pattern = savedSearch.getPattern();
- String count = savedSearch.getResultCount() == null ? "" : "(" + savedSearch.getResultCount() + ")";
- return "<span class=\"savedSearchesPanel-top\">" + name + "</span> " + count + "<br/>" //
- + "<span class=\"savedSearchesPanel-bottom\">" + pattern + "</span>";
- }
-
- private static String trashify() {
- return "<div name=\"action\"></div>";
- }
-
- public String getSelectedItem() {
- return "";
- }
-
- public int size() {
- return data.size();
- }
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java
deleted file mode 100644
index c4b91c5..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java
+++ /dev/null
@@ -1,762 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.search.suggest;
-
-import com.google.gwt.event.dom.client.*;
-import com.google.gwt.event.logical.shared.*;
-import com.google.gwt.event.shared.HandlerRegistration;
-import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.*;
-import com.google.gwt.user.client.ui.SuggestOracle.Callback;
-import com.google.gwt.user.client.ui.SuggestOracle.Request;
-import com.google.gwt.user.client.ui.SuggestOracle.Response;
-import com.google.gwt.user.client.ui.SuggestOracle.Suggestion;
-import org.rhq.core.domain.search.SearchSuggestion;
-import org.rhq.core.domain.search.SearchSuggestion.Kind;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.Messages;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.gwt.SearchGWTServiceAsync;
-import org.rhq.enterprise.gui.coregui.client.search.AbstractSearchBar;
-import org.rhq.enterprise.gui.coregui.client.util.Log;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-@Deprecated
-public class SuggestTextBox_v3 extends Composite implements HasText, HasAllFocusHandlers, HasValue<String>,
-
- HasSelectionHandlers<Suggestion> {
-
- private static final Messages MSG = CoreGUI.getMessages();
-
- private final AbstractSearchBar searchBar;
- private final SearchSuggestOracle oracle;
-
- private int limit = 20;
- private int currentCursorPosition = 0;
- private final SuggestionMenu suggestionMenu;
- private final PopupPanel suggestionPopup;
- private final TextBoxBase box;
- private final Callback callback = new Callback() {
- public void onSuggestionsReady(Request request, Response response) {
- showSuggestions(response.getSuggestions());
- }
- };
-
- private final String STYLE_NAME_TEXT_BOX = "patternField";
- private final String STYLE_NAME_POPUP_PANEL = "suggestPanel";
-
- public SuggestTextBox_v3(AbstractSearchBar searchBar, TextBoxBase box) {
- super();
-
- this.searchBar = searchBar;
- this.oracle = new SearchSuggestOracle();
-
- this.box = box;
- this.box.setName("SearchPatternField");
- initWidget(box);
-
- getElement().setAttribute("autocomplete", "off"); // we're producing completion suggestions, not the browser
-
- // suggestionMenu must be created before suggestionPopup, because
- // suggestionMenu is suggestionPopup's widget
- suggestionMenu = new SuggestionMenu(true);
- // let the text box maintain focus when navigating the menu
- suggestionMenu.setFocusOnHoverEnabled(false);
- suggestionPopup = createPopup();
-
- // need to fork PopupPanel to access the animation type
- //suggestionPopup.setAnimationType(PopupPanel.AnimationType.ROLL_DOWN);
-
- addEventsToTextBox();
- setStyleName(STYLE_NAME_TEXT_BOX);
- }
-
- private PopupPanel createPopup() {
- PopupPanel p = new PopupPanel(true, false);
- p.setWidget(suggestionMenu);
- p.setStyleName(STYLE_NAME_POPUP_PANEL);
- p.setPreviewingAllNativeEvents(true);
- p.addAutoHidePartner(getTextBox().getElement());
- return p;
- }
-
- class SuggestionCompletionCommand implements Command {
-
- private Suggestion suggestion;
-
- public SuggestionCompletionCommand(Suggestion suggestion) {
- this.suggestion = suggestion;
- }
-
- public void execute() {
- complete(suggestion, currentCursorPosition);
- }
- }
-
- private void showSuggestions(Collection<? extends Suggestion> suggestions) {
- if (suggestions.size() > 0) {
-
- // Hide the popup before we manipulate the menu within it. If we do not
- // do this, some browsers will redraw the popup as items are removed
- // and added to the menu.
- boolean isAnimationEnabled = suggestionPopup.isAnimationEnabled();
- if (suggestionPopup.isAttached()) {
- suggestionPopup.hide();
- }
-
- suggestionMenu.clearItems();
-
- for (Suggestion curSuggestion : suggestions) {
- final SuggestionMenuItem menuItem = new SuggestionMenuItem(curSuggestion, oracle.isDisplayStringHTML(),
- new SuggestionCompletionCommand(curSuggestion));
-
- suggestionMenu.addItem(menuItem);
- }
-
- class TextBoxSkewWrapper extends TextBox {
- private TextBoxBase wrapped;
- private int skewWidth;
- private int skewHeight;
-
- public TextBoxSkewWrapper(TextBoxBase textBoxBase, int skewWidth, int skewHeight) {
- this.wrapped = textBoxBase;
- this.skewWidth = skewWidth;
- this.skewHeight = skewHeight;
- }
-
- @Override
- public int getOffsetWidth() {
- return wrapped.getOffsetWidth();
- }
-
- @Override
- public int getOffsetHeight() {
- return wrapped.getOffsetHeight();
- }
-
- @Override
- public int getAbsoluteLeft() {
- return wrapped.getAbsoluteLeft() + skewWidth;
- }
-
- @Override
- public int getAbsoluteTop() {
- return wrapped.getAbsoluteTop() + skewHeight;
- }
- }
-
- suggestionPopup.showRelativeTo(new TextBoxSkewWrapper(getTextBox(), 0, 5));
- suggestionPopup.setAnimationEnabled(isAnimationEnabled);
- } else {
- suggestionPopup.hide();
- }
-
- setFocus(true);
- }
-
- private void addEventsToTextBox() {
- class TextBoxEvents extends HandlesAllKeyEvents implements ValueChangeHandler<String>, ClickHandler {
-
- private boolean isInstructionalCommentSelected() {
- if (!suggestionPopup.isAttached() || suggestionMenu.getSelectedItemIndex() < 0) {
- return false;
- }
-
- SearchSuggestion searchSuggestion = suggestionMenu.getSearchSuggestion();
- Kind kind = searchSuggestion.getKind();
- return kind == Kind.InstructionalTextComment;
- }
-
- // We used to allow clicking and keypress to select from the suggestion list. But this
- // could be confusing because we keep focus in the text box. A return would likely mean
- // the user wants to submit the current pattern in the text box for search. But if the mouse
- // was hovering over a suggest menu item, which could be accidental as the menu can be large and
- // pops up automatically, his pattern would get replaced by a random suggestion entry and then
- // that would get submitted. So, we now only accept clicking to select from the suggest menu
- // and we assume a return means the user wants to submit the current text box pattern.
- public void onClick(ClickEvent event) {
-
- // if the user clicked on one of our helpful little messages then just ignore it
- if (isInstructionalCommentSelected()) {
- return;
- }
-
- handleSuggestions();
- }
-
- public void onKeyDown(KeyDownEvent event) {
- delegateEvent(SuggestTextBox_v3.this, event);
- }
-
- public void onKeyPress(KeyPressEvent event) {
- if (event.getNativeEvent().getKeyCode() == KeyCodes.KEY_ENTER) {
- Log.debug("****** Pressed Enter in SearchBar");
- hideSuggestionList();
- }
-
- delegateEvent(SuggestTextBox_v3.this, event);
- }
-
- public void onKeyUp(KeyUpEvent event) {
- handleSuggestions();
-
- delegateEvent(SuggestTextBox_v3.this, event);
- }
-
- public void onValueChange(ValueChangeEvent<String> event) {
- Log.debug("OnValueChange in SearchBar: "+event.getValue());
- delegateEvent(SuggestTextBox_v3.this, event);
- }
-
- private void handleSuggestions() {
- int nextCursorPosition = getTextBox().getCursorPos();
- if (nextCursorPosition != -1) {
- // refresh suggestions if cursor moved, meaning users want suggestions from a different context
- if (currentCursorPosition != nextCursorPosition) {
- currentCursorPosition = nextCursorPosition;
- showSuggestions();
- }
- }
- }
- }
-
- TextBoxEvents events = new TextBoxEvents();
- events.addKeyHandlersTo(box);
- box.addClickHandler(events);
- box.addValueChangeHandler(events);
- }
-
- /*
- * Composite methods
- */
- public void setLimit(int limit) {
- this.limit = limit;
- }
-
- /*
- * Handler methods
- */
- public HandlerRegistration addKeyDownHandler(KeyDownHandler handler) {
- return addDomHandler(handler, KeyDownEvent.getType());
- }
-
- public HandlerRegistration addKeyPressHandler(KeyPressHandler handler) {
- return addDomHandler(handler, KeyPressEvent.getType());
- }
-
- public HandlerRegistration addKeyUpHandler(KeyUpHandler handler) {
- return addDomHandler(handler, KeyUpEvent.getType());
- }
-
- public HandlerRegistration addSelectionHandler(SelectionHandler<Suggestion> handler) {
- return addHandler(handler, SelectionEvent.getType());
- }
-
- public HandlerRegistration addValueChangeHandler(ValueChangeHandler<String> handler) {
- return addHandler(handler, ValueChangeEvent.getType());
- }
-
- public int getLimit() {
- return limit;
- }
-
- /*
- * TextBox methods
- */
- public void setText(String text) {
- box.setText(text);
- }
-
- public void setValue(String newValue) {
- box.setValue(newValue);
- }
-
- public void setValue(String value, boolean fireEvents) {
- box.setValue(value, fireEvents);
- }
-
- public String getText() {
- return box.getText();
- }
-
- public String getValue() {
- return box.getValue();
- }
-
- public TextBoxBase getTextBox() {
- return box;
- }
-
- public void setFocus(boolean focused) {
- box.setFocus(focused);
- }
-
- /*
- * SuggestBox methods
- */
- public void showSuggestionList() {
- if (isAttached()) {
- showSuggestions();
- }
- }
-
- public void hideSuggestionList() {
- this.suggestionPopup.hide();
- }
-
- public boolean isSuggestionListShowing() {
- return suggestionPopup.isShowing();
- }
-
- /**
- * Get the number of suggestions that are currently showing.
- *
- * @return the number of suggestions currently showing, 0 if there are none
- */
- int getSuggestionCount() {
- return isSuggestionListShowing() ? suggestionMenu.getNumItems() : 0;
- }
-
- void showSuggestions() {
- String query = box.getText();
- int cursorPos = currentCursorPosition;
- if (query.length() == 0) {
- oracle.requestDefaultSuggestions(new SearchSuggestionRequest(null, cursorPos, limit), callback);
- } else {
- oracle.requestSuggestions(new SearchSuggestionRequest(query, cursorPos, limit), callback);
- }
- }
-
- /**
- * The SuggestionMenu class is used for the display and selection of
- * suggestions in the SuggestBox widget. SuggestionMenu differs from MenuBar
- * in that it always has a vertical orientation, and it has no submenus. It
- * also allows for programmatic selection of items in the menu, and
- * programmatically performing the action associated with the selected item.
- * In the MenuBar class, items cannot be selected programatically - they can
- * only be selected when the user places the mouse over a particlar item.
- * Additional methods in SuggestionMenu provide information about the number
- * of items in the menu, and the index of the currently selected item.
- */
- private static class SuggestionMenu extends MenuBar {
-
- public SuggestionMenu(boolean vertical) {
- super(vertical);
- // Make sure that CSS styles specified for the default Menu classes
- // do not affect this menu
- setStyleName("");
- }
-
- @SuppressWarnings("unused")
- public void doSelectedItemAction() {
- // In order to perform the action of the item that is currently
- // selected, the menu must be showing.
- MenuItem selectedItem = getSelectedItem();
- if (selectedItem != null) {
- selectedItem.getCommand().execute();
- //doItemAction(selectedSuggestItem, true);
- }
- }
-
- public int getNumItems() {
- return getItems().size();
- }
-
- /**
- * Returns the index of the menu item that is currently selected.
- *
- * @return returns the selected item
- */
- public int getSelectedItemIndex() {
- // The index of the currently selected item can only be
- // obtained if the menu is showing.
- MenuItem selectedItem = getSelectedItem();
- if (selectedItem != null) {
- return getItems().indexOf(selectedItem);
- }
- return -1;
- }
-
- public SearchSuggestion getSearchSuggestion() {
- SuggestionMenuItem menuItem = (SuggestionMenuItem) getSelectedItem();
- Suggestion suggestion = menuItem.getSuggestion();
- SearchSuggestion searchSuggestion = extraSearchSuggestion(suggestion);
- return searchSuggestion;
- }
- }
-
- private static SearchSuggestion extraSearchSuggestion(Suggestion suggestion) {
- SearchSuggestionOracleAdapter adapter = (SearchSuggestionOracleAdapter) suggestion;
- SearchSuggestion searchSuggestion = adapter.getSearchSuggestion();
- return searchSuggestion;
- }
-
- /**
- * Class for menu items in a SuggestionMenu. A SuggestionMenuItem differs from
- * a MenuItem in that each item is backed by a Suggestion object. The text of
- * each menu item is derived from the display string of a Suggestion object,
- * and each item stores a reference to its Suggestion object.
- */
- private static class SuggestionMenuItem extends MenuItem {
-
- private static final String STYLENAME_DEFAULT = "suggestData";
-
- private Suggestion suggestion;
-
- public SuggestionMenuItem(Suggestion suggestion, boolean asHTML, SuggestionCompletionCommand command) {
- super(getFormattedLabel(suggestion), asHTML, command);
- // Each suggestion should be placed in a single row in the suggestion
- // menu. If the window is resized and the suggestion cannot fit on a
- // single row, it should be clipped (instead of wrapping around and
- // taking up a second row).
- DOM.setStyleAttribute(getElement(), "whiteSpace", "nowrap");
- setStyleName(STYLENAME_DEFAULT);
- setSuggestion(suggestion);
- }
-
- public Suggestion getSuggestion() {
- return suggestion;
- }
-
- public void setSuggestion(Suggestion suggestion) {
- this.suggestion = suggestion;
- }
-
- private static String getFormattedLabel(Suggestion suggestion) {
- return getFormattedLabel(extraSearchSuggestion(suggestion));
- }
-
- private static String getFormattedLabel(SearchSuggestion item) {
- String className = "suggestData ";
- String prefix = "";
-
- if (item.getKind() == SearchSuggestion.Kind.Simple) {
- className += "suggestDataSimple";
- prefix = "text";
- } else if (item.getKind() == SearchSuggestion.Kind.Advanced) {
- className += "suggestDataAdvanced";
- prefix = "query";
- } else if (item.getKind() == SearchSuggestion.Kind.GlobalSavedSearch
- || item.getKind() == SearchSuggestion.Kind.UserSavedSearch) {
- className += "suggestDataSavedSearch";
- prefix = "saved";
- } else {
- }
-
- String style = "font-variant: small-caps; font-weight: bold; font-size: 11px; float: left; margin-left: 2px; width: 50px;";
- int marginOffset = 20;
- if (className.endsWith("suggestDataSavedSearch")) {
- style += " color: green;";
- marginOffset += 2;
- } else {
- style += " color: gray;";
- if (className.endsWith("suggestDataSimple")) {
- marginOffset += 8;
- }
- }
-
- String decoratedPrefix = wrap(prefix, style);
- String formattedItemLabel = chopWithEvery(item.getLabel(), "<br/>", 100);
- String decoratedItemLabel = decorate(formattedItemLabel, "background-color: yellow;", item.getStartIndex(),
- item.getEndIndex());
- String highlightedSuggestion = colorOperator(decoratedItemLabel);
- String decoratedSuffix = wrap(highlightedSuggestion, "float: left; ");
- String floatClear = "<br style=\"clear: both;\" />";
-
- String innerHTML = decoratedPrefix + decoratedSuffix + floatClear;
- return innerHTML;
- }
-
- private static String chopWithEvery(String toChop, String with, int every) {
- //String[] words = toChop.split("\\s");
- List<String> words = chop(toChop, "\\/- \t\r\n");
- StringBuilder results = new StringBuilder();
- int currentLineLength = 0;
- for (String next : words) {
- results.append(next);
- currentLineLength += next.length();
- if (currentLineLength + next.length() > every) {
- results.append(with);
- currentLineLength = 0;
- }
- }
-
- return results.toString();
- }
-
- // StringTokenzier doesn't exist in GWT, so have to write my own
- private static List<String> chop(String dataToChop, String chopTokens) {
- List<String> words = new ArrayList<String>();
-
- StringBuilder builder = new StringBuilder();
- for (char next : dataToChop.toCharArray()) {
- if (chopTokens.indexOf(next) != -1) {
- if (builder.length() > 0) {
- words.add(builder.toString());
- builder = new StringBuilder();
- }
- }
- builder.append(next);
- }
-
- if (builder.length() > 0) {
- words.add(builder.toString());
- }
-
- return words;
- }
-
- private static final List<String> OPERATORS = Arrays.asList("!==", "!=", "==", "=");
-
- // TODO: fixing coloring strategy
- private static String colorOperator(String data) {
- for (String operator : OPERATORS) {
- int index = -1;
- while ((index = data.indexOf(operator, index + 1)) != -1) {
- if ((index - 5 >= 0) && data.substring(index - 5, index).equals("style") == false) {
- break;
- }
- }
- if (index != -1) {
- return decorate(data, "color: blue;", index, index + operator.length());
- }
- }
- return data;
- }
-
- private static String wrap(String data, String style) {
- return "<span style=\"" + style + "\">" + data + "</span>";
- }
-
- /*
- private static String decorate(String data, String style, int startIndex, int endIndex) {
- if (startIndex == -1) {
- return data; // no match
- }
- String before = data.substring(0, startIndex);
- String highlight = data.substring(startIndex, endIndex);
- String after = data.substring(endIndex);
- return before + "<span style=\"" + style + "\">" + highlight + "</span>" + after;
- }
- */
-
- private static String decorate(String data, String style, int startIndex, int endIndex) {
- if (startIndex == -1 || (startIndex == endIndex)) {
- return data; // no match or zero-width match
- }
-
- String[] words = data.split("<br/>");
- int counter = 0;
- int wordIndex = 0;
- int letterIndex = 0;
-
- StringBuilder results = new StringBuilder();
- while (counter < startIndex) {
- if (wordIndex == words.length) {
- break;
- }
-
- if (letterIndex < words[wordIndex].length()) { // more letters left in the current word?
- results.append(words[wordIndex].charAt(letterIndex)); // append the next char of the current word
- letterIndex++; // move to the next char in the current word
- counter++; // only move counter forward when we've added non-BR chars to the results
- } else { // next word
- results.append("<br/>"); // put the break point back in between words
- letterIndex = 0; // point to the first char
- wordIndex++; // of the next word
- }
- }
-
- // we're at start index, wrap all words and word fragments in the specified style up to endIndex
- results.append("<span style=\"" + style + "\">"); // seed action
- while (counter < endIndex) {
- if (wordIndex == words.length) {
- break;
- }
-
- if (letterIndex < words[wordIndex].length()) { // more letters left in the current word?
- results.append(words[wordIndex].charAt(letterIndex)); // append the next char of the current word
- letterIndex++; // move to the next char in the current word
- counter++; // only move counter forward when we've added non-BR chars to the results
- } else { // next word
- results.append("</span>"); // close the previous word, we don't highlight breaks
- results.append("<br/>"); // put the break point back in between words
- letterIndex = 0; // point to the first char
- wordIndex++; // of the next word
- results.append("<span style=\"" + style + "\">"); // prepare for next word
- }
- }
- results.append("</span>"); // end last dangling span
-
- // append the rest of the current word fragment, if any
- if (wordIndex != words.length) {
- results.append(words[wordIndex].substring(letterIndex));
- }
-
- // append the rest of the words
- while (++wordIndex < words.length) {
- results.append("<br/>"); // put the break point back in between words
- results.append(words[wordIndex]);
- }
-
- return results.toString();
- }
- }
-
- @Deprecated
- class SearchSuggestOracle extends SuggestOracle {
- private SearchGWTServiceAsync searchService = GWTServiceLookup.getSearchService();
-
- @Override
- public boolean isDisplayStringHTML() {
- return true;
- }
-
- @Override
- public void requestDefaultSuggestions(Request request, Callback callback) {
- requestSuggestions(request, callback);
- }
-
- @Override
- public void requestSuggestions(final Request request, final Callback callback) {
- SearchSuggestionRequest suggestionRequest = (SearchSuggestionRequest) request;
- String expression = suggestionRequest.getQuery();
- int caretPosition = suggestionRequest.getCursorPosition();
-
- searchService.getTabAwareSuggestions(searchBar.getSearchSubsystem(), expression, caretPosition,
- searchBar.getSelectedTab(), new AsyncCallback<List<SearchSuggestion>>() {
-
- public void onSuccess(List<SearchSuggestion> results) {
- adaptAndHandle(results.toArray(new SearchSuggestion[results.size()]));
- }
-
- public void onFailure(Throwable caught) {
- SearchSuggestion errorInform = new SearchSuggestion(Kind.InstructionalTextComment, MSG
- .view_searchBar_instructional_failSuggest());
- adaptAndHandle(errorInform);
- }
-
- private void adaptAndHandle(SearchSuggestion... searchSuggestionResults) {
- List<SearchSuggestionOracleAdapter> adaptedResults = new java.util.ArrayList<SearchSuggestionOracleAdapter>();
- for (SearchSuggestion next : searchSuggestionResults) {
- adaptedResults.add(new SearchSuggestionOracleAdapter(next));
- }
- if (adaptedResults.isEmpty()) {
- adaptedResults.add(new SearchSuggestionOracleAdapter(new SearchSuggestion(
- Kind.InstructionalTextComment, MSG.view_searchBar_instructional_noSuggest())));
- }
- SuggestOracle.Response response = new SuggestOracle.Response(adaptedResults);
- callback.onSuggestionsReady(request, response);
- }
- });
- }
- }
-
- protected void complete(Suggestion suggestion, int cursorPosition) {
- SearchSuggestion searchSuggestion = extraSearchSuggestion(suggestion);
- String currentText = getText().toLowerCase();
-
- if (searchSuggestion.getKind() == SearchSuggestion.Kind.GlobalSavedSearch
- || searchSuggestion.getKind() == SearchSuggestion.Kind.UserSavedSearch) {
- // execute saved searches immediately, since they presumably constitute complete expressions
- Log.debug("selected '" + searchSuggestion.getLabel() + "' saved search suggestion");
- searchBar.activateSavedSearch(searchSuggestion.getValue());
- } else {
- // selecting a simple suggestion or advanced suggestion
-
- int previousWhitespaceIndex = cursorPosition;
- if (cursorPosition != 0) {
- while (--previousWhitespaceIndex > 0) {
- if (currentText.charAt(previousWhitespaceIndex) == ' ') {
- previousWhitespaceIndex++; // put index right after found whitespace
- break;
- }
- }
- }
-
- int futureWhitespaceIndex = cursorPosition;
- while (futureWhitespaceIndex < currentText.length()) {
- if (currentText.charAt(futureWhitespaceIndex) == ' ') {
- break;
- }
- futureWhitespaceIndex++;
- }
-
- String before = getText().substring(0, previousWhitespaceIndex);
- String completion = suggestion.getReplacementString();
- String after = getText().substring(futureWhitespaceIndex);
-
- setValue(before + completion + after, true);
- currentCursorPosition = before.length() + completion.length();
- getTextBox().setCursorPos(currentCursorPosition);
-
- showSuggestions();
- }
- }
-
- @Deprecated
- class SearchSuggestionRequest extends SuggestOracle.Request {
- private int cursorPosition;
-
- public SearchSuggestionRequest(String query, int cursorPosition, int limit) {
- super(query, limit);
- this.cursorPosition = cursorPosition;
- }
-
- public int getCursorPosition() {
- return cursorPosition;
- }
- }
-
- class SearchSuggestionOracleAdapter implements SuggestOracle.Suggestion {
- private final SearchSuggestion suggestion;
-
- public SearchSuggestionOracleAdapter(SearchSuggestion suggestion) {
- this.suggestion = suggestion;
- }
-
- public String getDisplayString() {
- return suggestion.getLabel();
- }
-
- public String getReplacementString() {
- return suggestion.getValue();
- }
-
- public SearchSuggestion getSearchSuggestion() {
- return suggestion;
- }
- }
-
- public HandlerRegistration addFocusHandler(FocusHandler handler) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public HandlerRegistration addBlurHandler(BlurHandler handler) {
- // TODO Auto-generated method stub
- return null;
- }
-}
commit 123a951be3bd28161cdf7ccf3d45e59124d86489
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Sep 14 12:30:47 2012 -0400
[Bug 856819 - [as7, CLI] NullPointerException when trying to deploy war on EAP 6 in domain mode using CLI and createPackageBackedResource method]
The AS7 deployment code was relying on PackageVersion.filename being set. But this
is not a reliable field, it only reflects the filename of the file uploaded
to provide the content. It can't be used because:
- It is not set unless the file is tryly uploaded (likein he GUI via PackageVersionFileUploadServlet)
- It is not set via the CLI, or potentially other mechanisms, which supply only the binary content
- It is not necessarily a valid reflection of the content (i.e. not unique, etc)
The packageName is really the only thing we can use here. It is guaranteed,
is unique, and should reflect the content. It is what is used for similar needs
in the previous plugins.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
index 2851128..a4e99b4 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseComponent.java
@@ -390,7 +390,7 @@ public class BaseComponent<T extends ResourceComponent<?>> implements AS7Compone
ServerPluginConfiguration serverPluginConfig = getServerComponent().getServerPluginConfiguration();
ASUploadConnection uploadConnection = new ASUploadConnection(serverPluginConfig.getHostname(),
serverPluginConfig.getPort(), serverPluginConfig.getUser(), serverPluginConfig.getPassword());
- OutputStream out = uploadConnection.getOutputStream(details.getFileName());
+ OutputStream out = uploadConnection.getOutputStream(details.getKey().getName());
contentServices.downloadPackageBitsForChildResource(cctx, resourceTypeName, details.getKey(), out);
JsonNode uploadResult = uploadConnection.finishUpload();
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
index 7be42bb..1c667da 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/DeploymentComponent.java
@@ -134,7 +134,7 @@ public class DeploymentComponent extends BaseComponent<ResourceComponent<?>> imp
ResourcePackageDetails detail = packages.iterator().next();
ASUploadConnection uploadConnection = new ASUploadConnection(getASConnection());
- OutputStream out = uploadConnection.getOutputStream(detail.getFileName());
+ OutputStream out = uploadConnection.getOutputStream(detail.getKey().getName());
ResourceType resourceType = context.getResourceType();
log.info("Deploying " + resourceType.getName() + " Resource with key [" + detail.getKey() +"]...");
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java
index 8d5c64e..82b1042 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ServerGroupComponent.java
@@ -101,8 +101,8 @@ public class ServerGroupComponent extends BaseComponent implements ContentFacet,
ServerPluginConfiguration serverPluginConfig = getServerComponent().getServerPluginConfiguration();
ASUploadConnection uploadConnection = new ASUploadConnection(serverPluginConfig.getHostname(),
serverPluginConfig.getPort(), serverPluginConfig.getUser(), serverPluginConfig.getPassword());
- String fileName = details.getFileName();
- OutputStream out = uploadConnection.getOutputStream(fileName);
+ String packageName = details.getName();
+ OutputStream out = uploadConnection.getOutputStream(packageName);
contentServices.downloadPackageBits(cctx, details.getKey(), out, false);
JsonNode uploadResult = uploadConnection.finishUpload();
if (uploadResult.has(OUTCOME)) {
@@ -113,7 +113,7 @@ public class ServerGroupComponent extends BaseComponent implements ContentFacet,
ASConnection connection = getASConnection();
Address deploymentsAddress = new Address();
- deploymentsAddress.add("deployment", fileName);
+ deploymentsAddress.add("deployment", packageName);
Operation step1 = new Operation("add",deploymentsAddress);
// step1.addAdditionalProperty("hash", new PROPERTY_VALUE("BYTES_VALUE", hash));
List<Object> content = new ArrayList<Object>(1);
@@ -122,10 +122,10 @@ public class ServerGroupComponent extends BaseComponent implements ContentFacet,
content.add(contentValues);
step1.addAdditionalProperty("content",content);
- step1.addAdditionalProperty("name", fileName);
+ step1.addAdditionalProperty("name", packageName);
Address serverGroupAddress = new Address(context.getResourceKey());
- serverGroupAddress.add("deployment", fileName);
+ serverGroupAddress.add("deployment", packageName);
Operation step2 = new Operation("add",serverGroupAddress);
Operation step3 = new Operation("deploy",serverGroupAddress);
commit c1ba47b0832ac7268c426d4111a2ee2e19c1e4ae
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Sep 14 12:25:25 2012 -0400
[Bug 856833 - [as7] CLI invocation for a DomainDeployment Proxy deployToServerGroup fails]
This really had nothing to do with AS7, and everything to do with the
ResourceProxy code in the CLI, when it attempted to translate command-line
params to an operation Configuration.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java
index 29bd4a6..b739581 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java
@@ -35,6 +35,11 @@ import org.rhq.core.domain.configuration.definition.PropertyDefinitionSimple;
*/
public class ConfigurationClassBuilder {
+ /**
+ * @param def
+ * @return Map of propertyName to types for the config def
+ * @throws NotFoundException
+ */
public static LinkedHashMap<String, CtClass> translateParameters(ConfigurationDefinition def)
throws NotFoundException {
LinkedHashMap<String, CtClass> result = new LinkedHashMap<String, CtClass>();
@@ -45,7 +50,7 @@ public class ConfigurationClassBuilder {
for (PropertyDefinition pd : def.getPropertyDefinitions().values()) {
if (pd instanceof PropertyDefinitionSimple) {
PropertyDefinitionSimple simple = (PropertyDefinitionSimple) pd;
- String name = simpleName(simple.getDisplayName());
+ String name = pd.getName();
CtClass paramType = getSimpleTypeClass(simple);
result.put(name, paramType);
}
commit 2b1a462a41684da0ce8acfd289f1a81ed32c8097
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri Sep 14 07:56:18 2012 -0500
[BZ 857441] Update Sigar version
diff --git a/.classpath b/.classpath
index a5a5568..c7b5745 100644
--- a/.classpath
+++ b/.classpath
@@ -239,7 +239,7 @@
<classpathentry exported="true" kind="var" path="M2_REPO/org/richfaces/ui/richfaces-ui/3.3.3.Final/richfaces-ui-3.3.3.Final.jar" sourcepath="/M2_REPO/org/richfaces/ui/richfaces-ui/3.3.0.GA/richfaces-ui-3.3.0.GA-sources.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/postgresql/postgresql/9.1-901.jdbc4/postgresql-9.1-901.jdbc4.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-cache/1.4.1.SP9/jboss-cache-1.4.1.SP9.jar"/>
- <classpathentry exported="true" kind="var" path="M2_REPO/org/hyperic/sigar/1.6.5.132/sigar-1.6.5.132.jar" sourcepath="/M2_REPO/org/hyperic/sigar/1.6.3.82/sigar-1.6.3.82-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/hyperic/sigar/1.6.5.132-3/sigar-1.6.5.132-3.jar" sourcepath="/M2_REPO/org/hyperic/sigar/1.6.5.132-3/sigar-1.6.5.132-3-sources.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/transaction/jboss-jta/4.2.3.SP5/jboss-jta-4.2.3.SP5.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/transaction/jboss-jts-common/4.2.3.SP5/jboss-jts-common-4.2.3.SP5.jar"/>
<classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jbossws-spi/1.1.1.GA/jbossws-spi-1.1.1.GA.jar"/>
diff --git a/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java b/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java
index e622910..97b6df8 100644
--- a/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java
+++ b/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/impl/util/SigarInstaller.java
@@ -63,7 +63,7 @@ public class SigarInstaller {
.loadMetadataFromPom("pom.xml")
.goOffline()
// TODO (ips, 05/02/12): Figure out how to make this work without hard-coding the version.
- .artifact("org.hyperic:sigar-dist:zip:1.6.5.132")
+ .artifact("org.hyperic:sigar-dist:zip:1.6.5.132-3")
.resolveAs(JavaArchive.class);
if (sigars.size() > 1) {
diff --git a/modules/core/native-system/ant-run.xml b/modules/core/native-system/ant-run.xml
index 51507a7..a98f94d 100644
--- a/modules/core/native-system/ant-run.xml
+++ b/modules/core/native-system/ant-run.xml
@@ -11,7 +11,7 @@ Ant Script that builds a test jar to run SIGAR bug replication code.
<!-- in case it wasn't passed in, assume the default location -->
<property name="settings.localRepository" location="${user.home}/.m2/repository"/>
<property name="project.version" value="3.0.0-SNAPSHOT"/>
- <property name="sigar.version" value="1.6.5.132"/>
+ <property name="sigar.version" value="1.6.5.132-3"/>
<property name="log4j.version" value="1.2.16"/>
<fileset dir="${settings.localRepository}" id="jar.fileset">
diff --git a/modules/enterprise/agent/ant-run.xml b/modules/enterprise/agent/ant-run.xml
index 456a260..587a9e9 100644
--- a/modules/enterprise/agent/ant-run.xml
+++ b/modules/enterprise/agent/ant-run.xml
@@ -11,7 +11,7 @@ Ant Script that provides ways to package the Agent.
<!-- in case these weren't passed in (i.e. not invoked via maven), assume some defaults -->
<property name="settings.localRepository" location="${user.home}/.m2/repository"/>
<property name="project.version" value="2.0.0-SNAPSHOT"/>
- <property name="sigar.version" value="1.6.5.132"/>
+ <property name="sigar.version" value="1.6.5.132-3"/>
<property name="augeas.version" value="0.9.0"/>
<property name="augeas.classifier" value="el5"/>
<property name="augeas.zip.location" value="${settings.localRepository}/net/augeas/augeas-native/${augeas.version}/"/>
diff --git a/pom.xml b/pom.xml
index 7c1451e..61343ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,7 @@
<jtds.version>1.2.2</jtds.version>
<richfaces.version>3.3.3.Final</richfaces.version>
<jline.version>0.9.94</jline.version>
- <sigar.version>1.6.5.132</sigar.version>
+ <sigar.version>1.6.5.132-3</sigar.version>
<sigar.zip.version>1.6.5</sigar.zip.version>
<quartz.version>1.6.5</quartz.version>
<jna.version>3.2.5</jna.version>
commit 6c45114a0ab937e1aa0709ca162c9ebabd04c4ce
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Sep 13 14:01:28 2012 -0700
In addition to caching images also cache *.jpg and *.png as there can be images (such as those from smartGWT) that dont match the /images/* pattern and also need to be cached.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/filter/CacheControlFilter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/filter/CacheControlFilter.java
index dcd0cfb..3d1848f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/filter/CacheControlFilter.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/filter/CacheControlFilter.java
@@ -58,7 +58,7 @@ public class CacheControlFilter implements Filter {
httpResponse.setDateHeader("Expires", now.getTime() - 1);
httpResponse.setHeader("Pragma", "no-cache");
httpResponse.setHeader("Cache-Control", "public, max-age=0, must-revalidate");
- } else if (requestURI.contains(".cache.") || requestURI.contains("/images/")) {
+ } else if (requestURI.contains(".cache.") || requestURI.contains("/images/") || requestURI.endsWith("*.jpg") || requestURI.endsWith("*.png")) {
// Tell browser to cache the content for one year.
Date now = new Date();
HttpServletResponse httpResponse = (HttpServletResponse) response;
commit 0f008edea21b9749226c5fa63947a29c0bfff399
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Sep 13 13:55:49 2012 -0700
Optimize css properties in CoreGUI.css.
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
index 7c86907..6095aec 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css
@@ -56,47 +56,27 @@ a.menuBar, a.menuBar:link, a.menuBar:visited, a.menuBar:hover {
.OddRow {
- background-color: white;
- border-bottom-color: rgb(230, 234, 239);
- border-bottom-style: solid;
- border-bottom-width: 1px;
- border-right-color: rgb(217, 224, 227);
- border-right-style: solid;
- border-right-width: 1px;
-
+ background-color: #ffffff;
+ border-right: 1px solid rgb(217, 224, 227);
+ border-bottom: 1px solid rgb(230, 234, 239);
}
.OddRowDisabled {
- background-color: white;
- border-bottom-color: rgb(230, 234, 239);
- border-bottom-style: solid;
- border-bottom-width: 1px;
- border-right-color: rgb(217, 224, 227);
- border-right-style: solid;
- border-right-width: 1px;
-
+ background-color: #ffffff;
+ border-right: 1px solid rgb(217, 224, 227);
+ border-bottom: 1px solid rgb(230, 234, 239);
}
.EvenRow {
background-color: rgb(246, 246, 246);
- border-bottom-color: rgb(230, 234, 239);
- border-bottom-style: solid;
- border-bottom-width: 1px;
- border-right-color: rgb(217, 224, 227);
- border-right-style: solid;
- border-right-width: 1px;
-
+ border-right: 1px solid rgb(217, 224, 227);
+ border-bottom: 1px solid rgb(230, 234, 239);
}
.EvenRowDisabled {
background-color: rgb(246, 246, 246);
- border-bottom-color: rgb(230, 234, 239);
- border-bottom-style: solid;
- border-bottom-width: 1px;
- border-right-color: rgb(217, 224, 227);
- border-right-style: solid;
- border-right-width: 1px;
-
+ border-right: 1px solid rgb(217, 224, 227);
+ border-bottom: 1px solid rgb(230, 234, 239);
}
.inheritColor {
@@ -170,8 +150,7 @@ a.menuBar, a.menuBar:link, a.menuBar:visited, a.menuBar:hover {
}
.availBarDown {
- background-image: url("images/availBar/down.png");
- background-repeat: repeat-x;
+ background: url("images/availBar/down.png") repeat-x;
height: 28px;
}
@@ -317,9 +296,8 @@ a.menuBar, a.menuBar:link, a.menuBar:visited, a.menuBar:hover {
/** Not used right now **/
.gwtMenuBar {
- background-image: url('images/header/header_bg.png');
+ background: url('images/header/header_bg.png') repeat-x;
/*background-image: url("http://localhost:7080/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/ski…");*/
- background-repeat: repeat-x;
padding: 0px;
-moz-box-sizing: border-box;
overflow: hidden;
@@ -366,10 +344,7 @@ a.menuBar, a.menuBar:link, a.menuBar:visited, a.menuBar:hover {
}
.InfoBlock,.ConfirmationBlock,.WarnBlock,.ErrorBlock,.FatalBlock {
- /*padding: 4px;*/
- border-width: 1px;
- border-style: solid;
- /*font-size: 10px;*/
+ border: 1px solid;
color: #000000;
}
@@ -407,8 +382,7 @@ a.menuBar, a.menuBar:link, a.menuBar:visited, a.menuBar:hover {
}
.configurationEditorHeaderCell {
- border-style: solid;
- border-width: 1px;
+ border: 1px solid;
background-color: #EEE; /* light gray */
font-weight: bolder;
}
commit 743ad90df5e1efecf2e0d66246cf50a9788195f9
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Sep 13 13:54:21 2012 -0700
Remove old search.js and search.css as no longer needed.
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
index 6a78aab..cdcfe24 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
+++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html
@@ -17,7 +17,7 @@
if(search.indexOf("locale") == -1){
// IE uses browserLanguage
var lang = navigator.language!=null ? navigator.language : navigator.browserLanguage;
- var lang = lang.replace("-", "_");
+ lang = lang.replace("-", "_");
document.write("<meta name='gwt:property' content='locale="+lang +"'>");
}
</script>
@@ -32,7 +32,6 @@
</script>
<link rel="stylesheet" href="CoreGUI.css">
- <link rel="stylesheet" href="css/search.css">
<style type="text/css">
.menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled {
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/search.css b/modules/enterprise/gui/coregui/src/main/webapp/css/search.css
deleted file mode 100644
index 81a6967..0000000
--- a/modules/enterprise/gui/coregui/src/main/webapp/css/search.css
+++ /dev/null
@@ -1,245 +0,0 @@
-
-input {
- white-space: no-wrap;
-}
-
-div {
- margin-right: auto;
- margin-left: auto;
-}
-
-/*
- *
- * search container elements
- * searchBarContainer width is the total width of the search bar.
- * searchBarBackgroundContainer is the available width for the components inside (takes into consideration RHS padding)
- *
- */
-
-.searchBarContainer {
- width: 800px;
- position: relative;
- background-color: white;
- height: 34px;
- vertical-align: bottom;
- z-index: 999999;
-}
-
-.searchBarBackgroundContainer {
- position: absolute;
- background-color: white;
- border-style: inset;
- border-color: gray;
- border-width: 1px 1px 1px 1px;
- padding: 0;
- width: 785px;
- height: 20px;
- z-index: 999999;
-}
-
-.searchBarComponentsContainer {
- width: 100%;
- margin: 0;
- padding: 0;
- z-index: 999999;
-}
-
-.searchBarComponentLHS {
- background-color: white;
- float: left;
- /* width: 200px; */
-}
-
-.searchBarComponentRHS {
- background-color: white;
- float: right;
- padding-right: 4px;
- padding-top: 2px;
-}
-
-
-/*
- *
- * pattern field items
- * patternField is the current pattern, its width is the max visible portion
- * patternNameField is the the edit box when naming a saved search, its width is the max visible portion (less the border)
- * patternNameLabel is for displaying the saved search name when a saved search is selected
- *
- * - the combined width of patternField + patternNameField + all other RHS components (the star and
- * arrow images) must equal the width of searchBarBackgroundContainer in order for everything to be seen when
- * patternNameField (or patternNameLabel) are being shown.
- * - the width of patternNameField and patternNameLabel must be the same.
- *
- */
-
-.patternField {
- font-size: 13px;
- font-family: arial, sans-serif;
- width: 600px;
- padding: 0;
- margin: 0;
- border-color: white;
- border-style: none;
- outline: none;
- z-index: 999999;
-}
-
-.patternNameField {
- font-size: 11px;
- color: green;
- width: 150px;
- white-space: no-wrap;
- border-color: gray;
- border-style: dotted;
- border-width: thin;
- outline: none;
- z-index: 999999;
-}
-
-.patternNameLabel {
- background-color: rgb(192, 236, 207);
- color: rgb(51, 106, 63);
- font-weight: bold;
- white-space: nowrap;
- text-align: left;
- border-style: none;
- font-size: 11px;
- width: 150px;
- z-index: 999999;
-}
-
-
-/*
- *
- * saved search items
- *
- */
-
-.savedSearchesPanel {
- background-color: white;
- border-style: none;
- padding: 0;
- margin: 0;
- width: 785px;
- z-index: 999999;
-}
-
-.savedSearchesPanel-row {
- background-color: white;
- border-style: none;
- border-bottom-width: thin;
- border-bottom-style: solid;
- border-bottom-color: gray;
- padding: 0px 0px 0px 0px;
- margin: 0px 5px 0px 5px;
- width: 785px;
-}
-
-.savedSearchesGrid {
- background-color: white;
- border-style: solid;
- border-width: thin;
- border-color: buttonshadow;
-
- border-style: outset;
- border-top-color: silver;
- border-left-color: silver;
- border-bottom-color: gray;
- border-right-color: gray;
- border-width: 1px 1px 1px 1px;
-
- padding: 0;
- margin: 0;
-}
-
-.savedSearchesPanel-top {
- color: green;
- font-size: 12px;
- position: relative;
- padding: 0;
- margin: 0;
- top: 1px;
-}
-
-.savedSearchesPanel-bottom {
- font-size: 10px;
- position: relative;
- padding: 0;
- margin: 3px;
- bottom: 1px;
-}
-
-
-/*
- *
- * suggest items
- * suggestPanel spans the width of the container, all of the relevant widths must equal that of .searchBarBackgroundContainer
- *
- */
-
-.suggestPanel {
- width: 785px;
- background: white;
- border-style: outset;
- border-top-color: silver;
- border-left-color: silver;
- border-bottom-color: gray;
- border-right-color: gray;
- border-width: 1px 1px 1px 1px;
-
- z-index: 999999;
-}
-
-.suggestData {
- width: 785px;
- margin: 0;
- padding: 0;
- border: none;
-}
-
-.suggestData-selected {
- width: 785px;
- background: rgb(222,222,222);
-}
-
-.suggestDataSimple {
- color: black;
-}
-
-.suggestDataAdvanced {
- color: blue;
-}
-
-.suggestDataSavedSearch {
- color: green;
-}
-
-
-/*
- * Rounded Corners
- * http://articles.sitepoint.com/article/rounded-corners-css-javascript
- *
- * Applied to the patternNameLabel, so the width should be set the same
- */
-
-div.rounded {
- /* just a container for rounded2 div replacement algorithm */
-}
-div.rounded2 {
- width: 150px;
- z-index: 999999;
- background: rgb(192, 236, 207) url(/coregui/images/search/corner-upper-right-8.png) no-repeat top right;
-}
-div.rounded2 div {
- background: transparent url(/coregui/images/search/corner-upper-left-8.png) no-repeat top left;
-}
-div.rounded2 div div {
- background: transparent url(/coregui/images/search/corner-lower-right-8.png) no-repeat bottom right;
-}
-div.rounded2 div div div {
- background: transparent url(/coregui/images/search/corner-lower-left-8.png) no-repeat bottom left;
-}
-
-div.rounded2 div div div div {
- background-image: none;
-}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/search.js b/modules/enterprise/gui/coregui/src/main/webapp/js/search.js
deleted file mode 100644
index ad86428..0000000
--- a/modules/enterprise/gui/coregui/src/main/webapp/js/search.js
+++ /dev/null
@@ -1,61 +0,0 @@
-function roundedCorners() {
- var divs = document.getElementsByTagName('div');
- var rounded_divs = [];
- for (var i = 0; i < divs.length; i++) {
- if (/\brounded\b/.exec(divs[i].className)) {
- rounded_divs[rounded_divs.length] = divs[i];
- }
- }
- for (var i = 0; i < rounded_divs.length; i++) {
- var original = rounded_divs[i];
-
- /* Make it the inner div of the four */
- original.className = original.className.replace('rounded', '');
- //var originalId = original.id;
- //original.id = null;
-
- /* Now create the outer-most div */
- var tr = document.createElement('div');
- //tr.id = originalId;
- tr.className = 'rounded2';
-
- /* Swap out the original (we'll put it back later) */
- original.parentNode.replaceChild(tr, original);
-
- /* Create the two other inner nodes */
- var tl = document.createElement('div');
- var br = document.createElement('div');
-
- /* Now glue the nodes back in to the document */
- tr.appendChild(tl);
- tl.appendChild(br);
- br.appendChild(original);
- }
-}
-
-function loadRoundedCorners() {
-/*
- var pos = navigator.userAgent.indexOf('MSIE');
- if (pos > -1) {
- var longVersion = navigator.userAgent.substring(pos + 5);
- var shortVersion = longVersion.substring(0, longVersion.indexOf(';'));
- if (shortVersion.indexOf('8') == -1) {
- return;
- }
- }
-*/
-
- if (typeof window.onload != 'function') {
- window.onload = roundedCorners;
- } else {
- var oldMethod = window.onload;
- window.onload = function() {
- if (oldMethod) {
- oldMethod();
- }
- roundedCorners();
- }
- }
-}
-
-loadRoundedCorners();
commit d30f869055c15e1f5539d91dddc4b14d224cf490
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Aug 16 14:41:27 2012 +0200
[BZ 803737] - adding the core/native-system module to the API checks.
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index 82cd33a..934b13f 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -17,6 +17,10 @@
<description>
Java API that wraps the native library used to access low-level system resources natively.
</description>
+
+ <properties>
+ <rhq.internal>false</rhq.internal>
+ </properties>
<dependencies>
commit cc51a3cb86e68c5ef4e56bf1a2972c6f5c1a70db
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Aug 13 17:29:47 2012 +0200
[BZ 803737] - API checks based on clirr plugin
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 64ffe1c..8061224 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -17,6 +17,7 @@
<properties>
<!-- dependency versions -->
<jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
+ <rhq.internal>false</rhq.internal>
</properties>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index 5ba5465..556a182 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -15,6 +15,10 @@
<name>RHQ Plugin API</name>
<description>RHQ Plugin API used to write custom plugins</description>
+ <properties>
+ <rhq.internal>false</rhq.internal>
+ </properties>
+
<dependencies>
<!-- Internal Deps -->
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 2737ce3..9045533 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -14,6 +14,10 @@
<name>RHQ Utilities</name>
<description>generic utility classes for use by any RHQ module</description>
+ <properties>
+ <rhq.internal>false</rhq.internal>
+ </properties>
+
<dependencies>
<!-- Used by the (deprecated) legacy XML parser, which is used to parse RHQ license files. -->
@@ -130,6 +134,7 @@
</plugins>
</build>
</profile>
+
<profile>
<id>cobertura</id>
<activation>
diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml
index b3d036b..0bdc28b 100644
--- a/modules/enterprise/scripting/api/pom.xml
+++ b/modules/enterprise/scripting/api/pom.xml
@@ -10,6 +10,10 @@
<name>RHQ Scripting API</name>
<description>Provides API for adding scripting support to RHQ using different javax.scripting - based interpreters</description>
+ <properties>
+ <rhq.internal>false</rhq.internal>
+ </properties>
+
<build>
<plugins>
<plugin>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index aa0aad3..c567be7 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -24,6 +24,8 @@
<jboss-embeddable-ejb3.version>1.0.0.Alpha9</jboss-embeddable-ejb3.version>
<clean.db>true</clean.db>
+
+ <rhq.internal>false</rhq.internal>
</properties>
<dependencies>
@@ -903,6 +905,16 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Remote</include>
+ <include>**/ServerVersion</include>
+ </includes>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -1210,4 +1222,18 @@
</profile>
</profiles>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Remote</include>
+ <include>**/ServerVersion</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index b770b07..ce670b8 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -19,6 +19,7 @@
<properties>
<augeas-bindings.version>0.0.2</augeas-bindings.version>
+ <rhq.internal>false</rhq.internal>
</properties>
<dependencies>
@@ -208,7 +209,6 @@
</build>
</profile>
-
<profile>
<id>cobertura-plugins</id>
<activation>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 24d0e1c..7305db5 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -15,6 +15,10 @@
<name>RHQ Database Plugin</name>
<description>An abstract plugin for managing databases via JDBC</description>
+ <properties>
+ <rhq.internal>false</rhq.internal>
+ </properties>
+
<dependencies>
<dependency>
<groupId>com.h2database</groupId>
@@ -98,6 +102,7 @@
</plugins>
</build>
</profile>
+
<profile>
<id>cobertura-plugins</id>
<activation>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 8ca5f8a..5cc08b5 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -23,6 +23,7 @@
<jbossas.version>6.0.0.M1</jbossas.version>
<as5.version>6.1.0.Final</as5.version>
<as5.url>http://download.jboss.org/jbossas/6.1/jboss-as-distribution-6.1.0.Final.zip</as5.url>
+ <rhq.internal>false</rhq.internal>
</properties>
<dependencyManagement>
@@ -659,7 +660,7 @@
</plugins>
</build>
</profile>
-
+
<profile>
<id>cobertura-plugins</id>
<activation>
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index ecd2295..a02c9f3 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -27,6 +27,7 @@
<jboss-as-arquillian-container-managed.version>7.1.1.Final</jboss-as-arquillian-container-managed.version>
<java.tieredCompilation>-Dxxx</java.tieredCompilation>
<java.useCompressedOOPS>-Dxxx</java.useCompressedOOPS>
+ <rhq.internal>false</rhq.internal>
</properties>
@@ -611,6 +612,7 @@
</build>
</profile>
+
</profiles>
</project>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 866838e..13ea4ad 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -15,6 +15,10 @@
<name>RHQ JBossAS 3.2.x/4.x Plugin</name>
<description>A plugin for managing JBoss Application Server 3.2.x/4.x</description>
+ <properties>
+ <rhq.internal>false</rhq.internal>
+ </properties>
+
<dependencies>
<!-- internal -->
<!-- TODO: Move this up to the parent pom. -->
@@ -354,6 +358,7 @@
</plugins>
</build>
</profile>
+
<profile>
<id>cobertura-plugins</id>
<activation>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index c38a4d0..eba28da 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -15,7 +15,11 @@
<name>RHQ JMX Plugin</name>
<description>a plugin for managing a generic JMX-enabled application</description>
- <dependencies>
+ <properties>
+ <rhq.internal>false</rhq.internal>
+ </properties>
+
+ <dependencies>
<dependency>
<groupId>mc4j</groupId>
@@ -257,7 +261,7 @@
</plugins>
</build>
</profile>
-
+
<profile>
<id>cobertura-plugins</id>
<activation>
diff --git a/pom.xml b/pom.xml
index f6bd80d..7c1451e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,6 @@
<freemarker.version>2.3.18</freemarker.version>
<powermock.version>1.4.11</powermock.version>
<arquillian.version>1.0.1.Final</arquillian.version>
- <animal.sniffer.version>1.7</animal.sniffer.version>
<xercesImpl.version>2.9.1-jbossas-2</xercesImpl.version> <!-- see BZ-820629 and CVE-2009-2625 -->
<rhq.db.admin.username>rhqadmin</rhq.db.admin.username>
@@ -181,6 +180,17 @@
<localRepository>${user.home}/.m2/repository</localRepository>
<project.json.version>20080701</project.json.version>
+
+ <!-- Java API checking -->
+ <animal.sniffer.version>1.8</animal.sniffer.version>
+ <animal.sniffer.java.signature.groupId>org.codehaus.mojo.signature</animal.sniffer.java.signature.groupId>
+ <animal.sniffer.java.signature.artifactId>java16</animal.sniffer.java.signature.artifactId>
+ <animal.sniffer.java.signature.version>1.0</animal.sniffer.java.signature.version>
+ <!-- API checks -->
+ <clirr.version>2.4</clirr.version>
+ <!-- a default value for the child modules indicating that the module is not
+ part of our public API and is therefore not API-checked. -->
+ <rhq.internal>true</rhq.internal>
</properties>
@@ -741,7 +751,13 @@
</exclusions>
</configuration>
</plugin>
- </plugins>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>${clirr.version}</version>
+ </plugin>
+ </plugins>
</pluginManagement>
@@ -1036,7 +1052,9 @@
<target>
<property name="apidocs.dir" value="target/apidocs" />
- <copy dir="modules/core/domain/target/site/apidocs" todir="${apidocs.dir}/domain"/>
+ <copy todir="${apidocs.dir}/domain">
+ <fileset dir="modules/core/domain/target/site/apidocs" erroronmissingdir="false"/>
+ </copy>
</target>
</configuration>
<goals>
@@ -1074,9 +1092,9 @@
<id>java-api-check</id>
<configuration>
<signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java16</artifactId>
- <version>1.0</version>
+ <groupId>${animal.sniffer.java.signature.groupId}</groupId>
+ <artifactId>${animal.sniffer.java.signature.artifactId}</artifactId>
+ <version>${animal.sniffer.java.signature.version}</version>
</signature>
</configuration>
<phase>process-classes</phase>
@@ -1088,8 +1106,7 @@
</plugin>
</plugins>
- </build>
-
+ </build>
<repositories>
@@ -1328,17 +1345,99 @@
</build>
</profile>
- </profiles>
+ <profile>
+ <id>signature-check</id>
+ <activation>
+ <property>
+ <name>signature-check-base-version</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>signature-check</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <comparisonArtifacts>
+ <comparisonArtifact>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${signature-check-base-version}</version>
+ </comparisonArtifact>
+ </comparisonArtifacts>
+ <logResults>true</logResults>
+ <xmlOutputFile>${project.build.directory}/${project.build.finalName}.signature-check.xml</xmlOutputFile>
+ <failOnError>false</failOnError>
+ <skip>${rhq.internal}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <configuration>
+ <comparisonVersion>${signature-check-base-version}</comparisonVersion>
+ <comparisonArtifacts>
+ <comparisonArtifact>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${signature-check-base-version}</version>
+ </comparisonArtifact>
+ </comparisonArtifacts>
+ <skip>${rhq.internal}</skip>
+ <minSeverity>info</minSeverity>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+
+ <profile>
+ <activation>
+ <property>
+ <name>generate-dependency-graph</name>
+ <value>true</value>
+ </property>
+ </activation>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-overview-plugin</groupId>
+ <artifactId>maven-overview-plugin</artifactId>
+ <configuration>
+ <skip>${skip.overview}</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+</profiles>
<reporting>
<plugins>
- <plugin>
- <groupId>com.googlecode.maven-overview-plugin</groupId>
- <artifactId>maven-overview-plugin</artifactId>
- <version>RELEASE</version>
- </plugin>
-
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.0.1</version>
+ <reportSets>
+ <reportSet>
+ </reportSet>
+ </reportSets>
+ </plugin>
+
<!--
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
commit 96ea0adc66c658fa94ccb2ed8c2f95d14ab4c93f
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Sep 13 13:08:06 2012 +0200
[BZ 852169] - Add a copy of the downloadable sample modules to the CLI
samples/modules, so that they're available locally, too.
Updated the wording in the README file in samples to reflect the current
state of things.
diff --git a/modules/enterprise/remoting/cli/src/main/samples/README.txt b/modules/enterprise/remoting/cli/src/main/samples/README.txt
index 913cf62..96f0d46 100644
--- a/modules/enterprise/remoting/cli/src/main/samples/README.txt
+++ b/modules/enterprise/remoting/cli/src/main/samples/README.txt
@@ -6,12 +6,33 @@ have not undergone the same level of testing as other parts of the code base.
As such, the quality may not meet RHQ standards in some cases. Please consider
this when using these scripts for anything other than demonstration or testing.
-There may be inter-dependencies between some of the scripts. There is currently
-no mechanism in place to automatically handle script-level dependencies;
-consequently, you need to make sure to run scripts in the correct order. If a
-script has a dependency on other scripts, it will be documented within the
-script itself so that you know which scripts need to be run and in what order.
+There are inter-dependencies between some of the scripts. But because these
+scripts are not implemented as modules but rather as examples of what
+can be done, those dependencies are not expressed in code but have to be
+expressed manually on the commandline of the interactive CLI as suggested by
+the comments in the respective files (another reason is to keep the scripts
+backwards compatible in case someone used them in previous versions of RHQ
+that didn't offer CommonJS modules).
+In the "modules" directory, there are sample modules that mirror many of
+these sample scripts in a "modularized" form so that they are more easily
+available in your scripts (if you compare the files, you will find that
+the changes are fairly minor).
+
+The scripts in the "modules" directory are also available in the downloads
+section of the RHQ server. From your scripts, they are therefore available
+in at least two ways:
+
+1) var bundles = require("rhq://samples/modules/bundles");
+This will load the module stored locally in the samples/modules directory.
+
+2) var util = require("rhq://downloads/util");
+This will, as long as the CLI session is connected to an RHQ server, download
+the script from the RHQ server.
+
+Note that the latter, i.e. the "rhq://downloads/...", is also usable in the
+alert scripts that run on the RHQ server as alert notifications (unlike,
+of course, the former form).
Feedback
--------
diff --git a/modules/enterprise/remoting/cli/src/main/samples/modules/bundles.js b/modules/enterprise/remoting/cli/src/main/samples/modules/bundles.js
new file mode 100644
index 0000000..f7fbdc2
--- /dev/null
+++ b/modules/enterprise/remoting/cli/src/main/samples/modules/bundles.js
@@ -0,0 +1,150 @@
+/**
+ * file: bundles.js
+ *
+ * description: this file contains a few helper functions to make working
+ * with the bundle subsystem more convenient.
+ *
+ * Note that you must login before you can load the scripts.
+ *
+ * author: lkrejci(a)redhat.com
+ */
+
+var util = require('./util');
+
+/**
+ * A simple function to create a new bundle version from a zip file containing
+ * the bundle.
+ *
+ * @param pathToBundleZipFile the path to the bundle on the local file system
+ *
+ * @return an instance of BundleVersion class describing what's been created on
+ * the RHQ server.
+ */
+exports.createBundleVersion = function(pathToBundleZipFile) {
+ var bytes = getFileBytes(pathToBundleZipFile)
+ return BundleManager.createBundleVersionViaByteArray(bytes)
+}
+
+/**
+ * This is a helper function that one can use to find out what base directories
+ * given resource type defines.
+ * <p>
+ * These base directories then can be used when specifying bundle destinations.
+ *
+ * @param resourceTypeId
+ * @returns a java.util.Set of ResourceTypeBundleConfiguration objects
+ */
+exports.getAllBaseDirectories = function(resourceTypeId) {
+ var crit = new ResourceTypeCriteria;
+ crit.addFilterId(resourceTypeId);
+ crit.fetchBundleConfiguration(true);
+
+ var types = ResourceTypeManager.findResourceTypesByCriteria(crit);
+
+ if (types.size() == 0) {
+ throw "Could not find a resource type with id " + resourceTypeId;
+ } else if (types.size() > 1) {
+ throw "More than one resource type found with id " + resourceTypeId + "! How did that happen!";
+ }
+
+ var type = types.get(0);
+
+ return type.getResourceTypeBundleConfiguration().getBundleDestinationBaseDirectories();
+}
+
+/**
+ * Creates a new destination for given bundle. Once a destination exists,
+ * actual bundle versions can be deployed to it.
+ * <p>
+ * Note that this only differs from the <code>BundleManager.createBundleDestination</code>
+ * method in the fact that one can provide bundle and resource group names instead of their
+ * ids.
+ *
+ * @param destinationName the name of the destination to be created
+ * @param description the description for the destination
+ * @param bundleName the name of the bundle to create the destination for
+ * @param groupName name of a group of resources that the destination will handle
+ * @param baseDirName the name of the basedir definition that represents where inside the
+ * deployment of the individual resources the bundle will get deployed
+ * @param deployDir the specific sub directory of the base dir where the bundles will get deployed
+ *
+ * @return BundleDestination object
+ */
+exports.createBundleDestination = function(destinationName, description, bundleName, groupName, baseDirName, deployDir) {
+ var groupCrit = new ResourceGroupCriteria;
+ groupCrit.addFilterName(groupName);
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(groupCrit);
+
+ if (groups.empty) {
+ throw "No group called '" + groupName + "' found.";
+ }
+
+ var group = groups.get(0);
+
+ var bundleCrit = new BundleCriteria;
+ bundleCrit.addFilterName(bundleName);
+ var bundles = BundleManager.findBundlesByCriteria(bundleCrit);
+
+ if (bundles.empty) {
+ throw "No bundle called '" + bundleName + "' found.";
+ }
+
+ var bundle = bundles.get(0);
+
+ return BundleManager.createBundleDestination(bundle.id, destinationName, description, baseDirName, deployDir, group.id);
+}
+
+/**
+ * Tries to deploy given bundle version to provided destination using given configuration.
+ * <p>
+ * This method blocks while waiting for the deployment to complete or fail.
+ *
+ * @param destination the bundle destination (or id thereof)
+ * @param bundleVersion the bundle version to deploy (or id thereof)
+ * @param deploymentConfiguration the deployment configuration. This can be an ordinary
+ * javascript object (hash) or an instance of RHQ's Configuration. If it is the former,
+ * it is converted to a Configuration instance using the <code>asConfiguration</code>
+ * function from <code>util.js</code>. Please consult the documentation of that method
+ * to understand the limitations of that approach.
+ * @param description the deployment description
+ * @param isCleanDeployment if true, perform a wipe of the deploy directory prior to the deployment; if false,
+ * perform as an upgrade to the existing deployment, if any
+ *
+ * @return the BundleDeployment instance describing the deployment
+ */
+exports.deployBundle = function(destination, bundleVersion, deploymentConfiguration, description, isCleanDeployment) {
+ var destinationId = destination;
+ if (typeof(destination) == 'object') {
+ destinationId = destination.id;
+ }
+
+ var bundleVersionId = bundleVersion;
+ if (typeof(bundleVersion) == 'object') {
+ bundleVersionId = bundleVersion.id;
+ }
+
+ var deploymentConfig = deploymentConfiguration;
+ if (!(deploymentConfiguration instanceof Configuration)) {
+ deploymentConfig = util.asConfiguration(deploymentConfiguration);
+ }
+
+ var deployment = BundleManager.createBundleDeployment(bundleVersionId, destinationId, description, deploymentConfig);
+
+ deployment = BundleManager.scheduleBundleDeployment(deployment.id, isCleanDeployment);
+
+ var crit = new BundleDeploymentCriteria;
+ crit.addFilterId(deployment.id);
+
+ while (deployment.status == BundleDeploymentStatus.PENDING || deployment.status == BundleDeploymentStatus.IN_PROGRESS) {
+ java.lang.Thread.currentThread().sleep(1000);
+ var dps = BundleManager.findBundleDeploymentsByCriteria(crit);
+ if (dps.empty) {
+ throw "The deployment disappeared while we were waiting for it to complete.";
+ }
+
+ deployment = dps.get(0);
+ }
+
+ return deployment;
+}
+
diff --git a/modules/enterprise/remoting/cli/src/main/samples/modules/drift.js b/modules/enterprise/remoting/cli/src/main/samples/modules/drift.js
new file mode 100644
index 0000000..b07eaec
--- /dev/null
+++ b/modules/enterprise/remoting/cli/src/main/samples/modules/drift.js
@@ -0,0 +1,240 @@
+/**
+ * file: drift.js
+ *
+ * description: This script contains functions that illustrate and highlight
+ * drift monitoring functionality. Some of the functionality demonstrated in
+ * this script is currently available only via RHQ's remote client (and CLI)
+ * at the time of this writing.
+ *
+ * Note that you must login before you can load the scripts. Also please note
+ * that if a function is not documented, then it is not intended for public
+ * use. It is used only as an internal helper function.
+ *
+ * author: jsanda(a)redhat.com
+ */
+
+var util = require("./util");
+
+/**
+ * description: Generates a snapshot of changes sets belonging to a particular
+ * drift definition of a specific resource. By default all change sets are
+ * included in the snapshot. An optional third argument can be specified to
+ * limit or control the number of change sets included in the snapshot.
+ *
+ * Note that a snapshot is an accumulation or aggregation of change sets that
+ * provides a view of a resource, or more precisely, all files being monitored
+ * for drift, at a particular version or point in time.
+ *
+ * arguments:
+ * rid: A resource id, expected to be an integer
+ *
+ * defName: The drift definition name as a string
+ *
+ * filter: (optional) A map or JS object that limits the number of
+ * change sets included in the snapshot. It should specify two
+ * properties - startVersion and endVersion.
+ *
+ * return: A org.rhq.core.domamin.drift.DriftSnapshot object
+ *
+ * usage:
+ * // generates a snapshot that includes all change sets belonging to the
+ * // mydrift drift configuration.
+ * createSnapshot(123, 'mydrift')
+ *
+ * // generates a snapshot that includes change sets 3 through 5 inclusive.
+ * createSnapshot(123, 'mydrift', {startVersion: 3, endVersion: 5})
+ */
+exports.createSnapshot = function(rid, defName) {
+ var driftDef = findDriftDefinition(rid, function(d) { return defName.equals(d.name) });
+ var snapshotRequest;
+
+ if (arguments.length > 2) {
+ var filters = arguments[2];
+ snapshotRequest = DriftSnapshotRequest(driftDef.id, filters.startVersion, filters.endVersion);
+ } else {
+ snapshotRequest = DriftSnapshotRequest(driftDef.id);
+ }
+
+ return DriftManager.getSnapshot(snapshotRequest);
+}
+
+/** private helper function to find a drift definition by a filter */
+function findDriftDefinition(rid, filter) {
+ var criteria = ResourceCriteria();
+ criteria.addFilterId(rid);
+ criteria.fetchDriftDefinitions(true);
+
+ var resources = ResourceManager.findResourcesByCriteria(criteria);
+ var resource = resources.get(0);
+
+ return util.find(resource.driftDefinitions, function(config) {
+ return filter(DriftDefinition(config));
+ });
+}
+
+/**
+ * description: Generates a diff report that is printed to the console. By
+ * default this function generates a snapshot diff. The function expects two
+ * arguments which should be DriftSnapshot objects. A diff between those two
+ * snapshots is generated and printed to the console. A path can be specified
+ * as an optional third argument. If a path is a specified as a third argument,
+ * then a file diff will be performed using the file that matches the path in
+ * each change set. The format will be a unified diff.
+ *
+ * Note that the snapshots can be from the same or from different resources;
+ * however, if they are from different resources, it is assumed that the
+ * resources are of the same type.
+ *
+ * arguments:
+ * s1: A DriftSnapshot object
+ *
+ * s2: A DriftSnapshot object
+ *
+ * path: (optional) A string that specifies a path that exists in both s1 and
+ * s2.
+ *
+ * return: This function does not return a useful value. It may be an empty
+ * string or it could be null. Instead of returning its results, the function
+ * prints them to the CLI console. As such, this function is intended for
+ * use from the interactive CLI shell.
+ *
+ * usage:
+ * // Generates a snapshot diff report
+ * diff(s1, s2)
+ *
+ * // Generates a file diff report in the unified format
+ * diff(s1, s2, 'jboss_home/bin/run.conf')
+ */
+exports.diff = function(s1, s2) {
+ var theDiff = s1.diff(s2);
+
+ if (arguments.length > 2) {
+ var path = arguments[2];
+
+ if (theDiff.elementsInConflict.size() == 0) {
+ // If the snapshot diff reports no files in conflict, then there
+ // is no need to call the server to perform the file diff. We can
+ // instead return quickly.
+ println("There are no differences to report");
+ return "";
+ }
+
+ var pathFilter = function(entry) { return entry.path == path; };
+ var e1 = util.find(s1.driftInstances, pathFilter);
+ var e2 = util.find(s2.driftInstances, pathFilter);
+
+ var fileDiff = DriftManager.generateUnifiedDiff(e1, e2);
+ util.foreach(fileDiff.diff, println);
+ return "";
+ }
+
+ function printEntry(entry) {
+ println(entry.newDriftFile.hashId + '\t' + entry.path);
+ }
+
+ function report(header, elements) {
+ println(header + ':');
+ util.foreach(elements, printEntry);
+ println('\n');
+ }
+
+ report('elements in conflict', theDiff.elementsInConflict);
+ report('elements not in left', theDiff.elementsNotInLeft);
+ report('elements not in right', theDiff.elementsNotInRight);
+}
+
+/**
+ * description: Generates and returns the drift history for a file being
+ * monitored for drift. This function takes three arguments. The first two, the
+ * resource id drift configuration name, uniquely identify the drift
+ * configuration. The third argument specifies a path that is set up for
+ * monitoring by the drift configuration.
+ *
+ * arguments:
+ * rid: A resource id
+ *
+ * configName: A drift configuration name
+ *
+ * path: A path that is set up for drift monitoring by the drift
+ * configuration that is identified by the first two arguments. The path
+ * should be specified as relative to the base directory from which
+ * monitoring is done.
+ *
+ * return: A History object, which is a native JS object. This object contains
+ * a few methods for working with the file history:
+ *
+ * list: prints a short summary of all versions of the file
+ * view: returns the contents of a particular version of the file
+ * compare: compares two versions of the file and prints a unified diff
+ *
+ * usage:
+ * $ history = fetchHistory(123, 'mydrift', 'bin/run.conf')
+ * $ history.list() // prints a summary of all versions of 'bin/run.conf'
+ * $ history.view(1) // returns the full contents of version 1 of the file
+ * $ history.compare(1, 2) // generates and prints a unified diff of versions 1 and 2
+ */
+exports.fetchHistory = function(rid, driftDefName, path) {
+ function History() {
+ var entries = [];
+
+ function findDrift(version) {
+ return util.find(entries, function(drift) {
+ return drift.changeSet.version == version
+ });
+ }
+
+
+ var generate = function() {
+ entries = [];
+ var criteria = GenericDriftCriteria();
+ criteria.addFilterResourceIds([rid]);
+ criteria.fetchChangeSet(true);
+ criteria.addFilterPath(path);
+
+ var drifts = DriftManager.findDriftsByCriteria(criteria);
+ util.foreach(drifts, function(drift) {
+ if (drift.changeSet.driftDefinition.name == driftDefName &&
+ drift.path == path) {
+ entries.push(drift);
+ }
+ });
+
+ entries.sort(function(d1, d2) {
+ return d1.changeSet.version <= d2.changeSet.version
+ });
+ }
+
+ this.list = function() {
+ var format = java.text.DateFormat.getDateTimeInstance();
+ println(path + "\n-----------------------------------");
+ util.foreach(entries, function(drift) {
+ println(drift.changeSet.version + "\t" + format.format(drift.ctime));
+ });
+ }
+
+ this.view = function(version) {
+ var drift = findDrift(version);
+ if (drift == null) {
+ return "Could not find version " + version;
+ }
+ return java.lang.String(DriftManager.getDriftFileAsByteArray(drift.newDriftFile.hashId));
+ }
+
+ this.compare = function(v1, v2) {
+ var d1 = findDrift(v1);
+ if (d1 == null) {
+ return "Could not find version " + v1;
+ }
+ var d2 = findDrift(v2);
+ if (d2 == null) {
+ return "Could not find version " + v2;
+ }
+ var fileDiff = DriftManager.generateUnifiedDiff(d1, d2);
+ util.foreach(fileDiff.diff, println);
+ }
+
+ generate();
+ }
+
+ return new History();
+}
diff --git a/modules/enterprise/remoting/cli/src/main/samples/modules/jbossas.js b/modules/enterprise/remoting/cli/src/main/samples/modules/jbossas.js
new file mode 100644
index 0000000..6369cc1
--- /dev/null
+++ b/modules/enterprise/remoting/cli/src/main/samples/modules/jbossas.js
@@ -0,0 +1,811 @@
+/**
+ * This module contains a variety of utility functions for working with JBoss AS in different versions.
+ *
+ * @author Lukas Krejci
+ */
+
+
+var util = require('./util');
+var bundles = require("./bundles");
+
+//init the version-specific objects. We'll be adding the functions to them further down below.
+exports.as7 = {}
+
+/**
+ * This creates a new destination in the JBoss AS (4,5,6,7) servers from the provided
+ * group and deploys the application provided by the bundle to it. Once the app is deployed,
+ * the servers in the group are sequentially stopped and started.
+ *
+ * @param bundleZipFile the path to the zip file with the application bundle
+ * @param deploymentConfiguration the deployment configuration required by the bundle.
+ * See the <code>deployBundle</code> in <code>bundles.js</code> to find out about
+ * supported formats.
+ * @param groupName the name of the compatible group of JBossAS servers to deploy the bundle to
+ * @param destinationName the name of the destination that will be created so that the bundle
+ * can be deployed to it
+ * @param destinationDescription the description of the destination
+ * @param baseDirName the name of the base directory for the deployment. Each resource type
+ * defines a list of deployment base directories which you can review using, for example,
+ * the <code>getAllBaseDirectories(resourceTypeId)</code> function from <code>bundles.js</code>.
+ * @param deployDir the name of the directory under the base dir in which the bundle will be
+ * deployed to.
+ *
+ * @return the BundleDeployment instance
+ */
+exports.createAppAndRestart = function(bundleZipFile, deploymentConfiguration, groupName, destinationName, destinationDescription, baseDirName, deployDir) {
+ var gcrit = new ResourceGroupCriteria;
+ gcrit.addFilterName(groupName);
+ gcrit.fetchResourceType(true);
+
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(gcrit);
+ if (groups.empty) {
+ throw "Could not find a resource group called " + groupName;
+ } else if (groups.size() > 1) {
+ throw "There are more than 1 groups called " + groupName;
+ }
+
+ var group = groups.get(0);
+ var targetResourceType = group.resourceType;
+
+ var deployFn = function(restartFn) {
+
+ var bundleVersion = bundles.createBundleVersion(bundleZipFile);
+ var destination = BundleManager.createBundleDestination(bundleVersion.bundle.id, destinationName, destinationDescription, baseDirName, deployDir, group.id);
+
+ var deployment = bundles.deployBundle(bundleVersion, destination, deploymentConfiguration, null);
+
+ if (deployment.status != BundleDeploymentStatus.SUCCESS) {
+ throw "Deployment wasn't successful: " + deployment;
+ }
+
+ restartFn(group);
+
+ return deployment;
+ };
+
+ if (targetResourceType.plugin == "JBossAS" && targetResourceType.name == "JBossAS Server") {
+ return deployFn(_restartAS4);
+ } else if (targetResourceType.plugin == "JBossAS5" && targetResourceType.name == "JBossAS Server") {
+ return deployFn(_restartAS5);
+ } else if (targetResourceType.plugin == "jboss-as-7" &&
+ (targetResourceType.name == "JBossAS7-Standalone" ||
+ targetResourceType.name == "JBossAS-Managed")) {
+ return deployFn(_restartAS7);
+ }
+
+ throw "The resource group the destination targets doesn't seem to be a JBoss AS server group.";
+}
+
+/**
+ * Deploys an updated bundle of an enterprise application to a destination that
+ * points to a group of JBoss AS(4,5,6,7) servers and then stops all the servers
+ * serially and then starts them up again sequentially.
+ *
+ * @param bundleZipFile
+ * the path to the bundle zip file with the application
+ * @param jbasDestination
+ * the bundle destination the bundle should be deployed to (or id
+ * thereof)
+ * @param deploymentConfiguration
+ * the deployment configuration. This can be an ordinary javascript
+ * object (hash) or an instance of RHQ's Configuration. If it is the
+ * former, it is converted to the Configuration instance using the
+ * <code>asConfiguration</code> function from <code>util.js</code>.
+ * Please consult the documentation of that method to understand the
+ * limitations of that approach.
+ * @param description
+ * the deployment description
+ *
+ * @return the deployment instance
+ */
+exports.updateAppAndRestart = function(bundleZipFile, jbasDestination, deploymentConfiguration) {
+ // first figure out the jbas version we are deploying to
+ var destinationId = jbasDestination;
+ if (typeof(jbasDestination) == 'object') {
+ destinationId = jbasDestination.id;
+ }
+
+ var destCrit = new BundleDestinationCriteria
+ destCrit.fetchGroup(true)
+
+ var destinations = BundleManager.findBundleDestinationsByCriteria(destCrit);
+
+ if (destinations.empty) {
+ throw "No destinations corresponding to " + jbasDestination + " found on the server.";
+ }
+
+ var destination = destinations.get(0);
+
+ var targetResourceType = destination.group.resourceType;
+
+ if (targetResourceType == null) {
+ throw "This function expects a compatible group of JBoss AS (4,5,6 or 7) resources but the provided destination is connected with " + destination.group;
+ }
+
+ var deployFn = function(restartFn) {
+ var bundleVersion = bundles.createBundleVersion(bundleZipFile);
+ var deployment = bundles.deployBundle(bundleVersion, destination, deploymentConfiguration, null);
+
+ if (deployment.status != BundleDeploymentStatus.SUCCESS) {
+ throw "Deployment wasn't successful: " + deployment;
+ }
+
+ restartFn(destination.group);
+
+ return deployment;
+ };
+
+ if (targetResourceType.plugin == "JBossAS" && targetResourceType.name == "JBossAS Server") {
+ return deployFn(_restartAS4);
+ } else if (targetResourceType.plugin == "JBossAS5" && targetResourceType.name == "JBossAS Server") {
+ return deployFn(_restartAS5);
+ } else if (targetResourceType.plugin == "jboss-as-7" &&
+ (targetResourceType.name == "JBossAS7-Standalone" ||
+ targetResourceType.name == "JBossAS-Managed")) {
+ return deployFn(_restartAS7);
+ }
+
+ throw "The resource group the destination targets doesn't seem to be a JBoss AS server group.";
+}
+
+/**
+ * This function adds an AS7 server to a cluster with another AS7 instance, using
+ * the provided node name as its identifier.
+ * <p>
+ * This method only makes the new member use the same configuration as the existing
+ * member and synchronizes its jgroups, messaging and modcluster socket bindings
+ * with the cluster. Optionally it also copies over all the deployments to the
+ * new member.
+ * <p>
+ * The configurations are therefore assumed to be otherwise compatible - i.e.
+ * the infinispan cache containers should be configured correctly (or left at
+ * default values, which are configured correctly), etc.
+ *
+ * @param newAs7Resource the resource proxy of the AS7 instance to add
+ * @param newNodeName the node name, i.e. unique identification, of the new member
+ * in the cluster
+ * @param existingClusterMemberResource an AS7 instance that belongs to a cluster
+ * the new member should join into.
+ * @param copyDeployments whether or not to copy the deployments from the existing
+ * member to the new member
+ */
+exports.as7.addToCluster = function(newAs7Resource, newNodeName, existingClusterMemberResource, doCopyDeployments) {
+ println("Reading config of the existing cluster member");
+ var existingMember = {
+ 'id' : existingClusterMemberResource.id,
+ 'resourceConfiguration' : _getLiveResourceConfiguration(existingClusterMemberResource),
+ 'pluginConfiguration' : _getPluginConfiguration(existingClusterMemberResource)
+ };
+
+ var clusterConfig = _getClusterSignificantConfig(existingClusterMemberResource.children,
+ existingMember.pluginConfiguration, existingMember.resourceConfiguration);
+
+ println("Reading config of the new member");
+ var newMember = {
+ 'id' : newAs7Resource.id,
+ 'resourceConfiguration' : _getLiveResourceConfiguration(newAs7Resource),
+ 'pluginConfiguration' : _getPluginConfiguration(newAs7Resource)
+ };
+
+ var memberConfig = _getClusterSignificantConfig(newAs7Resource.children, newMember.pluginConfiguration, newMember.resourceConfiguration);
+
+ var memberResourceConfiguration = newMember.resourceConfiguration.deepCopy(false);
+
+ if (memberConfig['config'] != clusterConfig['config']) {
+ println("The configurations of the servers differ.\n" +
+ "The new cluster member's configuration will be changed to match the configuration of the existing member.");
+
+ newAs7Resource.updatePluginConfiguration(_changeConfig(newMember.pluginConfiguration, clusterConfig['config']));
+
+ //we need to restart straight away so that we see the changes to the
+ //rest of the configuration caused by the change of current config.
+ println("Restarting the new cluster member to switch it to the new configuration.");
+ newAs7Resource.restart();
+
+ //refresh the resource
+ newAs7Resource = ProxyFactory.getResource(newMember.id);
+ newMember = {
+ 'id' : newAs7Resource.id,
+ 'resourceConfiguration' : _getLiveResourceConfiguration(newAs7Resource),
+ 'pluginConfiguration' : _getPluginConfiguration(newAs7Resource)
+ };
+
+ //refresh the cluster specific config after the restart with the new
+ //config
+ memberConfig = _getClusterSignificantConfig(newAs7Resource.children, newMember.pluginConfiguration, newMember.resourceConfiguration);
+ memberResourceConfiguration = newMember.resourceConfiguration;
+ }
+
+ //now check what's the node name we see
+ if (memberConfig['node-name'] != newNodeName) {
+ println("Updating the node name of the new cluster member from '" + memberConfig['node-name'] + "' to '" + newNodeName + "'");
+ _updateNodeName(memberResourceConfiguration, newNodeName);
+
+ newAs7Resource.updateResourceConfiguration(memberResourceConfiguration);
+ memberResourceConfiguration = newMember.resourceConfiguration.deepCopy(false);
+ }
+
+ //now apply the socket binding changes for jgroups and other cluster
+ //significant subsystems
+ //first find the socket binding group config in the new member
+ for(i in newAs7Resource.children) {
+ var child = newAs7Resource.children[i];
+ if (child.resourceType.name == 'SocketBindingGroup' &&
+ child.resourceType.plugin == 'JBossAS7') {
+
+ println("Updating socket bindings of jgroups, messaging and modcluster subsystems");
+
+ var resourceConfig = _getLiveResourceConfiguration(child);
+
+ var portOffset = javascriptString(resourceConfig.getSimpleValue('port-offset', '0'));
+ var clusterMemberPortOffset = clusterConfig['port-offset'];
+
+ var newConfig = resourceConfig.deepCopy(false);
+
+ _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['jgroups']);
+ _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['messaging']);
+ _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['modcluster']);
+
+ child.updateResourceConfiguration(newConfig);
+ }
+ }
+
+ println("Restarting the new member for the new socket bindings to take effect.");
+ newAs7Resource.restart();
+
+ if (doCopyDeployments) {
+ println("Copying the deployments to the new cluster member...");
+ copyDeployments(existingClusterMemberResource, newAs7Resource);
+
+ println("Restarting the new cluster member.");
+ newAs7Resource.restart();
+ }
+}
+
+/**
+ * Copies all deployments from the source to the target. Both resources must
+ * be standalone AS7 servers.
+ *
+ * @param sourceAS7 the resource id or object of the source AS7 standalone instance
+ * @param targetAS7 the resource id or object of the target AS7 standalone instance
+ */
+exports.as7.copyDeployments = function(sourceAS7, targetAS7) {
+ if (typeof sourceAS7 == 'object') {
+ sourceAS7 = sourceAS7.id;
+ }
+
+ if (typeof targetAS7 == 'object') {
+ targetAS7 = targetAS7.id;
+ }
+
+ var deploymentResourceType = ResourceTypeManager.getResourceTypeByNameAndPlugin('Deployment', 'JBossAS7');
+
+ var deploymentsCrit = new ResourceCriteria;
+ deploymentsCrit.addFilterParentResourceId(sourceAS7);
+ deploymentsCrit.addFilterResourceTypeId(deploymentResourceType.id);
+
+ var unlimitedPageControl = PageControl.unlimitedInstance;
+
+ var sourceDeployments = ResourceManager.findResourcesByCriteria(deploymentsCrit);
+ var iterator = sourceDeployments.iterator();
+ while (iterator.hasNext()) {
+ var deploymentResource = iterator.next();
+ //get a resource proxy for easy access to configurations, etc.
+ deploymentResource = ProxyFactory.getResource(deploymentResource.id);
+
+ println("Copying deployment " + deploymentResource.name);
+
+ var installedPackage = ContentManager.getBackingPackageForResource(deploymentResource.id);
+ var content = ContentManager.getPackageBytes(deploymentResource.id, installedPackage.id);
+
+ var runtimeName = deploymentResource.resourceConfiguration.getSimpleValue('runtime-name', deploymentResource.name);
+
+ var deploymentConfiguration = new Configuration;
+ deploymentConfiguration.put(new PropertySimple('runtimeName', runtimeName));
+
+ //so now we have both metadata and the data of the deployment, let's
+ //push a copy of it to the target server
+ var history = ResourceFactoryManager.createPackageBackedResource(targetAS7,
+ deploymentResourceType.id, deploymentResource.name,
+ deploymentResource.pluginConfiguration,
+ installedPackage.packageVersion.generalPackage.name,
+ installedPackage.packageVersion.version,
+ installedPackage.packageVersion.architecture.id,
+ deploymentConfiguration, content, null);
+
+ while (history.status.name() == 'IN_PROGRESS') {
+ java.lang.Thread.sleep(1000);
+ //the API for checking the create histories is kinda weird..
+ var histories = ResourceFactoryManager.findCreateChildResourceHistory(targetAS7, null, null, unlimitedPageControl);
+ var hit = histories.iterator();
+ var found = false;
+ while(hit.hasNext()) {
+ var h = hit.next();
+
+ if (h.id == history.id) {
+ history = h;
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ throw "The history object for the deployment seems to have disappeared, this is very strange.";
+ }
+ }
+
+ println("Deployment finished with status: " + history.status.toString() +
+ (history.status.name() == 'SUCCESS' ? "." : (", error message: " + history.errorMessage + ".")));
+ }
+}
+
+function _getConfigName(as7PluginConfig) {
+ var argsValue = as7PluginConfig.getSimpleValue('startScriptArgs', '');
+
+ var args = argsValue.split('\n');
+
+ var possibleParams = ['-c ', '-c=', '--server-config='];
+
+ var ret = null;
+ for (i in args) {
+ var arg = args[i];
+
+ var found = false;
+
+ for(j in possibleParams) {
+ var param = possibleParams[j];
+ var pos = arg.indexOf(param);
+
+ if (pos >= 0) {
+ ret = arg.substring(pos + param.length).trim();
+ found = true;
+ break;
+ }
+ }
+
+ if (found) {
+ break;
+ }
+ }
+
+ if (ret != null && ret.startsWith('%') && ret.endsWith('%')) {
+ var pluginConfRef = ret.substring(1, ret.length - 1);
+ ret = as7PluginConfig.getSimpleValue(pluginConfigRef, null);
+ }
+
+ return ret;
+}
+
+function _changeConfig(pluginConfig, configName) {
+ var argsValue = javascriptString(pluginConfig.getSimpleValue('startScriptArgs', ''));
+
+ var args = argsValue.split('\n');
+
+ var possibleParams = ['-c ', '-c=', '--server-config='];
+
+ var updated = false;
+
+ for (i in args) {
+ var arg = args[i];
+
+ for(j in possibleParams) {
+ var param = possibleParams[j];
+
+ var pos = arg.indexOf(param);
+
+ if (pos >= 0) {
+ args[i] = param + configName;
+ updated = true;
+ break;
+ }
+ }
+
+ if (updated) {
+ break;
+ }
+ }
+
+ if (!updated) {
+ args.push("-c " + configName);
+ }
+
+ //join the config back together
+ for(i in args) {
+ if (i == 0) {
+ argsValue = args[i];
+ } else {
+ argsValue += "\n" + args[i];
+ }
+ }
+
+ pluginConfig.put(new PropertySimple('startScriptArgs', argsValue));
+
+ return pluginConfig;
+}
+
+/**
+ * The config properties of AS7 can have a form of ${propertyName:defaultvalue}.
+ * Because we can't figure out the value of the property if it is defined,
+ * (or get at its default value), we return the following hash from this function
+ * {
+ * property : propertyName,
+ * value : defaultvalue
+ * }
+ *
+ * At least one of the keys in the above hash will have a value.
+ */
+function _parseValueFromExpr(expr) {
+ var strExpr = expr + '';
+ if (strExpr.indexOf('${') == 0) {
+ var colonIdx = strExpr.indexOf(':');
+ if (colonIdx == -1) {
+ return { 'property' : expr };
+ } else {
+ var property = strExpr.substring(2, colonIdx);
+ var value = strExpr.substring(colonIdx + 1, strExpr.length - 1);
+
+ return { 'property' : property, 'value' : value };
+ }
+ } else {
+ return { 'value' : expr };
+ }
+}
+
+/**
+ * This converts the result of _parseValueFromExpr() function back into the
+ * ${property:defaultvalue} format.
+ */
+function _composeValueExpr(parsedValue) {
+ if (parsedValue.property == undefined) {
+ return parsedValue.value;
+ } else {
+ return '${' + parsedValue.property + ':' + parsedValue.value + '}';
+ }
+}
+
+function _updateNodeName(serverResourceConfiguration, newNodeName) {
+ //define it as a system prop
+ var systemProps = serverResourceConfiguration.getList('*2');
+ if (systemProps == null) {
+ systemProps = new PropertyList('*2');
+ serverResourceConfiguration.put(systemProps);
+ }
+
+ var it = systemProps.list.iterator();
+ var updated = false;
+ while (it.hasNext()) {
+ var systemProp = it.next();
+ var systemPropName = javascriptString(systemProp.getSimpleValue('name', null));
+ if (systemPropName == 'jboss.node.name') {
+ var systemPropValue = systemProp.getSimple('value');
+ if (systemPropValue == null) {
+ systemPropValue = new PropertySimple('value', newNodeName);
+ systemProp.put(systemPropValue);
+ } else {
+ systemPropValue.setValue(newNodeName);
+ }
+
+ updated = true;
+ break;
+ }
+ }
+
+ if (!updated) {
+ var systemProp = new PropertyMap('*:name');
+ systemProp.put(new PropertySimple('name', 'jboss.node.name'));
+ systemProp.put(new PropertySimple('value', newNodeName));
+ systemProps.add(systemProp);
+ }
+}
+
+function _updateSocketBindings(socketBindingsConfig, portOffset, clusterMemberPortOffset, socketBindingConfig) {
+ portOffset = _parseValueFromExpr(portOffset);
+ clusterMemberPortOffset = _parseValueFromExpr(clusterMemberPortOffset);
+
+ var portOffsetValue = portOffset.value != undefined ? portOffset.value : 0;
+ var clusterMemberPortOffsetValue = clusterMemberPortOffset.value != undefined ?
+ clusterMemberPortOffset.value : 0;
+
+ var portOffsetDiff = clusterMemberPortOffsetValue - portOffsetValue;
+
+ var ports = socketBindingsConfig.get('*');
+ var portIterator = ports.list.iterator();
+
+ var appliedProperties = [];
+
+ while (portIterator.hasNext()) {
+ var port = portIterator.next();
+
+ var name = port.getSimpleValue('name', null);
+
+ if (socketBindingConfig[name] != undefined) {
+ //k, this is a significant config, port it over
+
+ //compute the value of the ports
+ if (socketBindingConfig[name]['fixed-port'] == 'true') {
+ port.put(new PropertySimple('port:expr', socketBindingConfig[name]['port:expr']));
+ port.put(new PropertySimple('multicast-port:expr', socketBindingConfig[name]['multicast-port:expr']));
+ port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address']));
+ port.put(new PropertySimple('fixed-port', 'true'));
+ } else {
+ var portExprToUse = _parseValueFromExpr(socketBindingConfig[name]['port:expr']);
+ if (portExprToUse.value != undefined) {
+ portExprToUse.value = portOffsetDiff + parseInt(portExprToUse.value) + '';
+ }
+
+ var multicastPortExprToUse = _parseValueFromExpr(socketBindingConfig[name]['multicast-port:expr']);
+ if (multicastPortExprToUse.value != undefined) {
+ multicastPortExprToUse.value = portOffsetDiff + parseInt(multicastPortExprToUse.value) + '';
+ }
+
+ port.put(new PropertySimple('port:expr', _composeValueExpr(portExprToUse)));
+ port.put(new PropertySimple('multicast-port:expr', _composeValueExpr(multicastPortExprToUse)));
+ port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address']));
+ port.put(new PropertySimple('fixed-port', 'false'));
+ }
+ appliedProperties.push(name);
+ }
+ }
+
+ //I need contains() and Rhino's Array object apparently doesn't have indexOf()
+ //which I could otherwise use.
+ appliedProperties = java.util.Arrays.asList(appliedProperties);
+
+ //now add to the list the props that were not there
+ for(name in socketBindingConfig) {
+ if (appliedProperties.contains(name)) {
+ continue;
+ }
+
+ var port = new PropertyMap('binding');
+ ports.add(port);
+
+ port.put(new PropertySimple('name', name));
+ port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address']));
+ port.put(new PropertySimple('fixed-port', socketBindingConfig[name]['fixed-port']));
+
+ var portExprToUse = _parseValueFromExpr(socketBindingConfig[name]['port:expr']);
+ if (portExprToUse.value != undefined && !socketBindingConfig[name]['fixed-port']) {
+ portExprToUse.value = portOffsetDiff + parseInt(portExprToUse.value) + '';
+ }
+
+ var multicastPortExprToUse = _parseValueFromExpr(socketBindingConfig[name]['multicast-port:expr']);
+ if (multicastPortExprToUse.value != undefined && !socketBindingConfig[name]['fixed-port']) {
+ multicastPortExprToUse.value = portOffsetDiff + parseInt(multicastPortExprToUse.value) + '';
+ }
+
+ port.put(new PropertySimple('port:expr', _composeValueExpr(portExprToUse)));
+ port.put(new PropertySimple('multicast-port:expr', _composeValueExpr(multicastPortExprToUse)));
+ }
+}
+
+
+/**
+ * Returns a javascript hash of configuration properties significant for the
+ * cluster configuration.
+ *
+ * This method is quite simplistic - it merely reads out the important socket
+ * bindings and Infinispan configuration properties.
+ *
+ * It doesn't try to be smart about specifying which concrete caches and cache
+ * containers are used for individual subsystems like EJB3, JPA or web apps.
+ *
+ * @param resource the resource proxy of the AS7
+ */
+function _getClusterSignificantConfig(children, pluginConfiguration, resourceConfiguration) {
+ var ret = {};
+
+ ret['config'] = javascriptString(_getConfigName(pluginConfiguration));
+
+ ret['node-name'] = javascriptString(resourceConfiguration.getSimpleValue('node-name', null));
+
+ //the standalone server has a single socket binding group
+ for(var i in children) {
+ var child = children[i];
+ if (child.resourceType.plugin != 'JBossAS7') {
+ continue;
+ }
+ if (child.resourceType.name == 'SocketBindingGroup') {
+
+ var resourceConfig = _getLiveResourceConfiguration(child);
+
+ ret['port-offset'] = javascriptString(resourceConfig.getSimpleValue('port-offset', '0'));
+ var ports = resourceConfig.get('*');
+ var portIterator = ports.list.iterator();
+
+ var jgroups = {};
+ var messaging = {};
+ var modcluster = {};
+
+ ret['jgroups'] = jgroups;
+ ret['messaging'] = messaging;
+ ret['modcluster'] = modcluster;
+
+ while (portIterator.hasNext()) {
+ var port = portIterator.next();
+ var name = javascriptString(port.getSimpleValue('name', null));
+
+ if (name.indexOf('jgroups') == 0) {
+ jgroups[name] = _getSocketBinding(port);
+ } else if (name.indexOf('messaging') == 0) {
+ messaging[name] = _getSocketBinding(port);
+ } else if (name.indexOf('modcluster') == 0) {
+ modcluster[name] = _getSocketBinding(port);
+ }
+ }
+ } else if (child.resourceType.name == 'Infinispan') {
+ var ispn = {};
+ ret['infinispan'] = ispn;
+
+ //This has disappeared
+ //ispn['default-cache-container'] = javascriptString(child.defaultCacheContainer.value);
+ var cacheContainers = {};
+ ispn['cache-containers'] = cacheContainers;
+
+ for(cc in child.children) {
+ var cacheContainer = child.children[cc];
+
+ var caches = {};
+
+ var containerConfig = _getLiveResourceConfiguration(cacheContainer);
+
+ cacheContainers[cacheContainer.name] = {
+ 'default-cache' : javascriptString(containerConfig.getSimpleValue('default-cache', null)),
+ 'aliases' : _asArray(containerConfig.get('aliases')),
+ 'caches' : caches
+ };
+
+ for (c in cacheContainer.children) {
+ var cache = cacheContainer.children[c];
+
+ caches[cache.name] = {
+ '_flavor' : javascriptString(containerConfig.getSimpleValue('_flavor', null)),
+ 'batching' : javascriptString(containerConfig.getSimpleValue('batching', null)),
+ 'indexing' : javascriptString(containerConfig.getSimpleValue('indexing', null)),
+ 'mode' : javascriptString(containerConfig.getSimpleValue('mode', null))
+ };
+ }
+ }
+ }
+ }
+
+ return ret;
+}
+
+function _getSocketBinding(port) {
+ return {
+ 'port:expr' : javascriptString(port.getSimpleValue('port:expr', '0')),
+ 'multicast-port:expr' : javascriptString(port.getSimpleValue('multicast-port:expr', null)),
+ 'multicast-address' : javascriptString(port.getSimpleValue('multicast-address', null)),
+ 'fixed-port' : javascriptString(port.getSimpleValue('fixed-port', null))
+ };
+}
+
+function javascriptString(string) {
+ return string == null || string == undefined ? string : string + '';
+}
+
+function _asArray(propertyList) {
+ var ret = [];
+ if (propertyList == undefined || propertyList == null) {
+ return ret;
+ }
+
+ var it = propertyList.list.iterator();
+ while (it.hasNext()) {
+ var prop = it.next();
+
+ if (prop instanceof PropertySimple) {
+ ret.push(javascriptString(prop.stringValue));
+ }
+ }
+
+ return ret;
+}
+
+function _getPluginConfiguration(resource) {
+ if (typeof(resource) == 'number') {
+ resource = ProxyFactory.getResource(resource)
+ } else {
+ resource = ProxyFactory.getResource(resource.id)
+ }
+ return resource.pluginConfiguration
+}
+
+function _getLiveResourceConfiguration(resource) {
+ var id;
+ if (typeof(resource) == 'number') {
+ id = resource;
+ } else {
+ id = resource.id
+ }
+
+ return ConfigurationManager.getLiveResourceConfiguration(id, false)
+}
+
+function _loadGroupMembers(group) {
+ var crit = new ResourceGroupCriteria;
+ crit.addFilterId(group.id);
+ crit.fetchExplicitResources(true);
+ crit.fetchImplicitResources(true);
+
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(crit)
+
+ if (groups.empty) {
+ throw "Could not find a previously loaded group on the server: " + group;
+ }
+
+ return groups.get(0);
+}
+
+function _allResourceIds(group) {
+ var list = [];
+
+ if (group.explicitResources != null) {
+ foreach(group.explicitResources, function(resource) {
+ list.push(resource.id);
+ });
+ }
+
+ return list;
+}
+
+function _runOperationSequentially(group, operationName, operationConfig) {
+ group = _loadGroupMembers(group);
+ var resourceIds = _allResourceIds(group);
+
+ var conf = operationConfig;
+ if (!(conf instanceof Configuration)) {
+ conf = asConfiguration(conf);
+ }
+
+ // by specifying the resource ids explicitly, we define the order in which
+ // the operations will be executed on individual resources (in sequence).
+ // if the resourceIds were null, the operations would be invoked all at once
+ // in no particular order.
+ var schedule = OperationManager.scheduleGroupOperation(group.id, resourceIds, false, operationName, conf, 0, 0, 0, 0, null);
+
+ // now we need to wait for all the individual operations on resources to
+ // complete
+ var crit = new GroupOperationHistoryCriteria;
+ crit.addFilterJobId(new JobId(schedule.jobName, schedule.jobGroup));
+
+ while (true) {
+ // XXX should this be configurable?
+ // we're waiting for an AS to start/shutdown which takes time..
+ // Let's check in 5s intervals.
+ // We're waiting at the start of this loop to also ensure that the server
+ // had time to issue the quartz job and persist the history entry.
+ java.lang.Thread.currentThread().sleep(5000);
+
+ var results = OperationManager.findGroupOperationHistoriesByCriteria(crit);
+
+ if (results.empty) {
+ throw "Could not find operation history for schedule " + schedule + ". This should not happen.";
+ }
+
+ var history = results.get(0);
+
+ if (history.status != OperationRequestStatus.INPROGRESS) {
+ return history;
+ }
+ }
+}
+
+function _restartAS4(group) {
+ _runOperationSequentially(group, "shutdown", new Configuration);
+ _runOperationSequentially(group, "start", new Configuration);
+}
+
+function _restartAS5(group) {
+ _runOperationSequentially(group, "shutdown", new Configuration);
+ _runOperationSequentially(group, "start", new Configuration);
+}
+
+function _restartAS7(group) {
+ var shutdownOp = group.resourceType.name == "JBossAS7-Standalone" ? "shutdown" : "server:stop";
+ var startOp = group.resourceType.name == "JBossAS7-Standalone" ? "start" : "server:start";
+
+ _runOperationSequentially(group, shutdownOp, new Configuration);
+ _runOperationSequentially(group, startOp, new Configuration);
+}
diff --git a/modules/enterprise/remoting/cli/src/main/samples/modules/util.js b/modules/enterprise/remoting/cli/src/main/samples/modules/util.js
new file mode 100644
index 0000000..b67eebc
--- /dev/null
+++ b/modules/enterprise/remoting/cli/src/main/samples/modules/util.js
@@ -0,0 +1,280 @@
+/**
+ * file: util.js
+ *
+ * description: This script contains functions that provide core, low-level
+ * functionality such as iterating over a collection or searching a collection.
+ * This has no other script or library dependencies.
+ *
+ * author: jsanda(a)redhat.com
+ * author: lkrejci(a)redhat.com
+ *
+ * See also http://johnsanda.blogspot.com/search/label/javascript
+ */
+
+
+/**
+ * If obj is a JS array or a java.util.Collection, each element is passed to
+ * the callback function. If obj is a java.util.Map, each map entry is passed
+ * to the callback function as a key/value pair. If obj is none of the
+ * aforementioned types, it is treated as a generic object and each of its
+ * properties is passed to the callback function as a name/value pair.
+ */
+exports.foreach = function (obj, fn) {
+ if (obj instanceof Array) {
+ for (i in obj) {
+ fn(obj[i]);
+ }
+ }
+ else if (obj instanceof java.util.Collection) {
+ var iterator = obj.iterator();
+ while (iterator.hasNext()) {
+ fn(iterator.next());
+ }
+ }
+ else if (obj instanceof java.util.Map) {
+ var iterator = obj.entrySet().iterator()
+ while (iterator.hasNext()) {
+ var entry = iterator.next();
+ fn(entry.key, entry.value);
+ }
+ }
+ else { // assume we have a generic object
+ for (i in obj) {
+ fn(i, obj[i]);
+ }
+ }
+}
+
+/**
+ * Iterates over obj similar to foreach. fn should be a predicate that evaluates
+ * to true or false. The first match that is found is returned.
+ */
+exports.find = function(obj, fn) {
+ if (obj instanceof Array) {
+ for (i in obj) {
+ if (fn(obj[i])) {
+ return obj[i]
+ }
+ }
+ }
+ else if (obj instanceof java.util.Collection) {
+ var iterator = obj.iterator();
+ while (iterator.hasNext()) {
+ var next = iterator.next();
+ if (fn(next)) {
+ return next;
+ }
+ }
+ }
+ else if (obj instanceof java.util.Map) {
+ var iterator = obj.entrySet().iterator();
+ while (iterator.hasNext()) {
+ var entry = iterator.next();
+ if (fn(entry.key, entry.value)) {
+ return {key: entry.key, value: entry.value};
+ }
+ }
+ }
+ else {
+ for (i in obj) {
+ if (fn(i, obj[i])) {
+ return {key: i, value: obj[i]};
+ }
+ }
+ }
+ return null;
+}
+
+/**
+ * Iterates over obj similar to foreach. fn should be a predicate that evaluates
+ * to true or false. All of the matches are returned in a java.util.List.
+ */
+exports.findAll = function(obj, fn) {
+ var matches = java.util.ArrayList();
+ if ((obj instanceof Array) || (obj instanceof java.util.Collection)) {
+ foreach(obj, function(element) {
+ if (fn(element)) {
+ matches.add(element);
+ }
+ });
+ }
+ else {
+ foreach(obj, function(key, value) {
+ if (fn(theKey, theValue)) {
+ matches.add({key: theKey, value: theValue});
+ }
+ });
+ }
+ return matches;
+}
+
+/**
+ * A convenience function to convert javascript hashes into RHQ's configuration
+ * objects.
+ * <p>
+ * The conversion of individual keys in the hash follows these rules:
+ * <ol>
+ * <li> if a value of a key is a javascript array, it is interpreted as PropertyList
+ * <li> if a value is a hash, it is interpreted as a PropertyMap
+ * <li> otherwise it is interpreted as a PropertySimple
+ * <li> a null or undefined value is ignored
+ * </ol>
+ * <p>
+ * Note that the conversion isn't perfect, because the hash does not contain enough
+ * information to restore the names of the list members.
+ * <p>
+ * Example: <br/>
+ * <pre><code>
+ * {
+ * simple : "value",
+ * list : [ "value1", "value2"],
+ * listOfMaps : [ { k1 : "value", k2 : "value" }, { k1 : "value2", k2 : "value2" } ]
+ * }
+ * </code></pre>
+ * gets converted to a configuration object:
+ * Configuration:
+ * <ul>
+ * <li> PropertySimple(name = "simple", value = "value")
+ * <li> PropertyList(name = "list")
+ * <ol>
+ * <li>PropertySimple(name = "list", value = "value1")
+ * <li>PropertySimple(name = "list", value = "value2")
+ * </ol>
+ * <li> PropertyList(name = "listOfMaps")
+ * <ol>
+ * <li> PropertyMap(name = "listOfMaps")
+ * <ul>
+ * <li>PropertySimple(name = "k1", value = "value")
+ * <li>PropertySimple(name = "k2", value = "value")
+ * </ul>
+ * <li> PropertyMap(name = "listOfMaps")
+ * <ul>
+ * <li>PropertySimple(name = "k1", value = "value2")
+ * <li>PropertySimple(name = "k2", value = "value2")
+ * </ul>
+ * </ol>
+ * </ul>
+ * Notice that the members of the list have the same name as the list itself
+ * which generally is not the case.
+ */
+exports.asConfiguration = function(hash) {
+
+ config = new Configuration;
+
+ for(key in hash) {
+ value = hash[key];
+
+ if (value == null) {
+ continue;
+ }
+
+ (function(parent, key, value) {
+ function isArray(obj) {
+ return typeof(obj) == 'object' && (obj instanceof Array);
+ }
+
+ function isHash(obj) {
+ return typeof(obj) == 'object' && !(obj instanceof Array);
+ }
+
+ function isPrimitive(obj) {
+ return typeof(obj) != 'object';
+ }
+
+ //this is an anonymous function, so the only way it can call itself
+ //is by getting its reference via argument.callee. Let's just assign
+ //a shorter name for it.
+ var me = arguments.callee;
+
+ var prop = null;
+
+ if (isPrimitive(value)) {
+ prop = new PropertySimple(key, new java.lang.String(value));
+ } else if (isArray(value)) {
+ prop = new PropertyList(key);
+ for(var i = 0; i < value.length; ++i) {
+ var v = value[i];
+ if (v != null) {
+ me(prop, key, v);
+ }
+ }
+ } else if (isHash(value)) {
+ prop = new PropertyMap(key);
+ for(var i in value) {
+ var v = value[i];
+ if (value != null) {
+ me(prop, i, v);
+ }
+ }
+ }
+
+ if (parent instanceof PropertyList) {
+ parent.add(prop);
+ } else {
+ parent.put(prop);
+ }
+ })(config, key, value);
+ }
+
+ return config;
+}
+
+/**
+ * Opposite of <code>asConfiguration</code>. Converts an RHQ's configuration object
+ * into a javascript hash.
+ *
+ * @param configuration
+ */
+exports.asHash = function(configuration) {
+ ret = {}
+
+ iterator = configuration.getMap().values().iterator();
+ while(iterator.hasNext()) {
+ prop = iterator.next();
+
+ (function(parent, prop) {
+ function isArray(obj) {
+ return typeof(obj) == 'object' && (obj instanceof Array);
+ }
+
+ function isHash(obj) {
+ return typeof(obj) == 'object' && !(obj instanceof Array);
+ }
+
+ var me = arguments.callee;
+
+ var representation = null;
+
+ if (prop instanceof PropertySimple) {
+ representation = prop.stringValue;
+ } else if (prop instanceof PropertyList) {
+ representation = [];
+
+ for(var i = 0; i < prop.list.size(); ++i) {
+ var child = prop.list.get(i);
+ me(representation, child);
+ }
+ } else if (prop instanceof PropertyMap) {
+ representation = {};
+
+ var childIterator = prop.getMap().values().iterator();
+ while(childIterator.hasNext()) {
+ var child = childIterator.next();
+
+ me(representation, child);
+ }
+ }
+
+ if (isArray(parent)) {
+ parent.push(representation);
+ } else if (isHash(parent)) {
+ parent[prop.name] = representation;
+ }
+ })(ret, prop);
+ }
+ (function(parent) {
+
+ })(configuration);
+
+ return ret;
+}
\ No newline at end of file
commit 37153dce50218cf46b46ce86c4482b87c494a303
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Wed Sep 12 13:40:49 2012 +0200
Fixing the RhqDownloadsScriptSourceProvider unit test.
diff --git a/modules/enterprise/remoting/client-api/src/test/java/org/rhq/enterprise/clienapi/RhqDownloadsScriptSourceProviderTest.java b/modules/enterprise/remoting/client-api/src/test/java/org/rhq/enterprise/clienapi/RhqDownloadsScriptSourceProviderTest.java
index 78c0c57..01a38e6 100644
--- a/modules/enterprise/remoting/client-api/src/test/java/org/rhq/enterprise/clienapi/RhqDownloadsScriptSourceProviderTest.java
+++ b/modules/enterprise/remoting/client-api/src/test/java/org/rhq/enterprise/clienapi/RhqDownloadsScriptSourceProviderTest.java
@@ -22,13 +22,21 @@ package org.rhq.enterprise.clienapi;
import static org.testng.Assert.assertEquals;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.Reader;
import java.net.URI;
+import java.net.URL;
+import org.apache.tools.ant.filters.StringInputStream;
import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.testng.PowerMockObjectFactory;
+import org.testng.IObjectFactory;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
+import org.testng.annotations.ObjectFactory;
import org.testng.annotations.Test;
import org.rhq.bindings.StandardBindings;
@@ -43,11 +51,18 @@ import org.rhq.enterprise.clientapi.RhqDownloadsScriptSourceProvider;
* @author Lukas Krejci
*/
@Test
+(a)PrepareForTest(RhqDownloadsScriptSourceProvider.class)
public class RhqDownloadsScriptSourceProviderTest {
private File tmpDir;
+ @ObjectFactory
+ public IObjectFactory getObjectFactory() {
+ return new PowerMockObjectFactory();
+ }
+
private static final String EXPECTED_CONTENTS = "println('Hello, World!')";
+
@BeforeClass
public void createTmpDir() throws Exception {
tmpDir = FileUtil.createTempDirectory(getClass().getName(), null, null);
@@ -76,7 +91,11 @@ public class RhqDownloadsScriptSourceProviderTest {
public void canLocateScripts() throws Exception {
RemoteClient client = Mockito.mock(RemoteClient.class);
- Mockito.when(client.getRemoteURI()).thenReturn(tmpDir.toURI());
+ //this is akin to what the remote client actually returns as the remote URI
+ URI remoteURI = new URI("socket://localhost:7080");
+ Mockito.when(client.getRemoteURI()).thenReturn(remoteURI);
+
+ URI real = tmpDir.toURI().resolve("downloads/script-modules/test-script.js");
RhqDownloadsScriptSourceProvider provider = new RhqDownloadsScriptSourceProvider();
@@ -86,6 +105,10 @@ public class RhqDownloadsScriptSourceProviderTest {
URI location = new URI("rhq://downloads/test-script.js");
+ //let's actually cheat - the source provider will try to locate the script using HTTP
+ //but we subvert that and use the local file URL anyway...
+ PowerMockito.whenNew(URI.class).withArguments("http", "localhost:7080", "/downloads/script-modules/test-script.js", null, null).thenReturn(real);
+
Reader rdr = provider.getScriptSource(location);
try {
commit b7fd2841ad43677014d97161f7472ea7f76f6ccb
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Mon Aug 27 20:24:42 2012 +0200
[BZ 852169] - Modifying the rhq://downloads script source providers
to download the scripts from a new download section with scripts.
Also added the UI for listing the scripts.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java
index bcc4ad4..0096c58 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/DownloadsView.java
@@ -60,6 +60,8 @@ public class DownloadsView extends LocatableVLayout {
private SectionStackSection bundleSection;
private SectionStackSection connectorsSection;
private SectionStackSection cliAlertScriptsSection;
+ private SectionStackSection scriptModulesSection;
+
private ProductInfo productInfo;
public DownloadsView(String locatorId) {
@@ -81,18 +83,21 @@ public class DownloadsView extends LocatableVLayout {
bundleSection = new SectionStackSection(MSG.view_admin_downloads_bundleDownload());
connectorsSection = new SectionStackSection(MSG.view_admin_downloads_connectorsDownload());
cliAlertScriptsSection = new SectionStackSection(MSG.view_admin_downloads_cliAlertScriptsDownload());
+ scriptModulesSection = new SectionStackSection(MSG.view_admin_downloads_scriptModulesDownload());
agentSection.setExpanded(false);
cliSection.setExpanded(false);
bundleSection.setExpanded(false);
connectorsSection.setExpanded(false);
cliAlertScriptsSection.setExpanded(false);
+ scriptModulesSection.setExpanded(false);
sectionStack.addSection(agentSection);
sectionStack.addSection(cliSection);
sectionStack.addSection(bundleSection);
sectionStack.addSection(connectorsSection);
sectionStack.addSection(cliAlertScriptsSection);
+ sectionStack.addSection(scriptModulesSection);
addMember(sectionStack);
}
@@ -106,6 +111,7 @@ public class DownloadsView extends LocatableVLayout {
prepareBundleSection();
prepareConnectorsSection();
prepareCliAlertScriptsSection();
+ prepareScriptModulesSection();
}
private void prepareAgentSection() {
@@ -352,4 +358,55 @@ public class DownloadsView extends LocatableVLayout {
}
});
}
+
+ private void prepareScriptModulesSection() {
+ systemManager.getScriptModulesDownloads(new AsyncCallback<HashMap<String, String>>() {
+
+ @Override
+ public void onSuccess(HashMap<String, String> result) {
+ LocatableDynamicForm form = new LocatableDynamicForm(extendLocatorId("scriptModules"));
+ form.setMargin(10);
+ form.setWidth100();
+
+ if (result != null && !result.isEmpty()) {
+ int i = 0;
+ FormItem[] items = new FormItem[result.size() + 2];
+
+ for (Map.Entry<String, String> entry : result.entrySet()) {
+ StaticTextItem linkItem = new StaticTextItem("link" + i);
+ linkItem.setTitle(MSG.common_label_link());
+ linkItem.setValue("<a href=\"" + entry.getValue() + "\">" + entry.getKey() + "</a>");
+ items[i++] = linkItem;
+ }
+
+ SpacerItem spacerItem = new SpacerItem("spacer");
+ spacerItem.setHeight(5);
+ items[i++] = spacerItem;
+
+ StaticTextItem helpText = new StaticTextItem("scriptModulesHelp");
+ helpText.setColSpan(2);
+ helpText.setShowTitle(false);
+ helpText.setValue(MSG.view_admin_downloads_scriptModules_help());
+ items[i++] = helpText;
+
+ form.setItems(items);
+ } else {
+ StaticTextItem item = new StaticTextItem("noScriptModules");
+ item.setColSpan(2);
+ item.setShowTitle(false);
+ item.setValue(MSG.view_admin_downloads_scriptModules_none());
+ form.setItems(item);
+ }
+
+ scriptModulesSection.setItems(form);
+ scriptModulesSection.setExpanded(true);
+ sectionStack.markForRedraw();
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_admin_downloads_scriptModules_loadError(), caught);
+ }
+ });
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java
index a9fd575..b63b1c0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java
@@ -68,6 +68,16 @@ public interface SystemGWTService extends RemoteService {
HashMap<String, String> getCliAlertScriptDownloads() throws RuntimeException;
/**
+ * Returns the name and download URL (key and value respectively) of all script modules
+ * that are available on the server for download. These are provided by RHQ for other
+ * scripts to peruse using the module-loading mechanism of particular language.
+ *
+ * @return info about the available script modules
+ * @throws RuntimeException
+ */
+ HashMap<String, String> getScriptModulesDownloads() throws RuntimeException;
+
+ /**
* @return metadata properties about the CLI download available on the server.
*/
HashMap<String, String> getClientVersionProperties() throws RuntimeException;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java
index 5cbc8de..59c5bd8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java
@@ -150,6 +150,26 @@ public class SystemGWTServiceImpl extends AbstractGWTServiceImpl implements Syst
}
@Override
+ public HashMap<String, String> getScriptModulesDownloads() throws RuntimeException {
+ try {
+ File downloadsDir = getScriptModulesDownloadsDir();
+ List<File> files = getFiles(downloadsDir);
+ if (files == null) {
+ return new HashMap<String, String>(0);
+ } else {
+ HashMap<String, String> ret = new HashMap<String, String>(files.size());
+
+ for (File file : files) {
+ ret.put(file.getName(), "/downloads/script-modules/" + file.getName());
+ }
+ return ret;
+ }
+ } catch (Throwable t) {
+ throw getExceptionToThrowToClient(t);
+ }
+ }
+
+ @Override
public HashMap<String, String> getClientVersionProperties() throws RuntimeException {
File versionFile = new File(getClientDownloadDir(), "rhq-client-version.properties");
try {
@@ -211,6 +231,15 @@ public class SystemGWTServiceImpl extends AbstractGWTServiceImpl implements Syst
return downloadDir;
}
+ private File getScriptModulesDownloadsDir() {
+ File serverHomeDir = getServerHomeDir();
+ File downloadDir = new File(serverHomeDir, "deploy/rhq.ear/rhq-downloads/script-modules");
+ if (!downloadDir.exists()) {
+ throw new RuntimeException("Server is missing connectors download directory at [" + downloadDir + "]");
+ }
+ return downloadDir;
+ }
+
private File getClientDownloadDir() {
File serverHomeDir = getServerHomeDir();
File downloadDir = new File(serverHomeDir, "deploy/rhq.ear/rhq-downloads/rhq-client");
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 ab0eed7..4002fc7 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
@@ -566,6 +566,10 @@ view_admin_downloads_connectorsDownload = Connectors Download
view_admin_downloads_connectors_help = Connectors are software that is needed in order for some products to be manageable by {0}. You install connectors into some managed products so {0} agents can talk to them. See the documentation for more information.
view_admin_downloads_connectors_loadError = Cannot get connectors info
view_admin_downloads_connectors_none = No connectors are available for download
+view_admin_downloads_scriptModulesDownload = Script Modules Download
+view_admin_downloads_scriptModules_help = <p> Script modules are reusable components provided by RHQ to be used in your scripts (either alert scripts or CLI scripts). You can access them by using the "rhq://downloads/<module-name-without-file-extension>" URI in your scripting language of choice (i.e. in javascript, you would use the "require" function).</p>
+view_admin_downloads_scriptModules_none = No script modules are available for download
+view_admin_downloads_scriptModules_loadError = Cannot load the list of available script modules
view_admin_landing = From this section, the {0} global settings can be administered. This includes configuring security, setting up plugins, and managing {0} Servers and Agents.
view_admin_measTemplates_updateExisting_title = Update Existing Schedules
view_admin_measTemplates_updateExisting_tooltip = Check this box to update the collection schedules for the selected metrics on all existing resources of this type. If this is not checked, the template schedules will only be applied to new resources of this type that are added to inventory in the future.
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 dfd116e..ac127b4 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
@@ -585,6 +585,10 @@ view_admin_downloads_connectorsDownload = Stažení konektorů
##view_admin_downloads_connectors_help = Connectors are software that is needed in order for some products to be manageable by {0}. You install connectors into some managed products so {0} agents can talk to them. See the documentation for more information.
view_admin_downloads_connectors_loadError = Nelze získat informace o konektorech
view_admin_downloads_connectors_none = Žádné konektory nejsou dostupné pro stažení
+##view_admin_downloads_scriptModulesDownload = Script Modules Download
+##view_admin_downloads_scriptModules_help = <p> Script modules are reusable components provided by RHQ to be used in your scripts (either alert scripts or CLI scripts). You can access them by using the "rhq://downloads/<module-name-without-file-extension>" URI in your scripting language of choice (i.e. in javascript, you would use the "require" function).</p>
+##view_admin_downloads_scriptModules_none = No script modules are available for download
+##view_admin_downloads_scriptModules_loadError = Cannot load the list of available script modules
##view_admin_landing = From this section, the {0} global settings can be administered. This includes configuring security, setting up plugins, and managing {0} Servers and Agents.
view_admin_measTemplates_updateExisting_title = Změnit existující rozvrhy
##view_admin_measTemplates_updateExisting_tooltip = Check this box to update the collection schedules for the selected metrics on all existing resources of this type. If this is not checked, the template schedules will only be applied to new resources of this type that are added to inventory in the future.
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 473bc14..7f3fafa 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
@@ -533,6 +533,10 @@ view_admin_downloads_cli_version = Version des CLI
##view_admin_downloads_connectors_help = Connectors are software that is needed in order for some products to be manageable by {0}. You install connectors into some managed products so {0} agents can talk to them. See the documentation for more information.
##view_admin_downloads_connectors_loadError = Cannot get connectors info
##view_admin_downloads_connectors_none = No connectors are available for download
+##view_admin_downloads_scriptModulesDownload = Script Modules Download
+##view_admin_downloads_scriptModules_help = <p> Script modules are reusable components provided by RHQ to be used in your scripts (either alert scripts or CLI scripts). You can access them by using the "rhq://downloads/<module-name-without-file-extension>" URI in your scripting language of choice (i.e. in javascript, you would use the "require" function).</p>
+##view_admin_downloads_scriptModules_none = No script modules are available for download
+##view_admin_downloads_scriptModules_loadError = Cannot load the list of available script modules
view_admin_landing = In dieser Sektion können die globalen Einstellungen für {0} verwaltet werden. Dies schließt Sicherheitseinstellungen und Plugins ein, sowie die Verwaltung der {0} Server- und Agentplugins.
view_admin_measTemplates_updateExisting_title = Existierende Zeitpläne aktualisieren
##view_admin_measTemplates_updateExisting_tooltip = Check this box to update the collection schedules for the selected metrics on all existing resources of this type. If this is not checked, the template schedules will only be applied to new resources of this type that are added to inventory in the future.
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 35f696e..ad760f9 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
@@ -564,6 +564,10 @@ view_admin_downloads_connectorsDownload = コネクタのダウンロード
view_admin_downloads_connectors_help = コネクターは製品が{0}によって管理可能であるために必要となるソフトウェアです。RHQエージェントが通信できるように、管理製品にコネクターをインストールします。詳細はドキュメントをご覧ください。
view_admin_downloads_connectors_loadError = コネクター情報を取得できません
view_admin_downloads_connectors_none = ダウンロードのためのコネクターが見つかりません
+##view_admin_downloads_scriptModulesDownload = Script Modules Download
+##view_admin_downloads_scriptModules_help = <p> Script modules are reusable components provided by RHQ to be used in your scripts (either alert scripts or CLI scripts). You can access them by using the "rhq://downloads/<module-name-without-file-extension>" URI in your scripting language of choice (i.e. in javascript, you would use the "require" function).</p>
+##view_admin_downloads_scriptModules_none = No script modules are available for download
+##view_admin_downloads_scriptModules_loadError = Cannot load the list of available script modules
view_admin_landing = このセクションにおいて、{0}グローバル設定が管理されます。これはセキュリティ構成、プラグイン設定、RHQサーバーとエージェントの管理を含みます。
view_admin_measTemplates_updateExisting_title = 既存スケジュールの更新
view_admin_measTemplates_updateExisting_tooltip = このボックスをチェックすると、このタイプのすべてのリソースを対象に選択したメトリックスの収集スケジュールを更新します。もしこれがチェックされていなければ、テンプレートスケジュールが将来的にインベントリに追加されるこのタイプの新規リソースに適用されるだけです。
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 38b0f01..4241b3f 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
@@ -569,6 +569,10 @@ view_admin_downloads_connectorsDownload = Download dos Conectores
##view_admin_downloads_connectors_help = Connectors are software that is needed in order for some products to be manageable by RHQ. You install connectors into some managed products so RHQ agents can talk to them. See the documentation for more information.
view_admin_downloads_connectors_loadError = Imposs\u00EDvel recuperar informa\u00E7\u00F5es dos conectores
view_admin_downloads_connectors_none = Nenhum conector est\u00E1 dispon\u00EDvel para download
+##view_admin_downloads_scriptModulesDownload = Script Modules Download
+##view_admin_downloads_scriptModules_help = <p> Script modules are reusable components provided by RHQ to be used in your scripts (either alert scripts or CLI scripts). You can access them by using the "rhq://downloads/<module-name-without-file-extension>" URI in your scripting language of choice (i.e. in javascript, you would use the "require" function).</p>
+##view_admin_downloads_scriptModules_none = No script modules are available for download
+##view_admin_downloads_scriptModules_loadError = Cannot load the list of available script modules
##view_admin_landing = Nesta se\u00E7\u00E3o \u00E9 poss\u00EDvel administrar propriedades globais do RHQ. Isso inclui configura\u00E7\u00F5es de Seguran\u00E7a, Plugins, e gerenciamento de servidores RHQ e agentes.
view_admin_measTemplates_updateExisting_title = Atualizar agendamentos existentes
view_admin_measTemplates_updateExisting_tooltip = Marque esta op\u00E7\u00E3o para atualizar os agendamentos de coleta para as m\u00E9tricas selecionadas, em todos os recursos existentes para para este tipo. Caso contr\u00E1rio, o template dos agendamentos ser\u00E1 apenas aplicado para os novos recursos deste tipo, que ser\u00E1o adicionados ao invent\u00E1rio no futuro.
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 64479c7..d74907e 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
@@ -2462,6 +2462,10 @@ view_admin_downloads_cli_version = Версия CLI
##view_admin_downloads_connectors_help = Connectors are software that is needed in order for some products to be manageable by {0}. You install connectors into some managed products so {0} agents can talk to them. See the documentation for more information.
##view_admin_downloads_connectors_loadError = Cannot get connectors info
##view_admin_downloads_connectors_none = No connectors are available for download
+##view_admin_downloads_scriptModulesDownload = Script Modules Download
+##view_admin_downloads_scriptModules_help = <p> Script modules are reusable components provided by RHQ to be used in your scripts (either alert scripts or CLI scripts). You can access them by using the "rhq://downloads/<module-name-without-file-extension>" URI in your scripting language of choice (i.e. in javascript, you would use the "require" function).</p>
+##view_admin_downloads_scriptModules_none = No script modules are available for download
+##view_admin_downloads_scriptModules_loadError = Cannot load the list of available script modules
##view_alert_details_field_resource_ancestry = Resource Ancestry
##view_alert_details_field_watched_resource = Watched Resource
##view_bundle_list_error4 = No bundles found in this repository
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 c1f347f..56e6d59 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
@@ -556,6 +556,10 @@ view_admin_downloads_connectorsDownload = \u8fde\u63a5\u5668\u4e0b\u8f7d
##view_admin_downloads_connectors_help = Connectors are software that is needed in order for some products to be manageable by RHQ. You install connectors into some managed products so RHQ agents can talk to them. See the documentation for more information.
view_admin_downloads_connectors_loadError = \u65e0\u6cd5\u83b7\u5f97\u8fde\u63a5\u5668\u4fe1\u606f
view_admin_downloads_connectors_none = \u6ca1\u6709\u53ef\u7528\u8fde\u63a5\u5668\u4e0b\u8f7d
+##view_admin_downloads_scriptModulesDownload = Script Modules Download
+##view_admin_downloads_scriptModules_help = <p> Script modules are reusable components provided by RHQ to be used in your scripts (either alert scripts or CLI scripts). You can access them by using the "rhq://downloads/<module-name-without-file-extension>" URI in your scripting language of choice (i.e. in javascript, you would use the "require" function).</p>
+##view_admin_downloads_scriptModules_none = No script modules are available for download
+##view_admin_downloads_scriptModules_loadError = Cannot load the list of available script modules
##view_admin_landing = \u8fd9\u91cc\u4f60\u53ef\u4ee5\u7ba1\u7406RHQ\u5168\u5c40\u914d\u7f6e.\u5305\u62ec\u914d\u7f6e\u5b89\u5168,\u5b89\u88c5\u63d2\u4ef6,\u7ba1\u7406RHQ\u670d\u52a1\u5668\u548c\u4ee3\u7406.
view_admin_measTemplates_updateExisting_title = \u66f4\u65b0\u5b58\u5728\u7684\u8ba1\u5212\u4efb\u52a1
view_admin_measTemplates_updateExisting_tooltip = Check this box to update the collection schedules for the selected metrics on all existing resources of this type. If this is not checked, the template schedules will only be applied to new resources of this type that are added to inventory in the future.
diff --git a/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml b/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml
index 715bd9b..2690dd3 100644
--- a/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml
+++ b/modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml
@@ -86,7 +86,7 @@
<mkdir dir="${samples.home}" />
<echo>*** Populating sample scripts...</echo>
<copy verbose="true" toDir="${samples.home}">
- <fileset dir="${basedir}/src/main/samples/" includes="*.*" />
+ <fileset dir="${basedir}/src/main/samples/" includes="**" />
</copy>
</target>
diff --git a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RhqDownloadsScriptSourceProvider.java b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RhqDownloadsScriptSourceProvider.java
index 6b866db..c9096f9 100644
--- a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RhqDownloadsScriptSourceProvider.java
+++ b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RhqDownloadsScriptSourceProvider.java
@@ -25,6 +25,7 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.net.MalformedURLException;
import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import org.apache.commons.logging.Log;
@@ -33,6 +34,7 @@ import org.apache.commons.logging.LogFactory;
import org.rhq.bindings.StandardBindings;
import org.rhq.bindings.client.RhqFacade;
import org.rhq.bindings.script.BaseRhqSchemeScriptSourceProvider;
+import org.rhq.enterprise.communications.util.SecurityUtil;
/**
* @author Lukas Krejci
@@ -44,6 +46,8 @@ public class RhqDownloadsScriptSourceProvider extends BaseRhqSchemeScriptSourceP
private static final String AUTHORITY = "downloads";
+ private static final String URL_PATH_PREFIX = "/downloads/script-modules";
+
private RemoteClient remoteClient;
public RhqDownloadsScriptSourceProvider() {
@@ -69,7 +73,15 @@ public class RhqDownloadsScriptSourceProvider extends BaseRhqSchemeScriptSourceP
String path = scriptUri.getPath();
- URI remoteUri = remoteClient.getRemoteURI().resolve(AUTHORITY + path);
+ URI remoteUri = remoteClient.getRemoteURI().resolve(URL_PATH_PREFIX + path);
+
+ String replacementScheme = SecurityUtil.isTransportSecure(remoteUri.getScheme()) ? "https" : "http";
+
+ try {
+ remoteUri = new URI(replacementScheme, remoteUri.getAuthority(), remoteUri.getPath(), remoteUri.getQuery(), remoteUri.getFragment());
+ } catch (URISyntaxException e) {
+ LOG.error("Failed to copy the RHQ server download URI: " + remoteUri + " to the " + replacementScheme + " scheme.");
+ }
try {
URL downloadUrl = remoteUri.toURL();
diff --git a/modules/enterprise/remoting/client-api/src/test/java/org/rhq/enterprise/clienapi/RhqDownloadsScriptSourceProviderTest.java b/modules/enterprise/remoting/client-api/src/test/java/org/rhq/enterprise/clienapi/RhqDownloadsScriptSourceProviderTest.java
index 591df06..78c0c57 100644
--- a/modules/enterprise/remoting/client-api/src/test/java/org/rhq/enterprise/clienapi/RhqDownloadsScriptSourceProviderTest.java
+++ b/modules/enterprise/remoting/client-api/src/test/java/org/rhq/enterprise/clienapi/RhqDownloadsScriptSourceProviderTest.java
@@ -52,7 +52,7 @@ public class RhqDownloadsScriptSourceProviderTest {
public void createTmpDir() throws Exception {
tmpDir = FileUtil.createTempDirectory(getClass().getName(), null, null);
- File downloadsDir = new File(tmpDir, "downloads");
+ File downloadsDir = new File(new File(tmpDir, "downloads"), "script-modules");
downloadsDir.mkdirs();
File testScript = new File(downloadsDir, "test-script.js");
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java
index 7711078..c065b48 100644
--- a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java
+++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java
@@ -69,7 +69,7 @@ public class RhqDownloadsScriptSourceProvider extends BaseRhqSchemeScriptSourceP
String serverHomeDir = serverDetails.getDetails().get(ServerDetails.Detail.SERVER_HOME_DIR);
- File downloads = new File(serverHomeDir, "deploy/rhq.ear/rhq-downloads");
+ File downloads = new File(serverHomeDir, "deploy/rhq.ear/rhq-downloads/script-modules");
File file = new File(downloads, path);
diff --git a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/RhqDownloadsScriptSourceProviderTest.java b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/RhqDownloadsScriptSourceProviderTest.java
index 2c73eec..a2c4a33 100644
--- a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/RhqDownloadsScriptSourceProviderTest.java
+++ b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/RhqDownloadsScriptSourceProviderTest.java
@@ -54,7 +54,7 @@ public class RhqDownloadsScriptSourceProviderTest {
@BeforeClass
public void createTmpDir() throws Exception {
tmpDir = FileUtil.createTempDirectory(getClass().getName(), null, null);
- File downloadsDir = new File(new File(new File(tmpDir, "deploy"), "rhq.ear"), "rhq-downloads");
+ File downloadsDir = new File(new File(new File(new File(tmpDir, "deploy"), "rhq.ear"), "rhq-downloads"), "script-modules");
downloadsDir.mkdirs();
File testScript = new File(downloadsDir, "test-script.js");
diff --git a/modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js b/modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js
index 5dba002..f520488 100644
--- a/modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js
+++ b/modules/enterprise/server/container/src/main/downloadable-resources/cli-alert-scripts/fix-bundle-deployment.js
@@ -1,10 +1,6 @@
/**
* Using this script one can automatically reset a bundle deployment to a specified version.
*
- * This script consists of several utility methods originally included in standalone files
- * in the samples of the CLI distribution, which have been included in this file so that it
- * is usable on its own even in the server environment.
- *
* The configuration of the bundle and its version to reset to is located at the top of this file.
* Please provide the values to the variables as instructed to make this script work in
* a concrete situation.
@@ -70,415 +66,8 @@ var description = "redeploy due to drift";
// original versions from the bundle.
var isCleanDeployment = true;
-//-------------------- util.js
-
-/**
- * If obj is a JS array or a java.util.Collection, each element is passed to
- * the callback function. If obj is a java.util.Map, each map entry is passed
- * to the callback function as a key/value pair. If obj is none of the
- * aforementioned types, it is treated as a generic object and each of its
- * properties is passed to the callback function as a name/value pair.
- */
-function foreach(obj, fn) {
- if (obj instanceof Array) {
- for (i in obj) {
- fn(obj[i]);
- }
- }
- else if (obj instanceof java.util.Collection) {
- var iterator = obj.iterator();
- while (iterator.hasNext()) {
- fn(iterator.next());
- }
- }
- else if (obj instanceof java.util.Map) {
- var iterator = obj.entrySet().iterator()
- while (iterator.hasNext()) {
- var entry = iterator.next();
- fn(entry.key, entry.value);
- }
- }
- else { // assume we have a generic object
- for (i in obj) {
- fn(i, obj[i]);
- }
- }
-}
-
-/**
- * Iterates over obj similar to foreach. fn should be a predicate that evaluates
- * to true or false. The first match that is found is returned.
- */
-function find(obj, fn) {
- if (obj instanceof Array) {
- for (i in obj) {
- if (fn(obj[i])) {
- return obj[i]
- }
- }
- }
- else if (obj instanceof java.util.Collection) {
- var iterator = obj.iterator();
- while (iterator.hasNext()) {
- var next = iterator.next();
- if (fn(next)) {
- return next;
- }
- }
- }
- else if (obj instanceof java.util.Map) {
- var iterator = obj.entrySet().iterator();
- while (iterator.hasNext()) {
- var entry = iterator.next();
- if (fn(entry.key, entry.value)) {
- return {key: entry.key, value: entry.value};
- }
- }
- }
- else {
- for (i in obj) {
- if (fn(i, obj[i])) {
- return {key: i, value: obj[i]};
- }
- }
- }
- return null;
-}
-
-/**
- * Iterates over obj similar to foreach. fn should be a predicate that evaluates
- * to true or false. All of the matches are returned in a java.util.List.
- */
-function findAll(obj, fn) {
- var matches = java.util.ArrayList();
- if ((obj instanceof Array) || (obj instanceof java.util.Collection)) {
- foreach(obj, function(element) {
- if (fn(element)) {
- matches.add(element);
- }
- });
- }
- else {
- foreach(obj, function(key, value) {
- if (fn(theKey, theValue)) {
- matches.add({key: theKey, value: theValue});
- }
- });
- }
- return matches;
-}
-
-/**
- * A convenience function to convert javascript hashes into RHQ's configuration
- * objects.
- * <p>
- * The conversion of individual keys in the hash follows these rules:
- * <ol>
- * <li> if a value of a key is a javascript array, it is interpreted as PropertyList
- * <li> if a value is a hash, it is interpreted as a PropertyMap
- * <li> otherwise it is interpreted as a PropertySimple
- * <li> a null or undefined value is ignored
- * </ol>
- * <p>
- * Note that the conversion isn't perfect, because the hash does not contain enough
- * information to restore the names of the list members.
- * <p>
- * Example: <br/>
- * <pre><code>
- * {
- * simple : "value",
- * list : [ "value1", "value2"],
- * listOfMaps : [ { k1 : "value", k2 : "value" }, { k1 : "value2", k2 : "value2" } ]
- * }
- * </code></pre>
- * gets converted to a configuration object:
- * Configuration:
- * <ul>
- * <li> PropertySimple(name = "simple", value = "value")
- * <li> PropertyList(name = "list")
- * <ol>
- * <li>PropertySimple(name = "list", value = "value1")
- * <li>PropertySimple(name = "list", value = "value2")
- * </ol>
- * <li> PropertyList(name = "listOfMaps")
- * <ol>
- * <li> PropertyMap(name = "listOfMaps")
- * <ul>
- * <li>PropertySimple(name = "k1", value = "value")
- * <li>PropertySimple(name = "k2", value = "value")
- * </ul>
- * <li> PropertyMap(name = "listOfMaps")
- * <ul>
- * <li>PropertySimple(name = "k1", value = "value2")
- * <li>PropertySimple(name = "k2", value = "value2")
- * </ul>
- * </ol>
- * </ul>
- * Notice that the members of the list have the same name as the list itself
- * which generally is not the case.
- */
-function asConfiguration(hash) {
-
- config = new Configuration;
-
- for(key in hash) {
- value = hash[key];
-
- if (value == null) {
- continue;
- }
-
- (function(parent, key, value) {
- function isArray(obj) {
- return typeof(obj) == 'object' && (obj instanceof Array);
- }
-
- function isHash(obj) {
- return typeof(obj) == 'object' && !(obj instanceof Array);
- }
-
- function isPrimitive(obj) {
- return typeof(obj) != 'object';
- }
-
- //this is an anonymous function, so the only way it can call itself
- //is by getting its reference via argument.callee. Let's just assign
- //a shorter name for it.
- var me = arguments.callee;
-
- var prop = null;
-
- if (isPrimitive(value)) {
- prop = new PropertySimple(key, new java.lang.String(value));
- } else if (isArray(value)) {
- prop = new PropertyList(key);
- for(var i = 0; i < value.length; ++i) {
- var v = value[i];
- if (v != null) {
- me(prop, key, v);
- }
- }
- } else if (isHash(value)) {
- prop = new PropertyMap(key);
- for(var i in value) {
- var v = value[i];
- if (value != null) {
- me(prop, i, v);
- }
- }
- }
-
- if (parent instanceof PropertyList) {
- parent.add(prop);
- } else {
- parent.put(prop);
- }
- })(config, key, value);
- }
-
- return config;
-}
-
-/**
- * Opposite of <code>asConfiguration</code>. Converts an RHQ's configuration object
- * into a javascript hash.
- *
- * @param configuration
- */
-function asHash(configuration) {
- ret = {}
-
- iterator = configuration.getMap().values().iterator();
- while(iterator.hasNext()) {
- prop = iterator.next();
-
- (function(parent, prop) {
- function isArray(obj) {
- return typeof(obj) == 'object' && (obj instanceof Array);
- }
-
- function isHash(obj) {
- return typeof(obj) == 'object' && !(obj instanceof Array);
- }
-
- var me = arguments.callee;
-
- var representation = null;
-
- if (prop instanceof PropertySimple) {
- representation = prop.stringValue;
- } else if (prop instanceof PropertyList) {
- representation = [];
-
- for(var i = 0; i < prop.list.size(); ++i) {
- var child = prop.list.get(i);
- me(representation, child);
- }
- } else if (prop instanceof PropertyMap) {
- representation = {};
-
- var childIterator = prop.getMap().values().iterator();
- while(childIterator.hasNext()) {
- var child = childIterator.next();
-
- me(representation, child);
- }
- }
-
- if (isArray(parent)) {
- parent.push(representation);
- } else if (isHash(parent)) {
- parent[prop.name] = representation;
- }
- })(ret, prop);
- }
- (function(parent) {
-
- })(configuration);
-
- return ret;
-}
-
-//------------------------------ bundles.js
-
-/**
- * A simple function to create a new bundle version from a zip file containing
- * the bundle.
- *
- * @param pathToBundleZipFile the path to the bundle on the local file system
- *
- * @return an instance of BundleVersion class describing what's been created on
- * the RHQ server.
- */
-function createBundleVersion(pathToBundleZipFile) {
- var bytes = getFileBytes(pathToBundleZipFile)
- return BundleManager.createBundleVersionViaByteArray(bytes)
-}
-
-/**
- * This is a helper function that one can use to find out what base directories
- * given resource type defines.
- * <p>
- * These base directories then can be used when specifying bundle destinations.
- *
- * @param resourceTypeId
- * @returns a java.util.Set of ResourceTypeBundleConfiguration objects
- */
-function getAllBaseDirectories(resourceTypeId) {
- var crit = new ResourceTypeCriteria;
- crit.addFilterId(resourceTypeId);
- crit.fetchBundleConfiguration(true);
-
- var types = ResourceTypeManager.findResourceTypesByCriteria(crit);
-
- if (types.size() == 0) {
- throw "Could not find a resource type with id " + resourceTypeId;
- } else if (types.size() > 1) {
- throw "More than one resource type found with id " + resourceTypeId + "! How did that happen!";
- }
-
- var type = types.get(0);
-
- return type.getResourceTypeBundleConfiguration().getBundleDestinationBaseDirectories();
-}
-
-/**
- * Creates a new destination for given bundle. Once a destination exists,
- * actual bundle versions can be deployed to it.
- * <p>
- * Note that this only differs from the <code>BundleManager.createBundleDestination</code>
- * method in the fact that one can provide bundle and resource group names instead of their
- * ids.
- *
- * @param destinationName the name of the destination to be created
- * @param description the description for the destination
- * @param bundleName the name of the bundle to create the destination for
- * @param groupName name of a group of resources that the destination will handle
- * @param baseDirName the name of the basedir definition that represents where inside the
- * deployment of the individual resources the bundle will get deployed
- * @param deployDir the specific sub directory of the base dir where the bundles will get deployed
- *
- * @return BundleDestination object
- */
-function createBundleDestination(destinationName, description, bundleName, groupName, baseDirName, deployDir) {
- var groupCrit = new ResourceGroupCriteria;
- groupCrit.addFilterName(groupName);
- var groups = ResourceGroupManager.findResourceGroupsByCriteria(groupCrit);
-
- if (groups.empty) {
- throw "No group called '" + groupName + "' found.";
- }
-
- var group = groups.get(0);
-
- var bundleCrit = new BundleCriteria;
- bundleCrit.addFilterName(bundleName);
- var bundles = BundleManager.findBundlesByCriteria(bundleCrit);
-
- if (bundles.empty) {
- throw "No bundle called '" + bundleName + "' found.";
- }
-
- var bundle = bundles.get(0);
-
- return BundleManager.createBundleDestination(bundle.id, destinationName, description, baseDirName, deployDir, group.id);
-}
-
-/**
- * Tries to deploy given bundle version to provided destination using given configuration.
- * <p>
- * This method blocks while waiting for the deployment to complete or fail.
- *
- * @param destination the bundle destination (or id thereof)
- * @param bundleVersion the bundle version to deploy (or id thereof)
- * @param deploymentConfiguration the deployment configuration. This can be an ordinary
- * javascript object (hash) or an instance of RHQ's Configuration. If it is the former,
- * it is converted to a Configuration instance using the <code>asConfiguration</code>
- * function from <code>util.js</code>. Please consult the documentation of that method
- * to understand the limitations of that approach.
- * @param description the deployment description
- * @param isCleanDeployment if true, perform a wipe of the deploy directory prior to the deployment; if false,
- * perform as an upgrade to the existing deployment, if any
- *
- * @return the BundleDeployment instance describing the deployment
- */
-function deployBundle(destination, bundleVersion, deploymentConfiguration, description, isCleanDeployment) {
- var destinationId = destination;
- if (typeof(destination) == 'object') {
- destinationId = destination.id;
- }
-
- var bundleVersionId = bundleVersion;
- if (typeof(bundleVersion) == 'object') {
- bundleVersionId = bundleVersion.id;
- }
-
- var deploymentConfig = deploymentConfiguration;
- if (!(deploymentConfiguration instanceof Configuration)) {
- deploymentConfig = asConfiguration(deploymentConfiguration);
- }
-
- var deployment = BundleManager.createBundleDeployment(bundleVersionId, destinationId, description, deploymentConfig);
-
- deployment = BundleManager.scheduleBundleDeployment(deployment.id, isCleanDeployment);
-
- var crit = new BundleDeploymentCriteria;
- crit.addFilterId(deployment.id);
-
- while (deployment.status == BundleDeploymentStatus.PENDING || deployment.status == BundleDeploymentStatus.IN_PROGRESS) {
- java.lang.Thread.currentThread().sleep(1000);
- var dps = BundleManager.findBundleDeploymentsByCriteria(crit);
- if (dps.empty) {
- throw "The deployment disappeared while we were waiting for it to complete.";
- }
-
- deployment = dps.get(0);
- }
-
- return deployment;
-}
-
-//------------------- script body
+//-------------------------- script body
-deployBundle(destinationId, bundleVersionId, deploymentConfig, description, isCleanDeployment);
+var bundles = require('rhq://downloads/bundles');
+bundles.deployBundle(destinationId, bundleVersionId, deploymentConfig, description, isCleanDeployment);
diff --git a/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/bundles.js b/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/bundles.js
new file mode 100644
index 0000000..f7fbdc2
--- /dev/null
+++ b/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/bundles.js
@@ -0,0 +1,150 @@
+/**
+ * file: bundles.js
+ *
+ * description: this file contains a few helper functions to make working
+ * with the bundle subsystem more convenient.
+ *
+ * Note that you must login before you can load the scripts.
+ *
+ * author: lkrejci(a)redhat.com
+ */
+
+var util = require('./util');
+
+/**
+ * A simple function to create a new bundle version from a zip file containing
+ * the bundle.
+ *
+ * @param pathToBundleZipFile the path to the bundle on the local file system
+ *
+ * @return an instance of BundleVersion class describing what's been created on
+ * the RHQ server.
+ */
+exports.createBundleVersion = function(pathToBundleZipFile) {
+ var bytes = getFileBytes(pathToBundleZipFile)
+ return BundleManager.createBundleVersionViaByteArray(bytes)
+}
+
+/**
+ * This is a helper function that one can use to find out what base directories
+ * given resource type defines.
+ * <p>
+ * These base directories then can be used when specifying bundle destinations.
+ *
+ * @param resourceTypeId
+ * @returns a java.util.Set of ResourceTypeBundleConfiguration objects
+ */
+exports.getAllBaseDirectories = function(resourceTypeId) {
+ var crit = new ResourceTypeCriteria;
+ crit.addFilterId(resourceTypeId);
+ crit.fetchBundleConfiguration(true);
+
+ var types = ResourceTypeManager.findResourceTypesByCriteria(crit);
+
+ if (types.size() == 0) {
+ throw "Could not find a resource type with id " + resourceTypeId;
+ } else if (types.size() > 1) {
+ throw "More than one resource type found with id " + resourceTypeId + "! How did that happen!";
+ }
+
+ var type = types.get(0);
+
+ return type.getResourceTypeBundleConfiguration().getBundleDestinationBaseDirectories();
+}
+
+/**
+ * Creates a new destination for given bundle. Once a destination exists,
+ * actual bundle versions can be deployed to it.
+ * <p>
+ * Note that this only differs from the <code>BundleManager.createBundleDestination</code>
+ * method in the fact that one can provide bundle and resource group names instead of their
+ * ids.
+ *
+ * @param destinationName the name of the destination to be created
+ * @param description the description for the destination
+ * @param bundleName the name of the bundle to create the destination for
+ * @param groupName name of a group of resources that the destination will handle
+ * @param baseDirName the name of the basedir definition that represents where inside the
+ * deployment of the individual resources the bundle will get deployed
+ * @param deployDir the specific sub directory of the base dir where the bundles will get deployed
+ *
+ * @return BundleDestination object
+ */
+exports.createBundleDestination = function(destinationName, description, bundleName, groupName, baseDirName, deployDir) {
+ var groupCrit = new ResourceGroupCriteria;
+ groupCrit.addFilterName(groupName);
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(groupCrit);
+
+ if (groups.empty) {
+ throw "No group called '" + groupName + "' found.";
+ }
+
+ var group = groups.get(0);
+
+ var bundleCrit = new BundleCriteria;
+ bundleCrit.addFilterName(bundleName);
+ var bundles = BundleManager.findBundlesByCriteria(bundleCrit);
+
+ if (bundles.empty) {
+ throw "No bundle called '" + bundleName + "' found.";
+ }
+
+ var bundle = bundles.get(0);
+
+ return BundleManager.createBundleDestination(bundle.id, destinationName, description, baseDirName, deployDir, group.id);
+}
+
+/**
+ * Tries to deploy given bundle version to provided destination using given configuration.
+ * <p>
+ * This method blocks while waiting for the deployment to complete or fail.
+ *
+ * @param destination the bundle destination (or id thereof)
+ * @param bundleVersion the bundle version to deploy (or id thereof)
+ * @param deploymentConfiguration the deployment configuration. This can be an ordinary
+ * javascript object (hash) or an instance of RHQ's Configuration. If it is the former,
+ * it is converted to a Configuration instance using the <code>asConfiguration</code>
+ * function from <code>util.js</code>. Please consult the documentation of that method
+ * to understand the limitations of that approach.
+ * @param description the deployment description
+ * @param isCleanDeployment if true, perform a wipe of the deploy directory prior to the deployment; if false,
+ * perform as an upgrade to the existing deployment, if any
+ *
+ * @return the BundleDeployment instance describing the deployment
+ */
+exports.deployBundle = function(destination, bundleVersion, deploymentConfiguration, description, isCleanDeployment) {
+ var destinationId = destination;
+ if (typeof(destination) == 'object') {
+ destinationId = destination.id;
+ }
+
+ var bundleVersionId = bundleVersion;
+ if (typeof(bundleVersion) == 'object') {
+ bundleVersionId = bundleVersion.id;
+ }
+
+ var deploymentConfig = deploymentConfiguration;
+ if (!(deploymentConfiguration instanceof Configuration)) {
+ deploymentConfig = util.asConfiguration(deploymentConfiguration);
+ }
+
+ var deployment = BundleManager.createBundleDeployment(bundleVersionId, destinationId, description, deploymentConfig);
+
+ deployment = BundleManager.scheduleBundleDeployment(deployment.id, isCleanDeployment);
+
+ var crit = new BundleDeploymentCriteria;
+ crit.addFilterId(deployment.id);
+
+ while (deployment.status == BundleDeploymentStatus.PENDING || deployment.status == BundleDeploymentStatus.IN_PROGRESS) {
+ java.lang.Thread.currentThread().sleep(1000);
+ var dps = BundleManager.findBundleDeploymentsByCriteria(crit);
+ if (dps.empty) {
+ throw "The deployment disappeared while we were waiting for it to complete.";
+ }
+
+ deployment = dps.get(0);
+ }
+
+ return deployment;
+}
+
diff --git a/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/drift.js b/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/drift.js
new file mode 100644
index 0000000..b07eaec
--- /dev/null
+++ b/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/drift.js
@@ -0,0 +1,240 @@
+/**
+ * file: drift.js
+ *
+ * description: This script contains functions that illustrate and highlight
+ * drift monitoring functionality. Some of the functionality demonstrated in
+ * this script is currently available only via RHQ's remote client (and CLI)
+ * at the time of this writing.
+ *
+ * Note that you must login before you can load the scripts. Also please note
+ * that if a function is not documented, then it is not intended for public
+ * use. It is used only as an internal helper function.
+ *
+ * author: jsanda(a)redhat.com
+ */
+
+var util = require("./util");
+
+/**
+ * description: Generates a snapshot of changes sets belonging to a particular
+ * drift definition of a specific resource. By default all change sets are
+ * included in the snapshot. An optional third argument can be specified to
+ * limit or control the number of change sets included in the snapshot.
+ *
+ * Note that a snapshot is an accumulation or aggregation of change sets that
+ * provides a view of a resource, or more precisely, all files being monitored
+ * for drift, at a particular version or point in time.
+ *
+ * arguments:
+ * rid: A resource id, expected to be an integer
+ *
+ * defName: The drift definition name as a string
+ *
+ * filter: (optional) A map or JS object that limits the number of
+ * change sets included in the snapshot. It should specify two
+ * properties - startVersion and endVersion.
+ *
+ * return: A org.rhq.core.domamin.drift.DriftSnapshot object
+ *
+ * usage:
+ * // generates a snapshot that includes all change sets belonging to the
+ * // mydrift drift configuration.
+ * createSnapshot(123, 'mydrift')
+ *
+ * // generates a snapshot that includes change sets 3 through 5 inclusive.
+ * createSnapshot(123, 'mydrift', {startVersion: 3, endVersion: 5})
+ */
+exports.createSnapshot = function(rid, defName) {
+ var driftDef = findDriftDefinition(rid, function(d) { return defName.equals(d.name) });
+ var snapshotRequest;
+
+ if (arguments.length > 2) {
+ var filters = arguments[2];
+ snapshotRequest = DriftSnapshotRequest(driftDef.id, filters.startVersion, filters.endVersion);
+ } else {
+ snapshotRequest = DriftSnapshotRequest(driftDef.id);
+ }
+
+ return DriftManager.getSnapshot(snapshotRequest);
+}
+
+/** private helper function to find a drift definition by a filter */
+function findDriftDefinition(rid, filter) {
+ var criteria = ResourceCriteria();
+ criteria.addFilterId(rid);
+ criteria.fetchDriftDefinitions(true);
+
+ var resources = ResourceManager.findResourcesByCriteria(criteria);
+ var resource = resources.get(0);
+
+ return util.find(resource.driftDefinitions, function(config) {
+ return filter(DriftDefinition(config));
+ });
+}
+
+/**
+ * description: Generates a diff report that is printed to the console. By
+ * default this function generates a snapshot diff. The function expects two
+ * arguments which should be DriftSnapshot objects. A diff between those two
+ * snapshots is generated and printed to the console. A path can be specified
+ * as an optional third argument. If a path is a specified as a third argument,
+ * then a file diff will be performed using the file that matches the path in
+ * each change set. The format will be a unified diff.
+ *
+ * Note that the snapshots can be from the same or from different resources;
+ * however, if they are from different resources, it is assumed that the
+ * resources are of the same type.
+ *
+ * arguments:
+ * s1: A DriftSnapshot object
+ *
+ * s2: A DriftSnapshot object
+ *
+ * path: (optional) A string that specifies a path that exists in both s1 and
+ * s2.
+ *
+ * return: This function does not return a useful value. It may be an empty
+ * string or it could be null. Instead of returning its results, the function
+ * prints them to the CLI console. As such, this function is intended for
+ * use from the interactive CLI shell.
+ *
+ * usage:
+ * // Generates a snapshot diff report
+ * diff(s1, s2)
+ *
+ * // Generates a file diff report in the unified format
+ * diff(s1, s2, 'jboss_home/bin/run.conf')
+ */
+exports.diff = function(s1, s2) {
+ var theDiff = s1.diff(s2);
+
+ if (arguments.length > 2) {
+ var path = arguments[2];
+
+ if (theDiff.elementsInConflict.size() == 0) {
+ // If the snapshot diff reports no files in conflict, then there
+ // is no need to call the server to perform the file diff. We can
+ // instead return quickly.
+ println("There are no differences to report");
+ return "";
+ }
+
+ var pathFilter = function(entry) { return entry.path == path; };
+ var e1 = util.find(s1.driftInstances, pathFilter);
+ var e2 = util.find(s2.driftInstances, pathFilter);
+
+ var fileDiff = DriftManager.generateUnifiedDiff(e1, e2);
+ util.foreach(fileDiff.diff, println);
+ return "";
+ }
+
+ function printEntry(entry) {
+ println(entry.newDriftFile.hashId + '\t' + entry.path);
+ }
+
+ function report(header, elements) {
+ println(header + ':');
+ util.foreach(elements, printEntry);
+ println('\n');
+ }
+
+ report('elements in conflict', theDiff.elementsInConflict);
+ report('elements not in left', theDiff.elementsNotInLeft);
+ report('elements not in right', theDiff.elementsNotInRight);
+}
+
+/**
+ * description: Generates and returns the drift history for a file being
+ * monitored for drift. This function takes three arguments. The first two, the
+ * resource id drift configuration name, uniquely identify the drift
+ * configuration. The third argument specifies a path that is set up for
+ * monitoring by the drift configuration.
+ *
+ * arguments:
+ * rid: A resource id
+ *
+ * configName: A drift configuration name
+ *
+ * path: A path that is set up for drift monitoring by the drift
+ * configuration that is identified by the first two arguments. The path
+ * should be specified as relative to the base directory from which
+ * monitoring is done.
+ *
+ * return: A History object, which is a native JS object. This object contains
+ * a few methods for working with the file history:
+ *
+ * list: prints a short summary of all versions of the file
+ * view: returns the contents of a particular version of the file
+ * compare: compares two versions of the file and prints a unified diff
+ *
+ * usage:
+ * $ history = fetchHistory(123, 'mydrift', 'bin/run.conf')
+ * $ history.list() // prints a summary of all versions of 'bin/run.conf'
+ * $ history.view(1) // returns the full contents of version 1 of the file
+ * $ history.compare(1, 2) // generates and prints a unified diff of versions 1 and 2
+ */
+exports.fetchHistory = function(rid, driftDefName, path) {
+ function History() {
+ var entries = [];
+
+ function findDrift(version) {
+ return util.find(entries, function(drift) {
+ return drift.changeSet.version == version
+ });
+ }
+
+
+ var generate = function() {
+ entries = [];
+ var criteria = GenericDriftCriteria();
+ criteria.addFilterResourceIds([rid]);
+ criteria.fetchChangeSet(true);
+ criteria.addFilterPath(path);
+
+ var drifts = DriftManager.findDriftsByCriteria(criteria);
+ util.foreach(drifts, function(drift) {
+ if (drift.changeSet.driftDefinition.name == driftDefName &&
+ drift.path == path) {
+ entries.push(drift);
+ }
+ });
+
+ entries.sort(function(d1, d2) {
+ return d1.changeSet.version <= d2.changeSet.version
+ });
+ }
+
+ this.list = function() {
+ var format = java.text.DateFormat.getDateTimeInstance();
+ println(path + "\n-----------------------------------");
+ util.foreach(entries, function(drift) {
+ println(drift.changeSet.version + "\t" + format.format(drift.ctime));
+ });
+ }
+
+ this.view = function(version) {
+ var drift = findDrift(version);
+ if (drift == null) {
+ return "Could not find version " + version;
+ }
+ return java.lang.String(DriftManager.getDriftFileAsByteArray(drift.newDriftFile.hashId));
+ }
+
+ this.compare = function(v1, v2) {
+ var d1 = findDrift(v1);
+ if (d1 == null) {
+ return "Could not find version " + v1;
+ }
+ var d2 = findDrift(v2);
+ if (d2 == null) {
+ return "Could not find version " + v2;
+ }
+ var fileDiff = DriftManager.generateUnifiedDiff(d1, d2);
+ util.foreach(fileDiff.diff, println);
+ }
+
+ generate();
+ }
+
+ return new History();
+}
diff --git a/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/jbossas.js b/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/jbossas.js
new file mode 100644
index 0000000..6369cc1
--- /dev/null
+++ b/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/jbossas.js
@@ -0,0 +1,811 @@
+/**
+ * This module contains a variety of utility functions for working with JBoss AS in different versions.
+ *
+ * @author Lukas Krejci
+ */
+
+
+var util = require('./util');
+var bundles = require("./bundles");
+
+//init the version-specific objects. We'll be adding the functions to them further down below.
+exports.as7 = {}
+
+/**
+ * This creates a new destination in the JBoss AS (4,5,6,7) servers from the provided
+ * group and deploys the application provided by the bundle to it. Once the app is deployed,
+ * the servers in the group are sequentially stopped and started.
+ *
+ * @param bundleZipFile the path to the zip file with the application bundle
+ * @param deploymentConfiguration the deployment configuration required by the bundle.
+ * See the <code>deployBundle</code> in <code>bundles.js</code> to find out about
+ * supported formats.
+ * @param groupName the name of the compatible group of JBossAS servers to deploy the bundle to
+ * @param destinationName the name of the destination that will be created so that the bundle
+ * can be deployed to it
+ * @param destinationDescription the description of the destination
+ * @param baseDirName the name of the base directory for the deployment. Each resource type
+ * defines a list of deployment base directories which you can review using, for example,
+ * the <code>getAllBaseDirectories(resourceTypeId)</code> function from <code>bundles.js</code>.
+ * @param deployDir the name of the directory under the base dir in which the bundle will be
+ * deployed to.
+ *
+ * @return the BundleDeployment instance
+ */
+exports.createAppAndRestart = function(bundleZipFile, deploymentConfiguration, groupName, destinationName, destinationDescription, baseDirName, deployDir) {
+ var gcrit = new ResourceGroupCriteria;
+ gcrit.addFilterName(groupName);
+ gcrit.fetchResourceType(true);
+
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(gcrit);
+ if (groups.empty) {
+ throw "Could not find a resource group called " + groupName;
+ } else if (groups.size() > 1) {
+ throw "There are more than 1 groups called " + groupName;
+ }
+
+ var group = groups.get(0);
+ var targetResourceType = group.resourceType;
+
+ var deployFn = function(restartFn) {
+
+ var bundleVersion = bundles.createBundleVersion(bundleZipFile);
+ var destination = BundleManager.createBundleDestination(bundleVersion.bundle.id, destinationName, destinationDescription, baseDirName, deployDir, group.id);
+
+ var deployment = bundles.deployBundle(bundleVersion, destination, deploymentConfiguration, null);
+
+ if (deployment.status != BundleDeploymentStatus.SUCCESS) {
+ throw "Deployment wasn't successful: " + deployment;
+ }
+
+ restartFn(group);
+
+ return deployment;
+ };
+
+ if (targetResourceType.plugin == "JBossAS" && targetResourceType.name == "JBossAS Server") {
+ return deployFn(_restartAS4);
+ } else if (targetResourceType.plugin == "JBossAS5" && targetResourceType.name == "JBossAS Server") {
+ return deployFn(_restartAS5);
+ } else if (targetResourceType.plugin == "jboss-as-7" &&
+ (targetResourceType.name == "JBossAS7-Standalone" ||
+ targetResourceType.name == "JBossAS-Managed")) {
+ return deployFn(_restartAS7);
+ }
+
+ throw "The resource group the destination targets doesn't seem to be a JBoss AS server group.";
+}
+
+/**
+ * Deploys an updated bundle of an enterprise application to a destination that
+ * points to a group of JBoss AS(4,5,6,7) servers and then stops all the servers
+ * serially and then starts them up again sequentially.
+ *
+ * @param bundleZipFile
+ * the path to the bundle zip file with the application
+ * @param jbasDestination
+ * the bundle destination the bundle should be deployed to (or id
+ * thereof)
+ * @param deploymentConfiguration
+ * the deployment configuration. This can be an ordinary javascript
+ * object (hash) or an instance of RHQ's Configuration. If it is the
+ * former, it is converted to the Configuration instance using the
+ * <code>asConfiguration</code> function from <code>util.js</code>.
+ * Please consult the documentation of that method to understand the
+ * limitations of that approach.
+ * @param description
+ * the deployment description
+ *
+ * @return the deployment instance
+ */
+exports.updateAppAndRestart = function(bundleZipFile, jbasDestination, deploymentConfiguration) {
+ // first figure out the jbas version we are deploying to
+ var destinationId = jbasDestination;
+ if (typeof(jbasDestination) == 'object') {
+ destinationId = jbasDestination.id;
+ }
+
+ var destCrit = new BundleDestinationCriteria
+ destCrit.fetchGroup(true)
+
+ var destinations = BundleManager.findBundleDestinationsByCriteria(destCrit);
+
+ if (destinations.empty) {
+ throw "No destinations corresponding to " + jbasDestination + " found on the server.";
+ }
+
+ var destination = destinations.get(0);
+
+ var targetResourceType = destination.group.resourceType;
+
+ if (targetResourceType == null) {
+ throw "This function expects a compatible group of JBoss AS (4,5,6 or 7) resources but the provided destination is connected with " + destination.group;
+ }
+
+ var deployFn = function(restartFn) {
+ var bundleVersion = bundles.createBundleVersion(bundleZipFile);
+ var deployment = bundles.deployBundle(bundleVersion, destination, deploymentConfiguration, null);
+
+ if (deployment.status != BundleDeploymentStatus.SUCCESS) {
+ throw "Deployment wasn't successful: " + deployment;
+ }
+
+ restartFn(destination.group);
+
+ return deployment;
+ };
+
+ if (targetResourceType.plugin == "JBossAS" && targetResourceType.name == "JBossAS Server") {
+ return deployFn(_restartAS4);
+ } else if (targetResourceType.plugin == "JBossAS5" && targetResourceType.name == "JBossAS Server") {
+ return deployFn(_restartAS5);
+ } else if (targetResourceType.plugin == "jboss-as-7" &&
+ (targetResourceType.name == "JBossAS7-Standalone" ||
+ targetResourceType.name == "JBossAS-Managed")) {
+ return deployFn(_restartAS7);
+ }
+
+ throw "The resource group the destination targets doesn't seem to be a JBoss AS server group.";
+}
+
+/**
+ * This function adds an AS7 server to a cluster with another AS7 instance, using
+ * the provided node name as its identifier.
+ * <p>
+ * This method only makes the new member use the same configuration as the existing
+ * member and synchronizes its jgroups, messaging and modcluster socket bindings
+ * with the cluster. Optionally it also copies over all the deployments to the
+ * new member.
+ * <p>
+ * The configurations are therefore assumed to be otherwise compatible - i.e.
+ * the infinispan cache containers should be configured correctly (or left at
+ * default values, which are configured correctly), etc.
+ *
+ * @param newAs7Resource the resource proxy of the AS7 instance to add
+ * @param newNodeName the node name, i.e. unique identification, of the new member
+ * in the cluster
+ * @param existingClusterMemberResource an AS7 instance that belongs to a cluster
+ * the new member should join into.
+ * @param copyDeployments whether or not to copy the deployments from the existing
+ * member to the new member
+ */
+exports.as7.addToCluster = function(newAs7Resource, newNodeName, existingClusterMemberResource, doCopyDeployments) {
+ println("Reading config of the existing cluster member");
+ var existingMember = {
+ 'id' : existingClusterMemberResource.id,
+ 'resourceConfiguration' : _getLiveResourceConfiguration(existingClusterMemberResource),
+ 'pluginConfiguration' : _getPluginConfiguration(existingClusterMemberResource)
+ };
+
+ var clusterConfig = _getClusterSignificantConfig(existingClusterMemberResource.children,
+ existingMember.pluginConfiguration, existingMember.resourceConfiguration);
+
+ println("Reading config of the new member");
+ var newMember = {
+ 'id' : newAs7Resource.id,
+ 'resourceConfiguration' : _getLiveResourceConfiguration(newAs7Resource),
+ 'pluginConfiguration' : _getPluginConfiguration(newAs7Resource)
+ };
+
+ var memberConfig = _getClusterSignificantConfig(newAs7Resource.children, newMember.pluginConfiguration, newMember.resourceConfiguration);
+
+ var memberResourceConfiguration = newMember.resourceConfiguration.deepCopy(false);
+
+ if (memberConfig['config'] != clusterConfig['config']) {
+ println("The configurations of the servers differ.\n" +
+ "The new cluster member's configuration will be changed to match the configuration of the existing member.");
+
+ newAs7Resource.updatePluginConfiguration(_changeConfig(newMember.pluginConfiguration, clusterConfig['config']));
+
+ //we need to restart straight away so that we see the changes to the
+ //rest of the configuration caused by the change of current config.
+ println("Restarting the new cluster member to switch it to the new configuration.");
+ newAs7Resource.restart();
+
+ //refresh the resource
+ newAs7Resource = ProxyFactory.getResource(newMember.id);
+ newMember = {
+ 'id' : newAs7Resource.id,
+ 'resourceConfiguration' : _getLiveResourceConfiguration(newAs7Resource),
+ 'pluginConfiguration' : _getPluginConfiguration(newAs7Resource)
+ };
+
+ //refresh the cluster specific config after the restart with the new
+ //config
+ memberConfig = _getClusterSignificantConfig(newAs7Resource.children, newMember.pluginConfiguration, newMember.resourceConfiguration);
+ memberResourceConfiguration = newMember.resourceConfiguration;
+ }
+
+ //now check what's the node name we see
+ if (memberConfig['node-name'] != newNodeName) {
+ println("Updating the node name of the new cluster member from '" + memberConfig['node-name'] + "' to '" + newNodeName + "'");
+ _updateNodeName(memberResourceConfiguration, newNodeName);
+
+ newAs7Resource.updateResourceConfiguration(memberResourceConfiguration);
+ memberResourceConfiguration = newMember.resourceConfiguration.deepCopy(false);
+ }
+
+ //now apply the socket binding changes for jgroups and other cluster
+ //significant subsystems
+ //first find the socket binding group config in the new member
+ for(i in newAs7Resource.children) {
+ var child = newAs7Resource.children[i];
+ if (child.resourceType.name == 'SocketBindingGroup' &&
+ child.resourceType.plugin == 'JBossAS7') {
+
+ println("Updating socket bindings of jgroups, messaging and modcluster subsystems");
+
+ var resourceConfig = _getLiveResourceConfiguration(child);
+
+ var portOffset = javascriptString(resourceConfig.getSimpleValue('port-offset', '0'));
+ var clusterMemberPortOffset = clusterConfig['port-offset'];
+
+ var newConfig = resourceConfig.deepCopy(false);
+
+ _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['jgroups']);
+ _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['messaging']);
+ _updateSocketBindings(newConfig, portOffset, clusterMemberPortOffset, clusterConfig['modcluster']);
+
+ child.updateResourceConfiguration(newConfig);
+ }
+ }
+
+ println("Restarting the new member for the new socket bindings to take effect.");
+ newAs7Resource.restart();
+
+ if (doCopyDeployments) {
+ println("Copying the deployments to the new cluster member...");
+ copyDeployments(existingClusterMemberResource, newAs7Resource);
+
+ println("Restarting the new cluster member.");
+ newAs7Resource.restart();
+ }
+}
+
+/**
+ * Copies all deployments from the source to the target. Both resources must
+ * be standalone AS7 servers.
+ *
+ * @param sourceAS7 the resource id or object of the source AS7 standalone instance
+ * @param targetAS7 the resource id or object of the target AS7 standalone instance
+ */
+exports.as7.copyDeployments = function(sourceAS7, targetAS7) {
+ if (typeof sourceAS7 == 'object') {
+ sourceAS7 = sourceAS7.id;
+ }
+
+ if (typeof targetAS7 == 'object') {
+ targetAS7 = targetAS7.id;
+ }
+
+ var deploymentResourceType = ResourceTypeManager.getResourceTypeByNameAndPlugin('Deployment', 'JBossAS7');
+
+ var deploymentsCrit = new ResourceCriteria;
+ deploymentsCrit.addFilterParentResourceId(sourceAS7);
+ deploymentsCrit.addFilterResourceTypeId(deploymentResourceType.id);
+
+ var unlimitedPageControl = PageControl.unlimitedInstance;
+
+ var sourceDeployments = ResourceManager.findResourcesByCriteria(deploymentsCrit);
+ var iterator = sourceDeployments.iterator();
+ while (iterator.hasNext()) {
+ var deploymentResource = iterator.next();
+ //get a resource proxy for easy access to configurations, etc.
+ deploymentResource = ProxyFactory.getResource(deploymentResource.id);
+
+ println("Copying deployment " + deploymentResource.name);
+
+ var installedPackage = ContentManager.getBackingPackageForResource(deploymentResource.id);
+ var content = ContentManager.getPackageBytes(deploymentResource.id, installedPackage.id);
+
+ var runtimeName = deploymentResource.resourceConfiguration.getSimpleValue('runtime-name', deploymentResource.name);
+
+ var deploymentConfiguration = new Configuration;
+ deploymentConfiguration.put(new PropertySimple('runtimeName', runtimeName));
+
+ //so now we have both metadata and the data of the deployment, let's
+ //push a copy of it to the target server
+ var history = ResourceFactoryManager.createPackageBackedResource(targetAS7,
+ deploymentResourceType.id, deploymentResource.name,
+ deploymentResource.pluginConfiguration,
+ installedPackage.packageVersion.generalPackage.name,
+ installedPackage.packageVersion.version,
+ installedPackage.packageVersion.architecture.id,
+ deploymentConfiguration, content, null);
+
+ while (history.status.name() == 'IN_PROGRESS') {
+ java.lang.Thread.sleep(1000);
+ //the API for checking the create histories is kinda weird..
+ var histories = ResourceFactoryManager.findCreateChildResourceHistory(targetAS7, null, null, unlimitedPageControl);
+ var hit = histories.iterator();
+ var found = false;
+ while(hit.hasNext()) {
+ var h = hit.next();
+
+ if (h.id == history.id) {
+ history = h;
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ throw "The history object for the deployment seems to have disappeared, this is very strange.";
+ }
+ }
+
+ println("Deployment finished with status: " + history.status.toString() +
+ (history.status.name() == 'SUCCESS' ? "." : (", error message: " + history.errorMessage + ".")));
+ }
+}
+
+function _getConfigName(as7PluginConfig) {
+ var argsValue = as7PluginConfig.getSimpleValue('startScriptArgs', '');
+
+ var args = argsValue.split('\n');
+
+ var possibleParams = ['-c ', '-c=', '--server-config='];
+
+ var ret = null;
+ for (i in args) {
+ var arg = args[i];
+
+ var found = false;
+
+ for(j in possibleParams) {
+ var param = possibleParams[j];
+ var pos = arg.indexOf(param);
+
+ if (pos >= 0) {
+ ret = arg.substring(pos + param.length).trim();
+ found = true;
+ break;
+ }
+ }
+
+ if (found) {
+ break;
+ }
+ }
+
+ if (ret != null && ret.startsWith('%') && ret.endsWith('%')) {
+ var pluginConfRef = ret.substring(1, ret.length - 1);
+ ret = as7PluginConfig.getSimpleValue(pluginConfigRef, null);
+ }
+
+ return ret;
+}
+
+function _changeConfig(pluginConfig, configName) {
+ var argsValue = javascriptString(pluginConfig.getSimpleValue('startScriptArgs', ''));
+
+ var args = argsValue.split('\n');
+
+ var possibleParams = ['-c ', '-c=', '--server-config='];
+
+ var updated = false;
+
+ for (i in args) {
+ var arg = args[i];
+
+ for(j in possibleParams) {
+ var param = possibleParams[j];
+
+ var pos = arg.indexOf(param);
+
+ if (pos >= 0) {
+ args[i] = param + configName;
+ updated = true;
+ break;
+ }
+ }
+
+ if (updated) {
+ break;
+ }
+ }
+
+ if (!updated) {
+ args.push("-c " + configName);
+ }
+
+ //join the config back together
+ for(i in args) {
+ if (i == 0) {
+ argsValue = args[i];
+ } else {
+ argsValue += "\n" + args[i];
+ }
+ }
+
+ pluginConfig.put(new PropertySimple('startScriptArgs', argsValue));
+
+ return pluginConfig;
+}
+
+/**
+ * The config properties of AS7 can have a form of ${propertyName:defaultvalue}.
+ * Because we can't figure out the value of the property if it is defined,
+ * (or get at its default value), we return the following hash from this function
+ * {
+ * property : propertyName,
+ * value : defaultvalue
+ * }
+ *
+ * At least one of the keys in the above hash will have a value.
+ */
+function _parseValueFromExpr(expr) {
+ var strExpr = expr + '';
+ if (strExpr.indexOf('${') == 0) {
+ var colonIdx = strExpr.indexOf(':');
+ if (colonIdx == -1) {
+ return { 'property' : expr };
+ } else {
+ var property = strExpr.substring(2, colonIdx);
+ var value = strExpr.substring(colonIdx + 1, strExpr.length - 1);
+
+ return { 'property' : property, 'value' : value };
+ }
+ } else {
+ return { 'value' : expr };
+ }
+}
+
+/**
+ * This converts the result of _parseValueFromExpr() function back into the
+ * ${property:defaultvalue} format.
+ */
+function _composeValueExpr(parsedValue) {
+ if (parsedValue.property == undefined) {
+ return parsedValue.value;
+ } else {
+ return '${' + parsedValue.property + ':' + parsedValue.value + '}';
+ }
+}
+
+function _updateNodeName(serverResourceConfiguration, newNodeName) {
+ //define it as a system prop
+ var systemProps = serverResourceConfiguration.getList('*2');
+ if (systemProps == null) {
+ systemProps = new PropertyList('*2');
+ serverResourceConfiguration.put(systemProps);
+ }
+
+ var it = systemProps.list.iterator();
+ var updated = false;
+ while (it.hasNext()) {
+ var systemProp = it.next();
+ var systemPropName = javascriptString(systemProp.getSimpleValue('name', null));
+ if (systemPropName == 'jboss.node.name') {
+ var systemPropValue = systemProp.getSimple('value');
+ if (systemPropValue == null) {
+ systemPropValue = new PropertySimple('value', newNodeName);
+ systemProp.put(systemPropValue);
+ } else {
+ systemPropValue.setValue(newNodeName);
+ }
+
+ updated = true;
+ break;
+ }
+ }
+
+ if (!updated) {
+ var systemProp = new PropertyMap('*:name');
+ systemProp.put(new PropertySimple('name', 'jboss.node.name'));
+ systemProp.put(new PropertySimple('value', newNodeName));
+ systemProps.add(systemProp);
+ }
+}
+
+function _updateSocketBindings(socketBindingsConfig, portOffset, clusterMemberPortOffset, socketBindingConfig) {
+ portOffset = _parseValueFromExpr(portOffset);
+ clusterMemberPortOffset = _parseValueFromExpr(clusterMemberPortOffset);
+
+ var portOffsetValue = portOffset.value != undefined ? portOffset.value : 0;
+ var clusterMemberPortOffsetValue = clusterMemberPortOffset.value != undefined ?
+ clusterMemberPortOffset.value : 0;
+
+ var portOffsetDiff = clusterMemberPortOffsetValue - portOffsetValue;
+
+ var ports = socketBindingsConfig.get('*');
+ var portIterator = ports.list.iterator();
+
+ var appliedProperties = [];
+
+ while (portIterator.hasNext()) {
+ var port = portIterator.next();
+
+ var name = port.getSimpleValue('name', null);
+
+ if (socketBindingConfig[name] != undefined) {
+ //k, this is a significant config, port it over
+
+ //compute the value of the ports
+ if (socketBindingConfig[name]['fixed-port'] == 'true') {
+ port.put(new PropertySimple('port:expr', socketBindingConfig[name]['port:expr']));
+ port.put(new PropertySimple('multicast-port:expr', socketBindingConfig[name]['multicast-port:expr']));
+ port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address']));
+ port.put(new PropertySimple('fixed-port', 'true'));
+ } else {
+ var portExprToUse = _parseValueFromExpr(socketBindingConfig[name]['port:expr']);
+ if (portExprToUse.value != undefined) {
+ portExprToUse.value = portOffsetDiff + parseInt(portExprToUse.value) + '';
+ }
+
+ var multicastPortExprToUse = _parseValueFromExpr(socketBindingConfig[name]['multicast-port:expr']);
+ if (multicastPortExprToUse.value != undefined) {
+ multicastPortExprToUse.value = portOffsetDiff + parseInt(multicastPortExprToUse.value) + '';
+ }
+
+ port.put(new PropertySimple('port:expr', _composeValueExpr(portExprToUse)));
+ port.put(new PropertySimple('multicast-port:expr', _composeValueExpr(multicastPortExprToUse)));
+ port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address']));
+ port.put(new PropertySimple('fixed-port', 'false'));
+ }
+ appliedProperties.push(name);
+ }
+ }
+
+ //I need contains() and Rhino's Array object apparently doesn't have indexOf()
+ //which I could otherwise use.
+ appliedProperties = java.util.Arrays.asList(appliedProperties);
+
+ //now add to the list the props that were not there
+ for(name in socketBindingConfig) {
+ if (appliedProperties.contains(name)) {
+ continue;
+ }
+
+ var port = new PropertyMap('binding');
+ ports.add(port);
+
+ port.put(new PropertySimple('name', name));
+ port.put(new PropertySimple('multicast-address', socketBindingConfig[name]['multicast-address']));
+ port.put(new PropertySimple('fixed-port', socketBindingConfig[name]['fixed-port']));
+
+ var portExprToUse = _parseValueFromExpr(socketBindingConfig[name]['port:expr']);
+ if (portExprToUse.value != undefined && !socketBindingConfig[name]['fixed-port']) {
+ portExprToUse.value = portOffsetDiff + parseInt(portExprToUse.value) + '';
+ }
+
+ var multicastPortExprToUse = _parseValueFromExpr(socketBindingConfig[name]['multicast-port:expr']);
+ if (multicastPortExprToUse.value != undefined && !socketBindingConfig[name]['fixed-port']) {
+ multicastPortExprToUse.value = portOffsetDiff + parseInt(multicastPortExprToUse.value) + '';
+ }
+
+ port.put(new PropertySimple('port:expr', _composeValueExpr(portExprToUse)));
+ port.put(new PropertySimple('multicast-port:expr', _composeValueExpr(multicastPortExprToUse)));
+ }
+}
+
+
+/**
+ * Returns a javascript hash of configuration properties significant for the
+ * cluster configuration.
+ *
+ * This method is quite simplistic - it merely reads out the important socket
+ * bindings and Infinispan configuration properties.
+ *
+ * It doesn't try to be smart about specifying which concrete caches and cache
+ * containers are used for individual subsystems like EJB3, JPA or web apps.
+ *
+ * @param resource the resource proxy of the AS7
+ */
+function _getClusterSignificantConfig(children, pluginConfiguration, resourceConfiguration) {
+ var ret = {};
+
+ ret['config'] = javascriptString(_getConfigName(pluginConfiguration));
+
+ ret['node-name'] = javascriptString(resourceConfiguration.getSimpleValue('node-name', null));
+
+ //the standalone server has a single socket binding group
+ for(var i in children) {
+ var child = children[i];
+ if (child.resourceType.plugin != 'JBossAS7') {
+ continue;
+ }
+ if (child.resourceType.name == 'SocketBindingGroup') {
+
+ var resourceConfig = _getLiveResourceConfiguration(child);
+
+ ret['port-offset'] = javascriptString(resourceConfig.getSimpleValue('port-offset', '0'));
+ var ports = resourceConfig.get('*');
+ var portIterator = ports.list.iterator();
+
+ var jgroups = {};
+ var messaging = {};
+ var modcluster = {};
+
+ ret['jgroups'] = jgroups;
+ ret['messaging'] = messaging;
+ ret['modcluster'] = modcluster;
+
+ while (portIterator.hasNext()) {
+ var port = portIterator.next();
+ var name = javascriptString(port.getSimpleValue('name', null));
+
+ if (name.indexOf('jgroups') == 0) {
+ jgroups[name] = _getSocketBinding(port);
+ } else if (name.indexOf('messaging') == 0) {
+ messaging[name] = _getSocketBinding(port);
+ } else if (name.indexOf('modcluster') == 0) {
+ modcluster[name] = _getSocketBinding(port);
+ }
+ }
+ } else if (child.resourceType.name == 'Infinispan') {
+ var ispn = {};
+ ret['infinispan'] = ispn;
+
+ //This has disappeared
+ //ispn['default-cache-container'] = javascriptString(child.defaultCacheContainer.value);
+ var cacheContainers = {};
+ ispn['cache-containers'] = cacheContainers;
+
+ for(cc in child.children) {
+ var cacheContainer = child.children[cc];
+
+ var caches = {};
+
+ var containerConfig = _getLiveResourceConfiguration(cacheContainer);
+
+ cacheContainers[cacheContainer.name] = {
+ 'default-cache' : javascriptString(containerConfig.getSimpleValue('default-cache', null)),
+ 'aliases' : _asArray(containerConfig.get('aliases')),
+ 'caches' : caches
+ };
+
+ for (c in cacheContainer.children) {
+ var cache = cacheContainer.children[c];
+
+ caches[cache.name] = {
+ '_flavor' : javascriptString(containerConfig.getSimpleValue('_flavor', null)),
+ 'batching' : javascriptString(containerConfig.getSimpleValue('batching', null)),
+ 'indexing' : javascriptString(containerConfig.getSimpleValue('indexing', null)),
+ 'mode' : javascriptString(containerConfig.getSimpleValue('mode', null))
+ };
+ }
+ }
+ }
+ }
+
+ return ret;
+}
+
+function _getSocketBinding(port) {
+ return {
+ 'port:expr' : javascriptString(port.getSimpleValue('port:expr', '0')),
+ 'multicast-port:expr' : javascriptString(port.getSimpleValue('multicast-port:expr', null)),
+ 'multicast-address' : javascriptString(port.getSimpleValue('multicast-address', null)),
+ 'fixed-port' : javascriptString(port.getSimpleValue('fixed-port', null))
+ };
+}
+
+function javascriptString(string) {
+ return string == null || string == undefined ? string : string + '';
+}
+
+function _asArray(propertyList) {
+ var ret = [];
+ if (propertyList == undefined || propertyList == null) {
+ return ret;
+ }
+
+ var it = propertyList.list.iterator();
+ while (it.hasNext()) {
+ var prop = it.next();
+
+ if (prop instanceof PropertySimple) {
+ ret.push(javascriptString(prop.stringValue));
+ }
+ }
+
+ return ret;
+}
+
+function _getPluginConfiguration(resource) {
+ if (typeof(resource) == 'number') {
+ resource = ProxyFactory.getResource(resource)
+ } else {
+ resource = ProxyFactory.getResource(resource.id)
+ }
+ return resource.pluginConfiguration
+}
+
+function _getLiveResourceConfiguration(resource) {
+ var id;
+ if (typeof(resource) == 'number') {
+ id = resource;
+ } else {
+ id = resource.id
+ }
+
+ return ConfigurationManager.getLiveResourceConfiguration(id, false)
+}
+
+function _loadGroupMembers(group) {
+ var crit = new ResourceGroupCriteria;
+ crit.addFilterId(group.id);
+ crit.fetchExplicitResources(true);
+ crit.fetchImplicitResources(true);
+
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(crit)
+
+ if (groups.empty) {
+ throw "Could not find a previously loaded group on the server: " + group;
+ }
+
+ return groups.get(0);
+}
+
+function _allResourceIds(group) {
+ var list = [];
+
+ if (group.explicitResources != null) {
+ foreach(group.explicitResources, function(resource) {
+ list.push(resource.id);
+ });
+ }
+
+ return list;
+}
+
+function _runOperationSequentially(group, operationName, operationConfig) {
+ group = _loadGroupMembers(group);
+ var resourceIds = _allResourceIds(group);
+
+ var conf = operationConfig;
+ if (!(conf instanceof Configuration)) {
+ conf = asConfiguration(conf);
+ }
+
+ // by specifying the resource ids explicitly, we define the order in which
+ // the operations will be executed on individual resources (in sequence).
+ // if the resourceIds were null, the operations would be invoked all at once
+ // in no particular order.
+ var schedule = OperationManager.scheduleGroupOperation(group.id, resourceIds, false, operationName, conf, 0, 0, 0, 0, null);
+
+ // now we need to wait for all the individual operations on resources to
+ // complete
+ var crit = new GroupOperationHistoryCriteria;
+ crit.addFilterJobId(new JobId(schedule.jobName, schedule.jobGroup));
+
+ while (true) {
+ // XXX should this be configurable?
+ // we're waiting for an AS to start/shutdown which takes time..
+ // Let's check in 5s intervals.
+ // We're waiting at the start of this loop to also ensure that the server
+ // had time to issue the quartz job and persist the history entry.
+ java.lang.Thread.currentThread().sleep(5000);
+
+ var results = OperationManager.findGroupOperationHistoriesByCriteria(crit);
+
+ if (results.empty) {
+ throw "Could not find operation history for schedule " + schedule + ". This should not happen.";
+ }
+
+ var history = results.get(0);
+
+ if (history.status != OperationRequestStatus.INPROGRESS) {
+ return history;
+ }
+ }
+}
+
+function _restartAS4(group) {
+ _runOperationSequentially(group, "shutdown", new Configuration);
+ _runOperationSequentially(group, "start", new Configuration);
+}
+
+function _restartAS5(group) {
+ _runOperationSequentially(group, "shutdown", new Configuration);
+ _runOperationSequentially(group, "start", new Configuration);
+}
+
+function _restartAS7(group) {
+ var shutdownOp = group.resourceType.name == "JBossAS7-Standalone" ? "shutdown" : "server:stop";
+ var startOp = group.resourceType.name == "JBossAS7-Standalone" ? "start" : "server:start";
+
+ _runOperationSequentially(group, shutdownOp, new Configuration);
+ _runOperationSequentially(group, startOp, new Configuration);
+}
diff --git a/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/util.js b/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/util.js
new file mode 100644
index 0000000..b67eebc
--- /dev/null
+++ b/modules/enterprise/server/container/src/main/downloadable-resources/script-modules/util.js
@@ -0,0 +1,280 @@
+/**
+ * file: util.js
+ *
+ * description: This script contains functions that provide core, low-level
+ * functionality such as iterating over a collection or searching a collection.
+ * This has no other script or library dependencies.
+ *
+ * author: jsanda(a)redhat.com
+ * author: lkrejci(a)redhat.com
+ *
+ * See also http://johnsanda.blogspot.com/search/label/javascript
+ */
+
+
+/**
+ * If obj is a JS array or a java.util.Collection, each element is passed to
+ * the callback function. If obj is a java.util.Map, each map entry is passed
+ * to the callback function as a key/value pair. If obj is none of the
+ * aforementioned types, it is treated as a generic object and each of its
+ * properties is passed to the callback function as a name/value pair.
+ */
+exports.foreach = function (obj, fn) {
+ if (obj instanceof Array) {
+ for (i in obj) {
+ fn(obj[i]);
+ }
+ }
+ else if (obj instanceof java.util.Collection) {
+ var iterator = obj.iterator();
+ while (iterator.hasNext()) {
+ fn(iterator.next());
+ }
+ }
+ else if (obj instanceof java.util.Map) {
+ var iterator = obj.entrySet().iterator()
+ while (iterator.hasNext()) {
+ var entry = iterator.next();
+ fn(entry.key, entry.value);
+ }
+ }
+ else { // assume we have a generic object
+ for (i in obj) {
+ fn(i, obj[i]);
+ }
+ }
+}
+
+/**
+ * Iterates over obj similar to foreach. fn should be a predicate that evaluates
+ * to true or false. The first match that is found is returned.
+ */
+exports.find = function(obj, fn) {
+ if (obj instanceof Array) {
+ for (i in obj) {
+ if (fn(obj[i])) {
+ return obj[i]
+ }
+ }
+ }
+ else if (obj instanceof java.util.Collection) {
+ var iterator = obj.iterator();
+ while (iterator.hasNext()) {
+ var next = iterator.next();
+ if (fn(next)) {
+ return next;
+ }
+ }
+ }
+ else if (obj instanceof java.util.Map) {
+ var iterator = obj.entrySet().iterator();
+ while (iterator.hasNext()) {
+ var entry = iterator.next();
+ if (fn(entry.key, entry.value)) {
+ return {key: entry.key, value: entry.value};
+ }
+ }
+ }
+ else {
+ for (i in obj) {
+ if (fn(i, obj[i])) {
+ return {key: i, value: obj[i]};
+ }
+ }
+ }
+ return null;
+}
+
+/**
+ * Iterates over obj similar to foreach. fn should be a predicate that evaluates
+ * to true or false. All of the matches are returned in a java.util.List.
+ */
+exports.findAll = function(obj, fn) {
+ var matches = java.util.ArrayList();
+ if ((obj instanceof Array) || (obj instanceof java.util.Collection)) {
+ foreach(obj, function(element) {
+ if (fn(element)) {
+ matches.add(element);
+ }
+ });
+ }
+ else {
+ foreach(obj, function(key, value) {
+ if (fn(theKey, theValue)) {
+ matches.add({key: theKey, value: theValue});
+ }
+ });
+ }
+ return matches;
+}
+
+/**
+ * A convenience function to convert javascript hashes into RHQ's configuration
+ * objects.
+ * <p>
+ * The conversion of individual keys in the hash follows these rules:
+ * <ol>
+ * <li> if a value of a key is a javascript array, it is interpreted as PropertyList
+ * <li> if a value is a hash, it is interpreted as a PropertyMap
+ * <li> otherwise it is interpreted as a PropertySimple
+ * <li> a null or undefined value is ignored
+ * </ol>
+ * <p>
+ * Note that the conversion isn't perfect, because the hash does not contain enough
+ * information to restore the names of the list members.
+ * <p>
+ * Example: <br/>
+ * <pre><code>
+ * {
+ * simple : "value",
+ * list : [ "value1", "value2"],
+ * listOfMaps : [ { k1 : "value", k2 : "value" }, { k1 : "value2", k2 : "value2" } ]
+ * }
+ * </code></pre>
+ * gets converted to a configuration object:
+ * Configuration:
+ * <ul>
+ * <li> PropertySimple(name = "simple", value = "value")
+ * <li> PropertyList(name = "list")
+ * <ol>
+ * <li>PropertySimple(name = "list", value = "value1")
+ * <li>PropertySimple(name = "list", value = "value2")
+ * </ol>
+ * <li> PropertyList(name = "listOfMaps")
+ * <ol>
+ * <li> PropertyMap(name = "listOfMaps")
+ * <ul>
+ * <li>PropertySimple(name = "k1", value = "value")
+ * <li>PropertySimple(name = "k2", value = "value")
+ * </ul>
+ * <li> PropertyMap(name = "listOfMaps")
+ * <ul>
+ * <li>PropertySimple(name = "k1", value = "value2")
+ * <li>PropertySimple(name = "k2", value = "value2")
+ * </ul>
+ * </ol>
+ * </ul>
+ * Notice that the members of the list have the same name as the list itself
+ * which generally is not the case.
+ */
+exports.asConfiguration = function(hash) {
+
+ config = new Configuration;
+
+ for(key in hash) {
+ value = hash[key];
+
+ if (value == null) {
+ continue;
+ }
+
+ (function(parent, key, value) {
+ function isArray(obj) {
+ return typeof(obj) == 'object' && (obj instanceof Array);
+ }
+
+ function isHash(obj) {
+ return typeof(obj) == 'object' && !(obj instanceof Array);
+ }
+
+ function isPrimitive(obj) {
+ return typeof(obj) != 'object';
+ }
+
+ //this is an anonymous function, so the only way it can call itself
+ //is by getting its reference via argument.callee. Let's just assign
+ //a shorter name for it.
+ var me = arguments.callee;
+
+ var prop = null;
+
+ if (isPrimitive(value)) {
+ prop = new PropertySimple(key, new java.lang.String(value));
+ } else if (isArray(value)) {
+ prop = new PropertyList(key);
+ for(var i = 0; i < value.length; ++i) {
+ var v = value[i];
+ if (v != null) {
+ me(prop, key, v);
+ }
+ }
+ } else if (isHash(value)) {
+ prop = new PropertyMap(key);
+ for(var i in value) {
+ var v = value[i];
+ if (value != null) {
+ me(prop, i, v);
+ }
+ }
+ }
+
+ if (parent instanceof PropertyList) {
+ parent.add(prop);
+ } else {
+ parent.put(prop);
+ }
+ })(config, key, value);
+ }
+
+ return config;
+}
+
+/**
+ * Opposite of <code>asConfiguration</code>. Converts an RHQ's configuration object
+ * into a javascript hash.
+ *
+ * @param configuration
+ */
+exports.asHash = function(configuration) {
+ ret = {}
+
+ iterator = configuration.getMap().values().iterator();
+ while(iterator.hasNext()) {
+ prop = iterator.next();
+
+ (function(parent, prop) {
+ function isArray(obj) {
+ return typeof(obj) == 'object' && (obj instanceof Array);
+ }
+
+ function isHash(obj) {
+ return typeof(obj) == 'object' && !(obj instanceof Array);
+ }
+
+ var me = arguments.callee;
+
+ var representation = null;
+
+ if (prop instanceof PropertySimple) {
+ representation = prop.stringValue;
+ } else if (prop instanceof PropertyList) {
+ representation = [];
+
+ for(var i = 0; i < prop.list.size(); ++i) {
+ var child = prop.list.get(i);
+ me(representation, child);
+ }
+ } else if (prop instanceof PropertyMap) {
+ representation = {};
+
+ var childIterator = prop.getMap().values().iterator();
+ while(childIterator.hasNext()) {
+ var child = childIterator.next();
+
+ me(representation, child);
+ }
+ }
+
+ if (isArray(parent)) {
+ parent.push(representation);
+ } else if (isHash(parent)) {
+ parent[prop.name] = representation;
+ }
+ })(ret, prop);
+ }
+ (function(parent) {
+
+ })(configuration);
+
+ return ret;
+}
\ No newline at end of file
commit ced6234fd469a54719153e558faec20372c6530b
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Aug 24 15:29:28 2012 +0200
Fixing the FileSystemScriptSourceProvider to only support the absolute paths. This is so that it conforms with the "file" scheme known from browsers, etc.
The relative path support was done through handling URIs that actually didn't
conform to the spec.
Adding a ModulesDirectoryScriptSourceProvider so that modules can be loaded
from user-defined location in the CLI.
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/script/FileSystemScriptSourceProvider.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/script/FileSystemScriptSourceProvider.java
index 531222b..60c8da8 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/script/FileSystemScriptSourceProvider.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/script/FileSystemScriptSourceProvider.java
@@ -37,25 +37,28 @@ import org.rhq.scripting.ScriptSourceProvider;
public class FileSystemScriptSourceProvider implements ScriptSourceProvider {
private static final Log LOG = LogFactory.getLog(FileSystemScriptSourceProvider.class);
- private static final String SCHEME = "file";
+ private static final String DEFAULT_SCHEME = "file";
+ private final String scheme;
+
+ public FileSystemScriptSourceProvider() {
+ this(DEFAULT_SCHEME);
+ }
+
+ public FileSystemScriptSourceProvider(String scheme) {
+ this.scheme = scheme;
+ }
+
@Override
public Reader getScriptSource(URI location) {
String scheme = location.getScheme();
//return early if we can't handle this URI
- if (scheme != null && !SCHEME.equals(scheme)) {
+ if (scheme == null || !this.scheme.equals(scheme)) {
return null;
}
- String path = location.getSchemeSpecificPart();
-
- if (scheme != null) {
- // leave out the leading '//';
- path = path.substring(2);
- }
-
- File f = new File(path);
+ File f = getFile(location);
try {
if (f.exists() && f.isFile() && f.canRead()) {
@@ -69,4 +72,9 @@ public class FileSystemScriptSourceProvider implements ScriptSourceProvider {
return null;
}
+ protected File getFile(URI location) {
+ String path = location.getPath();
+
+ return new File(path);
+ }
}
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/script/ModulesDirectoryScriptSourceProvider.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/script/ModulesDirectoryScriptSourceProvider.java
new file mode 100644
index 0000000..0e46abe
--- /dev/null
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/script/ModulesDirectoryScriptSourceProvider.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 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.client.script;
+
+import java.io.File;
+import java.net.URI;
+
+/**
+ * This is a configurable source provider that the users can use to load modules from
+ * a configured directory.
+ *
+ * @author Lukas Krejci
+ */
+public class ModulesDirectoryScriptSourceProvider extends FileSystemScriptSourceProvider {
+
+ private static final File ROOT_DIR = new File(System.getProperty("rhq.scripting.modules.root-dir", "./samples/modules"));
+ private static final String SCHEME = "modules";
+
+ public ModulesDirectoryScriptSourceProvider() {
+ super(SCHEME);
+ }
+
+ @Override
+ protected File getFile(URI location) {
+ String path = location.getPath();
+
+ //remove the leading /
+ path = path.substring(1);
+
+ return new File(ROOT_DIR, path);
+ }
+}
diff --git a/modules/enterprise/remoting/cli/src/main/resources/META-INF/services/org.rhq.scripting.ScriptSourceProvider b/modules/enterprise/remoting/cli/src/main/resources/META-INF/services/org.rhq.scripting.ScriptSourceProvider
index a935c58..20b3f0c 100644
--- a/modules/enterprise/remoting/cli/src/main/resources/META-INF/services/org.rhq.scripting.ScriptSourceProvider
+++ b/modules/enterprise/remoting/cli/src/main/resources/META-INF/services/org.rhq.scripting.ScriptSourceProvider
@@ -1,2 +1,3 @@
org.rhq.enterprise.client.script.SamplesScriptSourceProvider
org.rhq.enterprise.client.script.FileSystemScriptSourceProvider
+org.rhq.enterprise.client.script.ModulesDirectoryScriptSourceProvider
\ No newline at end of file
commit 791ec17efbc286f78b5b17977b652f9aaec94920
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Aug 24 10:19:41 2012 +0200
Simplified the existing source providers to use URI authority and paths
instead of the whole scheme-specific part.
Added unit tests for the script source providers.
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/script/BaseRhqSchemeScriptSourceProvider.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/script/BaseRhqSchemeScriptSourceProvider.java
index d90403d..4c6756f 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/script/BaseRhqSchemeScriptSourceProvider.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/script/BaseRhqSchemeScriptSourceProvider.java
@@ -31,19 +31,22 @@ import org.rhq.scripting.ScriptSourceProvider;
public abstract class BaseRhqSchemeScriptSourceProvider implements ScriptSourceProvider {
public static final String SCHEME = "rhq";
-
+ private final String authority;
+
+ protected BaseRhqSchemeScriptSourceProvider(String expectedAuthority) {
+ this.authority = expectedAuthority;
+ }
+
@Override
public Reader getScriptSource(URI scriptUri) {
if (scriptUri == null || !SCHEME.equals(scriptUri.getScheme())) {
return null;
}
- String path = scriptUri.getSchemeSpecificPart();
-
- if (!path.startsWith("//")) {
+ if (!authority.equals(scriptUri.getAuthority())) {
return null;
}
-
+
return doGetScriptSource(scriptUri);
}
diff --git a/modules/enterprise/binding/src/main/java/org/rhq/bindings/script/RepoScriptSourceProvider.java b/modules/enterprise/binding/src/main/java/org/rhq/bindings/script/RepoScriptSourceProvider.java
index b316dea..2a1f944 100644
--- a/modules/enterprise/binding/src/main/java/org/rhq/bindings/script/RepoScriptSourceProvider.java
+++ b/modules/enterprise/binding/src/main/java/org/rhq/bindings/script/RepoScriptSourceProvider.java
@@ -55,10 +55,14 @@ public class RepoScriptSourceProvider extends BaseRhqSchemeScriptSourceProvider
private static final Log LOG = LogFactory.getLog(RepoScriptSourceProvider.class);
- private static final String PREFIX = "//repositories/";
+ private static final String AUTHORITY = "repositories";
private RhqFacade rhqFacade;
+ public RepoScriptSourceProvider() {
+ super(AUTHORITY);
+ }
+
@Override
public void rhqFacadeChanged(StandardBindings bindings) {
this.rhqFacade = bindings.getAssociatedRhqFacade();
@@ -70,13 +74,7 @@ public class RepoScriptSourceProvider extends BaseRhqSchemeScriptSourceProvider
return null;
}
- String path = scriptUri.getSchemeSpecificPart();
-
- if (!path.startsWith(PREFIX)) {
- return null;
- }
-
- path = path.substring(PREFIX.length());
+ String path = scriptUri.getPath().substring(1); //remove the leading / from the path
int slashIdx = path.indexOf('/');
diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/script/SamplesScriptSourceProvider.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/script/SamplesScriptSourceProvider.java
index ca328b1..132915a 100644
--- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/script/SamplesScriptSourceProvider.java
+++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/script/SamplesScriptSourceProvider.java
@@ -40,21 +40,21 @@ public class SamplesScriptSourceProvider extends BaseRhqSchemeScriptSourceProvid
private static final Log LOG = LogFactory.getLog(SamplesScriptSourceProvider.class);
- private static final String PREFIX = "//samples/";
+ private static final String AUTHORITY = "samples";
+ public SamplesScriptSourceProvider() {
+ super(AUTHORITY);
+ }
+
@Override
protected Reader doGetScriptSource(URI scriptUri) {
- String path = scriptUri.getSchemeSpecificPart();
-
- if (!path.startsWith(PREFIX)) {
- return null;
- }
+ String path = scriptUri.getPath();
- path = path.substring(2); //remove the leading '//';
+ path = path.substring(1); //remove the leading '/';
//here we suppose that the CLI was started using the rhq-cli.(sh|bat) script
//which sets the working directory to the root of the CLI deployment
- File file = new File(path);
+ File file = new File(AUTHORITY, path);
try {
return new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8"));
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index 530add9..eed1ac4 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -116,6 +116,20 @@
<scope>provided</scope> <!-- by JBossAS -->
</dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-testng</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<profiles>
diff --git a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java
index 0fd4b92..af434d2 100644
--- a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java
+++ b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RemoteClient.java
@@ -20,6 +20,9 @@ package org.rhq.enterprise.clientapi;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@@ -241,6 +244,17 @@ public class RemoteClient implements RhqFacade {
return this.subject;
}
+ public URI getRemoteURI() {
+ try {
+ return new URI(getTransport(), null, getHost(), getPort(), null, null, null);
+ } catch (URISyntaxException e) {
+ //does not happen, but hey
+ LOG.error("Error creating the remote URI with transport, host and port: " + getTransport() + ", "
+ + getHost() + " and " + getPort(), e);
+ return null;
+ }
+ }
+
public String getHost() {
return this.host;
}
diff --git a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RhqDownloadsScriptSourceProvider.java b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RhqDownloadsScriptSourceProvider.java
index 663e1b3..6b866db 100644
--- a/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RhqDownloadsScriptSourceProvider.java
+++ b/modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/clientapi/RhqDownloadsScriptSourceProvider.java
@@ -42,10 +42,14 @@ public class RhqDownloadsScriptSourceProvider extends BaseRhqSchemeScriptSourceP
private static final Log LOG = LogFactory.getLog(RhqDownloadsScriptSourceProvider.class);
- private static final String PREFIX = "//downloads/";
+ private static final String AUTHORITY = "downloads";
private RemoteClient remoteClient;
+ public RhqDownloadsScriptSourceProvider() {
+ super(AUTHORITY);
+ }
+
@Override
public void rhqFacadeChanged(StandardBindings bindings) {
RhqFacade facade = bindings.getAssociatedRhqFacade();
@@ -63,25 +67,18 @@ public class RhqDownloadsScriptSourceProvider extends BaseRhqSchemeScriptSourceP
return null;
}
- String path = scriptUri.getSchemeSpecificPart();
-
- if (!path.startsWith(PREFIX)) {
- return null;
- }
-
- path.substring(1); //remove the leading '/'
+ String path = scriptUri.getPath();
- String urlString = remoteClient.getTransport() + "://" + remoteClient.getHost() + ":" + remoteClient.getPort()
- + path;
+ URI remoteUri = remoteClient.getRemoteURI().resolve(AUTHORITY + path);
try {
- URL downloadUrl = new URL(urlString);
+ URL downloadUrl = remoteUri.toURL();
return new InputStreamReader(downloadUrl.openStream());
} catch (MalformedURLException e) {
- LOG.debug("Failed to download the script from the RHQ server using URL: " + urlString, e);
+ LOG.debug("Failed to download the script from the RHQ server using URL: " + remoteUri, e);
} catch (IOException e) {
- LOG.debug("Failed to download the script from the RHQ server using URL: " + urlString, e);
+ LOG.debug("Failed to download the script from the RHQ server using URL: " + remoteUri, e);
}
return null;
diff --git a/modules/enterprise/remoting/client-api/src/test/java/org/rhq/enterprise/clienapi/RhqDownloadsScriptSourceProviderTest.java b/modules/enterprise/remoting/client-api/src/test/java/org/rhq/enterprise/clienapi/RhqDownloadsScriptSourceProviderTest.java
new file mode 100644
index 0000000..591df06
--- /dev/null
+++ b/modules/enterprise/remoting/client-api/src/test/java/org/rhq/enterprise/clienapi/RhqDownloadsScriptSourceProviderTest.java
@@ -0,0 +1,98 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.clienapi;
+
+import static org.testng.Assert.assertEquals;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.Reader;
+import java.net.URI;
+
+import org.mockito.Mockito;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import org.rhq.bindings.StandardBindings;
+import org.rhq.core.util.file.FileUtil;
+import org.rhq.core.util.stream.StreamUtil;
+import org.rhq.enterprise.clientapi.RemoteClient;
+import org.rhq.enterprise.clientapi.RhqDownloadsScriptSourceProvider;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+@Test
+public class RhqDownloadsScriptSourceProviderTest {
+
+ private File tmpDir;
+
+ private static final String EXPECTED_CONTENTS = "println('Hello, World!')";
+ @BeforeClass
+ public void createTmpDir() throws Exception {
+ tmpDir = FileUtil.createTempDirectory(getClass().getName(), null, null);
+
+ File downloadsDir = new File(tmpDir, "downloads");
+ downloadsDir.mkdirs();
+
+ File testScript = new File(downloadsDir, "test-script.js");
+
+ FileOutputStream out = new FileOutputStream(testScript);
+
+ try {
+ out.write(EXPECTED_CONTENTS.getBytes());
+ } finally {
+ out.close();
+ }
+ }
+
+ @AfterClass
+ public void deleteTempDir() {
+ if (tmpDir != null) {
+ FileUtil.purge(tmpDir, true);
+ }
+ }
+
+ public void canLocateScripts() throws Exception {
+ RemoteClient client = Mockito.mock(RemoteClient.class);
+
+ Mockito.when(client.getRemoteURI()).thenReturn(tmpDir.toURI());
+
+ RhqDownloadsScriptSourceProvider provider = new RhqDownloadsScriptSourceProvider();
+
+ StandardBindings bindings = new StandardBindings(null, client);
+
+ provider.rhqFacadeChanged(bindings);
+
+ URI location = new URI("rhq://downloads/test-script.js");
+
+ Reader rdr = provider.getScriptSource(location);
+
+ try {
+ String contents = StreamUtil.slurp(rdr);
+ assertEquals(contents, EXPECTED_CONTENTS, "Unexpected script loaded");
+ } finally {
+ rdr.close();
+ }
+ }
+}
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index 91682fa..1810ecb 100644
--- a/modules/enterprise/server/client-api/pom.xml
+++ b/modules/enterprise/server/client-api/pom.xml
@@ -54,7 +54,22 @@
<artifactId>quartz</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
<scope>test</scope>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-testng</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<profiles>
diff --git a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java
index 7b9232a..7711078 100644
--- a/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java
+++ b/modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/RhqDownloadsScriptSourceProvider.java
@@ -44,20 +44,24 @@ public class RhqDownloadsScriptSourceProvider extends BaseRhqSchemeScriptSourceP
private static final Log LOG = LogFactory.getLog(RhqDownloadsScriptSourceProvider.class);
- private static final String PREFIX = "//downloads/";
+ private static final String AUTHORITY = "downloads";
- private SystemManagerLocal systemManager = LookupUtil.getSystemManager();
- private SubjectManagerLocal subjectManager = LookupUtil.getSubjectManager();
+ private SystemManagerLocal systemManager;
+ private SubjectManagerLocal subjectManager;
+ public RhqDownloadsScriptSourceProvider() {
+ this(LookupUtil.getSystemManager(), LookupUtil.getSubjectManager());
+ }
+
+ public RhqDownloadsScriptSourceProvider(SystemManagerLocal systemManager, SubjectManagerLocal subjectManager) {
+ super(AUTHORITY);
+ this.systemManager = systemManager;
+ this.subjectManager = subjectManager;
+ }
+
@Override
protected Reader doGetScriptSource(URI scriptUri) {
- String path = scriptUri.getSchemeSpecificPart();
-
- if (!path.startsWith(PREFIX)) {
- return null;
- }
-
- path = path.substring(PREFIX.length());
+ String path = scriptUri.getPath().substring(1); //remove the leading /
Subject overlord = subjectManager.getOverlord();
diff --git a/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/RhqDownloadsScriptSourceProviderTest.java b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/RhqDownloadsScriptSourceProviderTest.java
new file mode 100644
index 0000000..2c73eec
--- /dev/null
+++ b/modules/enterprise/server/client-api/src/test/java/org/rhq/enterprise/client/test/RhqDownloadsScriptSourceProviderTest.java
@@ -0,0 +1,102 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.client.test;
+
+import static org.testng.Assert.assertEquals;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.Reader;
+import java.net.URI;
+import java.util.HashMap;
+
+import org.mockito.Mockito;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.common.ServerDetails;
+import org.rhq.core.util.file.FileUtil;
+import org.rhq.core.util.stream.StreamUtil;
+import org.rhq.enterprise.client.RhqDownloadsScriptSourceProvider;
+import org.rhq.enterprise.server.auth.SubjectManagerLocal;
+import org.rhq.enterprise.server.system.SystemManagerLocal;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+@Test
+public class RhqDownloadsScriptSourceProviderTest {
+
+ private File tmpDir;
+
+ private static final String EXPECTED_CONTENTS = "println('Hello, World!')";
+ @BeforeClass
+ public void createTmpDir() throws Exception {
+ tmpDir = FileUtil.createTempDirectory(getClass().getName(), null, null);
+ File downloadsDir = new File(new File(new File(tmpDir, "deploy"), "rhq.ear"), "rhq-downloads");
+ downloadsDir.mkdirs();
+
+ File testScript = new File(downloadsDir, "test-script.js");
+
+ FileOutputStream out = new FileOutputStream(testScript);
+
+ try {
+ out.write(EXPECTED_CONTENTS.getBytes());
+ } finally {
+ out.close();
+ }
+ }
+
+ @AfterClass
+ public void deleteTempDir() {
+ if (tmpDir != null) {
+ FileUtil.purge(tmpDir, true);
+ }
+ }
+
+ public void canLocateScripts() throws Exception {
+ SystemManagerLocal systemManager = Mockito.mock(SystemManagerLocal.class);
+ SubjectManagerLocal subjectManager = Mockito.mock(SubjectManagerLocal.class);
+
+ ServerDetails details = new ServerDetails();
+ HashMap<ServerDetails.Detail, String> map = new HashMap<ServerDetails.Detail, String>();
+ map.put(ServerDetails.Detail.SERVER_HOME_DIR, tmpDir.getAbsolutePath());
+ details.setDetails(map);
+
+ Mockito.when(systemManager.getServerDetails(Mockito.<Subject>any())).thenReturn(details);
+
+ RhqDownloadsScriptSourceProvider provider = new RhqDownloadsScriptSourceProvider(systemManager, subjectManager);
+
+ URI location = new URI("rhq://downloads/test-script.js");
+
+ Reader rdr = provider.getScriptSource(location);
+
+ try {
+ String contents = StreamUtil.slurp(rdr);
+ assertEquals(contents, EXPECTED_CONTENTS, "Unexpected script loaded");
+ } finally {
+ rdr.close();
+ }
+ }
+}
commit f835c490a057254d71aba7b8714c3f04af257bfd
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Fri Aug 24 10:17:29 2012 +0200
Making the module loading conforming with CommonJS:
1) The .js extension is optional (and according to the spec it even
shouldn't be there)
2) Relative module IDs are working now
3) Added unit tests for the module resolution
4) Modified exisiting unit tests to use CommonJS-conforming module URIs
diff --git a/modules/enterprise/scripting/javascript/src/main/java/org/rhq/scripting/javascript/JsEngineProvider.java b/modules/enterprise/scripting/javascript/src/main/java/org/rhq/scripting/javascript/JsEngineProvider.java
index 63c5023..af89772 100644
--- a/modules/enterprise/scripting/javascript/src/main/java/org/rhq/scripting/javascript/JsEngineProvider.java
+++ b/modules/enterprise/scripting/javascript/src/main/java/org/rhq/scripting/javascript/JsEngineProvider.java
@@ -30,6 +30,8 @@ import org.rhq.scripting.ScriptEngineProvider;
*/
public class JsEngineProvider implements ScriptEngineProvider {
+ public static final String SCRIPT_FILE_EXTENSION = "js";
+
@Override
public String getSupportedLanguage() {
return "javascript";
@@ -37,7 +39,7 @@ public class JsEngineProvider implements ScriptEngineProvider {
@Override
public String getScriptFileExtension() {
- return "js";
+ return SCRIPT_FILE_EXTENSION;
}
@Override
diff --git a/modules/enterprise/scripting/javascript/src/main/java/org/rhq/scripting/javascript/util/ScriptSourceToModuleSourceProviderAdapter.java b/modules/enterprise/scripting/javascript/src/main/java/org/rhq/scripting/javascript/util/ScriptSourceToModuleSourceProviderAdapter.java
index fb3926b..9a02210 100644
--- a/modules/enterprise/scripting/javascript/src/main/java/org/rhq/scripting/javascript/util/ScriptSourceToModuleSourceProviderAdapter.java
+++ b/modules/enterprise/scripting/javascript/src/main/java/org/rhq/scripting/javascript/util/ScriptSourceToModuleSourceProviderAdapter.java
@@ -25,47 +25,55 @@ import java.net.URI;
import java.net.URISyntaxException;
import org.mozilla.javascript.commonjs.module.provider.ModuleSource;
+import org.mozilla.javascript.commonjs.module.provider.ModuleSourceProvider;
import org.mozilla.javascript.commonjs.module.provider.ModuleSourceProviderBase;
import org.rhq.scripting.ScriptSourceProvider;
+import org.rhq.scripting.javascript.JsEngineProvider;
/**
+ * This is an adapter that acts as a {@link ModuleSourceProvider} for Rhino
+ * but uses RHQ's {@link ScriptSourceProvider} to load the scripts.
*
- *
* @author Lukas Krejci
*/
public class ScriptSourceToModuleSourceProviderAdapter extends ModuleSourceProviderBase {
private static final long serialVersionUID = 1L;
-
+
+ private static final String SUFFIX = "." + JsEngineProvider.SCRIPT_FILE_EXTENSION;
+
private ScriptSourceProvider scriptSourceProvider;
-
+
public ScriptSourceToModuleSourceProviderAdapter(ScriptSourceProvider provider) {
scriptSourceProvider = provider;
}
-
+
@Override
protected ModuleSource loadFromPrivilegedLocations(String moduleId, Object validator) throws IOException,
URISyntaxException {
- //if the URI is absolute, we make sure to define the ModuleSource as sandboxed.
- //this is done by making the URI a "subpath" of the base.
URI uri = new URI(moduleId);
- URI base = null;
- if (uri.isAbsolute()) {
- base = uri;
+ if (!uri.isAbsolute()) {
+ return null;
}
- return loadFromUri(uri, base, validator);
+ return loadFromUri(uri, null, validator);
}
@Override
protected ModuleSource loadFromUri(URI uri, URI base, Object validator) throws IOException, URISyntaxException {
URI fullUri = uri;
if (base != null) {
- fullUri = uri.resolve(base);
+ fullUri = base.resolve(uri);
+ }
+
+ if (!fullUri.getSchemeSpecificPart().endsWith(SUFFIX)) {
+ fullUri =
+ new URI(fullUri.getScheme(), fullUri.getAuthority(), fullUri.getPath() + SUFFIX, fullUri.getQuery(),
+ fullUri.getFragment());
}
Reader sourceReader = scriptSourceProvider.getScriptSource(fullUri);
-
+
if (sourceReader == null) {
return null;
} else {
diff --git a/modules/enterprise/scripting/javascript/src/test/java/org/rhq/scripting/javascript/EngineTest.java b/modules/enterprise/scripting/javascript/src/test/java/org/rhq/scripting/javascript/EngineTest.java
index 6aa9355..6ed5757 100644
--- a/modules/enterprise/scripting/javascript/src/test/java/org/rhq/scripting/javascript/EngineTest.java
+++ b/modules/enterprise/scripting/javascript/src/test/java/org/rhq/scripting/javascript/EngineTest.java
@@ -63,8 +63,8 @@ public class EngineTest {
public void modulesCanBeLoaded() throws Exception {
String script = "" +
- "var m1 = require('target/test-classes/test-module1.js'); \n" +
- "var m2 = require('target/test-classes/test-module2.js'); \n" +
+ "var m1 = require('target/test-classes/test-module1'); \n" +
+ "var m2 = require('target/test-classes/test-module2'); \n" +
"println(typeof(m1.func1));\n" +
"println(typeof(m1.func2));\n" +
"println(typeof(m2.func3));\n" +
@@ -85,7 +85,7 @@ public class EngineTest {
+ "var test2 = \"strstr\"\n"
+ "var test3 = new java.lang.String(\"strstr\")\n";
- ScriptEngine engine = new ScriptEngineManager().getEngineByName("javascript");
+ ScriptEngine engine = getScriptEngine();
engine.eval(script);
@@ -104,6 +104,19 @@ public class EngineTest {
assertEquals(ret, 12, "Engine failed to pass a concatenated string as a string parameter.");
}
+ public void relativeModuleAddressingWorks() throws Exception {
+ String script = "var n = require('target/test-classes/nest');";
+
+ ScriptEngine engine = getScriptEngine();
+
+ Object ret = engine.eval(script + "n.nest()");
+ assertEquals(ret, "Deep nest", "A module could not be loaded using a relative path.");
+
+ ret = engine.eval(script + "n.maze()");
+ assertEquals(ret, "func1", "A module could not be loaded using a relative path.");
+
+ }
+
private ScriptEngine getScriptEngine() {
ScriptEngineManager manager = new ScriptEngineManager();
return manager.getEngineByName("rhino-nonjdk");
diff --git a/modules/enterprise/scripting/javascript/src/test/java/org/rhq/scripting/javascript/InitializerTest.java b/modules/enterprise/scripting/javascript/src/test/java/org/rhq/scripting/javascript/InitializerTest.java
index e71155b..36bfbb9 100644
--- a/modules/enterprise/scripting/javascript/src/test/java/org/rhq/scripting/javascript/InitializerTest.java
+++ b/modules/enterprise/scripting/javascript/src/test/java/org/rhq/scripting/javascript/InitializerTest.java
@@ -100,7 +100,7 @@ public class InitializerTest {
public void scriptSourceProviderApplied() throws Exception {
- String script = "var m = require('rhq://test-module1.js'); m.func1();";
+ String script = "var m = require('rhq:/test-module1'); m.func1();";
//first let's try to find the scripts with the default source provider...
ScriptEngine eng = new JsEngineInitializer().instantiate(Collections.<String>emptySet(), null);
@@ -118,7 +118,7 @@ public class InitializerTest {
if (!"rhq".equals(location.getScheme())) {
return null;
}
- String scriptName = location.getSchemeSpecificPart().substring(2); //remove the '//'
+ String scriptName = location.getPath().substring(1); //remove the '/'
InputStream src = getClass().getClassLoader().getResourceAsStream(scriptName);
return new InputStreamReader(src);
}
diff --git a/modules/enterprise/scripting/javascript/src/test/java/org/rhq/scripting/javascript/util/ScriptSourceToModuleSourceProviderAdapterTest.java b/modules/enterprise/scripting/javascript/src/test/java/org/rhq/scripting/javascript/util/ScriptSourceToModuleSourceProviderAdapterTest.java
new file mode 100644
index 0000000..72b6d25
--- /dev/null
+++ b/modules/enterprise/scripting/javascript/src/test/java/org/rhq/scripting/javascript/util/ScriptSourceToModuleSourceProviderAdapterTest.java
@@ -0,0 +1,117 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.scripting.javascript.util;
+
+import static org.testng.Assert.assertEquals;
+
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URI;
+import java.util.Collections;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
+
+import org.testng.annotations.Test;
+
+import org.rhq.scripting.ScriptSourceProvider;
+import org.rhq.scripting.javascript.JsEngineInitializer;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+@Test
+public class ScriptSourceToModuleSourceProviderAdapterTest {
+
+ private JsEngineInitializer initializer = new JsEngineInitializer();
+
+ private static class ClasspathScriptSourceProvider implements ScriptSourceProvider {
+ private ClassLoader cl;
+
+ public ClasspathScriptSourceProvider() {
+ this(ClasspathScriptSourceProvider.class.getClassLoader());
+ }
+
+ public ClasspathScriptSourceProvider(ClassLoader cl) {
+ this.cl = cl;
+ }
+
+ private static final String SCHEME = "classpath";
+ @Override
+ public Reader getScriptSource(URI uri) {
+ if (!SCHEME.equals(uri.getScheme())) {
+ return null;
+ }
+
+ String path = uri.getPath().substring(1); //remove the leading /
+
+ return new InputStreamReader(cl.getResourceAsStream(path));
+ }
+ }
+
+ private ScriptEngine getScriptEngine() throws ScriptException {
+ ScriptEngine engine = initializer.instantiate(Collections.<String>emptySet(), null);
+ initializer.installScriptSourceProvider(engine, new ClasspathScriptSourceProvider());
+
+ return engine;
+ }
+
+ public void simpleModuleLoad() throws Exception {
+ String script = "var m = require('classpath:/nested/deep-nest'); m.nest();";
+
+ Object ret = getScriptEngine().eval(script);
+
+ assertEquals(ret, "Deep nest", "deep-nest.js#nest() returned unexpected value");
+ }
+
+ public void relativePathsInRequire() throws Exception {
+ String script = "var m = require('classpath:/nest'); m.maze();";
+
+ Object ret = getScriptEngine().eval(script);
+
+ assertEquals(ret, "func1", "nest.js#maze() returned unexpected value");
+ }
+
+ public void urisWithAuthorityDontConfuseResolution() throws Exception {
+ String script = "var m = require('classpath://authority/nest'); m.maze();";
+
+ Object ret = getScriptEngine().eval(script);
+
+ assertEquals(ret, "func1", "nest.js#maze() returned unexpected value");
+ }
+
+ public void urisWithQueryDontConfuseResolution() throws Exception {
+ String script = "var m = require('classpath:/nest?query'); m.maze();";
+
+ Object ret = getScriptEngine().eval(script);
+
+ assertEquals(ret, "func1", "nest.js#maze() returned unexpected value");
+ }
+
+ public void urisWithFragmentDontConfuseResolution() throws Exception {
+ String script = "var m = require('classpath:/nest#fragment'); m.maze();";
+
+ Object ret = getScriptEngine().eval(script);
+
+ assertEquals(ret, "func1", "nest.js#maze() returned unexpected value");
+ }
+}
diff --git a/modules/enterprise/scripting/javascript/src/test/resources/nest.js b/modules/enterprise/scripting/javascript/src/test/resources/nest.js
new file mode 100644
index 0000000..e9ea75e
--- /dev/null
+++ b/modules/enterprise/scripting/javascript/src/test/resources/nest.js
@@ -0,0 +1,9 @@
+var dn = require('./nested/deep-nest');
+
+exports.nest = function() {
+ return dn.nest();
+}
+
+exports.maze = function() {
+ return dn.maze();
+}
\ No newline at end of file
diff --git a/modules/enterprise/scripting/javascript/src/test/resources/nested/deep-nest.js b/modules/enterprise/scripting/javascript/src/test/resources/nested/deep-nest.js
new file mode 100644
index 0000000..25110cd
--- /dev/null
+++ b/modules/enterprise/scripting/javascript/src/test/resources/nested/deep-nest.js
@@ -0,0 +1,8 @@
+exports.nest = function() {
+ return "Deep nest";
+}
+
+exports.maze = function() {
+ var m1 = require('../test-module1');
+ return m1.func1();
+}
commit 82877c7c61a21cc22685f0183671b16632155ede
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Sep 13 11:19:18 2012 +0200
BZ 856695 - Allow to filter events by time range
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DateTimeFilterItem.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DateTimeFilterItem.java
new file mode 100644
index 0000000..a89cebd
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DateTimeFilterItem.java
@@ -0,0 +1,86 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.gui.coregui.client.components.form;
+
+import java.util.Date;
+
+import com.google.gwt.user.datepicker.client.CalendarUtil;
+import com.smartgwt.client.util.DateUtil;
+import com.smartgwt.client.widgets.form.fields.DateItem;
+import com.smartgwt.client.widgets.form.fields.DateTimeItem;
+
+import static com.smartgwt.client.data.RelativeDate.END_OF_TODAY;
+import static com.smartgwt.client.data.RelativeDate.START_OF_TODAY;
+import static com.smartgwt.client.types.RelativeDateRangePosition.END;
+import static com.smartgwt.client.types.RelativeDateRangePosition.START;
+
+/**
+ * DateTimeItem used for filtering. This component adds the ability to returns
+ * its date and time value a Integer offset of the current Date. For instance,
+ * yesterday would return a -1. This ability to use Integer days instead of
+ * Dates provides for a more robust solution when sending Dates across the wire
+ * as Date.toString() in GWT creates a date format that has the local timezone
+ * in it. GWT is not able to parse these dates with the local timezone in them.
+ * GWT only knows how to parse RFC and GMT dates.
+ *
+ * @author Mike Thompson
+ */
+public class DateTimeFilterItem extends DateTimeItem {
+
+ public final static String START_DATE_FILTER = "startTime";
+ public final static String END_DATE_FILTER = "endTime";
+
+
+ public DateTimeFilterItem() {
+ standardConfiguration();
+ }
+
+ public DateTimeFilterItem(String name) {
+ super(name);
+ standardConfiguration();
+ }
+
+ public DateTimeFilterItem(String name, String title) {
+ super(name, title);
+ standardConfiguration();
+ }
+
+ private void standardConfiguration() {
+ this.setUseTextField(true);
+ this.setEnforceDate(true);
+ this.setEndDate(new Date());
+
+ }
+
+
+ @Override
+ public Object getValue() {
+ Date date = getValueAsDate();
+ if (date!=null)
+ return date.getTime();
+ return null;
+ }
+
+ @Override
+ public String toString() {
+ return String.valueOf(getValue());
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java
index a1aca43..9be8b30 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java
@@ -23,6 +23,7 @@
package org.rhq.enterprise.gui.coregui.client.inventory.common.event;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -79,7 +80,7 @@ public class EventCompositeDatasource extends RPCDataSource<EventComposite, Even
/**
* The view that contains the list grid which will display this datasource's data will call this
* method to get the field information which is used to control the display of the data.
- *
+ *
* @return list grid fields used to display the datasource data
*/
public ArrayList<ListGridField> getListGridFields() {
@@ -211,7 +212,7 @@ public class EventCompositeDatasource extends RPCDataSource<EventComposite, Even
record.setAttribute("severity", from.getSeverity().name());
record.setAttribute("source", from.getSourceLocation());
- // for ancestry handling
+ // for ancestry handling
record.setAttribute(AncestryUtil.RESOURCE_ID, from.getResourceId());
record.setAttribute(AncestryUtil.RESOURCE_NAME, from.getResourceName());
record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY, from.getResourceAncestry());
@@ -276,7 +277,7 @@ public class EventCompositeDatasource extends RPCDataSource<EventComposite, Even
typeRepo.getResourceTypes(typesSet.toArray(new Integer[typesSet.size()]), new TypesLoadedCallback() {
@Override
public void onTypesLoaded(Map<Integer, ResourceType> types) {
- // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo.
+ // Smartgwt has issues storing a Map as a ListGridRecord attribute. Wrap it in a pojo.
AncestryUtil.MapWrapper typesWrapper = new AncestryUtil.MapWrapper(types);
Record[] records = buildRecords(result);
@@ -284,7 +285,7 @@ public class EventCompositeDatasource extends RPCDataSource<EventComposite, Even
for (Record record : records) {
// To avoid a lot of unnecessary String construction, be lazy about building ancestry hover text.
- // Store the types map off the records so we can build a detailed hover string as needed.
+ // Store the types map off the records so we can build a detailed hover string as needed.
record.setAttribute(AncestryUtil.RESOURCE_ANCESTRY_TYPES, typesWrapper);
// Build the decoded ancestry Strings now for display
@@ -311,7 +312,7 @@ public class EventCompositeDatasource extends RPCDataSource<EventComposite, Even
EventCriteria criteria = new EventCriteria();
// This code is unlikely to be necessary as the encompassing view should be using an initial
- // sort specifier. But just in case, make sure we set the initial sort. Note that we have to
+ // sort specifier. But just in case, make sure we set the initial sort. Note that we have to
// manipulate the PageControl directly as per the restrictions on getFetchCriteria() (see jdoc).
PageControl pageControl = getPageControl(request);
if (pageControl.getOrderingFields().isEmpty()) {
@@ -324,6 +325,14 @@ public class EventCompositeDatasource extends RPCDataSource<EventComposite, Even
criteria.addFilterSourceName((String) criteriaMap.get("source"));
criteria.addFilterDetail((String) criteriaMap.get("detail"));
+ if (criteriaMap.get("startTime")!=null) {
+ Date tmp = (Date) criteriaMap.get("startTime");
+ criteria.addFilterStartTime(tmp.getTime());
+ }
+ if (criteriaMap.get("endTime")!=null) {
+ Date tmp = (Date) criteriaMap.get("endTime");
+ criteria.addFilterEndTime(tmp.getTime());
+ }
// There's no need to add a severities filter to the criteria if the user specified all severities.
if (severities.length != EventSeverity.values().length) {
criteria.addFilterSeverities(severities);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
index e146f0e..1268690 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
@@ -31,6 +31,7 @@ import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.data.SortSpecifier;
import com.smartgwt.client.types.SortDirection;
import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.form.fields.SpacerItem;
import com.smartgwt.client.widgets.form.fields.TextItem;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGridField;
@@ -42,6 +43,7 @@ import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.components.form.DateTimeFilterItem;
import org.rhq.enterprise.gui.coregui.client.components.form.EnumSelectItem;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
@@ -62,6 +64,9 @@ public class EventCompositeHistoryView extends TableSection<EventCompositeDataso
private EntityContext context;
private boolean hasWriteAccess;
+ protected DateTimeFilterItem startDateFilter;
+ protected DateTimeFilterItem endDateFilter;
+
static {
EventSeverity[] severityValues = EventSeverity.values();
String[] severityNames = new String[severityValues.length];
@@ -123,7 +128,13 @@ public class EventCompositeHistoryView extends TableSection<EventCompositeDataso
final EnumSelectItem severityFilter = new EnumSelectItem(EventCompositeDatasource.FILTER_SEVERITIES, MSG
.view_inventory_eventHistory_severityFilter(), EventSeverity.class, severities, severityIcons);
- setFilterFormItems(sourceFilter, detailsFilter, severityFilter);
+ startDateFilter = new DateTimeFilterItem(DateTimeFilterItem.START_DATE_FILTER, MSG.filter_from_date() );
+ endDateFilter = new DateTimeFilterItem(DateTimeFilterItem.END_DATE_FILTER, MSG.filter_to_date());
+
+ SpacerItem spacerItem = new SpacerItem();
+ spacerItem.setColSpan(2);
+
+ setFilterFormItems(sourceFilter, detailsFilter, severityFilter, startDateFilter, spacerItem, endDateFilter);
}
@Override
commit e95b37895324937307723862c6ea229c2f91f375
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Sep 13 10:10:24 2012 +0200
[BZ 846623] - Finishing the fix:
1) Make sure the UI doesn't contain stale data after an update of a alert def.
2) Provide a "copy-creation" of alert definition used for syncing the defs
on a resource with the corresponding group and template alert defs
(this is done by adding a "validateNotificationConfiguration boolean to
the AlertDefinitionManagerLocal.createAlertDefinition()).
3) A new method for updating dependent alert defs (similar to previously
added method for creating dependent alert defs)
4) Make sure conditions and notifications are loaded before leaving the update methods
so that lazy load exceptions don't occur.
5) Only perform validation and finalization on new or changed notifications.
6) Marking several methods that supported the old JSF UI and are unused
as deprecated.
7) new integration tests to check the behavior of alert senders that modify
the notification configuration.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java
index e75263d..a11b88e 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java
@@ -56,6 +56,7 @@ public class AlertDefinitionCriteria extends Criteria {
private String filterAlertTemplateResourceTypeName; // requires overrides
private List<Integer> filterResourceIds; // requires overrides
private List<Integer> filterResourceGroupIds; // requires overrides
+ private Integer filterGroupAlertDefinitionId;
private Boolean filterEnabled;
private Boolean filterDeleted = false; // find enabled definitions by default
private NonBindingOverrideFilter filterResourceOnly; // requires overrides - finds only those associated with a resource
@@ -80,6 +81,7 @@ public class AlertDefinitionCriteria extends Criteria {
filterOverrides.put("alertTemplateResourceTypeName", "resourceType.name like ?");
filterOverrides.put("resourceIds", "resource.id IN ( ? )");
filterOverrides.put("resourceGroupIds", "resourceGroup.id IN ( ? )");
+ filterOverrides.put("groupAlertDefinitionId", "groupAlertDefinition.id = ?");
filterOverrides.put("resourceOnly", "resource IS NOT NULL");
filterOverrides.put("notificationSenderNames", "id IN ("
+ "SELECT notif.alertDefinition.id FROM AlertNotification notif " + "WHERE notif.senderName IN ( ? ))");
@@ -158,6 +160,10 @@ public class AlertDefinitionCriteria extends Criteria {
this.filterNotificationSenderNames = Arrays.asList(notificationNames);
}
+ public void addFilterGroupAlertDefinitionId(Integer groupAlertDefinitionId) {
+ this.filterGroupAlertDefinitionId = groupAlertDefinitionId;
+ }
+
public void fetchAlerts(boolean fetchAlerts) {
this.fetchAlerts = fetchAlerts;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
index 6a2fbf5..ae46936 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
@@ -199,5 +199,5 @@ public abstract class AbstractAlertDefinitionsView extends TableSection<Abstract
protected abstract void disableButtonPressed(ListGridRecord[] selection);
- protected abstract void commitAlertDefinition(AlertDefinition alertDefinition, boolean isPurgeInternals);
+ protected abstract void commitAlertDefinition(AlertDefinition alertDefinition, boolean isPurgeInternals, AsyncCallback<AlertDefinition> resultReceiver);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
index b277077..4b8e072 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
@@ -198,7 +198,7 @@ public class GroupAlertDefinitionsView extends AbstractAlertDefinitionsView {
}
@Override
- protected void commitAlertDefinition(final AlertDefinition alertDefinition, boolean purgeInternals) {
+ protected void commitAlertDefinition(final AlertDefinition alertDefinition, boolean purgeInternals, final AsyncCallback<AlertDefinition> resultReceiver) {
if (alertDefinition.getId() == 0) {
GWTServiceLookup.getGroupAlertDefinitionService().createGroupAlertDefinitions(alertDefinition,
Integer.valueOf(this.group.getId()), new AsyncCallback<Integer>() {
@@ -208,11 +208,13 @@ public class GroupAlertDefinitionsView extends AbstractAlertDefinitionsView {
new Message(MSG.view_alert_definitions_create_success(), Severity.Info));
alertDefinition.setId(result.intValue());
GroupAlertDefinitionsView.this.refresh();
+ resultReceiver.onSuccess(alertDefinition);
}
@Override
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_create_failure(), caught);
+ resultReceiver.onFailure(caught);
}
});
} else {
@@ -224,11 +226,13 @@ public class GroupAlertDefinitionsView extends AbstractAlertDefinitionsView {
CoreGUI.getMessageCenter().notify(
new Message(MSG.view_alert_definitions_update_success(), Severity.Info));
GroupAlertDefinitionsView.this.refresh();
+ resultReceiver.onSuccess(result);
}
@Override
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_update_failure(), caught);
+ resultReceiver.onFailure(caught);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java
index 00aa951..5dfacc8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java
@@ -194,7 +194,7 @@ public class ResourceAlertDefinitionsView extends AbstractAlertDefinitionsView {
}
@Override
- protected void commitAlertDefinition(final AlertDefinition alertDefinition, boolean purgeInternals) {
+ protected void commitAlertDefinition(final AlertDefinition alertDefinition, boolean purgeInternals, final AsyncCallback<AlertDefinition> resultReceiver) {
if (alertDefinition.getId() == 0) {
GWTServiceLookup.getAlertDefinitionService().createAlertDefinition(alertDefinition,
Integer.valueOf(resource.getId()), new AsyncCallback<Integer>() {
@@ -204,11 +204,13 @@ public class ResourceAlertDefinitionsView extends AbstractAlertDefinitionsView {
new Message(MSG.view_alert_definitions_create_success(), Severity.Info));
alertDefinition.setId(result.intValue());
ResourceAlertDefinitionsView.this.refresh();
+ resultReceiver.onSuccess(alertDefinition);
}
@Override
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_create_failure(), caught);
+ resultReceiver.onFailure(caught);
}
});
} else {
@@ -219,11 +221,13 @@ public class ResourceAlertDefinitionsView extends AbstractAlertDefinitionsView {
CoreGUI.getMessageCenter().notify(
new Message(MSG.view_alert_definitions_update_success(), Severity.Info));
ResourceAlertDefinitionsView.this.refresh();
+ resultReceiver.onSuccess(result);
}
@Override
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_update_failure(), caught);
+ resultReceiver.onFailure(caught);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
index f2007ce..a5d15e9 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
@@ -23,6 +23,7 @@
package org.rhq.enterprise.gui.coregui.client.alert.definitions;
+import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Button;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
@@ -139,7 +140,16 @@ public class SingleAlertDefinitionView extends LocatableVLayout {
setAlertDefinition(getAlertDefinition()); // loads data into static fields
makeViewOnly();
- alertDefView.commitAlertDefinition(getAlertDefinition(), resetMatching);
+ alertDefView.commitAlertDefinition(getAlertDefinition(), resetMatching, new AsyncCallback<AlertDefinition>() {
+ @Override
+ public void onSuccess(AlertDefinition result) {
+ setAlertDefinition(result);
+ }
+
+ @Override
+ public void onFailure(Throwable caught) {
+ }
+ });
} else {
tabSet.selectTab(generalPropertiesTab);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java
index 0c710b4..1218c3a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java
@@ -206,7 +206,7 @@ public class TemplateAlertDefinitionsView extends AbstractAlertDefinitionsView {
}
@Override
- protected void commitAlertDefinition(final AlertDefinition alertDefinition, boolean resetMatching) {
+ protected void commitAlertDefinition(final AlertDefinition alertDefinition, boolean resetMatching, final AsyncCallback<AlertDefinition> resultReceiver) {
if (alertDefinition.getId() == 0) {
GWTServiceLookup.getAlertTemplateService().createAlertTemplate(alertDefinition,
Integer.valueOf(this.resourceType.getId()), new AsyncCallback<Integer>() {
@@ -216,11 +216,13 @@ public class TemplateAlertDefinitionsView extends AbstractAlertDefinitionsView {
new Message(MSG.view_alert_definitions_create_success(), Severity.Info));
alertDefinition.setId(result.intValue());
TemplateAlertDefinitionsView.this.refresh();
+ resultReceiver.onSuccess(alertDefinition);
}
@Override
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_create_failure(), caught);
+ resultReceiver.onFailure(caught);
}
});
} else {
@@ -231,11 +233,13 @@ public class TemplateAlertDefinitionsView extends AbstractAlertDefinitionsView {
CoreGUI.getMessageCenter().notify(
new Message(MSG.view_alert_definitions_update_success(), Severity.Info));
TemplateAlertDefinitionsView.this.refresh();
+ resultReceiver.onSuccess(result);
}
@Override
public void onFailure(Throwable caught) {
CoreGUI.getErrorHandler().handleError(MSG.view_alert_definitions_update_failure(), caught);
+ resultReceiver.onFailure(caught);
}
});
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java
index 01ba237..07d6132 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertDefinitionGWTServiceImpl.java
@@ -65,7 +65,7 @@ public class AlertDefinitionGWTServiceImpl extends AbstractGWTServiceImpl implem
@Override
public int createAlertDefinition(AlertDefinition alertDefinition, Integer resourceId) throws RuntimeException {
try {
- int results = alertDefManager.createAlertDefinition(getSessionSubject(), alertDefinition, resourceId);
+ int results = alertDefManager.createAlertDefinition(getSessionSubject(), alertDefinition, resourceId, true);
return results;
} catch (Throwable t) {
throw getExceptionToThrowToClient(t);
diff --git a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java
index e4c25f8..1db7d05 100644
--- a/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java
+++ b/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/NewDefinitionAction.java
@@ -92,7 +92,7 @@ public class NewDefinitionAction extends BaseAction {
alertDefinitionId = alertTemplateManager.createAlertTemplate(subject, alertDef, defForm.getType());
} else if (context == FormContext.Resource) {
AlertDefinitionManagerLocal alertDefinitionManager = LookupUtil.getAlertDefinitionManager();
- alertDefinitionId = alertDefinitionManager.createAlertDefinition(subject, alertDef, defForm.getId());
+ alertDefinitionId = alertDefinitionManager.createAlertDefinition(subject, alertDef, defForm.getId(), true);
} else if (context == FormContext.Group) {
GroupAlertDefinitionManagerLocal groupAlertDefinitionManager = LookupUtil
.getGroupAlertDefinitionManager();
diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml
index 43a14c8..d16253a 100644
--- a/modules/enterprise/server/itests/pom.xml
+++ b/modules/enterprise/server/itests/pom.xml
@@ -141,6 +141,18 @@
<scope>test</scope>
</dependency>
+ <!-- Shrinkwrap to build up test plugins etc. -->
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap</groupId>
+ <artifactId>shrinkwrap-impl-base</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
<!-- NOTE: The remaining test deps correspond to the classes contained in hibernate-all.jar and thirdparty-all.jar. -->
<dependency>
@@ -274,8 +286,30 @@
<version>${resteasy.version}</version>
</dependency>
+ <!-- Dependencies for RHQ components needed for integration tests -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rhq-serverplugin-drift</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-testng</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito</artifactId>
+ <version>${powermock.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
<build>
<testResources>
<testResource>
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java
new file mode 100644
index 0000000..be9b752
--- /dev/null
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/TestServerPluginService.java
@@ -0,0 +1,148 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.server;
+
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.core.domain.plugin.PluginKey;
+import org.rhq.core.domain.plugin.PluginStatusType;
+import org.rhq.core.domain.plugin.ServerPlugin;
+import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.enterprise.server.plugin.pc.AbstractTypeServerPluginContainer;
+import org.rhq.enterprise.server.plugin.pc.MasterServerPluginContainer;
+import org.rhq.enterprise.server.plugin.pc.MasterServerPluginContainerConfiguration;
+import org.rhq.enterprise.server.plugin.pc.ServerPluginEnvironment;
+import org.rhq.enterprise.server.plugin.pc.ServerPluginService;
+import org.rhq.enterprise.server.plugin.pc.ServerPluginType;
+import org.rhq.enterprise.server.xmlschema.ServerPluginDescriptorMetadataParser;
+import org.rhq.enterprise.server.xmlschema.ServerPluginDescriptorUtil;
+import org.rhq.enterprise.server.xmlschema.generated.serverplugin.ServerPluginDescriptorType;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public abstract class TestServerPluginService extends ServerPluginService implements TestServerPluginServiceMBean {
+ public TestMasterServerPluginContainer master;
+ public MasterServerPluginContainerConfiguration masterConfig;
+
+ protected TestServerPluginService() {
+ // build the config at constructor time so tests have it even before the PC is initialized
+ File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
+ this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
+ }
+
+ @Override
+ public MasterServerPluginContainer createMasterPluginContainer() {
+ this.master = new TestMasterServerPluginContainer();
+ this.master.initialize(this.masterConfig);
+ return this.master;
+ }
+
+ protected abstract List<AbstractTypeServerPluginContainer> createPluginContainers(MasterServerPluginContainer master);
+
+ public static ServerPlugin getPlugin(ServerPluginEnvironment env) {
+ return getPlugin(env.getPluginUrl(), env.getPluginDescriptor());
+ }
+
+ public static ServerPlugin getPlugin(URL pluginUrl, ServerPluginDescriptorType pluginDescriptor) {
+ try {
+ Configuration pluginConfig = null;
+ Configuration scheduledJobsConfig = null;
+ ConfigurationDefinition configDef;
+
+ configDef = ServerPluginDescriptorMetadataParser.getPluginConfigurationDefinition(pluginDescriptor);
+ if (configDef != null) {
+ pluginConfig = configDef.getDefaultTemplate().createConfiguration();
+ }
+
+ configDef = ServerPluginDescriptorMetadataParser.getScheduledJobsDefinition(pluginDescriptor);
+ if (configDef != null) {
+ scheduledJobsConfig = configDef.getDefaultTemplate().createConfiguration();
+ }
+
+ File pluginFile = new File(pluginUrl.toURI());
+ PluginKey pluginKey = PluginKey.createServerPluginKey(new ServerPluginType(pluginDescriptor).stringify(), pluginDescriptor.getName());
+ ServerPlugin plugin =
+ new ServerPlugin(0, pluginKey.getPluginName(), pluginFile.getName(),
+ pluginDescriptor.getDisplayName(), true, PluginStatusType.INSTALLED,
+ pluginDescriptor.getDescription(), "", MessageDigestGenerator.getDigestString(pluginFile),
+ pluginDescriptor.getVersion(), pluginDescriptor.getVersion(), pluginConfig,
+ scheduledJobsConfig, new ServerPluginType(pluginDescriptor).stringify(),
+ System.currentTimeMillis(), System.currentTimeMillis());
+ return plugin;
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static ServerPlugin getPlugin(URL pluginUrl) throws Exception {
+ ServerPluginDescriptorType type = ServerPluginDescriptorUtil.loadPluginDescriptorFromUrl(pluginUrl);
+
+ return getPlugin(pluginUrl, type);
+ }
+
+ protected Map<URL, ? extends ServerPluginDescriptorType> preloadAllPlugins() throws Exception {
+ return null;
+ }
+
+ private class TestMasterServerPluginContainer extends MasterServerPluginContainer {
+
+ @Override
+ protected ClassLoader createRootServerPluginClassLoader() {
+ return getClass().getClassLoader();
+ }
+
+ @Override
+ protected Map<URL, ? extends ServerPluginDescriptorType> preloadAllPlugins() throws Exception {
+ Map<URL, ? extends ServerPluginDescriptorType> plugins = TestServerPluginService.this.preloadAllPlugins();
+ if (plugins != null) {
+ return plugins;
+ }
+
+ // if our test never setup any plugins, ignore it and just return an empty map
+ File pluginDir = getConfiguration().getPluginDirectory();
+ if (pluginDir == null || pluginDir.listFiles() == null || pluginDir.listFiles().length == 0) {
+ return new HashMap<URL, ServerPluginDescriptorType>();
+ } else {
+ return super.preloadAllPlugins();
+ }
+ }
+
+ @Override
+ protected List<PluginKey> getDisabledPluginKeys() {
+ // in the real world, the db is checked for enable flag, here we say all plugins are enabled
+ return new ArrayList<PluginKey>();
+ }
+
+ @Override
+ protected List<AbstractTypeServerPluginContainer> createPluginContainers() {
+ return TestServerPluginService.this.createPluginContainers(this);
+ }
+ }
+}
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/TestServerPluginServiceMBean.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/TestServerPluginServiceMBean.java
new file mode 100644
index 0000000..3cd24a4
--- /dev/null
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/TestServerPluginServiceMBean.java
@@ -0,0 +1,31 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.server;
+
+import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceManagement;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public interface TestServerPluginServiceMBean extends ServerPluginServiceManagement {
+
+}
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java
new file mode 100644
index 0000000..d89855e
--- /dev/null
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/alert/AlertDefinitionWithComplexNotificationsTest.java
@@ -0,0 +1,716 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.server.alert;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.EntityManager;
+import javax.transaction.TransactionManager;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ZipExporter;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+
+import org.rhq.core.domain.alert.AlertDampening;
+import org.rhq.core.domain.alert.AlertDefinition;
+import org.rhq.core.domain.alert.AlertPriority;
+import org.rhq.core.domain.alert.BooleanExpression;
+import org.rhq.core.domain.alert.notification.AlertNotification;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.authz.Permission;
+import org.rhq.core.domain.authz.Role;
+import org.rhq.core.domain.cloud.Server;
+import org.rhq.core.domain.cloud.Server.OperationMode;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.criteria.AlertDefinitionCriteria;
+import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.plugin.ServerPlugin;
+import org.rhq.core.domain.resource.Agent;
+import org.rhq.core.domain.resource.InventoryStatus;
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.resource.group.ResourceGroup;
+import org.rhq.core.domain.shared.ResourceBuilder;
+import org.rhq.core.domain.shared.ResourceTypeBuilder;
+import org.rhq.enterprise.server.TestServerPluginService;
+import org.rhq.enterprise.server.auth.SessionManager;
+import org.rhq.enterprise.server.test.AbstractEJB3Test;
+import org.rhq.enterprise.server.test.TestServerCommunicationsService;
+import org.rhq.enterprise.server.util.LookupUtil;
+import org.rhq.enterprise.server.util.ResourceTreeHelper;
+import org.rhq.test.JPAUtils;
+import org.rhq.test.TransactionCallback;
+import org.rhq.test.TransactionCallbackWithContext;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+@Test(groups = "alert")
+public class AlertDefinitionWithComplexNotificationsTest extends AbstractEJB3Test {
+
+ private static final Log LOG = LogFactory.getLog(AlertDefinitionWithComplexNotificationsTest.class);
+
+ private enum ParentType {
+ GROUP, TEMPLATE
+ }
+
+ private String universalName;
+
+ private Server server;
+ private Agent agent;
+ private Subject subject;
+ private Role role;
+ private ResourceType resourceType;
+ private ResourceGroup resourceGroup;
+ private Set<Resource> resources;
+ private AlertDefinition templateAlertDefinition;
+ private AlertDefinition groupAlertDefinition;
+ private AlertDefinition resourceAlertDefinition;
+ private ServerPlugin serverPlugin;
+ private Set<Object> junk = new LinkedHashSet<Object>();
+
+ private int resourceLevelAlertDefinitionId;
+ private int groupLevelAlertDefinitionId;
+ private int templateLevelAlertDefinitionId;
+ private Resource copyTestsResource;
+
+ private TestAlertSenderPluginService alertSenderService;
+ private TestServerCommunicationsService agentService;
+
+ @BeforeClass
+ public void prepareDB() {
+ executeInTransaction(new TransactionCallback() {
+ @Override
+ public void execute() throws Exception {
+ EntityManager em = getEntityManager();
+
+ universalName = getClass().getName();
+
+ agent = new Agent("localhost", "localhost", 0, "foo", "bar");
+
+ server = new Server();
+ server.setAddress("localhost");
+ server.setName("localhost");
+ server.setOperationMode(OperationMode.NORMAL);
+
+ server.setAgents(Collections.singletonList(agent));
+
+ role = new Role(universalName);
+ role.addPermission(Permission.MANAGE_INVENTORY);
+ role.addPermission(Permission.MANAGE_SETTINGS);
+
+ subject = new Subject(universalName, true, false);
+ subject.addRole(role);
+
+ resourceType =
+ new ResourceTypeBuilder().createPlatformResourceType().withId(0).withName(universalName)
+ .withPlugin(universalName).build();
+
+ resourceGroup = new ResourceGroup(universalName, resourceType);
+
+ resources = new LinkedHashSet<Resource>();
+ for (int i = 0; i < 10; ++i) {
+ Resource res = createResourceForTest(universalName + i);
+
+ resources.add(res);
+
+ resourceGroup.addExplicitResource(res);
+ }
+
+ templateAlertDefinition = createDefinitionForTest(universalName + " template", true);
+ templateAlertDefinition.setResourceType(resourceType);
+
+ groupAlertDefinition = createDefinitionForTest(universalName + " group", true);
+ groupAlertDefinition.setResourceGroup(resourceGroup);
+
+ resourceAlertDefinition = createDefinitionForTest(universalName + " resource", true);
+ resourceAlertDefinition.setResource(resources.iterator().next());
+
+ em.persist(agent);
+ em.persist(server);
+ em.persist(role);
+ em.persist(subject);
+ em.persist(resourceType);
+ em.persist(resourceGroup);
+ for (Resource r : resources) {
+ em.persist(r);
+ }
+ em.persist(templateAlertDefinition);
+ em.persist(groupAlertDefinition);
+ em.persist(resourceAlertDefinition);
+
+ //only need this for a short time now, so that we can precreate the plugin structure
+ alertSenderService = new TestAlertSenderPluginService();
+ prepareCustomServerPluginService(alertSenderService);
+ alertSenderService.masterConfig.getPluginDirectory().mkdirs();
+ unprepareServerPluginService();
+
+ JavaArchive archive =
+ ShrinkWrap.create(JavaArchive.class).addClass(TestAlertSender.class)
+ .addAsResource("test-alert-sender-serverplugin.xml", "META-INF/rhq-serverplugin.xml");
+
+ File pluginFile =
+ new File(alertSenderService.masterConfig.getPluginDirectory(), "test-aler-plugin.jar");
+
+ archive.as(ZipExporter.class).exportTo(pluginFile, true);
+
+ //the alert sender plugin manager needs the plugins in the database...
+ serverPlugin = TestServerPluginService.getPlugin(pluginFile.toURI().toURL());
+ em.persist(serverPlugin);
+ }
+ });
+ }
+
+ @BeforeMethod
+ public void containerSetup() {
+ alertSenderService = new TestAlertSenderPluginService();
+ prepareCustomServerPluginService(alertSenderService);
+ alertSenderService.masterConfig.getPluginDirectory().mkdirs();
+
+ alertSenderService.startMasterPluginContainer();
+
+ agentService = prepareForTestAgents();
+ }
+
+ @AfterMethod
+ public void containerTearDown() throws Exception {
+ unprepareServerPluginService();
+ unprepareForTestAgents();
+ }
+
+ @AfterClass(alwaysRun = true)
+ public void cleanDB() throws Exception {
+ for (Object o : junk) {
+ removeNoExceptions(o);
+ }
+
+ removeNoExceptions(resourceAlertDefinition);
+ removeNoExceptions(groupAlertDefinition);
+ removeNoExceptions(templateAlertDefinition);
+ removeNoExceptions(resourceGroup);
+ for (Resource r : resources) {
+ r.removeExplicitGroup(resourceGroup);
+ r.getAlertDefinitions().clear();
+ removeNoExceptions(r);
+ }
+ removeNoExceptions(resourceType);
+ removeNoExceptions(subject);
+ removeNoExceptions(role);
+ removeNoExceptions(server);
+ removeNoExceptions(agent);
+
+ removeNoExceptions(serverPlugin);
+ }
+
+ @BeforeMethod
+ public void login() throws Exception {
+ //the embedded server cannot do a full-blown login
+ //so we hack our way in
+ subject = SessionManager.getInstance().put(subject);
+ }
+
+ @AfterMethod(alwaysRun = true)
+ public void logout() throws Exception {
+ SessionManager.getInstance().invalidate(subject.getSessionId());
+ }
+
+ private Resource getCopyTestsResource() throws Exception {
+ if (copyTestsResource == null) {
+ final String keyAndName = universalName + "-copyTests";
+
+ LookupUtil.getResourceManager().createResource(subject, createResourceForTest(keyAndName), Resource.ROOT_ID);
+
+ //ok, now the new resource should contain the alert definition defined by the template
+ ResourceCriteria crit = new ResourceCriteria();
+ crit.addFilterResourceKey(keyAndName);
+ crit.fetchExplicitGroups(true); //so that cleanup works
+ crit.fetchAlertDefinitions(true); //so that cleanup works
+
+ List<Resource> foundResources = LookupUtil.getResourceManager().findResourcesByCriteria(subject, crit);
+
+ assertEquals("A new resource should have been created", 1, foundResources.size());
+
+ Resource res = foundResources.get(0);
+ resources.add(res);
+
+ copyTestsResource = res;
+ }
+
+ return copyTestsResource;
+ }
+
+ public void testNotificationsCopiedOnAlertTemplateApplication() throws Exception {
+ TestAlertSender.setExpectedSubject(null);
+ TestAlertSender.resetValidateMethodCallCount();
+
+ Resource res = getCopyTestsResource();
+
+ //apply the template manually - this is done in server-agent back-and-forth that we
+ //don't test here and which is complex to mock out.
+ //this method has to be called using the overlord subject
+ LookupUtil.getAlertTemplateManager().updateAlertDefinitionsForResource(LookupUtil.getSubjectManager().getOverlord(), res.getId());
+
+ assertEquals("No validation should occur on the copied notifications", 0, TestAlertSender.getValidateMethodCallCount());
+
+ AlertDefinitionManagerLocal adm = LookupUtil.getAlertDefinitionManager();
+ AlertDefinitionCriteria adCrit = new AlertDefinitionCriteria();
+ adCrit.addFilterResourceIds(res.getId());
+ adCrit.fetchAlertNotifications(true);
+
+ List<AlertDefinition> foundAlertDefs = adm.findAlertDefinitionsByCriteria(subject, adCrit);
+ junk.addAll(foundAlertDefs);
+
+ assertEquals("The new resource should have an alert definition obtained from the template.", 1, foundAlertDefs.size());
+
+ AlertDefinition defWithNotifications = foundAlertDefs.get(0);
+
+ testSingleDependentAlertDefinition(defWithNotifications, ParentType.TEMPLATE, defWithNotifications.getParentId());
+ }
+
+ @Test(dependsOnMethods = "testNotificationsCopiedOnAlertTemplateApplication")
+ public void testNotificationsCopiedOnGroupMemberAddition() throws Exception {
+ TestAlertSender.setExpectedSubject(null);
+ TestAlertSender.resetValidateMethodCallCount();
+
+ Resource res = getCopyTestsResource();
+
+ LookupUtil.getResourceGroupManager().addResourcesToGroup(subject, resourceGroup.getId(), new int[] { res.getId() });
+
+ assertEquals("No validation should occur on the copied notifications", 0, TestAlertSender.getValidateMethodCallCount());
+
+ AlertDefinitionManagerLocal adm = LookupUtil.getAlertDefinitionManager();
+ AlertDefinitionCriteria adCrit = new AlertDefinitionCriteria();
+ adCrit.addFilterResourceIds(res.getId());
+ adCrit.fetchAlertNotifications(true);
+
+ List<AlertDefinition> foundAlertDefs = adm.findAlertDefinitionsByCriteria(subject, adCrit);
+ junk.addAll(foundAlertDefs);
+
+ //1 from the group, 1 from the template
+ assertEquals("The new resource should have an alert definition obtained from the group.", 2, foundAlertDefs.size());
+
+ AlertDefinition groupOriginatingDef = null;
+ for(AlertDefinition d : foundAlertDefs) {
+ if ((universalName + " group").equals(d.getName())) {
+ groupOriginatingDef = d;
+ break;
+ }
+ }
+
+ assertNotNull("The alert definition originating from the group not present on the resource.", groupOriginatingDef);
+
+ testSingleDependentAlertDefinition(groupOriginatingDef, ParentType.GROUP, groupOriginatingDef.getGroupAlertDefinition().getId());
+ }
+
+ public void testCorrectSubjectPassedOnResourceLevelAlertDefinitionCreation() throws Exception {
+ TestAlertSender.setExpectedSubject(subject);
+
+ AlertDefinitionManagerLocal adm = LookupUtil.getAlertDefinitionManager();
+
+ Resource res = resources.iterator().next();
+
+ AlertDefinition def = createDefinitionForTest("testCorrectSubjectPassedOnResourceLevelAlertDefinitionCreation", false);
+ def.setResource(resources.iterator().next());
+
+ int id = adm.createAlertDefinition(subject, def, res.getId(), true);
+ def.setId(id);
+
+ resourceLevelAlertDefinitionId = id;
+
+ junk.add(def);
+
+ testMainAlertDefinition(id);
+ }
+
+ @Test(dependsOnMethods = { "testNotificationsCopiedOnAlertTemplateApplication", "testNotificationsCopiedOnGroupMemberAddition" })
+ public void testCorrectSubjectPassedOnGroupLevelAlertDefinitionCreation() throws Exception {
+ TestAlertSender.setExpectedSubject(subject);
+
+ GroupAlertDefinitionManagerLocal gadm = LookupUtil.getGroupAlertDefinitionManager();
+
+ AlertDefinition def = createDefinitionForTest("testCorrectSubjectPassedOnGroupLevelAlertDefinitionCreation", false);
+ def.setResourceGroup(resourceGroup);
+
+ int id = gadm.createGroupAlertDefinitions(subject, def, resourceGroup.getId());
+ def.setId(id);
+
+ groupLevelAlertDefinitionId = id;
+
+ junk.add(def);
+
+ testMainAlertDefinition(id);
+ List<AlertDefinition> deps = testDependentAlertDefinitions(id, ParentType.GROUP);
+
+ junk.addAll(deps);
+ }
+
+ @Test(dependsOnMethods = { "testNotificationsCopiedOnAlertTemplateApplication", "testNotificationsCopiedOnGroupMemberAddition" })
+ public void testCorrectSubjectPassedOnTemplateLevelAlertDefinitionCreation() throws Exception {
+ TestAlertSender.setExpectedSubject(subject);
+
+ AlertTemplateManagerLocal atm = LookupUtil.getAlertTemplateManager();
+
+ AlertDefinition def = createDefinitionForTest("testCorrectSubjectPassedOnTemplateLevelAlertDefinitionCreation", false);
+ def.setResourceGroup(resourceGroup);
+
+ int id = atm.createAlertTemplate(subject, def, resourceType.getId());
+ def.setId(id);
+
+ templateLevelAlertDefinitionId = id;
+
+ junk.add(def);
+
+ testMainAlertDefinition(id);
+ List<AlertDefinition> deps = testDependentAlertDefinitions(id, ParentType.TEMPLATE);
+
+ junk.addAll(deps);
+ }
+
+ @Test(dependsOnMethods = "testCorrectSubjectPassedOnResourceLevelAlertDefinitionCreation")
+ public void testNoValidationWhenNoNotificationUpdateOnResourceLevel() throws Exception {
+ TestAlertSender.setExpectedSubject(subject);
+ TestAlertSender.resetValidateMethodCallCount();
+
+ AlertDefinitionManagerLocal adm = LookupUtil.getAlertDefinitionManager();
+
+ AlertDefinitionCriteria crit = new AlertDefinitionCriteria();
+ crit.addFilterId(resourceLevelAlertDefinitionId);
+ crit.fetchAlertNotifications(true);
+ crit.fetchConditions(true);
+
+ List<AlertDefinition> foundDefs = adm.findAlertDefinitionsByCriteria(subject, crit);
+
+ assertEquals("Failed to find the previously created resource level alert definition.", 1, foundDefs.size());
+
+ AlertDefinition foundDef = foundDefs.get(0);
+
+ foundDef.setEnabled(true);
+
+ adm.updateAlertDefinition(subject, resourceLevelAlertDefinitionId, foundDef, false);
+
+ assertEquals("The notification validation method shouldn't have been called", 0, TestAlertSender.getValidateMethodCallCount());
+ }
+
+ @Test(dependsOnMethods = "testCorrectSubjectPassedOnGroupLevelAlertDefinitionCreation")
+ public void testNoValidationWhenNoNotificationUpdateOnGroupLevel() throws Exception {
+ TestAlertSender.setExpectedSubject(subject);
+ TestAlertSender.resetValidateMethodCallCount();
+
+ AlertDefinitionManagerLocal adm = LookupUtil.getAlertDefinitionManager();
+
+ AlertDefinitionCriteria crit = new AlertDefinitionCriteria();
+ crit.addFilterId(groupLevelAlertDefinitionId);
+ crit.fetchAlertNotifications(true);
+ crit.fetchConditions(true);
+
+ List<AlertDefinition> foundDefs = adm.findAlertDefinitionsByCriteria(subject, crit);
+
+ assertEquals("Failed to find the previously created group level alert definition.", 1, foundDefs.size());
+
+ AlertDefinition foundDef = foundDefs.get(0);
+
+ foundDef.setEnabled(true);
+
+ GroupAlertDefinitionManagerLocal gadm = LookupUtil.getGroupAlertDefinitionManager();
+ gadm.updateGroupAlertDefinitions(subject, foundDef, true);
+
+ assertEquals("The notification validation method shouldn't have been called", 0, TestAlertSender.getValidateMethodCallCount());
+ }
+
+ @Test(dependsOnMethods = "testCorrectSubjectPassedOnTemplateLevelAlertDefinitionCreation")
+ public void testNoValidationWhenNoNotificationUpdateOnTemplateLevel() throws Exception {
+ TestAlertSender.setExpectedSubject(subject);
+ TestAlertSender.resetValidateMethodCallCount();
+
+ AlertDefinitionManagerLocal adm = LookupUtil.getAlertDefinitionManager();
+
+ AlertDefinitionCriteria crit = new AlertDefinitionCriteria();
+ crit.addFilterId(templateLevelAlertDefinitionId);
+ crit.fetchAlertNotifications(true);
+ crit.fetchConditions(true);
+
+ List<AlertDefinition> foundDefs = adm.findAlertDefinitionsByCriteria(subject, crit);
+
+ assertEquals("Failed to find the previously created resource level alert definition.", 1, foundDefs.size());
+
+ AlertDefinition foundDef = foundDefs.get(0);
+
+ foundDef.setEnabled(true);
+
+ AlertTemplateManagerLocal atm = LookupUtil.getAlertTemplateManager();
+
+ atm.updateAlertTemplate(subject, foundDef, true);
+
+ assertEquals("The notification validation method shouldn't have been called", 0, TestAlertSender.getValidateMethodCallCount());
+ }
+
+ @Test(dependsOnMethods = "testNoValidationWhenNoNotificationUpdateOnResourceLevel")
+ public void testCorrectSubjectPassedOnResourceLevelAlertDefinitionUpdate() throws Exception {
+ TestAlertSender.setExpectedSubject(subject);
+ TestAlertSender.resetValidateMethodCallCount();
+
+ AlertDefinitionManagerLocal adm = LookupUtil.getAlertDefinitionManager();
+
+ AlertDefinitionCriteria crit = new AlertDefinitionCriteria();
+ crit.addFilterId(resourceLevelAlertDefinitionId);
+ crit.fetchAlertNotifications(true);
+ crit.fetchConditions(true);
+
+ List<AlertDefinition> foundDefs = adm.findAlertDefinitionsByCriteria(subject, crit);
+
+ assertEquals("Failed to find the previously created resource level alert definition.", 1, foundDefs.size());
+
+ AlertDefinition foundDef = foundDefs.get(0);
+
+ AlertNotification newNotif = createAlertNotificationForTest(foundDef, false);
+ //just add some dummy config property so that the 2 notifs are distinguishable from each other
+ //and are saved separately
+ newNotif.getConfiguration().put(new PropertySimple("foo-resource", "bar"));
+
+ adm.updateAlertDefinition(subject, resourceLevelAlertDefinitionId, foundDef, false);
+
+ assertEquals("Validation should have been called for a new notification during alert def update", 1, TestAlertSender.getValidateMethodCallCount());
+ }
+
+ @Test(dependsOnMethods = "testCorrectSubjectPassedOnGroupLevelAlertDefinitionCreation")
+ public void testCorrectSubjectPassedOnGroupLevelAlertDefinitionUpdate() throws Exception {
+ TestAlertSender.setExpectedSubject(subject);
+ TestAlertSender.resetValidateMethodCallCount();
+
+ AlertDefinitionManagerLocal adm = LookupUtil.getAlertDefinitionManager();
+
+ AlertDefinitionCriteria crit = new AlertDefinitionCriteria();
+ crit.addFilterId(groupLevelAlertDefinitionId);
+ crit.fetchAlertNotifications(true);
+ crit.fetchConditions(true);
+
+ List<AlertDefinition> foundDefs = adm.findAlertDefinitionsByCriteria(subject, crit);
+
+ assertEquals("Failed to find the previously created group level alert definition.", 1, foundDefs.size());
+
+ AlertDefinition foundDef = foundDefs.get(0);
+
+ AlertNotification newNotif = createAlertNotificationForTest(foundDef, false);
+ //just add some dummy config property so that the 2 notifs are distinguishable from each other
+ //and are saved separately
+ newNotif.getConfiguration().put(new PropertySimple("foo-group", "bar"));
+
+ GroupAlertDefinitionManagerLocal gadm = LookupUtil.getGroupAlertDefinitionManager();
+ gadm.updateGroupAlertDefinitions(subject, foundDef, true);
+
+ //notice that the validation should be called just once, even though in effect we're creating 11 notifs
+ //1 for group and 10 for its members.
+ assertEquals("Validation should have been called for a new notification during alert def update", 1, TestAlertSender.getValidateMethodCallCount());
+ }
+
+ @Test(dependsOnMethods = "testCorrectSubjectPassedOnTemplateLevelAlertDefinitionCreation")
+ public void testCorrectSubjectPassedOnTemplateLevelAlertDefinitionUpdate() throws Exception {
+ TestAlertSender.setExpectedSubject(subject);
+ TestAlertSender.resetValidateMethodCallCount();
+
+ AlertDefinitionManagerLocal adm = LookupUtil.getAlertDefinitionManager();
+
+ AlertDefinitionCriteria crit = new AlertDefinitionCriteria();
+ crit.addFilterId(templateLevelAlertDefinitionId);
+ crit.fetchAlertNotifications(true);
+ crit.fetchConditions(true);
+
+ List<AlertDefinition> foundDefs = adm.findAlertDefinitionsByCriteria(subject, crit);
+
+ assertEquals("Failed to find the previously created template level alert definition.", 1, foundDefs.size());
+
+ AlertDefinition foundDef = foundDefs.get(0);
+
+ AlertNotification newNotif = createAlertNotificationForTest(foundDef, false);
+ //just add some dummy config property so that the 2 notifs are distinguishable from each other
+ //and are saved separately
+ newNotif.getConfiguration().put(new PropertySimple("foo-template", "bar"));
+
+ AlertTemplateManagerLocal atm = LookupUtil.getAlertTemplateManager();
+ atm.updateAlertTemplate(subject, foundDef, true);
+
+ //notice that the validation should be called just once, even though in effect we're creating 11 notifs
+ //1 for template and 10 for its members.
+ assertEquals("Validation should have been called for a new notification during alert def update", 1, TestAlertSender.getValidateMethodCallCount());
+ }
+
+ private void removeNoExceptions(final Object o) {
+ try {
+ JPAUtils.executeInTransaction(new TransactionCallbackWithContext<Void>() {
+ @Override
+ public Void execute(TransactionManager tm, EntityManager em) {
+ Object o2 = em.merge(o);
+
+ if (o2 instanceof Resource) {
+ ResourceTreeHelper.deleteResource(em, (Resource) o2);
+ } else {
+ em.remove(o2);
+ }
+ return null;
+ }
+ });
+ } catch (Exception e) {
+ LOG.error("Failed to DELETE an object from database: " + o, e);
+ }
+ }
+
+ private AlertDefinition createDefinition(String name) {
+ AlertDefinition ret = new AlertDefinition();
+ ret.setName(name);
+ ret.setPriority(AlertPriority.MEDIUM);
+ ret.setAlertDampening(new AlertDampening(AlertDampening.Category.NONE));
+ ret.setConditionExpression(BooleanExpression.ANY);
+ ret.setRecoveryId(0);
+
+ return ret;
+ }
+
+ private AlertDefinition createDefinitionForTest(String name, boolean precanned) {
+ AlertDefinition def = createDefinition(name);
+ createAlertNotificationForTest(def, precanned);
+
+ return def;
+ }
+
+ private AlertNotification createAlertNotificationForTest(AlertDefinition alertDefinition, boolean precanned) {
+ AlertNotification notif = new AlertNotification("Test Alert Sender");
+
+ Configuration alertConfig = new Configuration();
+
+ if (precanned) {
+ alertConfig.put(new PropertySimple(TestAlertSender.PERSISTENT_PROPERTY_NAME, TestAlertSender.PERSISTEN_PROPERTY_EXPECTED_VALUE));
+ } else {
+ alertConfig.put(new PropertySimple(TestAlertSender.PERSISTENT_PROPERTY_NAME, "persistent"));
+ alertConfig.put(new PropertySimple(TestAlertSender.EPHEMERAL_PROPERTY_NAME, "ephemeral"));
+ }
+
+ Configuration extraConfig = new Configuration();
+
+ if (precanned) {
+ extraConfig.put(new PropertySimple(TestAlertSender.PERSISTENT_PROPERTY_NAME, TestAlertSender.PERSISTEN_PROPERTY_EXPECTED_VALUE));
+ } else {
+ extraConfig.put(new PropertySimple(TestAlertSender.PERSISTENT_PROPERTY_NAME, "persistent"));
+ extraConfig.put(new PropertySimple(TestAlertSender.EPHEMERAL_PROPERTY_NAME, "ephemeral"));
+ }
+
+ notif.setConfiguration(alertConfig);
+ notif.setExtraConfiguration(extraConfig);
+
+ alertDefinition.addAlertNotification(notif);
+ notif.setAlertDefinition(alertDefinition);
+
+ return notif;
+ }
+
+ private void testMainAlertDefinition(int id) {
+ AlertDefinitionCriteria crit = new AlertDefinitionCriteria();
+ crit.addFilterId(id);
+ crit.fetchAlertNotifications(true);
+
+ List<AlertDefinition> checkList =
+ LookupUtil.getAlertDefinitionManager().findAlertDefinitionsByCriteria(subject, crit);
+
+ assertNotNull("Failed to retrieve the save alert definition", checkList);
+ assertEquals("The alert definition should have been saved.", 1, checkList.size());
+
+ AlertDefinition check = checkList.get(0);
+
+ assertEquals("There should be exactly 1 notification on the definition", 1, check.getAlertNotifications()
+ .size());
+
+ Configuration config = check.getAlertNotifications().get(0).getConfiguration();
+ assertEquals("Unexpected persistent value in notif config", TestAlertSender.PERSISTEN_PROPERTY_EXPECTED_VALUE,
+ config.getSimpleValue(TestAlertSender.PERSISTENT_PROPERTY_NAME, null));
+ assertNull("Ephemeral property seems to have been saved",
+ config.getSimpleValue(TestAlertSender.EPHEMERAL_PROPERTY_NAME, null));
+ }
+
+ private List<AlertDefinition> testDependentAlertDefinitions(int expectedParentId, ParentType parentType) {
+ AlertDefinitionCriteria crit = new AlertDefinitionCriteria();
+
+ Set<Integer> resourceIds = new HashSet<Integer>(resources.size());
+ for (Resource r : resources) {
+ resourceIds.add(r.getId());
+ }
+
+ if (parentType == ParentType.TEMPLATE) {
+ crit.addFilterAlertTemplateParentId(expectedParentId);
+ } else if (parentType == ParentType.GROUP) {
+ crit.addFilterGroupAlertDefinitionId(expectedParentId);
+ }
+
+ crit.fetchAlertNotifications(true);
+
+ List<AlertDefinition> checkList =
+ LookupUtil.getAlertDefinitionManager().findAlertDefinitionsByCriteria(subject, crit);
+
+ assertNotNull("Failed to retrieve the save alert definition", checkList);
+ assertEquals("The dependent alert definitions should have been saved.", resources.size(), checkList.size());
+
+ for (AlertDefinition check : checkList) {
+ testSingleDependentAlertDefinition(check, parentType, expectedParentId);
+ }
+
+ return checkList;
+ }
+
+ private void testSingleDependentAlertDefinition(AlertDefinition alertDef, ParentType parentType, int expectedParentId) {
+ assertEquals("There should be exactly 1 notification on the definition " + alertDef, 1, alertDef
+ .getAlertNotifications().size());
+
+ Configuration config = alertDef.getAlertNotifications().get(0).getConfiguration();
+ assertEquals("Unexpected persistent value in notif config " + alertDef,
+ TestAlertSender.PERSISTEN_PROPERTY_EXPECTED_VALUE,
+ config.getSimpleValue(TestAlertSender.PERSISTENT_PROPERTY_NAME, null));
+ assertNull("Ephemeral property seems to have been saved " + alertDef,
+ config.getSimpleValue(TestAlertSender.EPHEMERAL_PROPERTY_NAME, null));
+
+ if (parentType == ParentType.GROUP) {
+ assertEquals("The group parent id has unexpected value", expectedParentId, alertDef.getGroupAlertDefinition().getId());
+ } else if (parentType == ParentType.TEMPLATE) {
+ assertEquals("The parent id has unexpected value", Integer.valueOf(expectedParentId), alertDef.getParentId());
+ }
+ }
+
+ private Resource createResourceForTest(String resourceKey) {
+ Resource res = new ResourceBuilder().createPlatform().withRandomUuid().withResourceKey(resourceKey)
+ .withResourceType(resourceType).withName(resourceKey)
+ .withInventoryStatus(InventoryStatus.COMMITTED).build();
+ res.setAgent(agent);
+
+ return res;
+ }
+}
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/alert/TestAlertSender.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/alert/TestAlertSender.java
new file mode 100644
index 0000000..900d74c
--- /dev/null
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/alert/TestAlertSender.java
@@ -0,0 +1,107 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.server.alert;
+
+import org.testng.Assert;
+
+import org.rhq.core.domain.alert.Alert;
+import org.rhq.core.domain.alert.notification.SenderResult;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.enterprise.server.plugin.pc.ServerPluginComponent;
+import org.rhq.enterprise.server.plugin.pc.alert.AlertSender;
+import org.rhq.enterprise.server.plugin.pc.alert.AlertSenderValidationResults;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class TestAlertSender extends AlertSender<ServerPluginComponent> {
+
+ public static final String NAME = "Test Alert Sender";
+
+ public static final String PERSISTENT_PROPERTY_NAME = "persistent";
+ public static final String PERSISTEN_PROPERTY_EXPECTED_VALUE = "persistentephemeral";
+ public static final String EPHEMERAL_PROPERTY_NAME = "ephemeral";
+
+ private static Subject EXPECTED_SUBJECT;
+ private static volatile int VALIDATE_METHOD_CALL_COUNT;
+ private static Runnable VALIDATION_CHECKER;
+
+ public static void setExpectedSubject(Subject subject) {
+ EXPECTED_SUBJECT = subject;
+ }
+
+ public static void setValidationChecker(Runnable validationChecker) {
+ VALIDATION_CHECKER = validationChecker;
+ }
+
+ public static int getValidateMethodCallCount() {
+ return VALIDATE_METHOD_CALL_COUNT;
+ }
+
+ public static void resetValidateMethodCallCount() {
+ VALIDATE_METHOD_CALL_COUNT = 0;
+ }
+
+ @Override
+ public SenderResult send(Alert alert) {
+ SenderResult ret = new SenderResult();
+ ret.addSuccessMessage("kachny");
+
+ return ret;
+ }
+
+ @Override
+ public AlertSenderValidationResults validateAndFinalizeConfiguration(Subject subject) {
+ ++VALIDATE_METHOD_CALL_COUNT;
+
+ if (EXPECTED_SUBJECT != null && !subject.equals(EXPECTED_SUBJECT)) {
+ throw new AssertionError("Unexpected subject. Expected " + EXPECTED_SUBJECT + " but was " + subject);
+ }
+
+ if (VALIDATION_CHECKER != null) {
+ VALIDATION_CHECKER.run();
+ }
+
+ if (alertParameters.getSimple(EPHEMERAL_PROPERTY_NAME) == null) {
+ Assert.fail("Ephemeral property not present in alert parameters during validation. This should never happen.");
+ }
+
+ if (extraParameters.getSimple(EPHEMERAL_PROPERTY_NAME) == null) {
+ Assert.fail("Ephemeral property not present in extra parameters during validation. This should never happen.");
+ }
+
+ updateConfig(alertParameters);
+ updateConfig(extraParameters);
+
+ return new AlertSenderValidationResults(alertParameters, extraParameters);
+ }
+
+ private void updateConfig(Configuration configuration) {
+ String persistentValue = configuration.getSimpleValue(PERSISTENT_PROPERTY_NAME, "");
+ String ephemeralValue = configuration.getSimpleValue(EPHEMERAL_PROPERTY_NAME, "");
+
+ configuration.put(new PropertySimple(PERSISTENT_PROPERTY_NAME, persistentValue + ephemeralValue));
+ configuration.remove(EPHEMERAL_PROPERTY_NAME);
+ }
+}
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/alert/TestAlertSenderPluginService.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/alert/TestAlertSenderPluginService.java
new file mode 100644
index 0000000..9aae985
--- /dev/null
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/alert/TestAlertSenderPluginService.java
@@ -0,0 +1,67 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2012 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+package org.rhq.enterprise.server.alert;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.rhq.core.domain.plugin.ServerPlugin;
+import org.rhq.enterprise.server.TestServerPluginService;
+import org.rhq.enterprise.server.plugin.pc.AbstractTypeServerPluginContainer;
+import org.rhq.enterprise.server.plugin.pc.MasterServerPluginContainer;
+import org.rhq.enterprise.server.plugin.pc.ServerPluginEnvironment;
+import org.rhq.enterprise.server.plugin.pc.ServerPluginManager;
+import org.rhq.enterprise.server.plugin.pc.alert.AlertSenderPluginManager;
+import org.rhq.enterprise.server.plugin.pc.alert.AlertServerPluginContainer;
+
+/**
+ *
+ *
+ * @author Lukas Krejci
+ */
+public class TestAlertSenderPluginService extends TestServerPluginService {
+
+ @Override
+ protected List<AbstractTypeServerPluginContainer> createPluginContainers(MasterServerPluginContainer master) {
+ return Collections.<AbstractTypeServerPluginContainer>singletonList(new TestAlertServerPluginContainer(master));
+ }
+
+ class TestAlertServerPluginContainer extends AlertServerPluginContainer {
+ public TestAlertServerPluginContainer(MasterServerPluginContainer master) {
+ super(master);
+ }
+
+ @Override
+ protected ServerPluginManager createPluginManager() {
+ return new TestAlertServerPluginManager(this);
+ }
+ }
+
+ class TestAlertServerPluginManager extends AlertSenderPluginManager {
+ public TestAlertServerPluginManager(AlertServerPluginContainer pc) {
+ super(pc);
+ }
+
+ @Override
+ protected ServerPlugin getPlugin(ServerPluginEnvironment env) {
+ return TestServerPluginService.getPlugin(env);
+ }
+ }
+}
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginService.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginService.java
index 64c6537..46d725f 100644
--- a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginService.java
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginService.java
@@ -19,81 +19,25 @@
package org.rhq.enterprise.server.drift;
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collections;
import java.util.List;
-import java.util.Map;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
-import org.rhq.core.domain.plugin.PluginKey;
-import org.rhq.core.domain.plugin.PluginStatusType;
import org.rhq.core.domain.plugin.ServerPlugin;
-import org.rhq.core.util.MessageDigestGenerator;
+import org.rhq.enterprise.server.TestServerPluginService;
import org.rhq.enterprise.server.plugin.pc.AbstractTypeServerPluginContainer;
import org.rhq.enterprise.server.plugin.pc.MasterServerPluginContainer;
-import org.rhq.enterprise.server.plugin.pc.MasterServerPluginContainerConfiguration;
import org.rhq.enterprise.server.plugin.pc.ServerPluginEnvironment;
import org.rhq.enterprise.server.plugin.pc.ServerPluginManager;
-import org.rhq.enterprise.server.plugin.pc.ServerPluginService;
-import org.rhq.enterprise.server.plugin.pc.ServerPluginType;
import org.rhq.enterprise.server.plugin.pc.drift.DriftServerPluginContainer;
import org.rhq.enterprise.server.plugin.pc.drift.DriftServerPluginManager;
-import org.rhq.enterprise.server.xmlschema.ServerPluginDescriptorMetadataParser;
-import org.rhq.enterprise.server.xmlschema.generated.serverplugin.ServerPluginDescriptorType;
-public class DriftServerPluginService extends ServerPluginService implements DriftServerPluginServiceMBean {
-
- public TestMasterServerPluginContainer master;
- public MasterServerPluginContainerConfiguration masterConfig;
-
- public DriftServerPluginService() {
- // build the config at constructor time so tests have it even before the PC is initialized
- File dir = new File(System.getProperty("java.io.tmpdir"), "test-server-plugins");
- this.masterConfig = new MasterServerPluginContainerConfiguration(dir, dir, dir, null);
- }
+public class DriftServerPluginService extends TestServerPluginService {
@Override
- public MasterServerPluginContainer createMasterPluginContainer() {
- this.master = new TestMasterServerPluginContainer();
- this.master.initialize(this.masterConfig);
- return this.master;
+ protected List<AbstractTypeServerPluginContainer> createPluginContainers(MasterServerPluginContainer master) {
+ return Collections.<AbstractTypeServerPluginContainer>singletonList(new TestDriftServerPluginContainer(master));
}
- class TestMasterServerPluginContainer extends MasterServerPluginContainer {
- @Override
- protected ClassLoader createRootServerPluginClassLoader() {
- return getClass().getClassLoader();
- }
-
- @Override
- protected Map<URL, ? extends ServerPluginDescriptorType> preloadAllPlugins() throws Exception {
- // if our test never setup any plugins, ignore it and just return an empty map
- File pluginDir = getConfiguration().getPluginDirectory();
- if (pluginDir == null || pluginDir.listFiles() == null || pluginDir.listFiles().length == 0) {
- return new HashMap<URL, ServerPluginDescriptorType>();
- } else {
- return super.preloadAllPlugins();
- }
- }
-
- @Override
- protected List<PluginKey> getDisabledPluginKeys() {
- // in the real world, the db is checked for enable flag, here we say all plugins are enabled
- return new ArrayList<PluginKey>();
- }
-
- @Override
- protected List<AbstractTypeServerPluginContainer> createPluginContainers() {
- ArrayList<AbstractTypeServerPluginContainer> pcs = new ArrayList<AbstractTypeServerPluginContainer>(1);
- DriftServerPluginContainer driftPC = new TestDriftServerPluginContainer(this);
- pcs.add(driftPC);
-
- return pcs;
- }
- }
class TestDriftServerPluginContainer extends DriftServerPluginContainer {
public TestDriftServerPluginContainer(MasterServerPluginContainer master) {
@@ -101,9 +45,9 @@ public class DriftServerPluginService extends ServerPluginService implements Dri
}
@Override
- protected ServerPluginManager createPluginManager() {
- return new TestDriftServerPluginManager(this);
- }
+ protected ServerPluginManager createPluginManager() {
+ return new TestDriftServerPluginManager(this);
+ }
}
class TestDriftServerPluginManager extends DriftServerPluginManager {
@@ -113,34 +57,7 @@ public class DriftServerPluginService extends ServerPluginService implements Dri
@Override
protected ServerPlugin getPlugin(ServerPluginEnvironment env) {
- try {
- Configuration pluginConfig = null;
- Configuration scheduledJobsConfig = null;
- ConfigurationDefinition configDef;
-
- ServerPluginDescriptorType pluginDescriptor = env.getPluginDescriptor();
-
- configDef = ServerPluginDescriptorMetadataParser.getPluginConfigurationDefinition(pluginDescriptor);
- if (configDef != null) {
- pluginConfig = configDef.getDefaultTemplate().createConfiguration();
- }
-
- configDef = ServerPluginDescriptorMetadataParser.getScheduledJobsDefinition(pluginDescriptor);
- if (configDef != null) {
- scheduledJobsConfig = configDef.getDefaultTemplate().createConfiguration();
- }
-
- File pluginFile = new File(env.getPluginUrl().toURI());
- ServerPlugin plugin = new ServerPlugin(0, env.getPluginKey().getPluginName(), pluginFile.getName(),
- pluginDescriptor.getDisplayName(), true, PluginStatusType.INSTALLED, pluginDescriptor
- .getDescription(), "", MessageDigestGenerator.getDigestString(pluginFile), pluginDescriptor
- .getVersion(), pluginDescriptor.getVersion(), pluginConfig, scheduledJobsConfig,
- new ServerPluginType(pluginDescriptor).stringify(), System.currentTimeMillis(), System
- .currentTimeMillis());
- return plugin;
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
+ return TestServerPluginService.getPlugin(env);
}
- }
+ }
}
diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginServiceMBean.java b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginServiceMBean.java
deleted file mode 100644
index d38374e..0000000
--- a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/server/drift/DriftServerPluginServiceMBean.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2011 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-package org.rhq.enterprise.server.drift;
-
-import org.rhq.enterprise.server.plugin.pc.ServerPluginServiceManagement;
-
-public interface DriftServerPluginServiceMBean extends ServerPluginServiceManagement {
-}
diff --git a/modules/enterprise/server/itests/src/test/resources/log4j.xml b/modules/enterprise/server/itests/src/test/resources/log4j.xml
index bc65329..ca0936f 100644
--- a/modules/enterprise/server/itests/src/test/resources/log4j.xml
+++ b/modules/enterprise/server/itests/src/test/resources/log4j.xml
@@ -17,7 +17,7 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="true">
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <!-- <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/> -->
<param name="Target" value="System.out"/>
<param name="Threshold" value="WARN"/>
@@ -64,7 +64,7 @@
<category name="org.hibernate.SQL">
<priority value="DEBUG"/>
</category>
- -->
+ -->
<root>
<appender-ref ref="CONSOLE"/>
diff --git a/modules/enterprise/server/itests/src/test/resources/test-alert-sender-serverplugin.xml b/modules/enterprise/server/itests/src/test/resources/test-alert-sender-serverplugin.xml
new file mode 100644
index 0000000..f6bf879
--- /dev/null
+++ b/modules/enterprise/server/itests/src/test/resources/test-alert-sender-serverplugin.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<alert-plugin
+ name="alert-complex-test"
+ displayName="Alert:ComplexTest"
+ xmlns="urn:xmlns:rhq-serverplugin.alert"
+ xmlns:c="urn:xmlns:rhq-configuration"
+ xmlns:serverplugin="urn:xmlns:rhq-serverplugin"
+ package="org.rhq.enterprise.server.alert"
+ description="Alert sender plugin for testing the complex validation behavior."
+ >
+
+ <!-- How does this sender show up in drop downs etc -->
+ <short-name>Test Alert Sender</short-name>
+
+ <!-- Class that does the actual sending -->
+ <plugin-class>TestAlertSender</plugin-class>
+
+ <alert-configuration>
+ <c:simple-property name="persistent" type="string" required="true" description="The property that is persisted into the database."/>
+ <c:simple-property name="ephemeral" type="string" required="true" description="The property used only at creation/update time. It is not stored into the datbase because the plugin actually removes it from the configuration." />
+ </alert-configuration>
+</alert-plugin>
\ No newline at end of file
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
index 927ae74..0b3ff87 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java
@@ -18,6 +18,9 @@
*/
package org.rhq.enterprise.server.alert;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
import java.util.List;
import javax.ejb.EJB;
@@ -201,19 +204,19 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
public int createDependentAlertDefinition(Subject subject, AlertDefinition alertDefinition, int resourceId)
throws InvalidAlertDefinitionException {
- return createAlertDefinitionInternal(subject, alertDefinition, resourceId, false);
+ return createAlertDefinitionInternal(subject, alertDefinition, resourceId, false, false);
}
@Override
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
- public int createAlertDefinition(Subject subject, AlertDefinition alertDefinition, Integer resourceId)
+ public int createAlertDefinition(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean validateNotificationConfiguration)
throws InvalidAlertDefinitionException {
- return createAlertDefinitionInternal(subject, alertDefinition, resourceId, true);
+ return createAlertDefinitionInternal(subject, alertDefinition, resourceId, true, validateNotificationConfiguration);
}
- private int createAlertDefinitionInternal(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean checkPerms) throws InvalidAlertDefinitionException {
- checkAlertDefinition(subject, alertDefinition, resourceId);
+ private int createAlertDefinitionInternal(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean checkPerms, boolean validateNotificationConfiguration) throws InvalidAlertDefinitionException {
+ checkAlertDefinition(subject, null, alertDefinition, resourceId, validateNotificationConfiguration);
// if this is an alert definition, set up the link to a resource
if (resourceId != null) {
@@ -463,21 +466,34 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
return list;
}
+ @Override
@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
public AlertDefinition updateAlertDefinition(Subject subject, int alertDefinitionId,
AlertDefinition alertDefinition, boolean resetMatching) throws InvalidAlertDefinitionException,
AlertDefinitionUpdateException {
+ return updateAlertDefinitionInternal(subject, alertDefinitionId, alertDefinition, resetMatching, true, true);
+ }
+
+ @Override
+ @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+ public AlertDefinition updateDependentAlertDefinition(Subject subject, int alertDefinitionId, AlertDefinition alertDefinition, boolean resetMatching) throws InvalidAlertDefinitionException, AlertDefinitionUpdateException {
+ return updateAlertDefinitionInternal(subject, alertDefinitionId, alertDefinition, resetMatching, false, false);
+ }
+
+ private AlertDefinition updateAlertDefinitionInternal(Subject subject, int alertDefinitionId,
+ AlertDefinition alertDefinition, boolean resetMatching, boolean checkPerms, boolean finalizeNotifications) throws InvalidAlertDefinitionException,
+ AlertDefinitionUpdateException {
if (resetMatching) {
alertDefinitionManager.purgeInternals(alertDefinitionId);
}
-
+
/*
* Method for catching ENABLE / DISABLE changes will use switch logic off of the delta instead of calling out to
* the enable/disable functions
*/
AlertDefinition oldAlertDefinition = entityManager.find(AlertDefinition.class, alertDefinitionId);
- if (checkPermission(subject, oldAlertDefinition) == false) {
+ if (checkPerms && checkPermission(subject, oldAlertDefinition) == false) {
if (oldAlertDefinition.getResourceType() != null) {
throw new PermissionException("User [" + subject.getName()
+ "] does not have permission to modify alert templates for type ["
@@ -498,8 +514,9 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
* is not currently deleted
*/
boolean isResourceLevel = (oldAlertDefinition.getResource() != null);
- checkAlertDefinition(subject, alertDefinition, isResourceLevel ? oldAlertDefinition.getResource().getId()
- : null);
+
+ checkAlertDefinition(subject, oldAlertDefinition, alertDefinition, isResourceLevel ? oldAlertDefinition.getResource().getId()
+ : null, finalizeNotifications);
/*
* Should not be able to update an alert definition if the old alert definition is in an invalid state
@@ -590,6 +607,11 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
* begin with, and nothing needs to be added to the cache as a result
*/
+ //we've been touching both conditions and notifications of the updated alert definition, so we should
+ //return an object with the same... let's force lazy load before we leave the persistence context
+ new ArrayList<AlertCondition>(newAlertDefinition.getConditions());
+ new ArrayList<AlertNotification>(newAlertDefinition.getAlertNotifications());
+
return newAlertDefinition;
}
@@ -612,7 +634,7 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
}
}
- private void checkAlertDefinition(Subject subject, AlertDefinition alertDefinition, Integer resourceId)
+ private void checkAlertDefinition(Subject subject, AlertDefinition persistedAlertDefinition, AlertDefinition alertDefinition, Integer resourceId, boolean finalizeNotifications)
throws InvalidAlertDefinitionException {
// if someone enters a really long description, we need to truncate it - the column is only 250 chars
if (alertDefinition.getDescription() != null && alertDefinition.getDescription().length() > 250) {
@@ -640,8 +662,38 @@ public class AlertDefinitionManagerBean implements AlertDefinitionManagerLocal,
}
}
- if (!alertNotificationManager.finalizeNotifications(subject, alertDefinition.getAlertNotifications())) {
- throw new InvalidAlertDefinitionException("Some of the notifications failed to validate.");
+ if (finalizeNotifications) {
+ List<AlertNotification> notifications = new ArrayList<AlertNotification>(alertDefinition.getAlertNotifications());
+
+ //now remove the notifications that have not changed
+ if (persistedAlertDefinition != null) {
+ List<AlertNotification> persistedNotifications = persistedAlertDefinition.getAlertNotifications() == null ? Collections.<AlertNotification>emptyList() : persistedAlertDefinition.getAlertNotifications();
+
+ if (persistedNotifications.size() > 0) {
+ Iterator<AlertNotification> it = notifications.iterator();
+ while (it.hasNext()) {
+ AlertNotification newNotification = it.next();
+
+ if (newNotification.getId() == 0) {
+ //this is a fresh, not persisted notif. These guys have to be always finalized.
+ continue;
+ }
+
+ for(AlertNotification persistedNotification : persistedNotifications) {
+ //ignore the ids on the notifications as they may vary if we are comparing parent alert def with its children
+ //it's enough for us they they are semantically the same.
+ if (newNotification.getSenderName().equals(persistedNotification.getSenderName()) && newNotification.equalsData(persistedNotification)) {
+ it.remove();
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ if (!alertNotificationManager.finalizeNotifications(subject, notifications)) {
+ throw new InvalidAlertDefinitionException("Some of the notifications failed to validate.");
+ }
}
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java
index 81f0ac0..95dd3a7 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerLocal.java
@@ -45,11 +45,29 @@ public interface AlertDefinitionManagerLocal {
List<IntegerOptionItem> findAlertDefinitionOptionItemsForGroup(Subject subject, int groupId);
- int createAlertDefinition(Subject subject, AlertDefinition alertDefinition, Integer resourceId)
+ /**
+ * Creates a new alert definition. Note that the suject is checked to have necessary authz, which might not
+ * be what you want in all use cases. See {@link #createDependentAlertDefinition(Subject, AlertDefinition, int)}
+ * for further discussion of this.
+ *
+ * @param subject the user creating the alert definition
+ * @param alertDefinition the new alert definition to persist
+ * @param resourceId the resource id for which the def is being created
+ * @param finalizeNotificationConfiguration if true, the configuration of the def's notifications is validated.
+ * This is NOT what you want if, for example, you are merely creating a copy of an existing definition.
+ * Some notifications might require more input when creating the notification than is then persisted in their configs
+ * (prominent example being the CLI alert sender).
+ * This would then cause the validation to fail every time you created a copy of a definition and tried
+ * to persist it. Note that passing false AND having new, unpersisted notifications in the alert definition can
+ * lead to invalid configuration being stored for the notifications.
+ * @return the id of the newly persisted alert definition
+ * @throws InvalidAlertDefinitionException
+ */
+ int createAlertDefinition(Subject subject, AlertDefinition alertDefinition, Integer resourceId, boolean finalizeNotificationConfiguration)
throws InvalidAlertDefinitionException;
-
+
/**
- * This is exactly the same as {@link #createAlertDefinition(Subject, AlertDefinition, Integer)} but
+ * This is exactly the same as {@link #createAlertDefinition(Subject, AlertDefinition, Integer, boolean)} but
* assumes the resource is part of a group (or has given resource type for templates) for which
* a group or template alert definition is being created.
* <p>
@@ -93,6 +111,24 @@ public interface AlertDefinitionManagerLocal {
AlertDefinition updateAlertDefinition(Subject subject, int alertDefinitionId, AlertDefinition alertDefinition,
boolean resetMatching) throws InvalidAlertDefinitionException, AlertDefinitionUpdateException;
+ /**
+ * This method is similar in use-case to {@link #createDependentAlertDefinition(Subject, AlertDefinition, int)}.
+ * It assumes that the the update is part of some more complex operation (like updating alert definition on a group
+ * or a template) and that authz checks have already been performed.
+ * <p>
+ * This method is therefore identical to {@link #updateAlertDefinition(Subject, int, AlertDefinition, boolean)} but
+ * does not perform any authorization checks.
+ *
+ * @param subject the user that is updating the alert definition
+ * @param alertDefinitionId
+ * @param alertDefinition
+ * @param resetMatching
+ * @return
+ * @throws InvalidAlertDefinitionException
+ * @throws AlertDefinitionUpdateException
+ */
+ AlertDefinition updateDependentAlertDefinition(Subject subject, int alertDefinitionId, AlertDefinition alertDefinition, boolean resetMatching) throws InvalidAlertDefinitionException, AlertDefinitionUpdateException;
+
int purgeUnusedAlertDefinitions();
void purgeInternals(int alertDefinitionId);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
index 14b1dfb..0e38bb8 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java
@@ -109,6 +109,7 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
/**
* @throws AlertDefinitionUpdateException if the {@link AlertNotification} is not associated with a known sender
*/
+ @Deprecated
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public AlertNotification addAlertNotification(Subject user, int alertDefinitionId, AlertNotification notification)
throws AlertDefinitionUpdateException {
@@ -123,11 +124,12 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
List<AlertNotification> notifications = definition.getAlertNotifications();
notifications.add(notification);
- postProcessAlertDefinition(definition);
+ postProcessAlertDefinition(user, definition);
return notification;
}
+ @Deprecated
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public void updateAlertNotification(Subject subject, int alertDefinitionId, AlertNotification notification) {
AlertDefinition alertDefinition = getDetachedAlertDefinition(alertDefinitionId); // permissions check first
@@ -144,9 +146,10 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
notifications.add(notification);
}
- postProcessAlertDefinition(alertDefinition);
+ postProcessAlertDefinition(subject, alertDefinition);
}
+ @Deprecated
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
public int removeNotifications(Subject subject, Integer alertDefinitionId, Integer[] notificationIds) {
AlertDefinition alertDefinition = getDetachedAlertDefinition(alertDefinitionId); // permissions check first
@@ -168,7 +171,7 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
alertDefinition.getAlertNotifications().removeAll(toBeRemoved);
- postProcessAlertDefinition(alertDefinition);
+ postProcessAlertDefinition(subject, alertDefinition);
return removed;
}
@@ -178,16 +181,15 @@ public class AlertNotificationManagerBean implements AlertNotificationManagerLoc
return purgeQuery.executeUpdate();
}
- private AlertDefinition postProcessAlertDefinition(AlertDefinition definition) {
+ private AlertDefinition postProcessAlertDefinition(Subject subject, AlertDefinition definition) {
AlertDefinition updated = null;
AlertDefinitionContext context = definition.getContext();
- Subject overlord = subjectManager.getOverlord();
if (context == AlertDefinitionContext.Type) {
- updated = alertTemplateManager.updateAlertTemplate(overlord, definition, true);
+ updated = alertTemplateManager.updateAlertTemplate(subject, definition, true);
} else if (context == AlertDefinitionContext.Group) {
- updated = groupAlertDefintionManager.updateGroupAlertDefinitions(overlord, definition, true);
+ updated = groupAlertDefintionManager.updateGroupAlertDefinitions(subject, definition, true);
} else if (context == AlertDefinitionContext.Resource) {
- updated = alertDefinitionManager.updateAlertDefinition(overlord, definition.getId(), definition, false);
+ updated = alertDefinitionManager.updateAlertDefinition(subject, definition.getId(), definition, false);
} else {
throw new IllegalStateException("No support for updating alert notifications for AlertDefinitionContext: "
+ definition.getContext());
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java
index 56f8eab..3aa21cf 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java
@@ -44,7 +44,9 @@ public interface AlertNotificationManagerLocal {
* @param senderName shortName of the {@link AlertSender}
* @param configuration Properties for this alert sender.
* @throws AlertNotificationValidationException if the alert sender of the notification failed to finalize and validate the provided notification's configuration
+ * @deprecated this is used only by the legacy JSF UI and no longer works correctly
*/
+ @Deprecated
AlertNotification addAlertNotification(Subject user, int alertDefinitionId, AlertNotification notification) throws AlertDefinitionUpdateException, AlertNotificationValidationException;
/**
@@ -52,7 +54,9 @@ public interface AlertNotificationManagerLocal {
*
* @param notification
* @throws AlertNotificationValidationException if the alert sender of the notification failed to finalize and validate the notification's configuration
+ * @deprecated this is used only by the legacy JSF UI and no longer works correctly
*/
+ @Deprecated
void updateAlertNotification(Subject subject, int alertDefinitionId, AlertNotification notification) throws AlertDefinitionUpdateException, AlertNotificationValidationException;
/**
@@ -61,7 +65,9 @@ public interface AlertNotificationManagerLocal {
* @param alertDefinitionId alert definition to modify
* @param notificationIds Notifications to remove
* @return number of notifications removed
+ * @deprecated this is used only by the legacy JSF UI and no longer works correctly
*/
+ @Deprecated
int removeNotifications(Subject subject, Integer alertDefinitionId, Integer[] notificationIds);
/**
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
index cda1e0f..5b5c2ef 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java
@@ -118,16 +118,20 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
}
ResourceType type = resourceTypeManager.getResourceTypeById(user, resourceTypeId);
-
+
alertTemplate.setResourceType(type); // mark this as an alert "template" definition
+
int alertTemplateId = 0;
try {
- alertTemplateId = alertDefinitionManager.createAlertDefinition(user, alertTemplate, null);
+ alertTemplateId = alertDefinitionManager.createAlertDefinition(user, alertTemplate, null, true);
} catch (Throwable t) {
throw new AlertDefinitionCreationException("Could not create alertTemplate for " + type + " with data "
+ alertTemplate.toSimpleString(), t);
}
+ //get the alert definition we just created.. this is so that we can create copies of it
+ AlertDefinition persistedAlertTemplate = alertDefinitionManager.getAlertDefinition(user, alertTemplateId);
+
Throwable firstThrowable = null;
List<Integer> resourceIdsForType = getCommittedResourceIdsNeedingTemplateApplication(user, alertTemplateId,
@@ -136,7 +140,7 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
for (Integer resourceId : resourceIdsForType) {
try {
// construct the child
- AlertDefinition childAlertDefinition = new AlertDefinition(alertTemplate);
+ AlertDefinition childAlertDefinition = new AlertDefinition(persistedAlertTemplate);
childAlertDefinition.setParentId(alertTemplate.getId());
// persist the child as a dependent alert definition
@@ -187,7 +191,7 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
// persist the child, user is known to be overlord at this point for this system side-effect
try {
- alertDefinitionManager.createAlertDefinition(user, childAlertDefinition, resourceId);
+ alertDefinitionManager.createAlertDefinition(user, childAlertDefinition, resourceId, false);
} catch (Throwable t) {
throw new AlertDefinitionCreationException("Failed to create child AlertDefinition for Resource[id="
+ resourceId + "] with template " + template.toSimpleString());
@@ -259,7 +263,7 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
for (Integer alertDefinitionId : alertDefinitions) {
try {
alertDefinitionManager
- .updateAlertDefinition(overlord, alertDefinitionId, alertTemplate, resetMatching);
+ .updateDependentAlertDefinition(user, alertDefinitionId, updated, resetMatching);
} catch (Throwable t) {
// continue on error, update as many as possible
if (firstThrowable == null) {
@@ -279,11 +283,11 @@ public class AlertTemplateManagerBean implements AlertTemplateManagerLocal {
for (Integer resourceId : resourceIds) {
try {
// construct the child
- AlertDefinition childAlertDefinition = new AlertDefinition(alertTemplate);
+ AlertDefinition childAlertDefinition = new AlertDefinition(updated);
childAlertDefinition.setParentId(alertTemplate.getId());
// persist the child
- alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId);
+ alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId, false);
} catch (Throwable t) {
// continue on error, update as many as possible
if (firstThrowable == null) {
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
index 6df9ae0..8cac89c 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/GroupAlertDefinitionManagerBean.java
@@ -146,12 +146,15 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
int groupAlertDefinitionId = 0;
try {
- groupAlertDefinitionId = alertDefinitionManager.createAlertDefinition(subject, groupAlertDefinition, null);
+ groupAlertDefinitionId = alertDefinitionManager.createAlertDefinition(subject, groupAlertDefinition, null, true);
} catch (Throwable t) {
throw new AlertDefinitionCreationException("Could not create groupAlertDefinitions for " + group
+ " with data " + groupAlertDefinition.toSimpleString(), t);
}
+ //get the alert definition we just created.. this is so that we can create copies of it
+ AlertDefinition persistedDefinition = alertDefinitionManager.getAlertDefinition(subject, groupAlertDefinitionId);
+
Throwable firstThrowable = null;
List<Integer> resourceIdsForGroup = getCommittedResourceIdsNeedingGroupAlertDefinitionApplication(subject,
@@ -160,7 +163,7 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
for (Integer resourceId : resourceIdsForGroup) {
try {
// construct the child
- AlertDefinition childAlertDefinition = new AlertDefinition(groupAlertDefinition);
+ AlertDefinition childAlertDefinition = new AlertDefinition(persistedDefinition);
childAlertDefinition.setGroupAlertDefinition(groupAlertDefinition);
// persist the child
@@ -241,9 +244,10 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
LOG.debug("Need to update the following children alert definition ids: " + alertDefinitions);
}
List<Integer> alertDefinitionIdsInError = new ArrayList<Integer>();
+
for (Integer alertDefinitionId : alertDefinitions) {
try {
- alertDefinitionManager.updateAlertDefinition(overlord, alertDefinitionId, groupAlertDefinition,
+ alertDefinitionManager.updateDependentAlertDefinition(subject, alertDefinitionId, updated,
resetMatching);
} catch (Throwable t) {
// continue on error, update as many as possible
@@ -261,11 +265,11 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
for (Integer resourceId : resourceIds) {
try {
// construct the child
- AlertDefinition childAlertDefinition = new AlertDefinition(groupAlertDefinition);
+ AlertDefinition childAlertDefinition = new AlertDefinition(updated);
childAlertDefinition.setGroupAlertDefinition(groupAlertDefinition);
// persist the child
- alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId);
+ alertDefinitionManager.createAlertDefinition(subject, childAlertDefinition, resourceId, false);
} catch (Throwable t) {
// continue on error, update as many as possible
if (firstThrowable == null) {
@@ -308,7 +312,7 @@ public class GroupAlertDefinitionManagerBean implements GroupAlertDefinitionMana
childAlertDefinition.setGroupAlertDefinition(groupAlertDefinition);
// persist the child
- alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId);
+ alertDefinitionManager.createAlertDefinition(overlord, childAlertDefinition, resourceId, false);
} catch (Throwable t) {
// continue on error, create as many as possible
if (firstThrowable == null) {
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
index 47ba274..5116a90 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/alert/test/AlertConditionTest.java
@@ -479,7 +479,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId);
+ int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
@@ -513,7 +513,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId);
+ int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
@@ -546,7 +546,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId);
+ int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
@@ -579,7 +579,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId);
+ int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
@@ -613,7 +613,7 @@ public class AlertConditionTest extends UpdatePluginMetadataTestBase {
alertDefinition.setConditions(conditions);
AlertDefinitionManagerLocal alertDefManager = LookupUtil.getAlertDefinitionManager();
- int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId);
+ int defId = alertDefManager.createAlertDefinition(getOverlord(), alertDefinition, resourceId, true);
alertDefinition = alertDefManager.getAlertDefinition(getOverlord(), defId); // load it back so we get its ID and all condition IDs
assert alertDefinition != null && alertDefinition.getId() > 0 : "did not persist alert def properly: "
+ alertDefinition;
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java
index 825fdee..4b9dea2 100644
--- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java
+++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java
@@ -355,7 +355,7 @@ public class AvailabilityInsertPurgeTest extends AbstractEJB3PerformanceTest {
def.setPriority(AlertPriority.MEDIUM);
def.setAlertDampening(new AlertDampening(AlertDampening.Category.NONE));
def.setRecoveryId(0);
- alertDefinitionManager.createAlertDefinition(overlord, def, res.getId());
+ alertDefinitionManager.createAlertDefinition(overlord, def, res.getId(), true);
for (int MULTI : ROUNDS) {
String round = String.format(ROUND__FORMAT, MULTI);
commit 968394de21ec44fe0fb1598db4530fa31631e701
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Sep 12 17:42:29 2012 +0200
refactoring: removed unused method (findCallTimeDataForResource) it was used by class removed in commit 705254b
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java
index 8640383..0488b0c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java
@@ -33,7 +33,6 @@ import org.rhq.core.domain.measurement.MeasurementData;
import org.rhq.core.domain.measurement.MeasurementDataTrait;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementSchedule;
-import org.rhq.core.domain.measurement.calltime.CallTimeDataComposite;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite;
@@ -59,9 +58,6 @@ public interface MeasurementDataGWTService extends RemoteService {
List<List<MeasurementDataNumericHighLowComposite>> findDataForCompatibleGroup(int groupId, int[] definitionIds,
long beginTime, long endTime, int numPoints) throws RuntimeException;
- PageList<CallTimeDataComposite> findCallTimeDataForResource(int scheduleId, long start, long end,
- PageControl pageControl) throws RuntimeException;
-
PageList<MeasurementDefinition> findMeasurementDefinitionsByCriteria(MeasurementDefinitionCriteria criteria)
throws RuntimeException;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java
index eec590d..f014c94 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java
@@ -31,7 +31,6 @@ import org.rhq.core.domain.measurement.MeasurementData;
import org.rhq.core.domain.measurement.MeasurementDataTrait;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementSchedule;
-import org.rhq.core.domain.measurement.calltime.CallTimeDataComposite;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite;
@@ -116,16 +115,6 @@ public class MeasurementDataGWTServiceImpl extends AbstractGWTServiceImpl implem
}
}
- public PageList<CallTimeDataComposite> findCallTimeDataForResource(int scheduleId, long start, long end,
- PageControl pageControl) throws RuntimeException {
- try {
- return SerialUtility.prepare(callTimeDataManager.findCallTimeDataForResource(getSessionSubject(),
- scheduleId, start, end, pageControl), "MeasurementDataService.findCallTimeDataForResource");
- } catch (Throwable t) {
- throw getExceptionToThrowToClient(t);
- }
- }
-
public PageList<MeasurementDefinition> findMeasurementDefinitionsByCriteria(MeasurementDefinitionCriteria criteria)
throws RuntimeException {
try {
commit 30c79967d069c922b573f96090606e9295b5f70a
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Sep 12 17:28:34 2012 +0200
BZ 856484 - add support for Postgres 9.2 and later 9er versions.
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseTypeFactory.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseTypeFactory.java
index d3f4035..960d79d 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseTypeFactory.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/DatabaseTypeFactory.java
@@ -146,10 +146,10 @@ public class DatabaseTypeFactory {
if (db_name.indexOf("postgresql") != -1) {
if (db_version.startsWith("7.")) {
database_type_class = Postgresql7DatabaseType.class;
- } else if (db_version.startsWith("9.1")) {
- database_type_class = Postgresql91DatabaseType.class;
} else if (db_version.startsWith("9.0")) {
database_type_class = Postgresql90DatabaseType.class;
+ } else if (db_version.startsWith("9.")) { // 9.1, 9.2, 9.x...
+ database_type_class = Postgresql91DatabaseType.class;
} else if (db_version.startsWith("8.4")) {
database_type_class = Postgresql84DatabaseType.class;
} else if (db_version.startsWith("8.3")) {
diff --git a/modules/core/dbutils/src/main/java/org/rhq/core/db/Postgresql91DatabaseType.java b/modules/core/dbutils/src/main/java/org/rhq/core/db/Postgresql91DatabaseType.java
index ce5728e..80a12df 100644
--- a/modules/core/dbutils/src/main/java/org/rhq/core/db/Postgresql91DatabaseType.java
+++ b/modules/core/dbutils/src/main/java/org/rhq/core/db/Postgresql91DatabaseType.java
@@ -33,7 +33,7 @@ public class Postgresql91DatabaseType extends Postgresql90DatabaseType {
*/
@Override
public String getName() {
- return PostgresqlDatabaseType.VENDOR_NAME + "9.1";
+ return PostgresqlDatabaseType.VENDOR_NAME + " 9.1+";
}
/**
@@ -41,11 +41,11 @@ public class Postgresql91DatabaseType extends Postgresql90DatabaseType {
*/
@Override
public String getVersion() {
- return "9.1";
+ return "9.1+";
}
/**
- * Postgres 9.1 is using a standard conforming escape character out of the box
+ * Postgres 9.1 and later is using a standard conforming escape character out of the box
* unlike earlier versions of Postgres, which means we need to follow this convention
* here.
* @return escape char
commit 705254b82108c65f0b0ce61912617d1a2e1bc35c
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Sep 12 17:21:26 2012 +0200
refactoring: removed unused classes (CallTimeDataSource and CallTimeView) and marking some methods used only by portal-war as deprecated
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeDataSource.java
deleted file mode 100644
index 550215e..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeDataSource.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.calltime;
-
-import java.util.List;
-
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.data.DSRequest;
-import com.smartgwt.client.data.DSResponse;
-import com.smartgwt.client.data.DataSourceField;
-import com.smartgwt.client.data.Record;
-import com.smartgwt.client.data.fields.DataSourceIntegerField;
-import com.smartgwt.client.data.fields.DataSourceTextField;
-import com.smartgwt.client.widgets.HTMLFlow;
-import com.smartgwt.client.widgets.grid.ListGridRecord;
-
-import org.rhq.core.domain.criteria.Criteria;
-import org.rhq.core.domain.measurement.calltime.CallTimeDataComposite;
-import org.rhq.core.domain.util.PageControl;
-import org.rhq.core.domain.util.PageList;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-
-/**
- * @author Greg Hinkle
- */
-public class CallTimeDataSource extends RPCDataSource<CallTimeDataComposite, Criteria> {
-
- private double maxMaximum;
-
- public CallTimeDataSource() {
- List<DataSourceField> fields = addDataSourceFields();
- addFields(fields);
- }
-
- @Override
- protected List<DataSourceField> addDataSourceFields() {
- List<DataSourceField> fields = super.addDataSourceFields();
-
- DataSourceTextField callDestination = new DataSourceTextField("callDestination", MSG
- .view_resource_monitor_calltime_destination());
- fields.add(callDestination);
- DataSourceIntegerField count = new DataSourceIntegerField("count", MSG.view_resource_monitor_calltime_count());
- fields.add(count);
- DataSourceIntegerField minimum = new DataSourceIntegerField("minimum", MSG
- .view_resource_monitor_calltime_minimum());
- fields.add(minimum);
- DataSourceIntegerField average = new DataSourceIntegerField("average", MSG
- .view_resource_monitor_calltime_average());
- fields.add(average);
- DataSourceIntegerField maximum = new DataSourceIntegerField("maximum", MSG
- .view_resource_monitor_calltime_maximum());
- fields.add(maximum);
- DataSourceIntegerField total = new DataSourceIntegerField("total", MSG.common_title_total());
- fields.add(total);
-
- return fields;
- }
-
- @Override
- protected void executeFetch(final DSRequest request, final DSResponse response, final Criteria unused) {
- int scheduleId = Integer.parseInt((String) request.getCriteria().getValues().get("scheduleId"));
- long now = System.currentTimeMillis();
- long eightHoursAgo = now - (1000L * 60 * 60 * 8);
-
- PageControl pc = getPageControl(request);
-
- GWTServiceLookup.getMeasurementDataService().findCallTimeDataForResource(scheduleId, eightHoursAgo, now, pc,
- new AsyncCallback<PageList<CallTimeDataComposite>>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_calltime_loadFailed(), caught);
- }
-
- public void onSuccess(PageList<CallTimeDataComposite> result) {
- Record[] data = buildRecords(result);
- setGraphs(data);
- response.setData(data);
-
- processResponse(request.getRequestId(), response);
- }
- });
- }
-
- @Override
- protected Criteria getFetchCriteria(DSRequest request) {
- // we don't use criterias for this datasource, just return null
- return null;
- }
-
- @Override
- public CallTimeDataComposite copyValues(Record from) {
- throw new UnsupportedOperationException(MSG.view_resource_monitor_calltime_editFailed());
- }
-
- public void setGraphs(Record[] records) {
- for (Record record : records) {
- if (record.getAttributeAsInt("maximum") > maxMaximum)
- maxMaximum = record.getAttributeAsInt("maximum");
- }
-
- for (Record record : records) {
-
- int minWidth = (int) ((record.getAttributeAsInt("minimum") / maxMaximum) * 100d);
- int avgWidth = (int) ((record.getAttributeAsInt("average") / maxMaximum) * 100d);
- int maxWidth = (int) ((record.getAttributeAsInt("maximum") / maxMaximum) * 100d);
-
- if (record instanceof ListGridRecord) {
- ListGridRecord listGridRecord = (ListGridRecord) record;
- listGridRecord.setBackgroundComponent(new HTMLFlow("<div style=\"width: " + minWidth
- + "%; height: 33%; background-color: #A5B391;\"> </div>" + "<div style=\"width: " + avgWidth
- + "%; height: 33%; background-color: #A5B391;\"> </div>" + "<div style=\"width: " + maxWidth
- + "%; height: 33%; background-color: #A5B391;\"> </div>"));
- }
- }
- }
-
- @Override
- public ListGridRecord copyValues(CallTimeDataComposite from) {
- ListGridRecord record = new ListGridRecord();
-
- record.setAttribute("callDestination", from.getCallDestination());
-
- record.setAttribute("count", from.getCount());
- record.setAttribute("minimum", from.getMinimum());
- record.setAttribute("average", from.getAverage());
- record.setAttribute("maximum", from.getMaximum());
- record.setAttribute("total", from.getTotal());
-
- return record;
- }
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeView.java
deleted file mode 100644
index 894a1b3..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/calltime/CallTimeView.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.calltime;
-
-import java.util.EnumSet;
-
-import com.google.gwt.i18n.client.NumberFormat;
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.data.Criteria;
-import com.smartgwt.client.widgets.Label;
-import com.smartgwt.client.widgets.grid.CellFormatter;
-import com.smartgwt.client.widgets.grid.ListGridField;
-import com.smartgwt.client.widgets.grid.ListGridRecord;
-
-import org.rhq.core.domain.criteria.ResourceCriteria;
-import org.rhq.core.domain.measurement.DataType;
-import org.rhq.core.domain.measurement.MeasurementDefinition;
-import org.rhq.core.domain.measurement.MeasurementSchedule;
-import org.rhq.core.domain.resource.Resource;
-import org.rhq.core.domain.resource.ResourceType;
-import org.rhq.core.domain.util.PageList;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.components.table.Table;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLayout;
-
-/**
- * @author Greg Hinkle
- */
-public class CallTimeView extends LocatableLayout {
-
- private Resource resource;
- private int scheduleId;
-
- public CallTimeView(String locatorId, Resource resource) {
- super(locatorId);
- this.resource = resource;
- }
-
- @Override
- protected void onDraw() {
- super.onDraw();
-
- ResourceTypeRepository.Cache.getInstance().getResourceTypes(resource.getResourceType().getId(),
- EnumSet.of(ResourceTypeRepository.MetadataType.measurements),
- new ResourceTypeRepository.TypeLoadedCallback() {
- public void onTypesLoaded(ResourceType type) {
-
- for (final MeasurementDefinition def : type.getMetricDefinitions()) {
- if (def.getDataType() == DataType.CALLTIME) {
-
- ResourceCriteria criteria = new ResourceCriteria();
- criteria.addFilterId(resource.getId());
- criteria.fetchSchedules(true);
-
- GWTServiceLookup.getResourceService().findResourcesByCriteria(criteria,
- new AsyncCallback<PageList<Resource>>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(
- MSG.view_resource_monitor_calltime_lookupFailed(), caught);
- }
-
- public void onSuccess(PageList<Resource> result) {
- if (result.size() == 1) {
-
- Resource res = result.get(0);
- for (MeasurementSchedule s : res.getSchedules()) {
-
- if (s.getDefinition().getId() == def.getId()) {
-
- scheduleId = s.getId();
-
- setup();
- return;
- }
- }
- }
- setupNone();
- }
- });
- break;
-
- }
-
- }
-
- }
- });
-
- }
-
- public void setupNone() {
- addMember(new Label("No calltime data available for this resource"));
- }
-
- public void setup() {
-
- Table table = new Table(extendLocatorId("Table"), MSG.view_resource_monitor_calltime_title(), new Criteria(
- "scheduleId", String.valueOf(scheduleId)));
- table.getListGrid().setAlternateRecordStyles(false);
- table.setDataSource(new CallTimeDataSource());
- table.getListGrid().setUseAllDataSourceFields(true);
-
- final NumberFormat format = NumberFormat.getFormat("0");
-
- ListGridField callDestination = new ListGridField("callDestination", MSG
- .view_resource_monitor_calltime_destination());
- ListGridField count = new ListGridField("count", MSG.view_resource_monitor_calltime_count(), 70);
- ListGridField minimum = new ListGridField("minimum", MSG.view_resource_monitor_calltime_minimum(), 70);
- ListGridField average = new ListGridField("average", MSG.view_resource_monitor_calltime_average(), 70);
- average.setCellFormatter(new CellFormatter() {
- public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
- return format.format(((Number) o).doubleValue());
- }
- });
- ListGridField maximum = new ListGridField("maximum", MSG.view_resource_monitor_calltime_maximum(), 70);
- ListGridField total = new ListGridField("total", MSG.common_title_total(), 70);
-
- table.getListGrid().setFields(callDestination, count, minimum, average, maximum, total);
-
- addMember(table);
- markForRedraw();
- }
-
-}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerLocal.java
index 53d2523..73195ec 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerLocal.java
@@ -34,7 +34,9 @@ import org.rhq.core.domain.measurement.ui.MetricDisplaySummary;
@Local
public interface MeasurementChartsManagerLocal {
- @Deprecated
+ /**
+ * @deprecated portal-war
+ */
// TODO: jmarques - this will go away once ListChildrenAction is moved to JSF
List<MetricDisplaySummary> getMetricDisplaySummariesForMetrics(Subject subject, int resourceId, DataType dataType,
long begin, long end, boolean narrowed, boolean enabledOnly) throws MeasurementException;
@@ -52,10 +54,15 @@ public interface MeasurementChartsManagerLocal {
* @return
*
* @throws MeasurementException
+ *
+ * @deprecated portal-war
*/
List<MetricDisplaySummary> getMetricDisplaySummariesForCompatibleGroup(Subject subject, int groupId,
int[] measurementDefinitionIds, long begin, long end, boolean enabledOnly) throws MeasurementException;
+ /**
+ * @deprecated portal-war
+ */
List<MetricDisplaySummary> getMetricDisplaySummariesForCompatibleGroup(Subject subject, int groupId, String viewName);
/**
@@ -72,17 +79,28 @@ public interface MeasurementChartsManagerLocal {
* @return
*
* @throws MeasurementException
+ *
+ * @deprecated portal-war
*/
List<MetricDisplaySummary> getMetricDisplaySummariesForAutoGroup(Subject subject, int autoGroupParentResourceId,
int autoGroupChildResourceTypeId, int[] measurementDefinitionIds, long begin, long end, boolean enabledOnly)
throws MeasurementException;
+ /**
+ * @deprecated portal-war
+ */
List<MetricDisplaySummary> getMetricDisplaySummariesForAutoGroup(Subject subject, int parent, int type,
String viewName);
+ /**
+ * @deprecated portal-war
+ */
List<MetricDisplaySummary> getMetricDisplaySummariesForResource(Subject subject, int resourceId,
int[] measurementScheduleIds, long begin, long end) throws MeasurementException;
+ /**
+ * @deprecated portal-war
+ */
List<MetricDisplaySummary> getMetricDisplaySummariesForResource(Subject subject, int resourceId, String viewName)
throws MeasurementException;
@@ -99,6 +117,8 @@ public interface MeasurementChartsManagerLocal {
* resources values in a List for the value.
*
* @throws MeasurementException throws Measurement exception
+ *
+ * @deprecated portal-war
*/
Map<MeasurementDefinition, List<MetricDisplaySummary>> getMetricDisplaySummariesForMetricsCompare(Subject subject,
int[] resourceIds, int[] measurementDefinitionIds, long begin, long end) throws MeasurementException;
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java
index 1878a8f..49bc2fe 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java
@@ -83,6 +83,8 @@ public interface MeasurementDataManagerLocal {
* @param group compatible group
*
* @return a Map of resource id, List of summaries for this resource
+ *
+ * @deprecated portal-war
*/
Map<Integer, List<MetricDisplaySummary>> findNarrowedMetricsDisplaySummariesForCompGroup(Subject subject,
ResourceGroup group, long beginTime, long endTime);
@@ -91,10 +93,15 @@ public interface MeasurementDataManagerLocal {
* Get the {@link MetricDisplaySummary}s for the resources passed in, that all need to be of the same
* {@link ResourceType}. Summaries only contain a basic selection of fields for the purpose of filling the Child
* resource popups.
+ *
+ * @deprecated portal-war
*/
public Map<Integer, List<MetricDisplaySummary>> findNarrowedMetricDisplaySummariesForCompatibleResources(
Subject subject, Collection<Resource> resources, long beginTime, long endTime);
+ /**
+ * @deprecated portal-war (it is not used at all)
+ */
public Map<Integer, List<MetricDisplaySummary>> findNarrowedMetricsDisplaySummariesForAutoGroup(Subject subject,
int parentId, int cType, long beginTime, long endTime);
@@ -108,6 +115,8 @@ public interface MeasurementDataManagerLocal {
* @param resourceIds List of primary keys of the resources we are interested in
* @param begin begin time
* @param end end time
+ *
+ * @deprecated portal-war
*/
public Map<Integer, List<MetricDisplaySummary>> findNarrowedMetricDisplaySummariesForResourcesAndParent(
Subject subject, int resourceTypeId, int parentId, List<Integer> resourceIds, long begin, long end);
@@ -203,5 +212,8 @@ public interface MeasurementDataManagerLocal {
List<List<MeasurementDataNumericHighLowComposite>> findDataForResource(Subject subject, int resourceId,
int[] definitionIds, long beginTime, long endTime, int numPoints);
+ /**
+ * @deprecated portal-war (it is not used at all)
+ */
List<MeasurementDataNumeric> findRawData(Subject subject, int scheduleId, long startTime, long endTime);
}
\ No newline at end of file
commit b54ce46d2f1bcfbb8e7f5e996521592f008e3f24
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Wed Sep 12 13:52:08 2012 +0200
[BZ 856599 - 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.
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/ResourceGroupListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
index 2947bce..fd617c2 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,13 @@ 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().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();
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 9681ea1..ab0eed7 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
@@ -1425,6 +1425,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 b2a842d..dfd116e 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
@@ -1442,6 +1442,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 4fe89d0..473bc14 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
@@ -1260,6 +1260,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 e2e25e8..35f696e 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
@@ -1412,6 +1412,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 e3f044f..38b0f01 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
@@ -1437,6 +1437,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 e27ce16..64479c7 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
@@ -2468,6 +2468,7 @@ view_admin_downloads_cli_version = Версия CLI
##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.
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 2de43cc..c1f347f 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
@@ -1415,6 +1415,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 1d4e0d12dc0d013659e3ebde3b18eb24b0083e84
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: Tue Sep 11 17:59:29 2012 -0400
[BZ 839087] a few lines more of documentation.
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
index 25391e8..e8072ea 100644
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
@@ -131,6 +131,7 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
ProcessInfo processInfo = process.getProcessInfo();
DiscoveredResourceDetails details = discoverResourceDetails(context, processInfo);
if (details != null) {
+ //detect discovered jmx resources that are erroneously using the same key
if (discoveredResources.contains(details)) {
List<DiscoveredResourceDetails> duplicates = duplicatesByKey.get(details.getResourceKey());
if (duplicates == null) {
@@ -151,6 +152,7 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
}
}
+ //Log the erroneous collisions and take them out of the discoveredResource list.
for (String duplicateKey : duplicatesByKey.keySet()) {
List<DiscoveredResourceDetails> duplicates = duplicatesByKey.get(duplicateKey);
log.error("Multiple Resources with the same key (" + duplicateKey
@@ -511,6 +513,7 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
}
}
+ //build the resource names from supported JvmResourceKey instances. See JvmResourceKey.Type for more details.
switch (key.getType()) {
case Legacy: // implies main classname was not found. Include earlier naming format as well.
name.append("JMX Server (" + key.getJmxRemotingPort() + ")");
commit c431e51a08fbb6960c3c87090bef1c150c537c8c
Author: Simeon Pinder <spinder(a)fulliautomatix.conchfritter.com>
Date: Tue Sep 11 17:38:54 2012 -0400
[BZ 839087] add support for ConnectorAddress naming as well.
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
index 5914b9b..25391e8 100644
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
@@ -513,14 +513,19 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
switch (key.getType()) {
case Legacy: // implies main classname was not found. Include earlier naming format as well.
- name.append("JMX Server (" + key.getJmxRemotingPort() + ")");//
+ name.append("JMX Server (" + key.getJmxRemotingPort() + ")");
break;
- case JmxRemotingPort:
- name.append(':').append(key.getJmxRemotingPort()); break;
- case Explicit:
- name.append(' ').append(key.getExplicitValue()); break;
- default:
- throw new IllegalStateException("Unsupported key type: " + key.getType());
+ case ConnectorAddress:
+ name.append(key.getConnectorAddress());
+ break;
+ case JmxRemotingPort:
+ name.append(':').append(key.getJmxRemotingPort());
+ break;
+ case Explicit:
+ name.append(' ').append(key.getExplicitValue());
+ break;
+ default:
+ throw new IllegalStateException("Unsupported key type: " + key.getType());
}
return name.toString();
commit ad3c40c0812d74756eab640faabf83980ef8d891
Author: Elias Ross <genman(a)noderunner.net>
Date: Mon Sep 10 17:34:27 2012 -0400
[BZ 839087] adding support for Legacy types when generating names for discovered types.
- also applying original naming scheme for consistency.
diff --git a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
index f0a4f98..5914b9b 100644
--- a/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
+++ b/modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXDiscoveryComponent.java
@@ -46,6 +46,12 @@ import javax.management.remote.JMXServiceURL;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.mc4j.ems.connection.EmsConnection;
+import org.mc4j.ems.connection.bean.EmsBean;
+import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
+import org.mc4j.ems.connection.support.ConnectionProvider;
+import org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor;
+
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.resource.ResourceUpgradeReport;
@@ -63,12 +69,6 @@ import org.rhq.plugins.jmx.util.ConnectionProviderFactory;
import org.rhq.plugins.jmx.util.JvmResourceKey;
import org.rhq.plugins.jmx.util.JvmUtility;
-import org.mc4j.ems.connection.EmsConnection;
-import org.mc4j.ems.connection.bean.EmsBean;
-import org.mc4j.ems.connection.bean.attribute.EmsAttribute;
-import org.mc4j.ems.connection.support.ConnectionProvider;
-import org.mc4j.ems.connection.support.metadata.J2SE5ConnectionTypeDescriptor;
-
/**
* This component will discover JVM processes that appear to be long-running (i.e. "servers"). Specifically, it will
* discover java processes that:
@@ -512,6 +512,9 @@ public class JMXDiscoveryComponent implements ResourceDiscoveryComponent, Manual
}
switch (key.getType()) {
+ case Legacy: // implies main classname was not found. Include earlier naming format as well.
+ name.append("JMX Server (" + key.getJmxRemotingPort() + ")");//
+ break;
case JmxRemotingPort:
name.append(':').append(key.getJmxRemotingPort()); break;
case Explicit:
commit fadd80c00b33dc206e751cfee6473322a831eb35
Author: Richard Hensman <richard(a)onevisionconsulting.co.uk>
Date: Wed Aug 29 20:54:06 2012 +0100
Added Oracle ASM Disk Group Component to Oracle Plugin
diff --git a/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleAsmDiskGroupComponent.java b/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleAsmDiskGroupComponent.java
new file mode 100644
index 0000000..09e1a80
--- /dev/null
+++ b/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleAsmDiskGroupComponent.java
@@ -0,0 +1,117 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 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.plugins.oracle;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Locale;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.rhq.core.domain.measurement.AvailabilityType;
+import org.rhq.core.domain.measurement.DataType;
+import org.rhq.core.domain.measurement.MeasurementDataNumeric;
+import org.rhq.core.domain.measurement.MeasurementDataTrait;
+import org.rhq.core.domain.measurement.MeasurementReport;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
+import org.rhq.core.pluginapi.measurement.MeasurementFacet;
+import org.rhq.core.util.jdbc.JDBCUtil;
+import org.rhq.plugins.database.AbstractDatabaseComponent;
+import org.rhq.plugins.database.DatabaseQueryUtility;
+
+/**
+ * Oracle ASM Disk Group Component.
+ *
+ * @author Richard Hensman
+ */
+@SuppressWarnings("rawtypes")
+public class OracleAsmDiskGroupComponent extends AbstractDatabaseComponent
+ implements MeasurementFacet {
+
+ private static final String SQL_AVAILABLE = "SELECT COUNT(*) FROM v$asm_diskgroup WHERE group_number = ? and STATE <> 'BROKEN'";
+
+ private static final String SQL_VALUES = "SELECT GROUP_NUMBER, " + "NAME, "
+ + "SECTOR_SIZE sectorSize, " + "BLOCK_SIZE blockSize, "
+ + "ALLOCATION_UNIT_SIZE allocationUnitSize, " + "STATE state, "
+ + "TYPE type, " + "TOTAL_MB totalMb, " + "FREE_MB freeMb, "
+ + "((TOTAL_MB-FREE_MB)/TOTAL_MB) usedPercent, "
+ + "REQUIRED_MIRROR_FREE_MB requiredMirrorFreeMb, "
+ + "USABLE_FILE_MB usableFileMb, " + "OFFLINE_DISKS offlineDisks, "
+ + "COMPATIBILITY compatibility, "
+ + "DATABASE_COMPATIBILITY databaseCompatibility "
+ + "FROM v$asm_diskgroup WHERE group_number = ?";
+
+ private static Log log = LogFactory
+ .getLog(OracleAsmDiskGroupComponent.class);
+
+ public AvailabilityType getAvailability() {
+ PreparedStatement statement = null;
+ ResultSet resultSet = null;
+ try {
+ statement = getConnection().prepareStatement(SQL_AVAILABLE);
+ statement.setString(1, this.resourceContext.getResourceKey());
+ resultSet = statement.executeQuery();
+ if (resultSet.next() && (resultSet.getInt(1) == 1)) {
+ return AvailabilityType.UP;
+ }
+ } catch (SQLException e) {
+ log.debug("unable to query", e);
+ } finally {
+ JDBCUtil.safeClose(statement, resultSet);
+ }
+
+ return AvailabilityType.DOWN;
+ }
+
+ public void getValues(MeasurementReport report,
+ Set<MeasurementScheduleRequest> metrics) throws Exception {
+ PreparedStatement statement = null;
+ ResultSet resultSet = null;
+ try {
+ statement = this.getConnection().prepareStatement(SQL_VALUES);
+ statement.setString(1, this.resourceContext.getResourceKey());
+ resultSet = statement.executeQuery();
+ if (resultSet.next()) {
+ for (MeasurementScheduleRequest request : metrics) {
+ String name = request.getName().toUpperCase(Locale.US);
+ if (request.getDataType().equals(DataType.TRAIT)) {
+ report.addData(new MeasurementDataTrait(request,
+ resultSet.getString(name)));
+ } else {
+ try {
+ report.addData(new MeasurementDataNumeric(request,
+ resultSet.getDouble(name)));
+ } catch (SQLException e) {
+ // Ignoring metrics that cannot be read as a double
+ log.warn("Ignoring metric " + name
+ + " as it cannot be read as a double");
+ }
+ }
+ }
+ }
+ } catch (SQLException e) {
+ log.debug("Unable to read value", e);
+ removeConnection();
+ } finally {
+ DatabaseQueryUtility.close(statement, resultSet);
+ }
+ }
+}
\ No newline at end of file
diff --git a/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleAsmDiskGroupDiscoveryComponent.java b/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleAsmDiskGroupDiscoveryComponent.java
new file mode 100644
index 0000000..c023b1b
--- /dev/null
+++ b/modules/plugins/oracle/src/main/java/org/rhq/plugins/oracle/OracleAsmDiskGroupDiscoveryComponent.java
@@ -0,0 +1,92 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2008 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.plugins.oracle;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails;
+import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryComponent;
+import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext;
+import org.rhq.core.util.jdbc.JDBCUtil;
+import org.rhq.plugins.database.DatabaseComponent;
+
+/**
+ * Discovery Oracle ASM Disk Groups.
+ *
+ * @author Richard Hensman
+ */
+public class OracleAsmDiskGroupDiscoveryComponent implements ResourceDiscoveryComponent<DatabaseComponent<?>> {
+
+ private final Log log = LogFactory.getLog(getClass());
+
+ public Set<DiscoveredResourceDetails> discoverResources(
+ ResourceDiscoveryContext<DatabaseComponent<?>> resourceDiscoveryContext)
+ throws InvalidPluginConfigurationException, Exception {
+ Statement statement = null;
+ ResultSet resultSet = null;
+
+ String table = "V$ASM_DISKGROUP";
+ String keyColumn = "GROUP_NUMBER";
+ String nameColumn = "NAME";
+ String description = "Oracle ASM Disk Groups";
+
+ try {
+ Connection conn = resourceDiscoveryContext.getParentResourceComponent().getConnection();
+
+ statement = conn.createStatement();
+ resultSet = statement.executeQuery("SELECT * FROM " + table);
+
+ Configuration config = null;
+ Set<DiscoveredResourceDetails> found = new HashSet<DiscoveredResourceDetails>();
+ while (resultSet.next()) {
+ config = resourceDiscoveryContext.getDefaultPluginConfiguration();
+ String key = resultSet.getString(keyColumn);
+ String name = resultSet.getString(nameColumn);
+ DiscoveredResourceDetails details =
+ new DiscoveredResourceDetails(
+ resourceDiscoveryContext.getResourceType(),
+ key,
+ name,
+ null,
+ description, config, null);
+ found.add(details);
+ }
+
+ return found;
+ } catch (SQLException e) {
+ log.debug("table " + table + " column " + keyColumn, e);
+ } finally {
+ JDBCUtil.safeClose(resultSet);
+ JDBCUtil.safeClose(statement);
+ }
+
+ return Collections.emptySet();
+ }
+
+}
\ No newline at end of file
diff --git a/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml
index d8606e1..2174918 100644
--- a/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml
+++ b/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml
@@ -635,6 +635,33 @@
<metric property="usedPercent" displayName="Used Percent" description="Percentage of the Flash Recovery Area used" displayType="summary" units="percentage"/>
</service>
+
+ <service name="Oracle ASM Disk Groups"
+ discovery="org.rhq.plugins.oracle.OracleAsmDiskGroupDiscoveryComponent"
+ class="org.rhq.plugins.oracle.OracleAsmDiskGroupComponent">
+
+ <!--plugin-configuration>
+ <c:simple-property name="table" default="V$ASM_DISKGROUP"/>
+ <c:simple-property name="metricQuery" default="SELECT {key} FROM V$ASM_DISKGROUP"/>
+ <c:simple-property name="keyColumn" default="GROUP_NUMBER"/>
+ <c:simple-property name="name" default="NAME"/>
+ <c:simple-property name="description" default="Oracle ASM Disk Groups"/>
+ </plugin-configuration -->
+
+ <metric property="sectorSize" displayName="Sector Size" description="Physical block size (in bytes)" units="bytes" dataType="trait"/>
+ <metric property="blockSize" displayName="Block Size" description="Automatic Storage Management metadata block size (in bytes)" units="bytes" dataType="trait"/>
+ <metric property="allocationUnitSize" displayName="Allocation Unit Size" description="Size of the allocation unit (in bytes)" units="bytes" dataType="trait"/>
+ <metric property="state" displayName="State" description="State of the disk group relative to the instance" dataType="trait"/>
+ <metric property="type" displayName="Type" description="Redundancy type for the disk group" dataType="trait"/>
+ <metric property="totalMb" displayName="Total Size" description="Total capacity of the disk group (in megabytes)" units="megabytes" displayType="summary"/>
+ <metric property="freeMb" displayName="Free Space" description="Unused capacity of the disk group (in megabytes)" units="megabytes" displayType="summary"/>
+ <metric property="usedPercent" displayName="Used Percent" description="Percentage of the disk group used" units="percentage" displayType="summary"/>
+ <metric property="requiredMirrorFreeMb" displayName="Space Required to Mirror" description="Amount of space that is required to be available in a given disk group in order to restore redundancy after one or more disk failures" units="megabytes"/>
+ <metric property="usableFileMb" displayName="Usable Space" description="Amount of free space that can be safely utilized taking mirroring into account and yet be able to restore redundancy after a disk failure" units="megabytes"/>
+ <metric property="offlineDisks" displayName="Offline Disks" description="Number of disks in the disk group that are currently offline" dataType="trait"/>
+ <metric property="compatibility" displayName="Compatibility" description="Minimum software version required for an ASM instance to mount this disk group" dataType="trait"/>
+ <metric property="databaseCompatibility" displayName="Database Compatibility" description="Minimum software version required for a database instance to use files in this disk group" dataType="trait"/>
+ </service>
</server>
commit d2047949ff60a8fb2ed84ebdc676eac4a49f1487
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Mon Sep 10 11:38:33 2012 -0500
[BZ 851186] Updated the way default values are applied to fields on unset change.
Behaviour after update:
1) If the field is unset then disable field and set value to null
2) If the field is set then enable field and load saved value
3) On unset change from true to false, enable field and load default value if not null
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
index aec7274..5687ded 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
@@ -1293,6 +1293,11 @@ public class ConfigurationEditor extends LocatableVLayout {
protected FormItem buildSimpleField(final PropertyDefinitionSimple propertyDefinitionSimple,
final PropertySimple propertySimple) {
+ String value = propertySimple.getStringValue();
+ if (null == value && null != propertyDefinitionSimple.getDefaultValue()) {
+ value = propertyDefinitionSimple.getDefaultValue();
+ }
+
FormItem valueItem = null;
boolean propertyIsReadOnly = isReadOnly(propertyDefinitionSimple, propertySimple);
@@ -1302,6 +1307,7 @@ public class ConfigurationEditor extends LocatableVLayout {
// to wait until we implement masking/unmasking of PASSWORD props at the SLSB layer first.
if (propertyIsReadOnly && propertyDefinitionSimple.getType() != PropertySimpleType.PASSWORD) {
valueItem = new StaticTextItem();
+ valueItem.setValue(StringUtility.escapeHtml(value));
} else {
List<PropertyDefinitionEnumeration> enumeratedValues = propertyDefinitionSimple.getEnumeratedValues();
if (enumeratedValues != null && !enumeratedValues.isEmpty()) {
@@ -1361,6 +1367,12 @@ public class ConfigurationEditor extends LocatableVLayout {
List<Validator> validators = buildValidators(propertyDefinitionSimple, propertySimple);
valueItem.setValidators(validators.toArray(new Validator[validators.size()]));
+ if (isUnset(propertyDefinitionSimple, propertySimple)) {
+ setValue(valueItem, null);
+ } else {
+ valueItem.setValue(value);
+ }
+
if ((propertySimple.getConfiguration() != null) || (propertySimple.getParentMap() != null)
|| (propertySimple.getParentList() != null)) {
valueItem.addChangedHandler(new ChangedHandler() {
@@ -1403,16 +1415,6 @@ public class ConfigurationEditor extends LocatableVLayout {
valueItem.setTitle("none");
valueItem.setShowTitle(false);
- String value = propertySimple.getStringValue();
- if (null == value && null != propertyDefinitionSimple.getDefaultValue()) {
- value = propertyDefinitionSimple.getDefaultValue();
- }
- if (valueItem instanceof StaticTextItem) {
- // Property values are user-editable, so escape HTML when displayed as static text, to prevent XSS attacks.
- value = StringUtility.escapeHtml(value);
- }
- valueItem.setValue(value);
-
setValueAsTooltipIfAppropriate(valueItem, value);
valueItem.setRequired(propertyDefinitionSimple.isRequired());
@@ -1514,6 +1516,14 @@ public class ConfigurationEditor extends LocatableVLayout {
firePropertyChangedEvent(propertySimple, propertyDefinitionSimple, true);
}
} else {
+ String defaultValue = propertyDefinitionSimple.getDefaultValue();
+ if (defaultValue != null) {
+ setValue(valueItem, defaultValue);
+ updatePropertySimpleValue(unsetItem, defaultValue, propertySimple, propertyDefinitionSimple);
+ boolean isValid = valueItem.validate();
+ firePropertyChangedEvent(propertySimple, propertyDefinitionSimple, isValid);
+ }
+
valueItem.focusInItem();
}
1
0
[rhq] Branch 'feature/cassandra-backend' - 2 commits - modules/common modules/enterprise
by John Sanda 09 Oct '12
by John Sanda 09 Oct '12
09 Oct '12
modules/common/cassandra-common/src/main/java/org/rhq/cassandra/ClusterInitService.java | 152 ++++++++++
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java | 15
modules/enterprise/server/server-metrics/src/test/resources/log4j.properties | 38 ++
3 files changed, 197 insertions(+), 8 deletions(-)
New commits:
commit 29daf5c75a58b6034e2f74fe321293d2eff1afa7
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Oct 9 11:23:23 2012 -0400
using ClusterInitService to wait for cluster initialization
ClusterInitService provides a more robust way (than sleeping for some arbitrary
time) to ensure that the cluster has reached a consistent state before
executing tests.
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 db146dd..5dbb629 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
@@ -42,6 +42,7 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import org.rhq.cassandra.CassandraException;
+import org.rhq.cassandra.ClusterInitService;
import org.rhq.cassandra.bundle.DeploymentOptions;
import org.rhq.cassandra.bundle.EmbeddedDeployer;
import org.rhq.core.domain.measurement.DataType;
@@ -53,6 +54,7 @@ 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.cassandra.service.KeyIterator;
import me.prettyprint.hector.api.Cluster;
@@ -109,14 +111,11 @@ public class MetricsServerTest {
deployer.setDeploymentOptions(deploymentOptions);
deployer.deploy();
- // wait a little bit to give the cluster time to initialize. Need to wait for nodes
- // to start up and for schema changes to propogate. In a subsequent commit, I will
- // add logic to wait only as long as it takes for the cluster to initialize instead
- // of waiting for some arbitrary period which could be too long or too short.
- try {
- Thread.sleep(10000);
- } catch (InterruptedException e) {
- }
+ 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);
}
@BeforeMethod
diff --git a/modules/enterprise/server/server-metrics/src/test/resources/log4j.properties b/modules/enterprise/server/server-metrics/src/test/resources/log4j.properties
new file mode 100644
index 0000000..de17510
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/test/resources/log4j.properties
@@ -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.
+# */
+#
+
+log4j.rootCategory=INFO, FILE, CONSOLE
+
+log4j.appender.FILE=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.FILE.DatePattern='.'yyyy-MM-dd
+log4j.appender.FILE.File=./target/test.log
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.FILE.layout.ConversionPattern=%d{ABSOLUTE} %-5p %c %m%n
+#log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
+log4j.appender.FILE.Append=false
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n
\ No newline at end of file
commit 3e6668034dfd6c7d4766450f44e583060f2fcb0b
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Oct 9 11:20:36 2012 -0400
Initial commit for ClusterInitService
ClusterInitiService provides methods for use during cluster initialization. It
currently provides methods to block until the cluster is initialized and
accepting client connections and another method that blocks until schema
agreement is reached.
diff --git a/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/ClusterInitService.java b/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/ClusterInitService.java
new file mode 100644
index 0000000..0dbc8ef
--- /dev/null
+++ b/modules/common/cassandra-common/src/main/java/org/rhq/cassandra/ClusterInitService.java
@@ -0,0 +1,152 @@
+/*
+ *
+ * * 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.cassandra;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.thrift.transport.TSocket;
+import org.apache.thrift.transport.TTransportException;
+
+import me.prettyprint.cassandra.service.CassandraHost;
+import me.prettyprint.hector.api.Cluster;
+import me.prettyprint.hector.api.factory.HFactory;
+
+/**
+ * This class provides operations to ensure a cluster is initialized and in a consistent
+ * state. It does not offer functionality for initializing a cluster but rather to make
+ * sure that nodes have started up and are accepting client connections for example.
+ *
+ * @author John Sanda
+ */
+public class ClusterInitService {
+
+ private final Log log = LogFactory.getLog(ClusterInitService.class);
+
+ /**
+ * This method attempts to establish a Thrift RPC connection to each host. If the
+ * connection fails, the host is retried after going through the other, remaining
+ * hosts.
+ *
+ * @param hosts The cluster nodes to which a connection should be made
+ */
+ public void waitForClusterToStart(List<CassandraHost> hosts) {
+ long sleep = 100;
+ int timeout = 50;
+ Queue<CassandraHost> queue = new LinkedList<CassandraHost>(hosts);
+ CassandraHost host = queue.poll();
+
+ while (host != null) {
+ TSocket socket = new TSocket(host.getHost(), host.getPort(), timeout);
+ try {
+ socket.open();
+ if (log.isDebugEnabled()) {
+ log.debug("Successfully connected to cassandra node [" + host + "]");
+ }
+ } catch (TTransportException e) {
+ queue.offer(host);
+ String msg = "Unable to open thrift connection to cassandra node [" + host + "]";
+ logException(msg, e);
+ }
+ try {
+ Thread.sleep(sleep);
+ } catch (InterruptedException e) {
+ }
+ host = queue.poll();
+ }
+ }
+
+ /**
+ * Waits for the cluster to reach schema agreement. During cluster initialization
+ * before and while schema changes propagate throughout the cluster, there could be
+ * multiple schema versions found among nodes. Schema agreement is reached when there
+ * is a single schema version and all nodes are on that version.
+ *
+ * @param clusterName The cluster name used by underlying Hector APIs.
+ * @param hosts The cluster nodes
+ */
+ public void waitForSchemaAgreement(String clusterName, List<CassandraHost> hosts) {
+ long sleep = 100L;
+ Cluster cluster = HFactory.getOrCreateCluster(clusterName, hosts.get(0).getIp());
+ boolean schemaInAgreement = false;
+ String schemaVersion = null;
+
+ while (!schemaInAgreement) {
+ Map<String, List<String>> schemaVersions = cluster.describeSchemaVersions();
+ if (schemaVersions.size() > 1) {
+ if (log.isInfoEnabled()) {
+ log.info("Schema agreement has not been reached. Found " + schemaVersions.size() +
+ " schema versions");
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("Found the following schema versions: " + schemaVersions.keySet());
+ }
+ try {
+ Thread.sleep(sleep);
+ } catch (InterruptedException e) {
+ }
+ } else {
+ schemaVersion = schemaVersions.keySet().iterator().next();
+ List<String> hostAddresses = schemaVersions.get(schemaVersion);
+ if (hostAddresses.size() == hosts.size()) {
+ schemaInAgreement = true;
+ } else {
+ if (log.isInfoEnabled()) {
+ log.info("Schema agreement has not been reached. Found one schema version but only " +
+ hostAddresses.size() + " of " + hosts.size() + " nodes at version [" + schemaVersion + "]");
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("Found the following nodes at schema version [" + schemaVersion + "]: " +
+ hostAddresses);
+ }
+ try {
+ Thread.sleep(sleep);
+ } catch (InterruptedException e) {
+ }
+ }
+ }
+ }
+
+ if (log.isInfoEnabled()) {
+ log.info("Schema agreement has been reached at version [" + schemaVersion + "]");
+ }
+ }
+
+ private void logException(String msg, Exception e) {
+ if (log.isDebugEnabled()) {
+ log.debug(msg, e);
+ } else if (log.isInfoEnabled()) {
+ log.info(msg + ": " + e.getMessage());
+ } else {
+ log.warn(msg);
+ }
+ }
+
+}
1
0
modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 2 -
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml | 14 +++++++++-
modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml | 11 ++++---
3 files changed, 20 insertions(+), 7 deletions(-)
New commits:
commit 94b13df9455b7fef2f5112b6c6e65f5bdde824fa
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Oct 9 09:54:26 2012 -0400
limit what we monitor with rtfilter
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
index b6c1909..f68e791 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
@@ -42,7 +42,7 @@
</filter>
<filter-mapping>
<filter-name>RhqRtFilter</filter-name>
- <url-pattern>/*</url-pattern>
+ <url-pattern>/coregui/*</url-pattern>
</filter-mapping>
<servlet>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
index ab2ae5b..b1d3cb3 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
@@ -283,7 +283,19 @@
</filter>
<filter-mapping>
<filter-name>RhqRtFilter</filter-name>
- <url-pattern>/*</url-pattern>
+ <url-pattern>*.xhtml</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>RhqRtFilter</filter-name>
+ <url-pattern>*.rss</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>RhqRtFilter</filter-name>
+ <url-pattern>*.jsp</url-pattern>
+ </filter-mapping>
+ <filter-mapping>
+ <filter-name>RhqRtFilter</filter-name>
+ <url-pattern>*.do</url-pattern>
</filter-mapping>
<!-- This is the object that reads the /WEB-INF/rhq-server-internals.properties for internal configuration settings. -->
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml
index 30278b8..2b583c2 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml
@@ -34,6 +34,11 @@
</init-param>
</filter>
+ <filter>
+ <filter-name>RhqRtFilter</filter-name>
+ <filter-class>org.rhq.helpers.rtfilter.filter.RtFilter</filter-class>
+ </filter>
+
<!-- Simple request header dumper for debugging purposes
<filter>
<filter-name>DumperFilter</filter-name>
@@ -65,13 +70,9 @@
</filter-mapping>
-->
- <filter>
- <filter-name>RhqRtFilter</filter-name>
- <filter-class>org.rhq.helpers.rtfilter.filter.RtFilter</filter-class>
- </filter>
<filter-mapping>
<filter-name>RhqRtFilter</filter-name>
- <url-pattern>/*</url-pattern>
+ <url-pattern>/1/*</url-pattern>
</filter-mapping>
<servlet>
1
0
Rebased ref, commits from common ancestor:
1
0
New branch 'jkremser/errai-integration' available with the following commits:
commit df0c9ea2f7ce65372608c4da2827d734933d3a5b
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Tue Oct 9 13:22:50 2012 +0200
Errai integration (NOTE: the build with errai may need more memory, so if it is the case, increase it in your ~/.m2/settings.xml)
1
0
[rhq] Branch 'feature/cassandra-backend' - 2 commits - modules/common modules/enterprise
by John Sanda 09 Oct '12
by John Sanda 09 Oct '12
09 Oct '12
modules/common/cassandra-common/pom.xml | 2
modules/enterprise/server/server-metrics/pom.xml | 43 +
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateType.java | 43 +
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 81 ++
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java | 300 ++++++++++
5 files changed, 467 insertions(+), 2 deletions(-)
New commits:
commit 32e0827e29ecc32a8dbaa4a9cb4ab148fa7e973f
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Oct 8 22:23:29 2012 -0400
Initial commit for MetricsServerTest
This commit includes a test for inserting multiple raw metrics. This commit
also straightens out some SLF4J dependency conflicts.
diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml
index bab2e48..25c5f61 100644
--- a/modules/enterprise/server/server-metrics/pom.xml
+++ b/modules/enterprise/server/server-metrics/pom.xml
@@ -20,11 +20,36 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>rhq-cassandra-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>rhq-core-domain</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>test-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-nop</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.hectorclient</groupId>
<artifactId>hector-core</artifactId>
<version>1.1-1</version>
@@ -33,7 +58,17 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
- <version>1.1.5</version>
+ <version>${cassandra.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -47,5 +82,11 @@
<artifactId>joda-time</artifactId>
<version>2.1</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.1</version>
+ </dependency>
</dependencies>
</project>
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateType.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateType.java
new file mode 100644
index 0000000..39e9783
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/AggregateType.java
@@ -0,0 +1,43 @@
+/*
+ *
+ * * 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 enum AggregateType {
+ MAX, MIN, AVG;
+
+ public static AggregateType valueOf(int type) {
+ switch (type) {
+ case 0 : return MAX;
+ case 1 : return MIN;
+ case 2 : return AVG;
+ default: throw new IllegalArgumentException(type + " is not a supported " +
+ AggregateType.class.getSimpleName());
+ }
+ }
+}
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 1d62a7b..b2a990e 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
@@ -75,7 +75,88 @@ public class MetricsServer {
private DateTimeService dateTimeService = new DateTimeService();
+ // These property getters/setters are here right now primarily to facilitate
+ // testing.
+ public Cluster getCluster() {
+ return cluster;
+ }
+
+ public void setCluster(Cluster cluster) {
+ this.cluster = cluster;
+ }
+
+ public String getKeyspaceName() {
+ return keyspaceName;
+ }
+
+ public void setKeyspaceName(String keyspaceName) {
+ this.keyspaceName = keyspaceName;
+ }
+
+ public String getRawMetricsDataCF() {
+ return rawMetricsDataCF;
+ }
+
+ public void setRawMetricsDataCF(String rawMetricsDataCF) {
+ this.rawMetricsDataCF = rawMetricsDataCF;
+ }
+
+ public String getOneHourMetricsDataCF() {
+ return oneHourMetricsDataCF;
+ }
+
+ public void setOneHourMetricsDataCF(String oneHourMetricsDataCF) {
+ this.oneHourMetricsDataCF = oneHourMetricsDataCF;
+ }
+
+ public String getSixHourMetricsDataCF() {
+ return sixHourMetricsDataCF;
+ }
+
+ public void setSixHourMetricsDataCF(String sixHourMetricsDataCF) {
+ this.sixHourMetricsDataCF = sixHourMetricsDataCF;
+ }
+
+ public String getTwentyFourHourMetricsDataCF() {
+ return twentyFourHourMetricsDataCF;
+ }
+
+ public void setTwentyFourHourMetricsDataCF(String twentyFourHourMetricsDataCF) {
+ this.twentyFourHourMetricsDataCF = twentyFourHourMetricsDataCF;
+ }
+
+ public String getMetricsQueueCF() {
+ return metricsQueueCF;
+ }
+
+ public void setMetricsQueueCF(String metricsQueueCF) {
+ this.metricsQueueCF = metricsQueueCF;
+ }
+
+ public String getTraitsCF() {
+ return traitsCF;
+ }
+
+ public void setTraitsCF(String traitsCF) {
+ this.traitsCF = traitsCF;
+ }
+
+ public String getResourceTraitsCF() {
+ return resourceTraitsCF;
+ }
+
+ public void setResourceTraitsCF(String resourceTraitsCF) {
+ this.resourceTraitsCF = resourceTraitsCF;
+ }
+
+ public Keyspace getKeyspace() {
+ return keyspace;
+ }
+
+ public void setKeyspace(Keyspace keyspace) {
+ this.keyspace = keyspace;
+ }
public void addNumericData(Set<MeasurementDataNumeric> dataSet) {
Map<Integer, DateTime> updates = new TreeMap<Integer, DateTime>();
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
new file mode 100644
index 0000000..db146dd
--- /dev/null
+++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
@@ -0,0 +1,300 @@
+/*
+ *
+ * * 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 static org.rhq.test.AssertUtils.assertPropertiesMatch;
+import static org.testng.Assert.assertEquals;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.joda.time.DateTime;
+import org.joda.time.Duration;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import org.rhq.cassandra.CassandraException;
+import org.rhq.cassandra.bundle.DeploymentOptions;
+import org.rhq.cassandra.bundle.EmbeddedDeployer;
+import org.rhq.core.domain.measurement.DataType;
+import org.rhq.core.domain.measurement.MeasurementDataNumeric;
+import org.rhq.core.domain.measurement.MeasurementScheduleRequest;
+
+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.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.ColumnSlice;
+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.QueryResult;
+import me.prettyprint.hector.api.query.SliceQuery;
+
+/**
+ * @author John Sanda
+ */
+public class MetricsServerTest {
+
+ private final long SECOND = 1000;
+
+ private final long MINUTE = 60 * SECOND;
+
+ private final String RAW_METRIC_DATA_CF = "raw_metrics";
+
+ private final String ONE_HOUR_METRIC_DATA_CF = "one_hour_metric_data";
+
+ private final String SIX_HOUR_METRIC_DATA_CF = "six_hour_metric_data";
+
+ private final String TWENTY_FOUR_HOUR_METRIC_DATA_CF = "twenty_four_hour_metric_data";
+
+ private final String METRICS_WORK_QUEUE_CF = "metrics_work_queue";
+
+ private final String TRAITS_CF = "traits";
+
+ private final String RESOURCE_TRAITS_CF = "resource_traits";
+
+ private MetricsServer metricsServer;
+
+ private Keyspace keyspace;
+
+ @BeforeClass
+ public void deployCluster() throws CassandraException {
+ File basedir = new File("target");
+ File clusterDir = new File(basedir, "cassandra");
+ int numNodes = 2;
+
+ DeploymentOptions deploymentOptions = new DeploymentOptions();
+ deploymentOptions.setClusterDir(clusterDir.getAbsolutePath());
+ deploymentOptions.setNumNodes(numNodes);
+ deploymentOptions.setLoggingLevel("DEBUG");
+
+ EmbeddedDeployer deployer = new EmbeddedDeployer();
+ deployer.setDeploymentOptions(deploymentOptions);
+ deployer.deploy();
+
+ // wait a little bit to give the cluster time to initialize. Need to wait for nodes
+ // to start up and for schema changes to propogate. In a subsequent commit, I will
+ // add logic to wait only as long as it takes for the cluster to initialize instead
+ // of waiting for some arbitrary period which could be too long or too short.
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException e) {
+ }
+ }
+
+ @BeforeMethod
+ public void initServer() throws Exception {
+ Cluster cluster = HFactory.getOrCreateCluster("rhq", "127.0.0.1:9160");
+ keyspace = HFactory.createKeyspace("rhq", cluster);
+
+ metricsServer = new MetricsServer();
+ metricsServer.setCluster(cluster);
+ metricsServer.setKeyspace(keyspace);
+ metricsServer.setRawMetricsDataCF(RAW_METRIC_DATA_CF);
+ metricsServer.setOneHourMetricsDataCF(ONE_HOUR_METRIC_DATA_CF);
+ metricsServer.setSixHourMetricsDataCF(SIX_HOUR_METRIC_DATA_CF);
+ metricsServer.setTwentyFourHourMetricsDataCF(TWENTY_FOUR_HOUR_METRIC_DATA_CF);
+ metricsServer.setMetricsQueueCF(METRICS_WORK_QUEUE_CF);
+ metricsServer.setTraitsCF(TRAITS_CF);
+ metricsServer.setResourceTraitsCF(RESOURCE_TRAITS_CF);
+ purgeDB();
+ }
+
+ private void purgeDB() {
+ deleteAllRows(METRICS_WORK_QUEUE_CF, StringSerializer.get());
+ deleteAllRows(RAW_METRIC_DATA_CF, IntegerSerializer.get());
+ deleteAllRows(ONE_HOUR_METRIC_DATA_CF, IntegerSerializer.get());
+ deleteAllRows(SIX_HOUR_METRIC_DATA_CF, IntegerSerializer.get());
+ deleteAllRows(TWENTY_FOUR_HOUR_METRIC_DATA_CF, IntegerSerializer.get());
+ deleteAllRows(TRAITS_CF, IntegerSerializer.get());
+ deleteAllRows(RESOURCE_TRAITS_CF, IntegerSerializer.get());
+ }
+
+ 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 insertMultipleRawNumericDataForOneSchedule() {
+ int scheduleId = 123;
+
+ DateTime now = new DateTime();
+ DateTime threeMinutesAgo = now.minusMinutes(3);
+ DateTime twoMinutesAgo = now.minusMinutes(2);
+ DateTime oneMinuteAgo = now.minusMinutes(1);
+
+ int sevenDays = Duration.standardDays(7).toStandardSeconds().getSeconds();
+
+ 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));
+
+ 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())));
+ }
+
+ private void assert1HourMetricsQueueEquals(List<HColumn<Composite, Integer>> expected) {
+ assertMetricsQueueEquals(ONE_HOUR_METRIC_DATA_CF, expected);
+ }
+
+ private void assertMetricsQueueEquals(String columnFamily, List<HColumn<Composite, Integer>> expected) {
+ SliceQuery<String,Composite, Integer> sliceQuery = HFactory.createSliceQuery(keyspace, StringSerializer.get(),
+ new CompositeSerializer().get(), IntegerSerializer.get());
+ sliceQuery.setColumnFamily(METRICS_WORK_QUEUE_CF);
+ sliceQuery.setKey(columnFamily);
+
+ ColumnSliceIterator<String, Composite, Integer> iterator = new ColumnSliceIterator<String, Composite, Integer>(
+ sliceQuery, (Composite) null, (Composite) null, false);
+
+ List<HColumn<Composite, Integer>> actual = new ArrayList<HColumn<Composite, Integer>>();
+ while (iterator.hasNext()) {
+ actual.add(iterator.next());
+ }
+
+ assertEquals(actual.size(), expected.size(), "The number of entries in the queue do not match.");
+ int i = 0;
+ for (HColumn<Composite, Integer> expectedColumn : expected) {
+ HColumn<Composite, Integer> actualColumn = actual.get(i++);
+ assertEquals(getTimestamp(actualColumn.getName()), getTimestamp(expectedColumn.getName()),
+ "The timestamp does not match the expected value.");
+ assertEquals(getScheduleId(actualColumn.getName()), getScheduleId(expectedColumn.getName()),
+ "The schedule id does not match the expected value.");
+ }
+ }
+
+ private void assert1HourDataEquals(int scheduleId, List<HColumn<Composite, Double>> expected) {
+ assertMetricDataEquals(scheduleId, ONE_HOUR_METRIC_DATA_CF, expected);
+ }
+
+ private void assertMetricDataEquals(int scheduleId, String columnFamily, List<HColumn<Composite,
+ Double>> expected) {
+ SliceQuery<Integer, Composite, Double> query = HFactory.createSliceQuery(keyspace, IntegerSerializer.get(),
+ CompositeSerializer.get(), DoubleSerializer.get());
+ query.setColumnFamily(columnFamily);
+ query.setKey(scheduleId);
+
+ ColumnSliceIterator<Integer, Composite, Double> iterator = new ColumnSliceIterator<Integer, Composite, Double>(
+ query, (Composite) null, (Composite) null, false);
+
+ List<HColumn<Composite, Double>> actual = new ArrayList<HColumn<Composite, Double>>();
+ while (iterator.hasNext()) {
+ actual.add(iterator.next());
+ }
+
+ String prefix;
+ if (columnFamily.equals(ONE_HOUR_METRIC_DATA_CF)) {
+ prefix = "The one hour data for schedule id " + scheduleId + " is wrong.";
+ } else if (columnFamily.equals(SIX_HOUR_METRIC_DATA_CF)) {
+ prefix = "The six hour data for schedule id " + scheduleId + " is wrong.";
+ } else if (columnFamily.equals(TWENTY_FOUR_HOUR_METRIC_DATA_CF)) {
+ prefix = "The twenty-four hour data for schedule id " + scheduleId + " is wrong.";
+ } else {
+ throw new IllegalArgumentException(columnFamily + " is not a recognized column family");
+ }
+
+ assertEquals(actual.size(), expected.size(), prefix + " The number of columns do not match.");
+ int i = 0;
+ for (HColumn<Composite, Double> expectedColumn : expected) {
+ HColumn<Composite, Double> actualColumn = actual.get(i++);
+ assertEquals(getTimestamp(actualColumn.getName()), getTimestamp(expectedColumn.getName()),
+ prefix + " The timestamp does not match the expected value.");
+ assertEquals(getAggregateType(actualColumn.getName()), getAggregateType(expectedColumn.getName()),
+ prefix + " The column data type does not match the expected value");
+ assertEquals(actualColumn.getValue(), expectedColumn.getValue(), "The column value is wrong");
+ assertEquals(actualColumn.getTtl(), expectedColumn.getTtl(), "The ttl for the column is wrong.");
+ }
+ }
+
+ private Integer getScheduleId(Composite composite) {
+ return composite.get(1, IntegerSerializer.get());
+ }
+
+ private Long getTimestamp(Composite composite) {
+ return composite.get(0, LongSerializer.get());
+ }
+
+ private AggregateType getAggregateType(Composite composite) {
+ Integer type = composite.get(1, IntegerSerializer.get());
+ return AggregateType.valueOf(type);
+ }
+
+}
commit 3cd250bf2bb098d1f5772af545caa098331386c4
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Oct 8 22:21:16 2012 -0400
fixing cassandra version
we should be on 1.1.5 which is the latest release.
diff --git a/modules/common/cassandra-common/pom.xml b/modules/common/cassandra-common/pom.xml
index 7d165fd..3159649 100644
--- a/modules/common/cassandra-common/pom.xml
+++ b/modules/common/cassandra-common/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
- <version>1.1.4</version>
+ <version>1.1.5</version>
</dependency>
<dependency>
1
0
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit e999e1e43f9bc0075e785790f179a42012a1e416
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Oct 8 18:28:28 2012 -0400
we don't need the rtfilter stuff in our modules directory because we deploy the rtfilter directly in the EAR
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index 54dcbc4..5922afb 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -314,18 +314,20 @@
failonerror="false"/>
<antcall target="package-connectors" />
+
+ <!-- we don't need these in our modules directory because we deploy the rtfilter directly in the EAR
<echo>Deploying RT filter jar ...</echo>
<unzip src="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter/${project.version}/rhq-rtfilter-${project.version}.zip"
dest="${jboss.modules.dir}" />
<unzip src="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter-subsystem/${project.version}/rhq-rtfilter-subsystem-${project.version}.zip"
dest="${jboss.modules.dir}" />
- <!-- TODO: it is up to either the installer or our EAR's WAR to use this so JON itself can have its RT data collected -->
+ -->
</target>
<target name="package-connectors">
- <echo>Deploying the response-time (RT) servlet filter connectors ...</echo>
+ <echo>Packaging the response-time (RT) servlet filter connectors ...</echo>
<delete file="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors/connector-rtfilter.zip" />
<zip destfile="${jboss.deploy.dir}/${rhq.earName}/rhq-downloads/connectors/connector-rtfilter.zip">
<zipfileset dir="${settings.localRepository}/org/rhq/helpers/rhq-rtfilter/${project.version}">
1
0
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit b44ad1b934bbc80a52bfa1d4202294a63a94802c
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Oct 8 17:48:27 2012 -0400
[BZ 864213] fix the web resource's ability to collect response time data.
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java
index 3022478..8db5980 100644
--- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java
+++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/WebRuntimeComponent.java
@@ -19,6 +19,7 @@
package org.rhq.modules.plugins.jbossas7;
import java.io.File;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -62,7 +63,14 @@ public class WebRuntimeComponent extends BaseComponent<BaseComponent<?>> {
}
@Override
- public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> requests) throws Exception {
+ public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> origReqs) throws Exception {
+ // make our own copy so, as we iterate, we can remove the item that we can process,
+ // which will leave the rest for super.getValues() to process
+ HashSet<MeasurementScheduleRequest> requests;
+ requests = new HashSet<MeasurementScheduleRequest>(origReqs.size());
+ requests.addAll(origReqs);
+
+ // now process schedule requests
for (Iterator<MeasurementScheduleRequest> iterator = requests.iterator(); iterator.hasNext(); ) {
MeasurementScheduleRequest request = iterator.next();
if (request.getName().equals(RESPONSE_TIME_METRIC)) {
1
0
modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 10 +++++++-
modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml | 9 +++++++
modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml | 9 +++++++
modules/enterprise/server/ear/pom.xml | 12 ++++++++++
4 files changed, 39 insertions(+), 1 deletion(-)
New commits:
commit 5b6821fd1d7a2189d52ceac1f74f49845aaa146a
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Oct 8 17:49:06 2012 -0400
install the rtfilter in the RHQ Server so we can monitor it using the AS7 plugin's web resource's response time metric
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
index a434622..b6c1909 100644
--- a/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml
@@ -31,12 +31,20 @@
<filter-name>CacheControlFilter</filter-name>
<filter-class>org.rhq.enterprise.gui.coregui.server.filter.CacheControlFilter</filter-class>
</filter>
-
<filter-mapping>
<filter-name>CacheControlFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <filter>
+ <filter-name>RhqRtFilter</filter-name>
+ <filter-class>org.rhq.helpers.rtfilter.filter.RtFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>RhqRtFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
<servlet>
<servlet-name>org.rhq.enterprise.gui.coregui.CoreGUI RoleGWTService</servlet-name>
<servlet-class>org.rhq.enterprise.gui.coregui.server.gwt.RoleGWTServiceImpl</servlet-class>
diff --git a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
index a56d1bb..ab2ae5b 100644
--- a/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml
@@ -277,6 +277,15 @@
<url-pattern>*.do</url-pattern>
</filter-mapping>
+ <filter>
+ <filter-name>RhqRtFilter</filter-name>
+ <filter-class>org.rhq.helpers.rtfilter.filter.RtFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>RhqRtFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
<!-- This is the object that reads the /WEB-INF/rhq-server-internals.properties for internal configuration settings. -->
<listener>
<listener-class>org.rhq.enterprise.gui.startup.Configurator</listener-class>
diff --git a/modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml b/modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml
index a07456d..30278b8 100644
--- a/modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml
+++ b/modules/enterprise/gui/rest-war/src/main/webapp/WEB-INF/web.xml
@@ -65,6 +65,15 @@
</filter-mapping>
-->
+ <filter>
+ <filter-name>RhqRtFilter</filter-name>
+ <filter-class>org.rhq.helpers.rtfilter.filter.RtFilter</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>RhqRtFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
<servlet>
<servlet-name>Resteasy</servlet-name>
<servlet-class>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 28735d1..add3d06 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -143,6 +143,12 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.rhq.helpers</groupId>
+ <artifactId>rhq-rtfilter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- 3rd Party Deps -->
<!-- ** WARs -->
@@ -307,6 +313,12 @@
-->
<!-- ** JARs -->
+ <jarModule>
+ <groupId>org.rhq.helpers</groupId>
+ <artifactId>rhq-rtfilter</artifactId>
+ <bundleDir>lib</bundleDir>
+ <includeInApplicationXml>false</includeInApplicationXml>
+ </jarModule>
</modules>
</configuration>
1
0