[rhq] Branch 'lkrejci/jon-api-comp' - 0 commits -
by lkrejci
Rebased ref, commits from common ancestor:
10 years, 8 months
- 1
- 0
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 6 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java | 55 ++++------
3 files changed, 31 insertions(+), 32 deletions(-)
New commits:
commit b0ff8622f259f971ef309fe086829fffd62e2605
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Sep 27 11:20:32 2013 -0400
Fix an issue where the storage client init was using system properties
to get the storage user and password. This had two issues:
1) at install the system properties were seeded in AS via
-p rhq-server.properties, but this was prior to the generation of the
storage cluster creds.
2) for HA installs the props file was actually not even correct, the
generated values were superseded by the existing db creds.
This commit syncs the props file and the db, during install, so problem
2 really should no longer be a problem. But this was mainly done to
reduce confusion for a person who may have wondered why the db and props
file had different values. It didn't solve problem 1. To solve problem
1 the storage client should always get its creds from the DB, which it
now does.
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
index e10c993..445f41e 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
@@ -468,7 +468,8 @@ public class InstallerServiceImpl implements InstallerService {
throw new Exception("Cannot connect to the database: " + testConnectionErrorMessage);
}
- // write the new properties to the rhq-server.properties file (this ensures the encoded password is written out)
+ // write the new properties to the rhq-server.properties file (this ensures the encoded password is written
+ // out). Being paranoid, leaving this here despite the fact that we now write it out again, at the bottom.
saveServerProperties(serverProperties);
// Prepare the db schema.
@@ -548,6 +549,9 @@ public class InstallerServiceImpl implements InstallerService {
ServerInstallUtil.persistStorageNodesIfNecessary(serverProperties, clearTextDbPassword,
parseNodeInformation(serverProperties));
ServerInstallUtil.persistStorageClusterSettingsIfNecessary(serverProperties, clearTextDbPassword);
+
+ // For sanity, make sure the server props file is in sync with the db settings.
+ saveServerProperties(serverProperties);
}
@Override
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
index c484e0a..f0912fc 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/StartupBean.java
@@ -450,7 +450,7 @@ public class StartupBean implements StartupLocal {
}
/**
- * Initalizes the storage client subsystem which is needed for reading/writing metric data.
+ * Initializes the storage client subsystem which is needed for reading/writing metric data.
*
* @return true if the storage subsystem is running
*/
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java
index 943c53c..9cd7cc3 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageClientManagerBean.java
@@ -49,8 +49,11 @@ import org.apache.commons.logging.LogFactory;
import org.rhq.cassandra.schema.SchemaManager;
import org.rhq.cassandra.util.ClusterBuilder;
import org.rhq.core.domain.cloud.StorageNode;
-import org.rhq.core.util.StringUtil;
+import org.rhq.core.domain.common.composite.SystemSetting;
+import org.rhq.core.domain.common.composite.SystemSettings;
+import org.rhq.enterprise.server.auth.SubjectManagerLocal;
import org.rhq.enterprise.server.cloud.StorageNodeManagerLocal;
+import org.rhq.enterprise.server.system.SystemManagerLocal;
import org.rhq.server.metrics.DateTimeService;
import org.rhq.server.metrics.MetricsConfiguration;
import org.rhq.server.metrics.MetricsDAO;
@@ -66,13 +69,17 @@ public class StorageClientManagerBean {
private final Log log = LogFactory.getLog(StorageClientManagerBean.class);
- private static final String USERNAME_PROP = "rhq.storage.username";
- private static final String PASSWORD_PROP = "rhq.storage.password";
private static final String RHQ_KEYSPACE = "rhq";
@EJB
+ private SubjectManagerLocal subjectManager;
+
+ @EJB
private StorageNodeManagerLocal storageNodeManager;
+ @EJB
+ private SystemManagerLocal systemManager;
+
private Cluster cluster;
private StorageSession session;
private MetricsConfiguration metricsConfiguration;
@@ -94,8 +101,10 @@ public class StorageClientManagerBean {
log.info("Initializing storage client subsystem");
- final String username = getRequiredStorageProperty(USERNAME_PROP);
- final String password = getRequiredStorageProperty(PASSWORD_PROP);
+ // Always get the creds from the DB, system props may not be up to date at install time
+ SystemSettings settings = systemManager.getSystemSettings(subjectManager.getOverlord());
+ final String username = settings.get(SystemSetting.STORAGE_USERNAME);
+ final String password = settings.get(SystemSetting.STORAGE_PASSWORD);
List<StorageNode> storageNodes = new ArrayList<StorageNode>();
for (StorageNode storageNode : storageNodeManager.getStorageNodes()) {
@@ -105,9 +114,9 @@ public class StorageClientManagerBean {
// and REMOVE_MAINTENANCE, but this errors on the side of being safe. Lastly,
// if a storage node does not have a resource, then that means it was was
// deployed prior to installing the server.
- if (storageNode.getOperationMode() == StorageNode.OperationMode.NORMAL ||
- storageNode.getOperationMode() == StorageNode.OperationMode.MAINTENANCE ||
- storageNode.getResource() == null) {
+ if (storageNode.getOperationMode() == StorageNode.OperationMode.NORMAL
+ || storageNode.getOperationMode() == StorageNode.OperationMode.MAINTENANCE
+ || storageNode.getResource() == null) {
storageNodes.add(storageNode);
}
}
@@ -123,9 +132,9 @@ public class StorageClientManagerBean {
checkSchemaCompability(username, password, storageNodes);
} catch (NoHostAvailableException e) {
initialized = false;
- log.warn("Storage client subsystem wasn't initialized because it wasn't possible to connect to the" +
- " storage cluster. The RHQ server is set to MAINTENANCE mode. Please start the storage cluster" +
- " as soon as possible.");
+ log.warn("Storage client subsystem wasn't initialized because it wasn't possible to connect to the"
+ + " storage cluster. The RHQ server is set to MAINTENANCE mode. Please start the storage cluster"
+ + " as soon as possible.");
return initialized;
}
Session wrappedSession = createSession(username, password, storageNodes);
@@ -231,21 +240,17 @@ public class StorageClientManagerBean {
ProtocolOptions.Compression compression;
if (compressionEnabled) {
compression = ProtocolOptions.Compression.SNAPPY;
- log.info("Compression has been enabled for the storage client. Be aware that if your storage nodes do " +
- "not support compression then the client will not be able to connect to the storage cluster.");
+ log.info("Compression has been enabled for the storage client. Be aware that if your storage nodes do "
+ + "not support compression then the client will not be able to connect to the storage cluster.");
} else {
compression = ProtocolOptions.Compression.NONE;
log.debug("Storage client compression is disabled");
}
- cluster = new ClusterBuilder()
- .addContactPoints(hostNames.toArray(new String[hostNames.size()]))
- .withCredentialsObfuscated(username, password)
- .withPort(port)
+ cluster = new ClusterBuilder().addContactPoints(hostNames.toArray(new String[hostNames.size()]))
+ .withCredentialsObfuscated(username, password).withPort(port)
.withLoadBalancingPolicy(new RoundRobinPolicy())
- .withRetryPolicy(new LoggingRetryPolicy(DefaultRetryPolicy.INSTANCE))
- .withCompression(compression)
- .build();
+ .withRetryPolicy(new LoggingRetryPolicy(DefaultRetryPolicy.INSTANCE)).withCompression(compression).build();
return cluster.connect(RHQ_KEYSPACE);
}
@@ -263,14 +268,4 @@ public class StorageClientManagerBean {
metricsServer.setDateTimeService(dateTimeService);
metricsServer.init();
}
-
- private String getRequiredStorageProperty(String property) {
- String value = System.getProperty(property);
- if (StringUtil.isEmpty(property)) {
- throw new IllegalStateException("The system property [" + property + "] is not set. The RHQ "
- + "server will not be able connect to the RHQ storage node(s). This property should be defined "
- + "in rhq-server.properties.");
- }
- return value;
- }
}
10 years, 8 months
- 1
- 0
[rhq] 2 commits - modules/enterprise
by mike thompson
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java | 191 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java | 3
4 files changed, 129 insertions(+), 78 deletions(-)
New commits:
commit 226b0a806bbbd18dcffa69335f201238331ffbe8
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Sep 26 09:59:17 2013 -0700
[BZ 1012589] Multi-line Graph Auto-refresh not working.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java
index 7408f62..c3cfb75 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java
@@ -42,8 +42,10 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.JsonMetricProducer;
import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
+import org.rhq.enterprise.gui.coregui.client.dashboard.AutoRefreshUtil;
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.AutoRefresh;
import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.ButtonBarDateTimeRangeEditor;
import org.rhq.enterprise.gui.coregui.client.inventory.common.graph.Refreshable;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
@@ -62,7 +64,7 @@ import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPre
*
* @author Mike Thompson
*/
-public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout implements JsonMetricProducer, Refreshable {
+public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout implements JsonMetricProducer, AutoRefresh, Refreshable {
static protected final Messages MSG = CoreGUI.getMessages();
// string labels
@@ -89,6 +91,9 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl
private String chartTitle;
private Integer chartHeight;
+ protected static Timer refreshTimer;
+ protected boolean isRefreshing;
+
public CompositeGroupD3GraphListView(int groupId, int defId, boolean isAutoGroup) {
super();
this.groupId = groupId;
@@ -100,6 +105,7 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl
setHeight100();
setWidth100();
setPadding(10);
+ startRefreshCycle();
}
public void populateData() {
@@ -113,89 +119,89 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl
measurementForEachResource.clear();
groupService.findResourceGroupCompositesByCriteria(criteria,
- new AsyncCallback<PageList<ResourceGroupComposite>>() {
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_lookupFailed(), caught);
- }
-
- @Override
- public void onSuccess(PageList<ResourceGroupComposite> result) {
- if (result.isEmpty()) {
- return;
+ new AsyncCallback<PageList<ResourceGroupComposite>>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_graphs_lookupFailed(), caught);
}
- final ResourceGroup parentGroup = result.get(0).getResourceGroup();
- chartTitle = parentGroup.getName();
- Log.debug("group name: " + parentGroup.getName());
- // setting up a deferred Command to execute after all resource queries have completed (successfully or unsuccessfully)
- final CountDownLatch countDownLatch = CountDownLatch.create(parentGroup.getExplicitResources()
- .size(), new Command() {
- @Override
- /**
- * Do this only after ALL of the metric queries for each resource
- */
- public void execute() {
- if (parentGroup.getExplicitResources().size() != measurementForEachResource.size()) {
- Log.warn("Number of graphs doesn't match number of resources");
- Log.warn("# of child resources: " + parentGroup.getExplicitResources().size());
- Log.warn("# of charted graphs: " + measurementForEachResource.size());
- }
- drawGraph();
+ @Override
+ public void onSuccess(PageList<ResourceGroupComposite> result) {
+ if (result.isEmpty()) {
+ return;
}
- });
- final Set<Resource> childResources = parentGroup.getExplicitResources();
- if (!childResources.isEmpty()) {
+ final ResourceGroup parentGroup = result.get(0).getResourceGroup();
+ chartTitle = parentGroup.getName();
+ Log.debug("group name: " + parentGroup.getName());
+ // setting up a deferred Command to execute after all resource queries have completed (successfully or unsuccessfully)
+ final CountDownLatch countDownLatch = CountDownLatch.create(parentGroup.getExplicitResources()
+ .size(), new Command() {
+ @Override
+ /**
+ * Do this only after ALL of the metric queries for each resource
+ */
+ public void execute() {
+ if (parentGroup.getExplicitResources().size() != measurementForEachResource.size()) {
+ Log.warn("Number of graphs doesn't match number of resources");
+ Log.warn("# of child resources: " + parentGroup.getExplicitResources().size());
+ Log.warn("# of charted graphs: " + measurementForEachResource.size());
+ }
+ drawGraph();
+ }
+ });
- // resourceType will be the same for all autogroup children so get first
- Resource childResource = childResources.iterator().next();
+ final Set<Resource> childResources = parentGroup.getExplicitResources();
+ if (!childResources.isEmpty()) {
- ResourceTypeRepository.Cache.getInstance().getResourceTypes(
- childResource.getResourceType().getId(),
- EnumSet.of(ResourceTypeRepository.MetadataType.measurements),
- new ResourceTypeRepository.TypeLoadedCallback() {
- @Override
- public void onTypesLoaded(final ResourceType type) {
+ // resourceType will be the same for all autogroup children so get first
+ Resource childResource = childResources.iterator().next();
- for (MeasurementDefinition def : type.getMetricDefinitions()) {
- // only need the one selected measurement
- if (def.getId() == getDefinitionId()) {
- setDefinition(def);
- }
- }
-
- for (final Resource childResource : childResources) {
- Log.debug("Adding child composite: " + childResource.getName()
- + childResource.getId());
-
- GWTServiceLookup.getMeasurementDataService().findDataForResource(
- childResource.getId(), new int[] { getDefinitionId() },
- buttonBarDateTimeRangeEditor.getStartTime(),
- buttonBarDateTimeRangeEditor.getEndTime(), 60,
- new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
- @Override
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError(
- MSG.view_resource_monitor_graphs_loadFailed(), caught);
- countDownLatch.countDown();
- }
+ ResourceTypeRepository.Cache.getInstance().getResourceTypes(
+ childResource.getResourceType().getId(),
+ EnumSet.of(ResourceTypeRepository.MetadataType.measurements),
+ new ResourceTypeRepository.TypeLoadedCallback() {
+ @Override
+ public void onTypesLoaded(final ResourceType type) {
- @Override
- public void onSuccess(
- List<List<MeasurementDataNumericHighLowComposite>> measurements) {
- addMeasurementForEachResource(childResource.getName(),
- childResource.getId(), measurements.get(0));
- countDownLatch.countDown();
+ for (MeasurementDefinition def : type.getMetricDefinitions()) {
+ // only need the one selected measurement
+ if (def.getId() == getDefinitionId()) {
+ setDefinition(def);
}
- });
- }
- }
- });
+ }
+
+ for (final Resource childResource : childResources) {
+ Log.debug("Adding child composite: " + childResource.getName()
+ + childResource.getId());
+
+ GWTServiceLookup.getMeasurementDataService().findDataForResource(
+ childResource.getId(), new int[]{getDefinitionId()},
+ buttonBarDateTimeRangeEditor.getStartTime(),
+ buttonBarDateTimeRangeEditor.getEndTime(), 60,
+ new AsyncCallback<List<List<MeasurementDataNumericHighLowComposite>>>() {
+ @Override
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError(
+ MSG.view_resource_monitor_graphs_loadFailed(), caught);
+ countDownLatch.countDown();
+ }
+
+ @Override
+ public void onSuccess(
+ List<List<MeasurementDataNumericHighLowComposite>> measurements) {
+ addMeasurementForEachResource(childResource.getName(),
+ childResource.getId(), measurements.get(0));
+ countDownLatch.countDown();
+ }
+ });
+ }
+ }
+ });
+ }
}
- }
- });
+ });
}
@@ -418,6 +424,36 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl
return MSG.chart_xaxis_time_format_hours();
}
+ @Override
+ public void startRefreshCycle() {
+ refreshTimer = AutoRefreshUtil.startRefreshCycleWithPageRefreshInterval(this, this, refreshTimer);
+ }
+
+ @Override
+ protected void onDestroy() {
+ AutoRefreshUtil.onDestroy(refreshTimer);
+
+ super.onDestroy();
+ }
+
+ @Override
+ public boolean isRefreshing() {
+ return isRefreshing;
+ }
+
+ //Custom refresh operation as we are not directly extending Table
+ @Override
+ public void refresh() {
+ if (isVisible() && !isRefreshing()) {
+ isRefreshing = true;
+ try {
+ buttonBarDateTimeRangeEditor.updateTimeRangeToNow();
+ refreshData();
+ } finally {
+ isRefreshing = false;
+ }
+ }
+ }
/**
* Client can choose which graph types to render.
*/
commit 77312423e631cc63462868baedfb0e8fe129e1fc
Author: Mike Thompson <mithomps(a)redhat.com>
Date: Thu Sep 26 07:52:06 2013 -0700
Update Summary metric portlet graphs for Date/Time range feedback of period being selected for charting.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
index 778bbb2..561f961 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/graph/ButtonBarDateTimeRangeEditor.java
@@ -64,9 +64,12 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
private Label dateRangeLabel;
private DateTimeButtonBarClickHandler dateTimeButtonBarClickHandler;
private AbstractMeasurementRangeEditor.MetricRangePreferences prefs;
+ // just a reference to pass to CustomDateRangeWindow as it must be final
+ // so 'this' won't work
final private ButtonBarDateTimeRangeEditor self;
private RefreshIntervalMenu refreshIntervalMenu;
private boolean allowPreferenceUpdateRefresh;
+ private boolean isCustomDateRangeActive;
public ButtonBarDateTimeRangeEditor(MeasurementUserPreferences measurementUserPrefs, Refreshable d3GraphListView) {
this.self = this;
@@ -110,6 +113,7 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
CustomDateRangeWindow customDateRangeWindow = new CustomDateRangeWindow(MSG
.common_buttonbar_custom_window_title(), MSG.common_buttonbar_custom_window_subtitle(), self,
new Date(prefs.begin), new Date(prefs.end));
+ isCustomDateRangeActive = true;
customDateRangeWindow.show();
}
});
@@ -130,6 +134,10 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
addMember(toolStrip);
}
+ public boolean isCustomTimeRangeActive(){
+ return isCustomDateRangeActive;
+ }
+
public void redrawGraphs() {
d3GraphListView.refreshData();
}
@@ -213,6 +221,7 @@ public class ButtonBarDateTimeRangeEditor extends EnhancedVLayout {
public void onClick(ClickEvent clickEvent) {
IButton button = (IButton) clickEvent.getSource();
String selectedDateTimeRange = button.getTitle();
+ isCustomDateRangeActive = false;
Date now = new Date();
Date calculatedStartDateTime = calculateStartDate(now, selectedDateTimeRange);
saveDateRange(calculatedStartDateTime.getTime(), now.getTime());
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
index dcfb744..561a7a5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/D3GroupGraphListView.java
@@ -141,7 +141,9 @@ public final class D3GroupGraphListView extends AbstractD3GraphListView implemen
@Override
public void run() {
availabilityGraph.drawJsniChart();
- buttonBarDateTimeRangeEditor.updateTimeRangeToNow();
+ if(!buttonBarDateTimeRangeEditor.isCustomTimeRangeActive()){
+ buttonBarDateTimeRangeEditor.updateTimeRangeToNow();
+ }
}
}.schedule(150);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java
index 013696f..7408f62 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/CompositeGroupD3GraphListView.java
@@ -103,7 +103,6 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl
}
public void populateData() {
- buttonBarDateTimeRangeEditor.updateTimeRangeToNow();
ResourceGroupGWTServiceAsync groupService = GWTServiceLookup.getResourceGroupService();
ResourceGroupCriteria criteria = new ResourceGroupCriteria();
@@ -143,7 +142,6 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl
Log.warn("# of charted graphs: " + measurementForEachResource.size());
}
drawGraph();
- buttonBarDateTimeRangeEditor.updateTimeRangeToNow();
}
});
@@ -284,6 +282,9 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl
@Override
public void run() {
+ if(!buttonBarDateTimeRangeEditor.isCustomTimeRangeActive()){
+ buttonBarDateTimeRangeEditor.updateTimeRangeToNow();
+ }
drawJsniChart();
}
}.schedule(200);
@@ -357,7 +358,6 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl
sb.append("{ \"x\":" + measurement.getTimestamp() + ",");
MeasurementNumericValueAndUnits dataValue = normalizeUnitsAndValues(measurement.getValue(),
definition.getUnits());
- //sb.append(" \"y\":" + MeasurementUnits.scaleUp(measurement.getValue(), definition.getUnits()) + "},");
sb.append(" \"y\":" + dataValue.getValue() + "},");
adjustedMeasurementUnits = dataValue.getUnits().toString();
}
@@ -381,8 +381,9 @@ public abstract class CompositeGroupD3GraphListView extends EnhancedVLayout impl
}
sb.setLength(sb.length() - 1); // delete the last ','
sb.append("]");
+ Log.debug("Multi-resource Graph size: " + measurementForEachResource.size());
}
- Log.debug("Multi-resource Graph json: " + sb.toString());
+ //Log.debug("Multi-resource Graph json: " + sb.toString());
return sb.toString();
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
index 6eab1e9..0086871 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/D3GraphListView.java
@@ -233,6 +233,9 @@ public class D3GraphListView extends AbstractD3GraphListView {
new Timer() {
@Override
public void run() {
+ if(!buttonBarDateTimeRangeEditor.isCustomTimeRangeActive()){
+ buttonBarDateTimeRangeEditor.updateTimeRangeToNow();
+ }
availabilityGraph.drawJsniChart();
}
}.schedule(150);
10 years, 8 months
- 1
- 0
[rhq] 3 commits - modules/enterprise
by Jiri Kremser
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java | 15 +
modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java | 2
modules/enterprise/server/jar/intentional-api-changes-since-4.9.0.xml | 15 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java | 12 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementAggregate.java | 83 ++++++++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 34 +++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote.java | 21 ++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java | 6
10 files changed, 175 insertions(+), 17 deletions(-)
New commits:
commit 1b567f2f9eb2e81f86dbedf60cf85b42283aea05
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Thu Sep 26 22:36:43 2013 +0200
api checks: Adding back the org.rhq.enterprise.server.measurement.MeasurementAggregate see the commit c2a609f48 for more details.
diff --git a/modules/enterprise/server/jar/intentional-api-changes-since-4.9.0.xml b/modules/enterprise/server/jar/intentional-api-changes-since-4.9.0.xml
index 40508c6..488adc3 100644
--- a/modules/enterprise/server/jar/intentional-api-changes-since-4.9.0.xml
+++ b/modules/enterprise/server/jar/intentional-api-changes-since-4.9.0.xml
@@ -41,4 +41,19 @@
<justification>Adding a method to a remote API interface is safe. This is newly implemented functionality.</justification>
</difference>
+ <difference>
+ <className>org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote</className>
+ <differenceType>7006</differenceType> <!-- method return type changed -->
+ <method>org.rhq.core.domain.measurement.MeasurementAggregate getAggregate(org.rhq.core.domain.auth.Subject, int, long, long)</method>
+ <to>org.rhq.enterprise.server.measurement.MeasurementAggregate</to>
+ <justification>In RHQ 4.8 the MeasurementAggregate class was moved from server jar module to core domain module. This change is not backward compatible with Java clients using the remote EJB API. The breaking change was introduced by commit 2f6e74080e2299 the backward compatible change was introduced by c2a609f48d5f36.</justification>
+ </difference>
+
+ <difference>
+ <className>org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote</className>
+ <differenceType>7012</differenceType> <!-- method added to an interface -->
+ <method>org.rhq.core.domain.measurement.MeasurementAggregate getMeasurementAggregate(org.rhq.core.domain.auth.Subject, int, long, long)</method>
+ <justification>Adding a method to a remote API interface is safe. This is method is added in order to deprecate the getAggregate. For more details see the previous intentional change.</justification>
+ </difference>
+
</differences>
commit c2a609f48d5f364310060d031069495679b69c6f
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Thu Sep 26 22:32:46 2013 +0200
Adding back the org.rhq.enterprise.server.measurement.MeasurementAggregate because of the JON 3.2 backward compatibility breakage (for EJB remote clients). This contains also adding a new method, deprecating the old method and the added class so that it can be removed in the next major release.
diff --git a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
index dbd03ae..e07fb65 100644
--- a/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
+++ b/modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBeanTest.java
@@ -258,7 +258,7 @@ public class MeasurementDataManagerBeanTest extends AbstractEJB3Test {
dataManager.mergeMeasurementReport(report);
waitForRawInserts();
- MeasurementAggregate actual = dataManager.getAggregate(getOverlord(), dynamicSchedule.getId(),
+ MeasurementAggregate actual = dataManager.getMeasurementAggregate(getOverlord(), dynamicSchedule.getId(),
beginTime.getMillis(), endTime.getMillis());
MeasurementAggregate expected = new MeasurementAggregate(1.1, divide((1.1 + 2.2 + 3.3 + 4.4 + 5.5 + 6.6), 6),
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
index 97dd33f..70a0e60 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
@@ -347,7 +347,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN
// find the aggregates and enrich the result instance
if (!scheduleIdsMap.isEmpty()) {
if ((scheduleId = scheduleIdsMap.get(METRIC_TOKENS)) != null) {
- MeasurementAggregate tokensAggregate = measurementManager.getAggregate(subject, scheduleId, beginTime,
+ MeasurementAggregate tokensAggregate = measurementManager.getMeasurementAggregate(subject, scheduleId, beginTime,
endTime);
result.setTokens(tokensAggregate);
}
@@ -369,7 +369,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN
result.setTotalDiskUsedPercentage(totalDiskUsedPercentageAggregateWithUnits);
}
if ((scheduleId = scheduleIdsMap.get(METRIC_FREE_DISK_TO_DATA_RATIO)) != null) {
- MeasurementAggregate freeDiskToDataRatioAggregate = measurementManager.getAggregate(subject,
+ MeasurementAggregate freeDiskToDataRatioAggregate = measurementManager.getMeasurementAggregate(subject,
scheduleId, beginTime, endTime);
result.setFreeDiskToDataSizeRatio(freeDiskToDataRatioAggregate);
}
@@ -383,17 +383,17 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN
}
if ((scheduleId = scheduleIdsMap.get(METRIC_KEY_CACHE_SIZE)) != null) {
updateAggregateTotal(totalDiskUsedAggregate,
- measurementManager.getAggregate(subject, scheduleId, beginTime, endTime));
+ measurementManager.getMeasurementAggregate(subject, scheduleId, beginTime, endTime));
}
if ((scheduleId = scheduleIdsMap.get(METRIC_ROW_CACHE_SIZE)) != null) {
updateAggregateTotal(totalDiskUsedAggregate,
- measurementManager.getAggregate(subject, scheduleId, beginTime, endTime));
+ measurementManager.getMeasurementAggregate(subject, scheduleId, beginTime, endTime));
}
if ((scheduleId = scheduleIdsMap.get(METRIC_TOTAL_COMMIT_LOG_SIZE)) != null) {
updateAggregateTotal(totalDiskUsedAggregate,
- measurementManager.getAggregate(subject, scheduleId, beginTime, endTime));
+ measurementManager.getMeasurementAggregate(subject, scheduleId, beginTime, endTime));
}
if (totalDiskUsedAggregate.getMax() > 0) {
StorageNodeLoadComposite.MeasurementAggregateWithUnits totalDiskUsedAggregateWithUnits = new StorageNodeLoadComposite.MeasurementAggregateWithUnits(
@@ -539,7 +539,7 @@ public class StorageNodeManagerBean implements StorageNodeManagerLocal, StorageN
private StorageNodeLoadComposite.MeasurementAggregateWithUnits getMeasurementAggregateWithUnits(Subject subject,
int schedId, MeasurementUnits units, long beginTime, long endTime) {
- MeasurementAggregate measurementAggregate = measurementManager.getAggregate(subject, schedId, beginTime,
+ MeasurementAggregate measurementAggregate = measurementManager.getMeasurementAggregate(subject, schedId, beginTime,
endTime);
StorageNodeLoadComposite.MeasurementAggregateWithUnits measurementAggregateWithUnits = new StorageNodeLoadComposite.MeasurementAggregateWithUnits(
measurementAggregate, units);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementAggregate.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementAggregate.java
new file mode 100644
index 0000000..7acc5f6
--- /dev/null
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementAggregate.java
@@ -0,0 +1,83 @@
+/*
+ * 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.enterprise.server.measurement;;
+
+import java.io.Serializable;
+
+/**
+ * Simple Java Bean to hold aggregate values
+ *
+ * @author <a href="mailto:heiko.rupp@redhat.com">Heiko W. Rupp</a>
+ * @deprecated As of release RHQ 4.8, replaced by {@link org.rhq.core.domain.measurement.MeasurementAggregate}. Use this class from core domain instead.
+ */
+public class MeasurementAggregate implements Serializable {
+
+ static final long serialVersionUID = 5673395371271765240L;
+
+ Double min;
+ Double avg;
+ Double max;
+
+ public MeasurementAggregate() {
+ }
+
+ public MeasurementAggregate(Double min, Double avg, Double max) {
+ this.min = (min != null) ? min : Double.NaN;
+ this.avg = (avg != null) ? avg : Double.NaN;
+ this.max = (max != null) ? max : Double.NaN;
+ }
+
+ public Double getMin() {
+ return min;
+ }
+
+ public void setMin(Double min) {
+ this.min = min;
+ }
+
+ public Double getAvg() {
+ return avg;
+ }
+
+ public void setAvg(Double avg) {
+ this.avg = avg;
+ }
+
+ public Double getMax() {
+ return max;
+ }
+
+ public void setMax(Double max) {
+ this.max = max;
+ }
+
+ @Override
+ public String toString() {
+ return "Min: " + min + ", Max: " + max + ", Avg: " + avg;
+ }
+
+ /**
+ * Return true if the aggregate has "no real data" I.e. when all values are Not A Number.
+ *
+ * @return
+ */
+ public boolean isEmpty() {
+ return min.isNaN() && avg.isNaN() && max.isNaN();
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
index 3504cdc..1470337 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
@@ -480,7 +480,7 @@ public class MeasurementBaselineManagerBean implements MeasurementBaselineManage
throw new BaselineCreationException("Baseline calculation is only valid for a dynamic measurement");
}
- MeasurementAggregate agg = dataManager.getAggregate(subjectManager.getOverlord(), schedule.getId(), startDate,
+ MeasurementAggregate agg = dataManager.getMeasurementAggregate(subjectManager.getOverlord(), schedule.getId(), startDate,
endDate);
// attach the entity, so we can find the baseline
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java
index c481c6e..618bcc7 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java
@@ -373,7 +373,7 @@ public class MeasurementChartsManagerBean implements MeasurementChartsManagerLoc
summary.setCollectionType(collectionType);
if (!narrowed) {
- MeasurementAggregate compositeHighLow = dataManager.getAggregate(subject, schedule.getId(), begin, end);
+ MeasurementAggregate compositeHighLow = dataManager.getMeasurementAggregate(subject, schedule.getId(), begin, end);
if (compositeHighLow.isEmpty()) {
summary.setValuesPresent(false);
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
index 19c5ecf..ee679f1 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
@@ -605,9 +605,41 @@ public class MeasurementDataManagerBean implements MeasurementDataManagerLocal,
log.debug(callingMethod + ": " + stats.toString());
}
+ @Deprecated
@Override
@TransactionAttribute(TransactionAttributeType.NOT_SUPPORTED)
- public MeasurementAggregate getAggregate(Subject subject, int scheduleId, long startTime, long endTime) {
+ public org.rhq.enterprise.server.measurement.MeasurementAggregate getAggregate(Subject subject, int scheduleId, long startTime, long endTime) {
+ MeasurementScheduleCriteria criteria = new MeasurementScheduleCriteria();
+ criteria.addFilterId(scheduleId);
+ criteria.fetchResource(true);
+
+ PageList<MeasurementSchedule> schedules = measurementScheduleManager.findSchedulesByCriteria(
+ subjectManager.getOverlord(), criteria);
+ if (schedules.isEmpty()) {
+ throw new MeasurementException("Could not fine MeasurementSchedule with the id[" + scheduleId + "]");
+ }
+ MeasurementSchedule schedule = schedules.get(0);
+
+ if (authorizationManager.canViewResource(subject, schedule.getResource().getId()) == false) {
+ throw new PermissionException("User[" + subject.getName()
+ + "] does not have permission to view schedule[id=" + scheduleId + "]");
+ }
+
+ if (schedule.getDefinition().getDataType() != DataType.MEASUREMENT) {
+ throw new IllegalArgumentException(schedule + " is not about numerical values. Can't compute aggregates");
+ }
+
+ if (startTime > endTime) {
+ throw new IllegalArgumentException("Start date " + startTime + " is not before " + endTime);
+ }
+
+ MetricsServer metricsServer = storageClientManager.getMetricsServer();
+ AggregateNumericMetric summary = metricsServer.getSummaryAggregate(scheduleId, startTime, endTime);
+
+ return new org.rhq.enterprise.server.measurement.MeasurementAggregate(summary.getMin(), summary.getAvg(), summary.getMax());
+ }
+
+ public MeasurementAggregate getMeasurementAggregate(Subject subject, int scheduleId, long startTime, long endTime) {
MeasurementScheduleCriteria criteria = new MeasurementScheduleCriteria();
criteria.addFilterId(scheduleId);
criteria.fetchResource(true);
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote.java
index 116c82a..1a049c3 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerRemote.java
@@ -51,8 +51,27 @@ public interface MeasurementDataManagerRemote {
*
* @throws FetchException if the schedule does not reference numerical data or if the user is not allowed to view
* the {@link Resource} corresponding to this scheduleId
+ * @deprecated class {@link org.rhq.enterprise.server.measurement.MeasurementAggregate} has been deprecated
+ * since RHQ 4.8, therefore this method was deprecated as well and
+ * replaced by {@link #getMeasurementAggregate(org.rhq.core.domain.auth.Subject,int,long,long)}
*/
- MeasurementAggregate getAggregate(Subject subject, int scheduleId, long startTime, long endTime);
+ org.rhq.enterprise.server.measurement.MeasurementAggregate getAggregate(Subject subject, int scheduleId, long startTime, long endTime);
+
+ /**
+ * Get the aggregate values of the numerical values for a given schedule. This can only provide aggregates for data
+ * in the "live" table
+ *
+ * @param subject the user requesting the aggregate
+ * @param scheduleId the id of the {@link MeasurementSchedule} for which this aggregate is being requested
+ * @param start the start time
+ * @param end the end time
+ *
+ * @return MeasurementAggregate bean with the data
+ *
+ * @throws FetchException if the schedule does not reference numerical data or if the user is not allowed to view
+ * the {@link Resource} corresponding to this scheduleId
+ */
+ MeasurementAggregate getMeasurementAggregate(Subject subject, int scheduleId, long startTime, long endTime);
/**
* Return all known trait data for the passed schedule, defined by resourceId and definitionId
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
index d5ca8dc..fb927ec 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/rest/MetricHandlerBean.java
@@ -162,7 +162,7 @@ public class MetricHandlerBean extends AbstractRestBean {
MeasurementSchedule schedule = obtainSchedule(scheduleId, false, DataType.MEASUREMENT);
- MeasurementAggregate aggr = dataManager.getAggregate(caller, scheduleId, startTime, endTime);
+ MeasurementAggregate aggr = dataManager.getMeasurementAggregate(caller, scheduleId, startTime, endTime);
MetricAggregate res = new MetricAggregate(scheduleId, aggr.getMin(),aggr.getAvg(),aggr.getMax());
int definitionId = schedule.getDefinition().getId();
@@ -387,7 +387,7 @@ public class MetricHandlerBean extends AbstractRestBean {
List<List<MeasurementDataNumericHighLowComposite>> listList =
dataManager.findDataForContext(caller, EntityContext.forResource(sched.getResource().getId()),definitionId,startTime,endTime,dataPoints);
if (!listList.isEmpty()) {
- MeasurementAggregate measurementAggregate = dataManager.getAggregate(caller,scheduleId,startTime,endTime);
+ MeasurementAggregate measurementAggregate = dataManager.getMeasurementAggregate(caller,scheduleId,startTime,endTime);
List<MeasurementDataNumericHighLowComposite> list = listList.get(0);
MetricAggregate res = new MetricAggregate(scheduleId,measurementAggregate.getMin(),measurementAggregate.getAvg(),measurementAggregate.getMax());
boolean isHtml = mediaType.equals(MediaType.TEXT_HTML_TYPE);
@@ -552,7 +552,7 @@ public class MetricHandlerBean extends AbstractRestBean {
List<MetricAggregate> ret = new ArrayList<MetricAggregate>(schedules.size());
for (MeasurementSchedule schedule: schedules) {
- MeasurementAggregate aggr = dataManager.getAggregate(caller,schedule.getId(),startTime,endTime);
+ MeasurementAggregate aggr = dataManager.getMeasurementAggregate(caller,schedule.getId(),startTime,endTime);
MetricAggregate res = new MetricAggregate(schedule.getId(), aggr.getMin(),aggr.getAvg(),aggr.getMax());
if (includeDataPoints) {
commit 0d40ad930ba3248614e366f28f0a98ad8c98f136
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Thu Sep 26 22:32:11 2013 +0200
[BZ 967542] - UI shows confusing units when editing Availability Duration alert condition type - The table with listed conditions should now display the same number-unit tuple as the popup dialog.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java
index ce95963..6d75a27 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertFormatUtility.java
@@ -28,6 +28,7 @@ import org.rhq.core.domain.alert.AlertConditionCategory;
import org.rhq.core.domain.alert.AlertConditionOperator;
import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.measurement.MeasurementUnits;
+import org.rhq.core.domain.measurement.composite.MeasurementNumericValueAndUnits;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.Messages;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient;
@@ -93,9 +94,17 @@ public class AlertFormatUtility {
}
str.append(" For ");
- // value is stored in seconds but should be presented in minutes
- String value = String.valueOf(Integer.valueOf(condition.getOption()) / 60);
- String formatted = MeasurementConverterClient.format(value, MeasurementUnits.MINUTES);
+ long longValue = Long.valueOf(condition.getOption());
+ MeasurementNumericValueAndUnits valueWithUnits;
+ if (longValue % 3600 == 0) {
+ valueWithUnits = MeasurementConverterClient.fit((double) longValue, MeasurementUnits.SECONDS,
+ MeasurementUnits.HOURS, MeasurementUnits.HOURS);
+ } else {
+ valueWithUnits = MeasurementConverterClient.fit((double) longValue, MeasurementUnits.SECONDS,
+ MeasurementUnits.MINUTES, MeasurementUnits.MINUTES);
+ }
+ String formatted = MeasurementConverterClient.format(String.valueOf(valueWithUnits.getValue()),
+ valueWithUnits.getUnits());
str.append(formatted);
str.append("]");
10 years, 8 months
- 1
- 0
[rhq] Branch 'refs/tags/RHQ_4_9_0_JON320ER2' - 6 commits - modules/core modules/enterprise
by rhqci
modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml | 4 -
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 8 +-
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 9 ++-
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java | 8 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java | 29 ++++++----
5 files changed, 36 insertions(+), 22 deletions(-)
New commits:
commit bff9b1589a9b8bc295ddd2230af755410a4fd016
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Sep 26 12:35:08 2013 -0400
Bug 1010841 - Installation of RHQ server fails - de-obfuscating db password failed
Fix in a way that won't suffer from ambiguity or db vendor incompatibilities.
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
index ebf7189..7213fc3 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
@@ -148,9 +148,9 @@
<data ID="62" PROPERTY_KEY="STORAGE_GOSSIP_PORT" FREAD_ONLY="TRUE"/>
- <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/>
+ <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="UNSET" DEFAULT_PROPERTY_VALUE="UNSET" FREAD_ONLY="TRUE"/>
- <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/>
+ <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="UNSET" DEFAULT_PROPERTY_VALUE="UNSET" FREAD_ONLY="TRUE"/>
</table>
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 94688f6..713aefe 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -2263,22 +2263,22 @@
<schema-directSQL>
<statement targetDBVendor="postgresql" desc="Adding storage username">
INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only)
- VALUES (63, 'STORAGE_USERNAME', null, null, true)
+ VALUES (63, 'STORAGE_USERNAME', 'UNSET', 'UNSET', true)
</statement>
<statement targetDBVendor="oracle" desc="Adding storage username">
INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only)
- VALUES (63, 'STORAGE_USERNAME', null, null, 1)
+ VALUES (63, 'STORAGE_USERNAME', 'UNSET', 'UNSET', 1)
</statement>
</schema-directSQL>
<schema-directSQL>
<statement targetDBVendor="postgresql" desc="Adding storage password">
INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only)
- VALUES (64, 'STORAGE_PASSWORD', null, null, true)
+ VALUES (64, 'STORAGE_PASSWORD', 'UNSET', 'UNSET', true)
</statement>
<statement targetDBVendor="oracle" desc="Adding default storage password">
INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only)
- VALUES (64, 'STORAGE_PASSWORD', null, null, 1)
+ VALUES (64, 'STORAGE_PASSWORD', 'UNSET', 'UNSET', 1)
</statement>
</schema-directSQL>
</schemaSpec>
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
index 408442a..e10c993 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
@@ -50,7 +50,6 @@ import org.rhq.core.util.obfuscation.PicketBoxObfuscator;
import org.rhq.enterprise.server.installer.ServerInstallUtil.ExistingSchemaOption;
import org.rhq.enterprise.server.installer.ServerInstallUtil.SupportedDatabaseType;
-
/**
* @author John Mazzitelli
*/
@@ -61,6 +60,8 @@ public class InstallerServiceImpl implements InstallerService {
private static final String EAR_NAME = "rhq.ear";
private static final String SYSPROP_PROPFILE = "rhq.server.properties-file";
+ private static final String UNSET = "UNSET";
+
private final Log log = LogFactory.getLog(InstallerServiceImpl.class);
private final InstallerConfiguration installerConfiguration;
@@ -508,16 +509,16 @@ public class InstallerServiceImpl implements InstallerService {
throw new Exception("Could not complete the database schema installation", e);
}
- // if the storage cluster credentials are already set (typically an HA install), override
+ // if the storage cluster credentials are already set in the DB (typically an HA install), override
// what's currently in the server properties file, and then continue with storage schema setup
Map<String, String> storageProperties = ServerInstallUtil.fetchStorageClusterSettings(serverProperties,
clearTextDbPassword);
String storageUsernameSetting = storageProperties.get(ServerProperties.PROP_STORAGE_USERNAME);
String storagePasswordSetting = storageProperties.get(ServerProperties.PROP_STORAGE_PASSWORD);
- if (StringUtil.isNotBlank(storageUsernameSetting)) {
+ if (!(StringUtil.isBlank(storageUsernameSetting) || storageUsernameSetting.equals(UNSET))) {
serverProperties.put(ServerProperties.PROP_STORAGE_USERNAME, storageUsernameSetting);
}
- if (StringUtil.isNotBlank(storagePasswordSetting)) {
+ if (!(StringUtil.isBlank(storagePasswordSetting) || storagePasswordSetting.equals(UNSET))) {
serverProperties.put(ServerProperties.PROP_STORAGE_PASSWORD, storagePasswordSetting);
}
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
index c01ef5c..c5b66d7 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
@@ -1054,9 +1054,11 @@ public class ServerInstallUtil {
connection = getDatabaseConnection(dbUrl, userName, password);
connection.setAutoCommit(false);
- updateClusterSetting = connection.prepareStatement("UPDATE rhq_system_config "
- + "SET property_value = ?, default_property_value = ? "
- + "WHERE property_key = ? AND property_value IS NULL AND default_property_value IS NULL");
+ updateClusterSetting = connection.prepareStatement("" //
+ + "UPDATE rhq_system_config " //
+ + " SET property_value = ?, default_property_value = ? " //
+ + " WHERE property_key = ? " //
+ + " AND ( property_value IS NULL OR property_value = '' OR property_value = 'UNSET' ) ");
updateClusterSetting.setString(1, serverProperties.get(ServerProperties.PROP_STORAGE_USERNAME));
updateClusterSetting.setString(2, serverProperties.get(ServerProperties.PROP_STORAGE_USERNAME));
commit 3bffda4fd4905f8a2a8566a115d3a33772ba3645
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Sep 26 11:26:34 2013 -0400
Don't consider a blank string a valid storage username or password
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
index 59c9360..408442a 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
@@ -43,12 +43,14 @@ import org.rhq.common.jbossas.client.controller.WebJBossASClient;
import org.rhq.core.db.DatabaseTypeFactory;
import org.rhq.core.domain.cloud.StorageNode;
import org.rhq.core.util.PropertiesFileUpdate;
+import org.rhq.core.util.StringUtil;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.core.util.obfuscation.Obfuscator;
import org.rhq.core.util.obfuscation.PicketBoxObfuscator;
import org.rhq.enterprise.server.installer.ServerInstallUtil.ExistingSchemaOption;
import org.rhq.enterprise.server.installer.ServerInstallUtil.SupportedDatabaseType;
+
/**
* @author John Mazzitelli
*/
@@ -512,10 +514,10 @@ public class InstallerServiceImpl implements InstallerService {
clearTextDbPassword);
String storageUsernameSetting = storageProperties.get(ServerProperties.PROP_STORAGE_USERNAME);
String storagePasswordSetting = storageProperties.get(ServerProperties.PROP_STORAGE_PASSWORD);
- if (null != storageUsernameSetting) {
+ if (StringUtil.isNotBlank(storageUsernameSetting)) {
serverProperties.put(ServerProperties.PROP_STORAGE_USERNAME, storageUsernameSetting);
}
- if (null != storagePasswordSetting) {
+ if (StringUtil.isNotBlank(storagePasswordSetting)) {
serverProperties.put(ServerProperties.PROP_STORAGE_PASSWORD, storagePasswordSetting);
}
commit 067e1fae156247c31c154e86776292a8cdec068d
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu Sep 26 10:39:37 2013 -0400
Revert "tag RHQ_4_7_0_JONCI"
This reverts commit e2150bf14a3333c336b91e2077e54e685cb15188.
diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml
index 4aae357..9783c17 100644
--- a/code-coverage/pom.xml
+++ b/code-coverage/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-code-coverage</artifactId>
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index 434edad..df3c6b7 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 86baa5a..e27e9ae 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml
index 5195e6e..ad356e9 100644
--- a/modules/common/cassandra-auth/pom.xml
+++ b/modules/common/cassandra-auth/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-cassandra-auth</artifactId>
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml
index dc9fcac..1ee2365 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml
+++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-cassandra-ccm</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-cassandra-ccm-arquillian</artifactId>
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
index b84d36c..86298a7 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
+++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-cassandra-ccm</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-cassandra-ccm-core</artifactId>
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml
index 8640d5b..4b78cec 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml
+++ b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-cassandra-ccm</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-cassandra-ccm-maven-plugin</artifactId>
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml
index b817c60..7a5bf61 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml
+++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-cassandra-ccm</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-cassandra-ccm-testng</artifactId>
diff --git a/modules/common/cassandra-ccm/pom.xml b/modules/common/cassandra-ccm/pom.xml
index 1b8bc61..44e3f9e 100644
--- a/modules/common/cassandra-ccm/pom.xml
+++ b/modules/common/cassandra-ccm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-common-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/common/cassandra-installer/pom.xml b/modules/common/cassandra-installer/pom.xml
index fac3833..0c341cd 100644
--- a/modules/common/cassandra-installer/pom.xml
+++ b/modules/common/cassandra-installer/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-cassandra-installer</artifactId>
diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml
index c62a28f..1a4e928 100644
--- a/modules/common/cassandra-schema/pom.xml
+++ b/modules/common/cassandra-schema/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-cassandra-schema</artifactId>
diff --git a/modules/common/cassandra-util/pom.xml b/modules/common/cassandra-util/pom.xml
index 800f5d1..18d2ef8 100644
--- a/modules/common/cassandra-util/pom.xml
+++ b/modules/common/cassandra-util/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-cassandra-util</artifactId>
diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml
index d3baf3b..a97a3f1 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-common-drift</artifactId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 93f3805..a22d463 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-filetemplate-bundle-common</artifactId>
diff --git a/modules/common/jboss-as-dmr-client/pom.xml b/modules/common/jboss-as-dmr-client/pom.xml
index ef791fb..cf49eb0 100644
--- a/modules/common/jboss-as-dmr-client/pom.xml
+++ b/modules/common/jboss-as-dmr-client/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-jboss-as-dmr-client</artifactId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 866f669..bff6e36 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-jboss-as-common</artifactId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index d31a6ad..8a4966b 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 f4b2afa..fefcf36 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<!-- Model Version -->
diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml
index 33e48b1..832fdd3 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<!-- Model Version -->
diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml
index 66df7dd..f6638aa 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/arquillian-integration/suite-extension/pom.xml b/modules/core/arquillian-integration/suite-extension/pom.xml
index bbe0954..fd8e278 100644
--- a/modules/core/arquillian-integration/suite-extension/pom.xml
+++ b/modules/core/arquillian-integration/suite-extension/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-arquillian-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<!-- Model Version -->
diff --git a/modules/core/arquillian-integration/test-agent-plugin/pom.xml b/modules/core/arquillian-integration/test-agent-plugin/pom.xml
index b560968..474988c 100644
--- a/modules/core/arquillian-integration/test-agent-plugin/pom.xml
+++ b/modules/core/arquillian-integration/test-agent-plugin/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-arquillian-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index a06011c..cdb3121 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index ff8a21b..b3bcfd0 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 83c9dac..ce66cca 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index b59e15e..ab06e9e 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-core-domain</artifactId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 710a585..e25a193 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index 86a3e7e..d076cd9 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index adf5bd4..fdf355f 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 2ed4c26..8cb5215 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 e03ac78..57987fd 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 97ed3ab..a619439 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 b2c1184..143ce73 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 0820f4b..72e7d1b 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml
index ecdde93..24a00ee 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 9765a55..dcbfd30 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 2d97b0b..4935618a 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-core-util</artifactId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index c832b41..fcd9b26 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index c0554c6..20854c9 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 4d3b17e..8cd2d97 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 f3e07b4..0a1e19b 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 1ea7d61..e3de1bc 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index d418db5..908c109 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 57c01e8..578f0ed 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 b418671..cf9088d 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/remoting-war/pom.xml b/modules/enterprise/gui/remoting-war/pom.xml
index 53a1556..4e7d74c 100644
--- a/modules/enterprise/gui/remoting-war/pom.xml
+++ b/modules/enterprise/gui/remoting-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/rest-examples-war/pom.xml b/modules/enterprise/gui/rest-examples-war/pom.xml
index 0ab8d0e..b946b2b 100644
--- a/modules/enterprise/gui/rest-examples-war/pom.xml
+++ b/modules/enterprise/gui/rest-examples-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 22ee22b..b6a7a04 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 300e679..1eac425 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 427c5fb..d8527f8 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 49e0186..ed18648 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 a087cb1..982d3d3 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index bbd87da..d445ed7 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml
index 4b4ba59..575a004 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-scripting-api</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 aac6e73..f469ca5 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-scripting-javascript</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 4c47992..50ab4c3 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-scripting-parent</artifactId>
<packaging>pom</packaging>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 1e36d6c..7ef3212 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-scripting-python</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<name>RHQ Python support</name>
<description>Provides RHQ scripting in Python using Jython</description>
diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml
index 61830f3..83d7b23 100644
--- a/modules/enterprise/server/appserver/pom.xml
+++ b/modules/enterprise/server/appserver/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index 12215be..91a653b 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml
index 1af4fa8..58a16f2 100644
--- a/modules/enterprise/server/data-migration/pom.xml
+++ b/modules/enterprise/server/data-migration/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index f35a0a4..6a4b21c 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml
index c9c0a03..04dc335 100644
--- a/modules/enterprise/server/installer/pom.xml
+++ b/modules/enterprise/server/installer/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
index 7af6f9d..f9f2e6a 100644
--- a/modules/enterprise/server/itests-2/pom.xml
+++ b/modules/enterprise/server/itests-2/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 4d8a07d..3f7c17a 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 abc220d..44d1b10 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 20c07de..dc9d767 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 471003a..e81935a 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 2457b0d..a1a6f8b 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 d620c92..d32dddd 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 7e3cbe7..eb14068 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 54dcd5b..3e00528 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 317e61b..39b5ca5 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 36e246a..12758b4 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 5551c92..6aab82f 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml
index 6f7ac53..56ad7b6 100644
--- a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml
+++ b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 8edfd9b..1ef821f 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 32acda7..21145a5 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 02fd80d..82c6669 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 8689924..7259db3 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 5833fee..e497a9c 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 7211f4c..c7caff8 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 13b66fe..93fe1f4 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index c86f705..7d1797b 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 6b28aa9..117271d 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 32d9a39..2449ed8 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 a6cdea1..fd56fff 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index bca927d..1e9b481 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 bb51ace..9c2ccf4 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml
index 713b1b4..0c9d27c 100644
--- a/modules/enterprise/server/server-control/pom.xml
+++ b/modules/enterprise/server/server-control/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml
index 0d39f8e..7d57760 100644
--- a/modules/enterprise/server/server-metrics/pom.xml
+++ b/modules/enterprise/server/server-metrics/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml
index fc766fe..03c2ce5 100644
--- a/modules/enterprise/server/startup-subsystem/pom.xml
+++ b/modules/enterprise/server/startup-subsystem/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 edf7c87..6350464 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index e63e38e..768ec0a 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<build>
<plugins>
diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml
index a7ed4cc..dd97e8f 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml
index 545b5db..26c709d 100644
--- a/modules/helpers/metrics-simulator/pom.xml
+++ b/modules/helpers/metrics-simulator/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index 718c14c..36e76d8 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 fa787c5..d5bd8e7 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 84ef130..9630bc8 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml
index 0567602..c31b804 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index df8b7ef..63f1e62 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 ca3d81f..77ed069 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 0b0c363..0a616d3 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>jndi-access-test</artifactId>
diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml
index 5e1f84c..4510e72 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 777f236..8038922 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>jndi-access-remote-server</artifactId>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index ac50627..da1ad51 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml
index 7c5748d..556c1e4 100644
--- a/modules/integration-tests/rest-api/pom.xml
+++ b/modules/integration-tests/rest-api/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-integration-tests</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index a7b8e47..523406f 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 7c2d095..167ab67 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 0c23814..a89a568 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 71c5eca..f96b173 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 56452fb..679f9b3 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml
index 6d5887e..e16b1fd 100644
--- a/modules/plugins/cassandra/pom.xml
+++ b/modules/plugins/cassandra/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index ddc9e9e..bc7bca1 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 5f332a0..0edf971 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 2f42e79..9446a83 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index dd1d4a3..92dace7 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index d252d6c..ebdb5c0 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index a10b0f8..a3f17f4 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index 0d0eefa..44ac23f 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index e0e3cdc..a9e7295 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index b31fd66..092ac13 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index aaa9aa2..6853c1a 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index a35e582..b32ee81 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 725187f..dc08424 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 00d0bda..f4a7a88 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 1c8fe0f..993a215 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 513f5b4..44e9ce9 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index 69b26bf..a8e46d8 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 6e2414b..18e79f9 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index ac3304d..c3c0db9 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index bab062b..206f2d7 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index 21102b3..c1a9f61 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index c45ff85..9678528 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml
index a7df5f9..06b5a80 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 6f8216c..cd0c446 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index 6ac7fb2..2160f12 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 766df02..1b10af4 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 930f335..4e18f5f 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index ba2069c..51af020 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index bf6fe94..feb87c4 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 0cc62a9..bb904517 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index 4989446..414a2c4 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index a579f86..f373663 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml
index 834091d..942836c 100644
--- a/modules/plugins/rhq-storage/pom.xml
+++ b/modules/plugins/rhq-storage/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index b3fce75..9269350 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 1f52ac4..c018eed 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 539f1b9..b2c4587 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index ee7b2fd..404f7d6 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sonarqube/pom.xml b/modules/plugins/sonarqube/pom.xml
index 834b985..fb12b85 100644
--- a/modules/plugins/sonarqube/pom.xml
+++ b/modules/plugins/sonarqube/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>rhq-sonarqube-plugin</artifactId>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index b9f2b39..9f53f6f 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index beb0dd1..764fe67 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index f9bd9b1..f043ba1 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index 45d589a..67c4519 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</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 f46c475..01d0d24 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index 678e67f..7fbac03 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index 70e298a..41280b9 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 3407cad..3d4ed73 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.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index b3d1503..c305a40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.7.0.JON</version>
+ <version>4.9.0.JON320ER2</version>
<packaging>pom</packaging>
<name>RHQ</name>
commit ef5f203efbd77817f65dc72f9bf300a89d5660c3
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Sep 26 09:51:24 2013 -0400
A change to solve an ora test failure for
SynchronizationManagerBeanTest#testExport, due to oracle treating "" as
null for config settings initialized to "".
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
index 86bb1b8..4c2e4d4 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java
@@ -208,8 +208,8 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot
public void setStorageClusterSettings(Subject subject, SystemSettings settings) {
for (SystemSetting setting : settings.keySet()) {
if (!isStorageSetting(setting)) {
- throw new IllegalArgumentException(setting + " cannot be updated through this method. This method " +
- "only allows updating of storage cluster settings.");
+ throw new IllegalArgumentException(setting + " cannot be updated through this method. This method "
+ + "only allows updating of storage cluster settings.");
}
}
setSystemSettings(settings, false, true);
@@ -255,12 +255,13 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot
String existingValue = transformSystemConfigurationProperty(prop, existingConfig.getPropertyValue(),
true);
- if ((existingValue == null && value != null) || !existingValue.equals(value)) {
+ //also for oracle, treat null and empty string as the same.
+ if ((isEmpty(existingValue) && !isEmpty(value))
+ || (null != existingValue && !existingValue.equals(value))) {
//SystemSetting#isReadOnly should be a superset of the "fReadOnly" field in the database
//but let's just be super paranoid here...
- if ((prop.isReadOnly()
- || (existingConfig.getFreadOnly() != null && existingConfig.getFreadOnly().booleanValue())) &&
- !(isStorageSetting(prop) || updateStorageSettings)) {
+ if ((prop.isReadOnly() || (existingConfig.getFreadOnly() != null && existingConfig.getFreadOnly()
+ .booleanValue())) && !(isStorageSetting(prop) || updateStorageSettings)) {
throw new IllegalArgumentException("The setting [" + prop.getInternalName()
+ "] is read-only - you cannot change its current value! Current value is ["
+ existingConfig.getPropertyValue() + "] while the new value was [" + value + "].");
@@ -282,12 +283,20 @@ public class SystemManagerBean implements SystemManagerLocal, SystemManagerRemot
cachedSystemSettings = null;
}
+ private static boolean isEmpty(String string) {
+ return null == string || string.trim().isEmpty();
+ }
+
private boolean isStorageSetting(SystemSetting setting) {
switch (setting) {
- case STORAGE_CQL_PORT: return true;
- case STORAGE_GOSSIP_PORT: return true;
- case STORAGE_AUTOMATIC_DEPLOYMENT: return true;
- default: return false;
+ case STORAGE_CQL_PORT:
+ return true;
+ case STORAGE_GOSSIP_PORT:
+ return true;
+ case STORAGE_AUTOMATIC_DEPLOYMENT:
+ return true;
+ default:
+ return false;
}
}
commit b9c792694d2ba6d604a7837cba71fc8644655ed9
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Thu Sep 26 09:50:11 2013 -0400
Revert " updating itest fix for oracle failures."
This reverts commit 7abad911acaf15b7b0dd58af64df2be2c75c905a.
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
index 223042a..ebf7189 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
@@ -148,9 +148,9 @@
<data ID="62" PROPERTY_KEY="STORAGE_GOSSIP_PORT" FREAD_ONLY="TRUE"/>
- <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE=" " DEFAULT_PROPERTY_VALUE=" " FREAD_ONLY="TRUE"/>
+ <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/>
- <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE=" " DEFAULT_PROPERTY_VALUE=" " FREAD_ONLY="TRUE"/>
+ <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/>
</table>
commit e2150bf14a3333c336b91e2077e54e685cb15188
Author: Hudson <jboss-qa-internal(a)redhat.com>
Date: Thu Sep 26 03:20:42 2013 -0400
tag RHQ_4_7_0_JONCI
diff --git a/code-coverage/pom.xml b/code-coverage/pom.xml
index 9783c17..4aae357 100644
--- a/code-coverage/pom.xml
+++ b/code-coverage/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-code-coverage</artifactId>
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index df3c6b7..434edad 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index e27e9ae..86baa5a 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/cassandra-auth/pom.xml b/modules/common/cassandra-auth/pom.xml
index ad356e9..5195e6e 100644
--- a/modules/common/cassandra-auth/pom.xml
+++ b/modules/common/cassandra-auth/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-cassandra-auth</artifactId>
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml
index 1ee2365..dc9fcac 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml
+++ b/modules/common/cassandra-ccm/cassandra-ccm-arquillian/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-cassandra-ccm</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-cassandra-ccm-arquillian</artifactId>
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
index 86298a7..b84d36c 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
+++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-cassandra-ccm</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-cassandra-ccm-core</artifactId>
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml
index 4b78cec..8640d5b 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml
+++ b/modules/common/cassandra-ccm/cassandra-ccm-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-cassandra-ccm</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-cassandra-ccm-maven-plugin</artifactId>
diff --git a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml
index 7a5bf61..b817c60 100644
--- a/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml
+++ b/modules/common/cassandra-ccm/cassandra-ccm-testng/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-cassandra-ccm</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-cassandra-ccm-testng</artifactId>
diff --git a/modules/common/cassandra-ccm/pom.xml b/modules/common/cassandra-ccm/pom.xml
index 44e3f9e..1b8bc61 100644
--- a/modules/common/cassandra-ccm/pom.xml
+++ b/modules/common/cassandra-ccm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>rhq-common-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/common/cassandra-installer/pom.xml b/modules/common/cassandra-installer/pom.xml
index 0c341cd..fac3833 100644
--- a/modules/common/cassandra-installer/pom.xml
+++ b/modules/common/cassandra-installer/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-cassandra-installer</artifactId>
diff --git a/modules/common/cassandra-schema/pom.xml b/modules/common/cassandra-schema/pom.xml
index 1a4e928..c62a28f 100644
--- a/modules/common/cassandra-schema/pom.xml
+++ b/modules/common/cassandra-schema/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-cassandra-schema</artifactId>
diff --git a/modules/common/cassandra-util/pom.xml b/modules/common/cassandra-util/pom.xml
index 18d2ef8..800f5d1 100644
--- a/modules/common/cassandra-util/pom.xml
+++ b/modules/common/cassandra-util/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-cassandra-util</artifactId>
diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml
index a97a3f1..d3baf3b 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-common-drift</artifactId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index a22d463..93f3805 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-filetemplate-bundle-common</artifactId>
diff --git a/modules/common/jboss-as-dmr-client/pom.xml b/modules/common/jboss-as-dmr-client/pom.xml
index cf49eb0..ef791fb 100644
--- a/modules/common/jboss-as-dmr-client/pom.xml
+++ b/modules/common/jboss-as-dmr-client/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-jboss-as-dmr-client</artifactId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index bff6e36..866f669 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-jboss-as-common</artifactId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 8a4966b..d31a6ad 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 fefcf36..f4b2afa 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<!-- Model Version -->
diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml
index 832fdd3..33e48b1 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<!-- Model Version -->
diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml
index f6638aa..66df7dd 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/arquillian-integration/suite-extension/pom.xml b/modules/core/arquillian-integration/suite-extension/pom.xml
index fd8e278..bbe0954 100644
--- a/modules/core/arquillian-integration/suite-extension/pom.xml
+++ b/modules/core/arquillian-integration/suite-extension/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-arquillian-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<!-- Model Version -->
diff --git a/modules/core/arquillian-integration/test-agent-plugin/pom.xml b/modules/core/arquillian-integration/test-agent-plugin/pom.xml
index 474988c..b560968 100644
--- a/modules/core/arquillian-integration/test-agent-plugin/pom.xml
+++ b/modules/core/arquillian-integration/test-agent-plugin/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-arquillian-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index cdb3121..a06011c 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index b3bcfd0..ff8a21b 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index ce66cca..83c9dac 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index ab06e9e..b59e15e 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-core-domain</artifactId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index e25a193..710a585 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index d076cd9..86a3e7e 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index fdf355f..adf5bd4 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 8cb5215..2ed4c26 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 57987fd..e03ac78 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 a619439..97ed3ab 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 143ce73..b2c1184 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 72e7d1b..0820f4b 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml
index 24a00ee..ecdde93 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index dcbfd30..9765a55 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 4935618a..2d97b0b 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-core-util</artifactId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index fcd9b26..c832b41 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 20854c9..c0554c6 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml
index 8cd2d97..4d3b17e 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-script-bindings</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 0a1e19b..f3e07b4 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 e3de1bc..1ea7d61 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 908c109..d418db5 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 578f0ed..57c01e8 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 cf9088d..b418671 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/remoting-war/pom.xml b/modules/enterprise/gui/remoting-war/pom.xml
index 4e7d74c..53a1556 100644
--- a/modules/enterprise/gui/remoting-war/pom.xml
+++ b/modules/enterprise/gui/remoting-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/gui/rest-examples-war/pom.xml b/modules/enterprise/gui/rest-examples-war/pom.xml
index b946b2b..0ab8d0e 100644
--- a/modules/enterprise/gui/rest-examples-war/pom.xml
+++ b/modules/enterprise/gui/rest-examples-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 b6a7a04..22ee22b 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 1eac425..300e679 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index d8527f8..427c5fb 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 ed18648..49e0186 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 982d3d3..a087cb1 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index d445ed7..bbd87da 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/scripting/api/pom.xml b/modules/enterprise/scripting/api/pom.xml
index 575a004..4b4ba59 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-scripting-api</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 f469ca5..aac6e73 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-scripting-javascript</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 50ab4c3..4c47992 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-scripting-parent</artifactId>
<packaging>pom</packaging>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 7ef3212..1e36d6c 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-scripting-python</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<name>RHQ Python support</name>
<description>Provides RHQ scripting in Python using Jython</description>
diff --git a/modules/enterprise/server/appserver/pom.xml b/modules/enterprise/server/appserver/pom.xml
index 83d7b23..61830f3 100644
--- a/modules/enterprise/server/appserver/pom.xml
+++ b/modules/enterprise/server/appserver/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml
index 91a653b..12215be 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-server-client-api</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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/data-migration/pom.xml b/modules/enterprise/server/data-migration/pom.xml
index 58a16f2..1af4fa8 100644
--- a/modules/enterprise/server/data-migration/pom.xml
+++ b/modules/enterprise/server/data-migration/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index 6a4b21c..f35a0a4 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/installer/pom.xml b/modules/enterprise/server/installer/pom.xml
index 04dc335..c9c0a03 100644
--- a/modules/enterprise/server/installer/pom.xml
+++ b/modules/enterprise/server/installer/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml
index f9f2e6a..7af6f9d 100644
--- a/modules/enterprise/server/itests-2/pom.xml
+++ b/modules/enterprise/server/itests-2/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 3f7c17a..4d8a07d 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 44d1b10..abc220d 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>alert-cli</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 dc9d767..20c07de 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.server</groupId>
<artifactId>alert-email</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 e81935a..471003a 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-irc</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 a1a6f8b..2457b0d 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-log4j</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 d32dddd..d620c92 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-microblog</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 eb14068..7e3cbe7 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-mobicents</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 3e00528..54dcd5b 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-operations</artifactId>
<packaging>jar</packaging>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 39b5ca5..317e61b 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-roles</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 12758b4..36e246a 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-snmp</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 6aab82f..5551c92 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>alert-subject</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<name>RHQ Enterprise Server Subject Alert Plugin</name>
diff --git a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml
index 56ad7b6..6f7ac53 100644
--- a/modules/enterprise/server/plugins/alertdef-rhq/pom.xml
+++ b/modules/enterprise/server/plugins/alertdef-rhq/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 1ef821f..8edfd9b 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 21145a5..32acda7 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>rhq-serverplugin-cobbler</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 82c6669..02fd80d 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 7259db3..8689924 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 e497a9c..5833fee 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 c7caff8..7211f4c 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 93fe1f4..13b66fe 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq</groupId>
<artifactId>packagetype-cli</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<name>RHQ Enterprise Server CLI Package Type Plugin</name>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 7d1797b..c86f705 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 117271d..6b28aa9 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 2449ed8..32d9a39 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 fd56fff..a6cdea1 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml
index 1e9b481..bca927d 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 9c2ccf4..bb51ace 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/server-control/pom.xml b/modules/enterprise/server/server-control/pom.xml
index 0c9d27c..713b1b4 100644
--- a/modules/enterprise/server/server-control/pom.xml
+++ b/modules/enterprise/server/server-control/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/server-metrics/pom.xml b/modules/enterprise/server/server-metrics/pom.xml
index 7d57760..0d39f8e 100644
--- a/modules/enterprise/server/server-metrics/pom.xml
+++ b/modules/enterprise/server/server-metrics/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/enterprise/server/startup-subsystem/pom.xml b/modules/enterprise/server/startup-subsystem/pom.xml
index 03c2ce5..fc766fe 100644
--- a/modules/enterprise/server/startup-subsystem/pom.xml
+++ b/modules/enterprise/server/startup-subsystem/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 6350464..edf7c87 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml
index 768ec0a..e63e38e 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.rhq.helpers</groupId>
<artifactId>bundleGen</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<build>
<plugins>
diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml
index dd97e8f..a7ed4cc 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/metrics-simulator/pom.xml b/modules/helpers/metrics-simulator/pom.xml
index 26c709d..545b5db 100644
--- a/modules/helpers/metrics-simulator/pom.xml
+++ b/modules/helpers/metrics-simulator/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-helpers</artifactId>
<groupId>org.rhq.helpers</groupId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml
index 36e76d8..718c14c 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>perftest-support</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 d5bd8e7..fa787c5 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 9630bc8..84ef130 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml
index c31b804..0567602 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index 63f1e62..df8b7ef 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 77ed069..ca3d81f 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 0a616d3..0b0c363 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>jndi-access-test</artifactId>
diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml
index 4510e72..5e1f84c 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 8038922..777f236 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>jndi-access-remote-server</artifactId>
diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml
index da1ad51..ac50627 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/integration-tests/rest-api/pom.xml b/modules/integration-tests/rest-api/pom.xml
index 556c1e4..7c5748d 100644
--- a/modules/integration-tests/rest-api/pom.xml
+++ b/modules/integration-tests/rest-api/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-integration-tests</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 523406f..a7b8e47 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 167ab67..7c2d095 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index a89a568..0c23814 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index f96b173..71c5eca 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index 679f9b3..56452fb 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cassandra/pom.xml b/modules/plugins/cassandra/pom.xml
index e16b1fd..6d5887e 100644
--- a/modules/plugins/cassandra/pom.xml
+++ b/modules/plugins/cassandra/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index bc7bca1..ddc9e9e 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 0edf971..5f332a0 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 9446a83..2f42e79 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index 92dace7..dd1d4a3 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index ebdb5c0..d252d6c 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index a3f17f4..a10b0f8 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index 44ac23f..0d0eefa 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index a9e7295..e0e3cdc 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 092ac13..b31fd66 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-hudson-plugin</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<packaging>jar</packaging>
<name>RHQ Hudson Plugin</name>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 6853c1a..aaa9aa2 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index b32ee81..a35e582 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 dc08424..725187f 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 f4a7a88..00d0bda 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 993a215..1c8fe0f 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 44e9ce9..513f5b4 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index a8e46d8..69b26bf 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 18e79f9..6e2414b 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index c3c0db9..ac3304d 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml
index 206f2d7..bab062b 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index c1a9f61..21102b3 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 9678528..c45ff85 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/noop/pom.xml b/modules/plugins/noop/pom.xml
index 06b5a80..a7df5f9 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index cd0c446..6f8216c 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml
index 2160f12..6ac7fb2 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 1b10af4..766df02 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 4e18f5f..930f335 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 51af020..ba2069c 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index feb87c4..bf6fe94 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index bb904517..0cc62a9 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index 414a2c4..4989446 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index f373663..a579f86 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-storage/pom.xml b/modules/plugins/rhq-storage/pom.xml
index 942836c..834091d 100644
--- a/modules/plugins/rhq-storage/pom.xml
+++ b/modules/plugins/rhq-storage/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 9269350..b3fce75 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index c018eed..1f52ac4 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index b2c4587..539f1b9 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 404f7d6..ee7b2fd 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sonarqube/pom.xml b/modules/plugins/sonarqube/pom.xml
index fb12b85..834b985 100644
--- a/modules/plugins/sonarqube/pom.xml
+++ b/modules/plugins/sonarqube/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>rhq-sonarqube-plugin</artifactId>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 9f53f6f..b9f2b39 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 764fe67..beb0dd1 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index f043ba1..f9bd9b1 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index 67c4519..45d589a 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</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 01d0d24..f46c475 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index 7fbac03..678e67f 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index 41280b9..70e298a 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 3d4ed73..3407cad 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.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
</parent>
<artifactId>test-utils</artifactId>
diff --git a/pom.xml b/pom.xml
index c305a40..b3d1503 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.9.0.JON320ER2</version>
+ <version>4.7.0.JON</version>
<packaging>pom</packaging>
<name>RHQ</name>
10 years, 8 months
- 1
- 0
[rhq] Branch 'nightly/rhq.jon' - 2 commits - modules/core modules/enterprise
by Simeon Pinder
modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml | 4 ++--
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 8 ++++----
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 9 ++++++---
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java | 8 +++++---
4 files changed, 17 insertions(+), 12 deletions(-)
New commits:
commit bff9b1589a9b8bc295ddd2230af755410a4fd016
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Sep 26 12:35:08 2013 -0400
Bug 1010841 - Installation of RHQ server fails - de-obfuscating db password failed
Fix in a way that won't suffer from ambiguity or db vendor incompatibilities.
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
index ebf7189..7213fc3 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
@@ -148,9 +148,9 @@
<data ID="62" PROPERTY_KEY="STORAGE_GOSSIP_PORT" FREAD_ONLY="TRUE"/>
- <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/>
+ <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="UNSET" DEFAULT_PROPERTY_VALUE="UNSET" FREAD_ONLY="TRUE"/>
- <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/>
+ <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="UNSET" DEFAULT_PROPERTY_VALUE="UNSET" FREAD_ONLY="TRUE"/>
</table>
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 94688f6..713aefe 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -2263,22 +2263,22 @@
<schema-directSQL>
<statement targetDBVendor="postgresql" desc="Adding storage username">
INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only)
- VALUES (63, 'STORAGE_USERNAME', null, null, true)
+ VALUES (63, 'STORAGE_USERNAME', 'UNSET', 'UNSET', true)
</statement>
<statement targetDBVendor="oracle" desc="Adding storage username">
INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only)
- VALUES (63, 'STORAGE_USERNAME', null, null, 1)
+ VALUES (63, 'STORAGE_USERNAME', 'UNSET', 'UNSET', 1)
</statement>
</schema-directSQL>
<schema-directSQL>
<statement targetDBVendor="postgresql" desc="Adding storage password">
INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only)
- VALUES (64, 'STORAGE_PASSWORD', null, null, true)
+ VALUES (64, 'STORAGE_PASSWORD', 'UNSET', 'UNSET', true)
</statement>
<statement targetDBVendor="oracle" desc="Adding default storage password">
INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only)
- VALUES (64, 'STORAGE_PASSWORD', null, null, 1)
+ VALUES (64, 'STORAGE_PASSWORD', 'UNSET', 'UNSET', 1)
</statement>
</schema-directSQL>
</schemaSpec>
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
index 408442a..e10c993 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
@@ -50,7 +50,6 @@ import org.rhq.core.util.obfuscation.PicketBoxObfuscator;
import org.rhq.enterprise.server.installer.ServerInstallUtil.ExistingSchemaOption;
import org.rhq.enterprise.server.installer.ServerInstallUtil.SupportedDatabaseType;
-
/**
* @author John Mazzitelli
*/
@@ -61,6 +60,8 @@ public class InstallerServiceImpl implements InstallerService {
private static final String EAR_NAME = "rhq.ear";
private static final String SYSPROP_PROPFILE = "rhq.server.properties-file";
+ private static final String UNSET = "UNSET";
+
private final Log log = LogFactory.getLog(InstallerServiceImpl.class);
private final InstallerConfiguration installerConfiguration;
@@ -508,16 +509,16 @@ public class InstallerServiceImpl implements InstallerService {
throw new Exception("Could not complete the database schema installation", e);
}
- // if the storage cluster credentials are already set (typically an HA install), override
+ // if the storage cluster credentials are already set in the DB (typically an HA install), override
// what's currently in the server properties file, and then continue with storage schema setup
Map<String, String> storageProperties = ServerInstallUtil.fetchStorageClusterSettings(serverProperties,
clearTextDbPassword);
String storageUsernameSetting = storageProperties.get(ServerProperties.PROP_STORAGE_USERNAME);
String storagePasswordSetting = storageProperties.get(ServerProperties.PROP_STORAGE_PASSWORD);
- if (StringUtil.isNotBlank(storageUsernameSetting)) {
+ if (!(StringUtil.isBlank(storageUsernameSetting) || storageUsernameSetting.equals(UNSET))) {
serverProperties.put(ServerProperties.PROP_STORAGE_USERNAME, storageUsernameSetting);
}
- if (StringUtil.isNotBlank(storagePasswordSetting)) {
+ if (!(StringUtil.isBlank(storagePasswordSetting) || storagePasswordSetting.equals(UNSET))) {
serverProperties.put(ServerProperties.PROP_STORAGE_PASSWORD, storagePasswordSetting);
}
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
index c01ef5c..c5b66d7 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
@@ -1054,9 +1054,11 @@ public class ServerInstallUtil {
connection = getDatabaseConnection(dbUrl, userName, password);
connection.setAutoCommit(false);
- updateClusterSetting = connection.prepareStatement("UPDATE rhq_system_config "
- + "SET property_value = ?, default_property_value = ? "
- + "WHERE property_key = ? AND property_value IS NULL AND default_property_value IS NULL");
+ updateClusterSetting = connection.prepareStatement("" //
+ + "UPDATE rhq_system_config " //
+ + " SET property_value = ?, default_property_value = ? " //
+ + " WHERE property_key = ? " //
+ + " AND ( property_value IS NULL OR property_value = '' OR property_value = 'UNSET' ) ");
updateClusterSetting.setString(1, serverProperties.get(ServerProperties.PROP_STORAGE_USERNAME));
updateClusterSetting.setString(2, serverProperties.get(ServerProperties.PROP_STORAGE_USERNAME));
commit 3bffda4fd4905f8a2a8566a115d3a33772ba3645
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Sep 26 11:26:34 2013 -0400
Don't consider a blank string a valid storage username or password
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
index 59c9360..408442a 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
@@ -43,12 +43,14 @@ import org.rhq.common.jbossas.client.controller.WebJBossASClient;
import org.rhq.core.db.DatabaseTypeFactory;
import org.rhq.core.domain.cloud.StorageNode;
import org.rhq.core.util.PropertiesFileUpdate;
+import org.rhq.core.util.StringUtil;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.core.util.obfuscation.Obfuscator;
import org.rhq.core.util.obfuscation.PicketBoxObfuscator;
import org.rhq.enterprise.server.installer.ServerInstallUtil.ExistingSchemaOption;
import org.rhq.enterprise.server.installer.ServerInstallUtil.SupportedDatabaseType;
+
/**
* @author John Mazzitelli
*/
@@ -512,10 +514,10 @@ public class InstallerServiceImpl implements InstallerService {
clearTextDbPassword);
String storageUsernameSetting = storageProperties.get(ServerProperties.PROP_STORAGE_USERNAME);
String storagePasswordSetting = storageProperties.get(ServerProperties.PROP_STORAGE_PASSWORD);
- if (null != storageUsernameSetting) {
+ if (StringUtil.isNotBlank(storageUsernameSetting)) {
serverProperties.put(ServerProperties.PROP_STORAGE_USERNAME, storageUsernameSetting);
}
- if (null != storagePasswordSetting) {
+ if (StringUtil.isNotBlank(storagePasswordSetting)) {
serverProperties.put(ServerProperties.PROP_STORAGE_PASSWORD, storagePasswordSetting);
}
10 years, 8 months
- 1
- 0
[rhq] modules/core
by Thomas Segismont
modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 2ec569c22ac62a0624ed1044db2c6a0e33107cc2
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Thu Sep 26 18:51:11 2013 +0200
Fix ResourceContainerTest intermittent failure
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java
index d02447e..c7c2b77 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/inventory/ResourceContainerTest.java
@@ -19,7 +19,7 @@
package org.rhq.core.pc.inventory;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
@@ -147,7 +147,7 @@ public class ResourceContainerTest {
public void testUninterruptedComponentInvocationContext() throws Exception {
ResourceContainer resourceContainer = getResourceContainer();
OperationFacet proxy = resourceContainer.createResourceComponentProxy(OperationFacet.class,
- FacetLockType.WRITE, 150, true, false, true);
+ FacetLockType.WRITE, SECONDS.toMillis(2), true, false, true);
try {
OperationResult op = proxy.invokeOperation("op", new Configuration());
assertTrue(op.getSimpleResult().equals(MockResourceComponent.OPERATION_RESULT));
@@ -218,8 +218,8 @@ public class ResourceContainerTest {
public OperationResult invokeOperation(String name, Configuration parameters) throws Exception {
long start = System.nanoTime();
while (!resourceContext.getComponentInvocationContext().isInterrupted()) {
- if ((System.nanoTime() - start) > MILLISECONDS.toNanos(100)) {
- // Return after 100ms
+ // Return after 1s
+ if ((System.nanoTime() - start) > SECONDS.toNanos(1)) {
caughtInterruptedComponentInvocation = false;
return new OperationResult(OPERATION_RESULT);
}
10 years, 8 months
- 1
- 0
[rhq] modules/core modules/enterprise
by Thomas Segismont
modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java | 31 +-
modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java | 31 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 108 ++++------
3 files changed, 82 insertions(+), 88 deletions(-)
New commits:
commit 8cfdad217914a513f98f2a474e367b1374eb23ea
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Thu Sep 26 18:37:49 2013 +0200
Bug 1010330 - JBossAS7 server resource is not available after upgrade to jon3.2.er1
The bug was introduced with the implementation of BZ974876 "[RFE] ResourceUpgradeFacet should support upgrade of plugin config properties"
In DiscoveryBossBean, upgrade responses were filled with current resource plugin configuration if the upgrade request had nothing to update in it. But plugin config was loaded lazily and when going through the server services marshalling layer, it was turned into null. As a consequence, the server still had the right configuration, but the agent data was wrong.
diff --git a/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java b/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java
index a16ceb8..1f56095 100644
--- a/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java
+++ b/modules/core/arquillian-integration/container/src/main/java/org/rhq/test/arquillian/FakeServerInventory.java
@@ -1,24 +1,20 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2013 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.
+ * 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 and the GNU Lesser General Public License
- * for more details.
+ * GNU 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.
+ * 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.test.arquillian;
@@ -330,19 +326,28 @@ public class FakeServerInventory {
}
}, ID_COMPARATOR);
if (resource != null) {
+
+ ResourceUpgradeResponse resp = new ResourceUpgradeResponse();
+ resp.setResourceId(resource.getId());
+
if (request.getNewDescription() != null) {
resource.setDescription(request.getNewDescription());
+ resp.setUpgradedResourceDescription(resource.getDescription());
}
+
if (request.getNewName() != null) {
resource.setName(request.getNewName());
+ resp.setUpgradedResourceName(resource.getName());
}
if (request.getNewResourceKey() != null) {
resource.setResourceKey(request.getNewResourceKey());
+ resp.setUpgradedResourceKey(resource.getResourceKey());
}
if (request.getNewPluginConfiguration() != null) {
resource.setPluginConfiguration(request.getNewPluginConfiguration());
+ resp.setUpgradedResourcePluginConfiguration(resource.getPluginConfiguration());
}
if (request.getUpgradeErrorMessage() != null) {
@@ -352,12 +357,6 @@ public class FakeServerInventory {
resource.getResourceErrors().add(error);
}
- ResourceUpgradeResponse resp = new ResourceUpgradeResponse();
- resp.setResourceId(resource.getId());
- resp.setUpgradedResourceName(resource.getName());
- resp.setUpgradedResourceKey(resource.getResourceKey());
- resp.setUpgradedResourceDescription(resource.getDescription());
- resp.setUpgradedResourcePluginConfiguration(resource.getPluginConfiguration());
responses.add(resp);
}
}
diff --git a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java
index 28f2d83..3f2bbb9 100644
--- a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java
+++ b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/upgrade/FakeServerInventory.java
@@ -1,24 +1,20 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
+ * Copyright (C) 2005-2013 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.
+ * 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 and the GNU Lesser General Public License
- * for more details.
+ * GNU 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.
+ * 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.core.pc.upgrade;
@@ -186,19 +182,28 @@ public class FakeServerInventory {
}
}, ID_COMPARATOR);
if (resource != null) {
+
+ ResourceUpgradeResponse resp = new ResourceUpgradeResponse();
+ resp.setResourceId(resource.getId());
+
if (request.getNewDescription() != null) {
resource.setDescription(request.getNewDescription());
+ resp.setUpgradedResourceDescription(resource.getDescription());
}
+
if (request.getNewName() != null) {
resource.setName(request.getNewName());
+ resp.setUpgradedResourceName(resource.getName());
}
if (request.getNewResourceKey() != null) {
resource.setResourceKey(request.getNewResourceKey());
+ resp.setUpgradedResourceKey(resource.getResourceKey());
}
if (request.getNewPluginConfiguration() != null) {
resource.setPluginConfiguration(request.getNewPluginConfiguration());
+ resp.setUpgradedResourcePluginConfiguration(resource.getPluginConfiguration());
}
if (request.getUpgradeErrorMessage() != null) {
@@ -208,12 +213,6 @@ public class FakeServerInventory {
resource.getResourceErrors().add(error);
}
- ResourceUpgradeResponse resp = new ResourceUpgradeResponse();
- resp.setResourceId(resource.getId());
- resp.setUpgradedResourceName(resource.getName());
- resp.setUpgradedResourceKey(resource.getResourceKey());
- resp.setUpgradedResourceDescription(resource.getDescription());
- resp.setUpgradedResourcePluginConfiguration(resource.getPluginConfiguration());
responses.add(resp);
}
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
index 899dbe9..09b6271 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java
@@ -114,6 +114,7 @@ import org.rhq.enterprise.server.util.LookupUtil;
*/
@Stateless
public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemote {
+ private static final Log LOG = LogFactory.getLog(DiscoveryBossBean.class.getName());
static private final int MERGE_BATCH_SIZE;
@@ -128,8 +129,6 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
MERGE_BATCH_SIZE = mergeBatchSize;
}
- private final Log log = LogFactory.getLog(DiscoveryBossBean.class.getName());
-
@PersistenceContext(unitName = RHQConstants.PERSISTENCE_UNIT_NAME)
private EntityManager entityManager;
@@ -173,11 +172,11 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
Set<ResourceType> deletedTypes = filter.apply(report);
if (!deletedTypes.isEmpty()) {
- if (log.isDebugEnabled()) {
- log.debug("The inventory report from " + report.getAgent() + " with added roots "
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("The inventory report from " + report.getAgent() + " with added roots "
+ report.getAddedRoots() + " contains these deleted resource types " + deletedTypes);
} else {
- log.info("The inventory report from " + report.getAgent() + " contains these deleted resource types "
+ LOG.info("The inventory report from " + report.getAgent() + " contains these deleted resource types "
+ deletedTypes);
}
throw new StaleTypeException("The report contains one or more resource types that have been marked for "
@@ -195,13 +194,13 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
+ agent.getName() + "] was recently removed from the inventory. In any other case this is a bug.");
}
- if (log.isDebugEnabled()) {
- log.debug("Received inventory report from RHQ Agent [" + knownAgent + "]. Number of added roots: "
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Received inventory report from RHQ Agent [" + knownAgent + "]. Number of added roots: "
+ report.getAddedRoots().size());
}
Set<Resource> roots = report.getAddedRoots();
- log.debug(report);
+ LOG.debug(report);
final Map<String, ResourceType> allTypes = new HashMap<String, ResourceType>();
@@ -220,8 +219,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
mergeResource(root, knownAgent);
- if (log.isDebugEnabled()) {
- log.debug("Root merged: resource/millis=" + root.getName() + '/'
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Root merged: resource/millis=" + root.getName() + '/'
+ (System.currentTimeMillis() - rootStart));
}
}
@@ -251,8 +250,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
results = null;
}
- if (log.isDebugEnabled()) {
- log.debug("Inventory merge completed in (" + (System.currentTimeMillis() - start) + ")ms");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Inventory merge completed in (" + (System.currentTimeMillis() - start) + ")ms");
}
return results;
@@ -351,8 +350,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
scheduleAgentInventoryOperationJob(platforms, servers);
- if (log.isDebugEnabled()) {
- log.debug("Inventory status set to [" + status + "] for [" + platforms.size() + "] platforms and ["
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Inventory status set to [" + status + "] for [" + platforms.size() + "] platforms and ["
+ servers.size() + "] servers in [" + (System.currentTimeMillis() - start) + "]ms");
}
}
@@ -365,7 +364,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
isScheduled = true;
}
} catch (SchedulerException se) {
- log.error("Error getting job detail", se);
+ LOG.error("Error getting job detail", se);
}
return isScheduled;
}
@@ -402,7 +401,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
scheduler.scheduleJob(jobDetail, trigger);
}
} catch (SchedulerException e) {
- log.error("Failed to schedule agent inventory update operation.", e);
+ LOG.error("Failed to schedule agent inventory update operation.", e);
updateAgentInventoryStatus(platforms, servers);
}
}
@@ -426,7 +425,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
syncInfo = entityManager.find(ResourceSyncInfo.class, platform.getId());
agentClient.getDiscoveryAgentService().synchronizeInventory(syncInfo);
} catch (Exception e) {
- log.warn("Could not perform commit synchronization with agent for platform [" + platform.getName()
+ LOG.warn("Could not perform commit synchronization with agent for platform [" + platform.getName()
+ "]", e);
}
}
@@ -438,7 +437,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
syncInfo = entityManager.find(ResourceSyncInfo.class, server.getId());
agentClient.getDiscoveryAgentService().synchronizeInventory(syncInfo);
} catch (Exception e) {
- log.warn("Could not perform commit synchronization with agent for server [" + server.getName()
+ LOG.warn("Could not perform commit synchronization with agent for server [" + server.getName()
+ "]", e);
}
}
@@ -605,7 +604,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
result.add(upgradedData);
}
} catch (Exception e) {
- log.error("Failed to process upgrade request for resource " + existingResource + ".", e);
+ LOG.error("Failed to process upgrade request for resource " + existingResource + ".", e);
}
}
}
@@ -643,7 +642,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
versionChanged = !oldVersion.equals(newVersion);
if (versionChanged) {
- log.info("Resource [" + resource + "] changed its version from [" + oldVersion + "] to [" + newVersion
+ LOG.info("Resource [" + resource + "] changed its version from [" + oldVersion + "] to [" + newVersion
+ "]");
resource.setVersion(newVersion);
@@ -688,20 +687,20 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
if (needsUpgrade(resource.getResourceKey(), resourceKey)) {
resource.setResourceKey(resourceKey);
logMessage.append("resourceKey, ");
+ ret.setUpgradedResourceKey(resource.getResourceKey());
}
- ret.setUpgradedResourceKey(resource.getResourceKey());
if (allowGenericPropertiesUpgrade && needsUpgrade(resource.getName(), name)) {
resource.setName(name);
logMessage.append("name, ");
+ ret.setUpgradedResourceName(resource.getName());
}
- ret.setUpgradedResourceName(resource.getName());
if (allowGenericPropertiesUpgrade && needsUpgrade(resource.getDescription(), description)) {
resource.setDescription(description);
logMessage.append("description, ");
+ ret.setUpgradedResourceDescription(resource.getDescription());
}
- ret.setUpgradedResourceDescription(resource.getDescription());
// If provided, assume the new plugin config should replace the old plugin config in its entirety.
// Use a deep copy without ids as the updgardeRequest config may contain entity config props.
@@ -714,9 +713,6 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
PluginConfigurationUpdate update = configurationManager.upgradePluginConfiguration(
subjectManager.getOverlord(), resource.getId(), pluginConfig);
ret.setUpgradedResourcePluginConfiguration(update.getResource().getPluginConfiguration());
-
- } else {
- ret.setUpgradedResourcePluginConfiguration(resource.getPluginConfiguration());
}
// finally let's remove the potential previous upgrade error. we've now successfully
@@ -730,7 +726,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
logMessage.replace(logMessage.length() - 1, logMessage.length(), "to become [").append(resource.toString())
.append("]");
- log.info(logMessage.toString());
+ LOG.info(logMessage.toString());
}
return ret;
@@ -787,8 +783,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
long start = System.currentTimeMillis();
- if (log.isDebugEnabled()) {
- log.debug("Merging [" + resource + "]...");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Merging [" + resource + "]...");
}
// We don't merge the entire resource tree. Instead we batch them in order to reduce transaction overhead
@@ -797,8 +793,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
// NOTE: this will also strip out all resources that are to be ignored; thus, ignored resources won't get merged
List<Resource> resourceList = treeToBreadthFirstList(resource);
- if (log.isDebugEnabled()) {
- log.debug("Preparing to merge [" + resourceList.size() + "] Resources with a batch size of ["
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Preparing to merge [" + resourceList.size() + "] Resources with a batch size of ["
+ MERGE_BATCH_SIZE + "]");
}
@@ -813,8 +809,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
resourceBatch.clear();
}
- if (log.isDebugEnabled()) {
- log.debug("Resource and children merged: resource/millis=" + resource.getName() + '/'
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Resource and children merged: resource/millis=" + resource.getName() + '/'
+ (System.currentTimeMillis() - start));
}
@@ -854,7 +850,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
throws InvalidInventoryReportException {
long batchStart = System.currentTimeMillis();
- boolean isDebugEnabled = log.isDebugEnabled();
+ boolean isDebugEnabled = LOG.isDebugEnabled();
// Cache parent resources we've already fetched from the DB, many resources will have the same parent
Map<Integer, Resource> parentMap = new HashMap<Integer, Resource>();
@@ -874,7 +870,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
}
if (isDebugEnabled) {
- log.debug("Single Resource merged: resource/millis=" + resource.getName() + '/'
+ LOG.debug("Single Resource merged: resource/millis=" + resource.getName() + '/'
+ (System.currentTimeMillis() - start));
}
}
@@ -884,7 +880,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
if (isDebugEnabled) {
long delta = (System.currentTimeMillis() - batchStart);
- log.debug("Resource Batch merged: size/average/millis=" + resourceBatch.size() + "/" + delta
+ LOG.debug("Resource Batch merged: size/average/millis=" + resourceBatch.size() + "/" + delta
/ resourceBatch.size() + "/" + delta);
}
}
@@ -917,31 +913,31 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
*/
private Resource findExistingResource(Resource resource, Map<Integer, Resource> parentMap) {
- boolean isDebugEnabled = log.isDebugEnabled();
+ boolean isDebugEnabled = LOG.isDebugEnabled();
if (isDebugEnabled) {
- log.debug("getExistingResource processing for [" + resource + "]");
+ LOG.debug("getExistingResource processing for [" + resource + "]");
}
Resource existingResource = null;
if (resource.getId() != 0) {
if (isDebugEnabled) {
- log.debug("Agent claims resource is already in inventory. Id=" + resource.getId());
+ LOG.debug("Agent claims resource is already in inventory. Id=" + resource.getId());
}
// This maybe could be more efficient using a named query that pulls some lazy data, but this should be fine
existingResource = entityManager.find(Resource.class, resource.getId());
if (isDebugEnabled) {
if (null != existingResource) {
- log.debug("Found resource already in inventory. Id=" + resource.getId());
+ LOG.debug("Found resource already in inventory. Id=" + resource.getId());
} else {
// agent lied - agent's copy of JON server inventory must be stale.
- log.debug("However, no resource exists with the specified id. Id=" + resource.getId());
+ LOG.debug("However, no resource exists with the specified id. Id=" + resource.getId());
}
}
} else {
- log.debug("Agent reported resource with id of 0");
+ LOG.debug("Agent reported resource with id of 0");
}
// If necessary double-check for an existing resource using the business key.
@@ -949,7 +945,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
// or if the agent didn't know about it to begin with (id was 0).
if (existingResource == null) {
if (isDebugEnabled) {
- log.debug("Checking if a resource exists with the specified business key. Id=" + resource.getId()
+ LOG.debug("Checking if a resource exists with the specified business key. Id=" + resource.getId()
+ ", key=" + resource.getResourceKey());
}
@@ -969,7 +965,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
int parentId = parent.getId();
if (parentId <= 0) {
- log.warn("Expected potential parent resource to have a valid ID. Parent=" + parent + ", Child="
+ LOG.warn("Expected potential parent resource to have a valid ID. Parent=" + parent + ", Child="
+ resource);
}
@@ -1010,20 +1006,20 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
// We found it - reset the id to what it should be.
resource.setId(existingResource.getId());
if (isDebugEnabled) {
- log.debug("Found resource already in inventory with specified business key, Id=" + resource.getId());
+ LOG.debug("Found resource already in inventory with specified business key, Id=" + resource.getId());
}
} else {
- log.debug("Unable to find the agent-reported resource by id or business key.");
+ LOG.debug("Unable to find the agent-reported resource by id or business key.");
if (resource.getId() != 0) {
// existingResource is still null at this point, the resource does not exist in inventory.
- log.error("Resetting the resource's id to zero. Previous Id=" + resource.getId());
+ LOG.error("Resetting the resource's id to zero. Previous Id=" + resource.getId());
resource.setId(0);
// TODO: Is there anything else we should do here to inform the agent it has an out-of-sync resource?
} else {
- log.debug("Resource's id was already zero, nothing to do for the merge.");
+ LOG.debug("Resource's id was already zero, nothing to do for the merge.");
}
}
}
@@ -1083,8 +1079,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
}
} else {
- if (log.isDebugEnabled()) {
- log.debug("Existing Resource " + existingResource + " has invalid parent type ("
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Existing Resource " + existingResource + " has invalid parent type ("
+ existingResourceParentType + ") and so does plugin-reported Resource " + updatedResource
+ " (" + updatedResourceParentType + ") - valid parent types are [" + validParentTypes + "].");
}
@@ -1093,8 +1089,8 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
// The below block is for Resources that were created via the RHQ GUI, whose descriptions will be null.
if (existingResource.getDescription() == null && updatedResource.getDescription() != null) {
- if (log.isDebugEnabled()) {
- log.debug("Setting description of existing resource with id " + existingResource.getId() + " to '"
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Setting description of existing resource with id " + existingResource.getId() + " to '"
+ updatedResource.getDescription() + "' (as reported by agent)...");
}
existingResource.setDescription(updatedResource.getDescription());
@@ -1104,7 +1100,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
if ((existingResource.getResourceKey() != null)
&& !existingResource.getResourceKey().equals(updatedResource.getResourceKey())) {
- log.warn("Agent reported that key for " + existingResource + " has changed from '"
+ LOG.warn("Agent reported that key for " + existingResource + " has changed from '"
+ existingResource.getResourceKey() + "' to '" + updatedResource.getResourceKey() + "'.");
}
@@ -1152,7 +1148,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
}
if (null == resourceType) {
- log.error("Reported resource [" + resource + "] has an unknown type [" + resource.getResourceType()
+ LOG.error("Reported resource [" + resource + "] has an unknown type [" + resource.getResourceType()
+ "]. The Agent most likely has a plugin named '" + plugin
+ "' installed that is not installed on the Server. Resource will be ignored...");
return false;
@@ -1292,7 +1288,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
try {
this.availabilityManager.setResourceAvailabilities(resourceIds, AvailabilityType.UNKNOWN);
} catch (Exception e) {
- log.error("Failed to reset availabilities for resources being ignored: " + ThrowableUtil.getAllMessages(e));
+ LOG.error("Failed to reset availabilities for resources being ignored: " + ThrowableUtil.getAllMessages(e));
}
return;
@@ -1367,7 +1363,7 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
ResourceCategory category = resource.getResourceType().getCategory();
if (category == ResourceCategory.PLATFORM) {
if (target == InventoryStatus.IGNORED && (resource.getInventoryStatus() == InventoryStatus.COMMITTED)) {
- log.warn("Cannot ignore a committed platform - skipping request to ignore:" + resource);
+ LOG.warn("Cannot ignore a committed platform - skipping request to ignore:" + resource);
} else {
platforms.add(resource);
}
10 years, 8 months
- 1
- 0
[rhq] 2 commits - modules/core modules/enterprise
by Jay Shaughnessy
modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml | 4 +-
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 8 ++--
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 19 +++++-----
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 9 ++--
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java | 8 ++--
5 files changed, 27 insertions(+), 21 deletions(-)
New commits:
commit cbd5dfa575bd337a9fb6007707a49f1b63a6da35
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Sep 26 12:35:58 2013 -0400
improve comments in generated rhq-server.properties
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 41e8931..57d2012 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
@@ -793,20 +793,23 @@ rhq.sync.endpoint-address=false
# not be edited.
rhq.server.management.password=
-#############################################
-# Cassandra cluster configuration settings
-#############################################
-# The username RHQ will use to authenticate against Cassandra.
+# The username RHQ will use to authenticate against the Storage Cluster.
+# The value is generated and should not be edited.
rhq.storage.username=${rhq.storage.username}
-# The password RHQ will use to authenticate against Cassandra.
+# The password RHQ will use to authenticate against the Storage Cluster.
+# The value is generated and obfuscated and should not be edited.
rhq.storage.password=${rhq.storage.password}
-# A comma-delimited list of storage nodes. Each Cassandra node uses this list as
+#############################################
+# Storage cluster configuration settings
+#############################################
+
+# A comma-delimited list of storage nodes. Each Storage node uses this list as
# contact points to find other nodes in the cluster and learn the ring
# topology. The RHQ server(s) use this list to connect to the cluster;
-# therefore, this property MUST BE SET in order for RHQ to talk to Cassandra.
-# The of an entry is as follows,
+# therefore, this property MUST BE SET in order for RHQ to talk to the Storage.
+# Cluster. The of an entry is as follows:
#
# hostname1,hostname2
#
commit 09c7e488dcc099d890482de94e6a6098018a7e4b
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Sep 26 12:35:08 2013 -0400
Bug 1010841 - Installation of RHQ server fails - de-obfuscating db password failed
Fix in a way that won't suffer from ambiguity or db vendor incompatibilities.
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
index ebf7189..7213fc3 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/sysconfig-data.xml
@@ -148,9 +148,9 @@
<data ID="62" PROPERTY_KEY="STORAGE_GOSSIP_PORT" FREAD_ONLY="TRUE"/>
- <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/>
+ <data ID="63" PROPERTY_KEY="STORAGE_USERNAME" PROPERTY_VALUE="UNSET" DEFAULT_PROPERTY_VALUE="UNSET" FREAD_ONLY="TRUE"/>
- <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="" DEFAULT_PROPERTY_VALUE="" FREAD_ONLY="TRUE"/>
+ <data ID="64" PROPERTY_KEY="STORAGE_PASSWORD" PROPERTY_VALUE="UNSET" DEFAULT_PROPERTY_VALUE="UNSET" FREAD_ONLY="TRUE"/>
</table>
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 94688f6..713aefe 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -2263,22 +2263,22 @@
<schema-directSQL>
<statement targetDBVendor="postgresql" desc="Adding storage username">
INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only)
- VALUES (63, 'STORAGE_USERNAME', null, null, true)
+ VALUES (63, 'STORAGE_USERNAME', 'UNSET', 'UNSET', true)
</statement>
<statement targetDBVendor="oracle" desc="Adding storage username">
INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only)
- VALUES (63, 'STORAGE_USERNAME', null, null, 1)
+ VALUES (63, 'STORAGE_USERNAME', 'UNSET', 'UNSET', 1)
</statement>
</schema-directSQL>
<schema-directSQL>
<statement targetDBVendor="postgresql" desc="Adding storage password">
INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only)
- VALUES (64, 'STORAGE_PASSWORD', null, null, true)
+ VALUES (64, 'STORAGE_PASSWORD', 'UNSET', 'UNSET', true)
</statement>
<statement targetDBVendor="oracle" desc="Adding default storage password">
INSERT INTO rhq_system_config (id, property_key, property_value, default_property_value, fread_only)
- VALUES (64, 'STORAGE_PASSWORD', null, null, 1)
+ VALUES (64, 'STORAGE_PASSWORD', 'UNSET', 'UNSET', 1)
</statement>
</schema-directSQL>
</schemaSpec>
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
index 408442a..e10c993 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
@@ -50,7 +50,6 @@ import org.rhq.core.util.obfuscation.PicketBoxObfuscator;
import org.rhq.enterprise.server.installer.ServerInstallUtil.ExistingSchemaOption;
import org.rhq.enterprise.server.installer.ServerInstallUtil.SupportedDatabaseType;
-
/**
* @author John Mazzitelli
*/
@@ -61,6 +60,8 @@ public class InstallerServiceImpl implements InstallerService {
private static final String EAR_NAME = "rhq.ear";
private static final String SYSPROP_PROPFILE = "rhq.server.properties-file";
+ private static final String UNSET = "UNSET";
+
private final Log log = LogFactory.getLog(InstallerServiceImpl.class);
private final InstallerConfiguration installerConfiguration;
@@ -508,16 +509,16 @@ public class InstallerServiceImpl implements InstallerService {
throw new Exception("Could not complete the database schema installation", e);
}
- // if the storage cluster credentials are already set (typically an HA install), override
+ // if the storage cluster credentials are already set in the DB (typically an HA install), override
// what's currently in the server properties file, and then continue with storage schema setup
Map<String, String> storageProperties = ServerInstallUtil.fetchStorageClusterSettings(serverProperties,
clearTextDbPassword);
String storageUsernameSetting = storageProperties.get(ServerProperties.PROP_STORAGE_USERNAME);
String storagePasswordSetting = storageProperties.get(ServerProperties.PROP_STORAGE_PASSWORD);
- if (StringUtil.isNotBlank(storageUsernameSetting)) {
+ if (!(StringUtil.isBlank(storageUsernameSetting) || storageUsernameSetting.equals(UNSET))) {
serverProperties.put(ServerProperties.PROP_STORAGE_USERNAME, storageUsernameSetting);
}
- if (StringUtil.isNotBlank(storagePasswordSetting)) {
+ if (!(StringUtil.isBlank(storagePasswordSetting) || storagePasswordSetting.equals(UNSET))) {
serverProperties.put(ServerProperties.PROP_STORAGE_PASSWORD, storagePasswordSetting);
}
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
index c01ef5c..c5b66d7 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
@@ -1054,9 +1054,11 @@ public class ServerInstallUtil {
connection = getDatabaseConnection(dbUrl, userName, password);
connection.setAutoCommit(false);
- updateClusterSetting = connection.prepareStatement("UPDATE rhq_system_config "
- + "SET property_value = ?, default_property_value = ? "
- + "WHERE property_key = ? AND property_value IS NULL AND default_property_value IS NULL");
+ updateClusterSetting = connection.prepareStatement("" //
+ + "UPDATE rhq_system_config " //
+ + " SET property_value = ?, default_property_value = ? " //
+ + " WHERE property_key = ? " //
+ + " AND ( property_value IS NULL OR property_value = '' OR property_value = 'UNSET' ) ");
updateClusterSetting.setString(1, serverProperties.get(ServerProperties.PROP_STORAGE_USERNAME));
updateClusterSetting.setString(2, serverProperties.get(ServerProperties.PROP_STORAGE_USERNAME));
10 years, 8 months
- 1
- 0
[rhq] modules/enterprise
by Jay Shaughnessy
modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit b19ccea4c8917e9481326a376555c413a151fe95
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Sep 26 11:26:34 2013 -0400
Don't consider a blank string a valid storage username or password
diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
index 59c9360..408442a 100644
--- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
+++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
@@ -43,12 +43,14 @@ import org.rhq.common.jbossas.client.controller.WebJBossASClient;
import org.rhq.core.db.DatabaseTypeFactory;
import org.rhq.core.domain.cloud.StorageNode;
import org.rhq.core.util.PropertiesFileUpdate;
+import org.rhq.core.util.StringUtil;
import org.rhq.core.util.exception.ThrowableUtil;
import org.rhq.core.util.obfuscation.Obfuscator;
import org.rhq.core.util.obfuscation.PicketBoxObfuscator;
import org.rhq.enterprise.server.installer.ServerInstallUtil.ExistingSchemaOption;
import org.rhq.enterprise.server.installer.ServerInstallUtil.SupportedDatabaseType;
+
/**
* @author John Mazzitelli
*/
@@ -512,10 +514,10 @@ public class InstallerServiceImpl implements InstallerService {
clearTextDbPassword);
String storageUsernameSetting = storageProperties.get(ServerProperties.PROP_STORAGE_USERNAME);
String storagePasswordSetting = storageProperties.get(ServerProperties.PROP_STORAGE_PASSWORD);
- if (null != storageUsernameSetting) {
+ if (StringUtil.isNotBlank(storageUsernameSetting)) {
serverProperties.put(ServerProperties.PROP_STORAGE_USERNAME, storageUsernameSetting);
}
- if (null != storagePasswordSetting) {
+ if (StringUtil.isNotBlank(storagePasswordSetting)) {
serverProperties.put(ServerProperties.PROP_STORAGE_PASSWORD, storagePasswordSetting);
}
10 years, 8 months
- 1
- 0