[rhq] 5 commits - modules/core modules/enterprise
by Greg Hinkle
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceConfigurationUpdateCriteria.java | 162 ++++++++++
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java | 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java | 68 ++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java | 138 +++++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java | 18 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java | 56 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java | 154 +++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java | 61 +++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java | 21 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java | 25 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 27 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java | 5
16 files changed, 664 insertions(+), 111 deletions(-)
New commits:
commit 257c7680ec31b84d8a1a332cf728480f4a718c16
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu Jul 29 17:48:27 2010 -0400
Global operation history view for reports section
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java
index de4bd1e..c353fdb 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryDataSource.java
@@ -20,14 +20,6 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operatio
import java.util.Date;
-import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria;
-import org.rhq.core.domain.operation.ResourceOperationHistory;
-import org.rhq.core.domain.util.PageList;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
-import org.rhq.enterprise.gui.coregui.client.gwt.OperationGWTServiceAsync;
-import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -36,6 +28,14 @@ import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.types.FieldType;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria;
+import org.rhq.core.domain.operation.ResourceOperationHistory;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.OperationGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+
/**
* @author Greg Hinkle
*/
@@ -107,7 +107,7 @@ public class OperationHistoryDataSource extends RPCDataSource<ResourceOperationH
record.setAttribute("operationDefinition", from.getOperationDefinition());
record.setAttribute("operationName", from.getOperationDefinition().getDisplayName());
record.setAttribute("errorMessage", from.getErrorMessage());
- record.setAttribute("status", from.getStatus().getDisplayName());
+ record.setAttribute("status", from.getStatus().name());
record.setAttribute("parameters", from.getParameters());
record.setAttribute("entity",from);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java
index ad2d156..b537f5d 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java
@@ -20,8 +20,23 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operatio
import java.util.EnumSet;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+import com.smartgwt.client.widgets.grid.events.RecordDoubleClickEvent;
+import com.smartgwt.client.widgets.grid.events.RecordDoubleClickHandler;
+import com.smartgwt.client.widgets.layout.VLayout;
+import com.smartgwt.client.widgets.menu.IMenuButton;
+import com.smartgwt.client.widgets.menu.Menu;
+import com.smartgwt.client.widgets.menu.MenuItem;
+import com.smartgwt.client.widgets.menu.events.ClickHandler;
+import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
+
import org.rhq.core.domain.criteria.ResourceOperationHistoryCriteria;
import org.rhq.core.domain.operation.OperationDefinition;
+import org.rhq.core.domain.operation.OperationRequestStatus;
import org.rhq.core.domain.operation.ResourceOperationHistory;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
@@ -34,22 +49,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.detail.OperationDetailsView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.data.Criteria;
-import com.smartgwt.client.widgets.events.DoubleClickEvent;
-import com.smartgwt.client.widgets.events.DoubleClickHandler;
-import com.smartgwt.client.widgets.grid.CellFormatter;
-import com.smartgwt.client.widgets.grid.ListGridRecord;
-import com.smartgwt.client.widgets.grid.events.RecordDoubleClickEvent;
-import com.smartgwt.client.widgets.grid.events.RecordDoubleClickHandler;
-import com.smartgwt.client.widgets.layout.VLayout;
-import com.smartgwt.client.widgets.menu.IMenuButton;
-import com.smartgwt.client.widgets.menu.Menu;
-import com.smartgwt.client.widgets.menu.MenuButton;
-import com.smartgwt.client.widgets.menu.MenuItem;
-import com.smartgwt.client.widgets.menu.events.ClickHandler;
-import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent;
-
/**
* @author Greg Hinkle
*/
@@ -91,6 +90,31 @@ public class OperationHistoryView extends VLayout {
table.getListGrid().getField("id").setWidth(40);
table.getListGrid().getField("operationName").setWidth("*");
table.getListGrid().getField("status").setWidth(100);
+ table.getListGrid().getField("status").setCellFormatter(new CellFormatter() {
+ public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
+ OperationRequestStatus status = OperationRequestStatus.valueOf((String) o);
+ String icon = "";
+ switch (status) {
+ case INPROGRESS:
+ break;
+ case SUCCESS:
+ icon = "_ok";
+ break;
+ case FAILURE:
+ icon = "_failed";
+ break;
+ case CANCELED:
+ icon = "_cancel";
+ break;
+ }
+
+
+ return Canvas.imgHTML("subsystems/control/Operation" + icon + "_16.png", 16, 16) + status.getDisplayName();
+ }
+ });
+
+
+
table.getListGrid().getField("startedTime").setWidth(120);
if (this.resource == null) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
index a842474..4c25c61 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
@@ -47,9 +47,10 @@ import org.rhq.enterprise.gui.coregui.client.admin.users.UsersView;
import org.rhq.enterprise.gui.coregui.client.alert.AlertsView;
import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane;
import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.platform.PlatformPortletView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ConfigurationHistoryView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.OperationHistoryView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.discovery.ResourceAutodiscoveryView;
-import org.rhq.enterprise.gui.coregui.client.report.tag.TagCloudView;
+import org.rhq.enterprise.gui.coregui.client.report.measurement.MeasurementOOBView;
import org.rhq.enterprise.gui.coregui.client.report.tag.TaggedView;
/**
@@ -261,9 +262,9 @@ public class ReportTopView extends HLayout implements BookmarkableView {
if ("Tag Cloud".equals(page)) {
content = new TaggedView();
} else if ("Suspect Metrics".equals(page)) {
-// todo
+ content = new MeasurementOOBView();
} else if ("Recent Configuration Changes".equals(page)) {
- // todo
+ content = new ConfigurationHistoryView();
} else if ("Recent Operations".equals(page)) {
content = new OperationHistoryView();
} else if ("Recent Alerts".equals(page)) {
commit f60815062de16b61e874b8bac38c9c5d5a452550
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu Jul 29 17:47:43 2010 -0400
Global configuration history view and lookup via criteria
Configuration detail moved to a dialog
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java
index cbe4cc9..4010ae0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java
@@ -6,6 +6,8 @@ import org.rhq.core.domain.configuration.PluginConfigurationUpdate;
import org.rhq.core.domain.configuration.RawConfiguration;
import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria;
+import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.server.configuration.ConfigurationUpdateStillInProgressException;
@@ -23,12 +25,16 @@ public interface ConfigurationGWTService extends RemoteService {
ConfigurationDefinition getResourceConfigurationDefinition(int resourceTypeId);
- PageList<ResourceConfigurationUpdate> findResourceConfigurationUpdates(int resourceId);
+ PageList<ResourceConfigurationUpdate> findResourceConfigurationUpdates(
+ Integer resourceId, Long beginDate, Long endDate, boolean suppressOldest, PageControl pc);
+
ResourceConfigurationUpdate updateResourceConfiguration(int resourceId, Configuration configuration);
PluginConfigurationUpdate updatePluginConfiguration(int resourceId, Configuration configuration);
+ PageList<ResourceConfigurationUpdate> findResourceConfigurationUpdatesByCriteria(ResourceConfigurationUpdateCriteria criteria);
+
RawConfiguration dummy(RawConfiguration config);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java
index c476bee..6f721b2 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java
@@ -19,6 +19,8 @@
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration;
import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
+import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria;
+import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync;
@@ -46,21 +48,21 @@ public class ConfigurationHistoryDataSource extends RPCDataSource<ResourceConfig
public ConfigurationHistoryDataSource() {
super();
- // id, resource, subject, configuration, createdTime, duration, errorMessage, modifiedTime, status
-
-
DataSourceIntegerField idField = new DataSourceIntegerField("id");
idField.setPrimaryKey(true);
addField(idField);
- DataSourceTextField submittedField = new DataSourceTextField("createdTime");
+ DataSourceTextField resourceField = new DataSourceTextField("resource", "Resource");
+ addField(resourceField);
+
+ DataSourceTextField submittedField = new DataSourceTextField("createdTime", "Created");
submittedField.setType(FieldType.DATETIME);
addField(submittedField);
- DataSourceTextField statusField = new DataSourceTextField("status");
+ DataSourceTextField statusField = new DataSourceTextField("status", "Status");
addField(statusField);
- DataSourceTextField subjectField = new DataSourceTextField("subject");
+ DataSourceTextField subjectField = new DataSourceTextField("subject", "Subject");
addField(subjectField);
@@ -69,46 +71,52 @@ public class ConfigurationHistoryDataSource extends RPCDataSource<ResourceConfig
@Override
protected void executeFetch(final DSRequest request, final DSResponse response) {
- int resourceId = (Integer) request.getCriteria().getValues().get("resourceId");
-
- configurationService.findResourceConfigurationUpdates(resourceId, new AsyncCallback<PageList<ResourceConfigurationUpdate>>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Unable to load configuration history",caught);
- response.setStatus(DSResponse.STATUS_FAILURE);
- processResponse(request.getRequestId(),response);
- }
-
- public void onSuccess(PageList<ResourceConfigurationUpdate> result) {
- response.setData(buildRecords(result));
- response.setTotalRows(result.getTotalSize());
- processResponse(request.getRequestId(), response);
- }
- });
+ ResourceConfigurationUpdateCriteria criteria = new ResourceConfigurationUpdateCriteria();
+ criteria.fetchConfiguration(true);
+ criteria.fetchResource(true);
+
+ criteria.setPageControl(getPageControl(request));
+
+ if (request.getCriteria().getValues().get("resourceId") != null) {
+ criteria.addFilterResourceIds((Integer)request.getCriteria().getValues().get("resourceId"));
+ }
+
+ configurationService.findResourceConfigurationUpdatesByCriteria(criteria,
+ new AsyncCallback<PageList<ResourceConfigurationUpdate>>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError("Unable to load configuration history", caught);
+ response.setStatus(DSResponse.STATUS_FAILURE);
+ processResponse(request.getRequestId(), response);
+ }
+
+ public void onSuccess(PageList<ResourceConfigurationUpdate> result) {
+ response.setData(buildRecords(result));
+ response.setTotalRows(result.getTotalSize());
+ processResponse(request.getRequestId(), response);
+ }
+ });
}
-
-
-
@Override
public ResourceConfigurationUpdate copyValues(ListGridRecord from) {
- return null; // TODO: Implement this method.
+ return null; // TODO: Implement this method.
}
@Override
public ListGridRecord copyValues(ResourceConfigurationUpdate from) {
ListGridRecord record = new ListGridRecord();
record.setAttribute("id", from.getId());
- record.setAttribute("resource",from.getResource());
- record.setAttribute("subject",from.getSubjectName());
+ record.setAttribute("resource", from.getResource());
+ record.setAttribute("subject", from.getSubjectName());
record.setAttribute("configuration", from.getConfiguration());
- record.setAttribute("createdTime",new Date(from.getCreatedTime()));
+ record.setAttribute("createdTime", new Date(from.getCreatedTime()));
record.setAttribute("duration", from.getDuration());
record.setAttribute("errorMessage", from.getErrorMessage());
record.setAttribute("modifiedTime", new Date(from.getModifiedTime()));
- record.setAttribute("status",from.getStatus().name());
+ record.setAttribute("status", from.getStatus().name());
- record.setAttribute("entity",from);
+ record.setAttribute("entity", from);
return record;
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java
index 6d64732..b033a40 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java
@@ -20,6 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configur
import java.util.EnumSet;
+import com.smartgwt.client.widgets.Window;
import com.smartgwt.client.widgets.layout.Layout;
import org.rhq.core.domain.configuration.Configuration;
@@ -61,4 +62,18 @@ public class ConfigurationHistoryDetailView extends Layout {
addMember(editor);
markForRedraw();
}
+
+ public void displayInDialog() {
+
+ Window window = new Window();
+ window.setTitle("Configuration Details");
+ window.setWidth(800);
+ window.setHeight(800);
+ window.setIsModal(true);
+ window.setShowModalMask(true);
+ window.setCanDragResize(true);
+ window.centerInPage();
+ window.addItem(this);
+ window.show();
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java
index d7ca524..721fd06 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java
@@ -24,15 +24,24 @@ import java.util.EnumSet;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.SelectionAppearance;
import com.smartgwt.client.types.SelectionStyle;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import com.smartgwt.client.widgets.grid.events.CellDoubleClickEvent;
+import com.smartgwt.client.widgets.grid.events.CellDoubleClickHandler;
import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler;
import com.smartgwt.client.widgets.grid.events.SelectionEvent;
import com.smartgwt.client.widgets.layout.VLayout;
+import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.core.domain.operation.OperationRequestStatus;
+import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationComparisonView;
import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.table.TableAction;
@@ -43,20 +52,22 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp
*/
public class ConfigurationHistoryView extends VLayout {
- private int resourceId;
+ private Integer resourceId;
- ConfigurationHistoryDetailView detailView;
- /**
- * Resource list filtered by a given criteria
- */
- public ConfigurationHistoryView(final int resourceId) {
- this.resourceId = resourceId;
-
+ public ConfigurationHistoryView() {
setWidth100();
setHeight100();
setAnimateMembers(true);
+
+ }
+
+
+ public ConfigurationHistoryView(final int resourceId) {
+ this();
+ this.resourceId = resourceId;
+
}
@@ -65,7 +76,9 @@ public class ConfigurationHistoryView extends VLayout {
super.onDraw();
Criteria criteria = new Criteria();
- criteria.addCriteria("resourceId", resourceId);
+ if (resourceId != null) {
+ criteria.addCriteria("resourceId", (int)resourceId);
+ }
final ConfigurationHistoryDataSource datasource = new ConfigurationHistoryDataSource();
@@ -75,15 +88,47 @@ public class ConfigurationHistoryView extends VLayout {
table.setDataSource(datasource);
table.getListGrid().setUseAllDataSourceFields(true);
- ListGridField idField = new ListGridField("id", "ID", 60);
- ListGridField createdField = new ListGridField("createdTime", "Timestamp", 200);
- ListGridField statusField = new ListGridField("status", "Status", 100);
- ListGridField userField = new ListGridField("subject", "User", 150);
- table.getListGrid().setFields(idField, createdField, statusField, userField);
- table.getListGrid().setSelectionType(SelectionStyle.SIMPLE);
- table.getListGrid().setSelectionAppearance(SelectionAppearance.CHECKBOX);
- table.getListGrid().setResizeFieldsInRealTime(true);
+ ListGrid grid = table.getListGrid();
+
+ grid.getField("id").setWidth(60);
+ grid.getField("createdTime").setWidth(200);
+
+ if (resourceId != null) {
+ grid.hideField("resource");
+ } else {
+ grid.getField("resource").setCellFormatter(new CellFormatter() {
+ public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
+ Resource res = (Resource) o;
+ return "<a href=\"#Resource/" + res.getId() + "\">" + res.getName() + "</a>";
+ }
+ });
+ }
+
+ grid.getField("status").setWidth(100);
+ grid.getField("status").setCellFormatter(new CellFormatter() {
+ public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
+ ConfigurationUpdateStatus status = ConfigurationUpdateStatus.valueOf((String) o);
+ String icon = "";
+ switch (status) {
+ case INPROGRESS:
+ break;
+ case SUCCESS:
+ icon = "_ok";
+ break;
+ case FAILURE:
+ icon = "_failed";
+ break;
+ case NOCHANGE:
+ break;
+ }
+
+ return Canvas.imgHTML("subsystems/configure/Configure" + icon + "_16.png", 16, 16) + o;
+ }
+ });
+
+ grid.getField("subject").setWidth(150);
+
table.addTableAction("Remove", Table.SelectionEnablement.ANY,
@@ -91,6 +136,7 @@ public class ConfigurationHistoryView extends VLayout {
new TableAction() {
public void executeAction(ListGridRecord[] selection) {
// TODO: Implement this method.
+ CoreGUI.getErrorHandler().handleError("Not implemented");
}
});
@@ -106,44 +152,48 @@ public class ConfigurationHistoryView extends VLayout {
}
});
+ table.getListGrid().addCellDoubleClickHandler(new CellDoubleClickHandler() {
+ public void onCellDoubleClick(CellDoubleClickEvent cellDoubleClickEvent) {
+ ListGridRecord record = cellDoubleClickEvent.getRecord();
+ showDetails(record);
+ }
+ });
+
+ table.addTableAction("Show Details", Table.SelectionEnablement.SINGLE, null,
+ new TableAction() {
+ public void executeAction(ListGridRecord[] selection) {
+
+ ListGridRecord record = selection[0];
+
+ showDetails(record);
+ }
+ });
- table.setShowResizeBar(true);
- table.setResizeBarTarget("next");
addMember(table);
+ }
+ public static void showDetails(ListGridRecord record) {
+ final ResourceConfigurationUpdate update = (ResourceConfigurationUpdate) record.getAttributeAsObject("entity");
- detailView = new ConfigurationHistoryDetailView();
- detailView.setHeight("70%");
- detailView.hide();
+ ResourceTypeRepository.Cache.getInstance().getResourceTypes(
+ update.getResource().getResourceType().getId(),
+ EnumSet.of(ResourceTypeRepository.MetadataType.resourceConfigurationDefinition),
+ new ResourceTypeRepository.TypeLoadedCallback() {
- addMember(detailView);
+ public void onTypesLoaded(ResourceType type) {
+ ConfigurationDefinition definition = type.getResourceConfigurationDefinition();
- table.getListGrid().addSelectionChangedHandler(new SelectionChangedHandler() {
- public void onSelectionChanged(SelectionEvent selectionEvent) {
- if (selectionEvent.getState()) {
- ListGridRecord record = (ListGridRecord) selectionEvent.getRecord();
- final ResourceConfigurationUpdate update = (ResourceConfigurationUpdate) record.getAttributeAsObject("entity");
- ResourceTypeRepository.Cache.getInstance().getResourceTypes(
- update.getResource().getResourceType().getId(),
- EnumSet.of(ResourceTypeRepository.MetadataType.resourceConfigurationDefinition),
- new ResourceTypeRepository.TypeLoadedCallback() {
+ ConfigurationHistoryDetailView detailView = new ConfigurationHistoryDetailView();
- public void onTypesLoaded(ResourceType type) {
+ detailView.setConfiguration(definition, update.getConfiguration());
- ConfigurationDefinition definition = type.getResourceConfigurationDefinition();
+ detailView.displayInDialog();
+
+ }
+ });
- detailView.setConfiguration(definition, update.getConfiguration());
- detailView.setHeight("75%");
- showMember(detailView);
- }
- });
- } else {
- hideMember(detailView);
- }
- }
- });
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java
index 83c15b7..487b167 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java
@@ -6,6 +6,7 @@ import org.rhq.core.domain.configuration.PluginConfigurationUpdate;
import org.rhq.core.domain.configuration.RawConfiguration;
import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
@@ -49,14 +50,12 @@ public class ConfigurationGWTServiceImpl extends AbstractGWTServiceImpl implemen
return SerialUtility.prepare(definition, "ResourceDefinition");
}
- public PageList<ResourceConfigurationUpdate> findResourceConfigurationUpdates(int resourceId) {
- PageList<ResourceConfigurationUpdate> result;
+ public PageList<ResourceConfigurationUpdate> findResourceConfigurationUpdates(
+ Integer resourceId, Long beginDate, Long endDate, boolean suppressOldest, PageControl pc) {
- PageControl pc = PageControl.getUnlimitedInstance();
- pc.initDefaultOrderingField("cu.id", PageOrdering.DESC);
-
- // TODO GH: I'd prefer a criteria based solution here
- result = configurationManager.findResourceConfigurationUpdates(getSessionSubject(), resourceId, null, null, false, pc);
+ PageList<ResourceConfigurationUpdate> result =
+ configurationManager.findResourceConfigurationUpdates(
+ getSessionSubject(), resourceId, beginDate, endDate, suppressOldest, pc);
return SerialUtility.prepare(result, "ConfigurationService.findResourceConfigurationUpdates");
}
@@ -76,6 +75,14 @@ public class ConfigurationGWTServiceImpl extends AbstractGWTServiceImpl implemen
return SerialUtility.prepare(update, "ConfigurationService.updatePluginConfiguration");
}
+ public PageList<ResourceConfigurationUpdate> findResourceConfigurationUpdatesByCriteria(ResourceConfigurationUpdateCriteria criteria) {
+ PageList<ResourceConfigurationUpdate> updates =
+ configurationManager.findResourceConfigurationUpdatesByCriteria(
+ getSessionSubject(), criteria
+ );
+
+ return SerialUtility.prepare(updates, "ConfigurationService.findResourceConfigurationUpdatesByCriteria");
+ }
public RawConfiguration dummy(RawConfiguration config) {
System.out.println(config.getPath());
commit eb013e6250a5f4ba88bebefb41582c5b62e52615
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu Jul 29 17:46:28 2010 -0400
Measurement oob history view for reports
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java
index d4a4731..cd99ad7 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java
@@ -33,6 +33,7 @@ import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.calltime.CallTimeDataComposite;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
+import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
@@ -55,4 +56,10 @@ public interface MeasurementDataGWTService extends RemoteService {
public PageList<MeasurementDefinition> findMeasurementDefinitionsByCriteria(MeasurementDefinitionCriteria criteria);
public PageList<MeasurementSchedule> findMeasurementSchedulesByCriteria(MeasurementScheduleCriteria criteria);
+
+ PageList<MeasurementOOBComposite> getSchedulesWithOOBs(String metricNameFilter,
+ String resourceNameFilter, String parentNameFilter, PageControl pc);
+
+ PageList<MeasurementOOBComposite> getHighestNOOBsForResource(int resourceId, int n);
+
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
new file mode 100644
index 0000000..0df9e99
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
@@ -0,0 +1,154 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.report.measurement;
+
+import java.util.Collection;
+import java.util.List;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
+import com.smartgwt.client.data.fields.DataSourceLinkField;
+import com.smartgwt.client.data.fields.DataSourceTextField;
+import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+import org.rhq.core.domain.measurement.MeasurementConverterClient;
+import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
+import org.rhq.core.domain.util.PageControl;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+
+/**
+ * @author Greg Hinkle
+ */
+public class MeasurementOOBDataSource extends RPCDataSource<MeasurementOOBComposite> {
+
+ private int maximumFactor = 0;
+
+ public MeasurementOOBDataSource() {
+
+
+ DataSourceTextField metricField = new DataSourceTextField("scheduleName","Metric");
+ addField(metricField);
+
+ DataSourceTextField resourceField = new DataSourceTextField("resourceName", "Resource");
+ addField(resourceField);
+
+ DataSourceTextField parentField = new DataSourceTextField("parentName", "Parent");
+ addField(parentField);
+
+ DataSourceTextField bandField = new DataSourceTextField("formattedBaseband", "Band");
+ addField(bandField);
+
+ DataSourceTextField outlierField = new DataSourceTextField("formattedOutlier", "Outlier");
+ addField(outlierField);
+
+ DataSourceTextField factorField = new DataSourceTextField("factor", "Out of range factor (%)");
+ addField(factorField);
+
+ }
+
+
+ @Override
+ protected void executeFetch(final DSRequest request, final DSResponse response) {
+
+ PageControl pc = getPageControl(request);
+
+ GWTServiceLookup.getMeasurementDataService().getSchedulesWithOOBs(
+ null, null, null, pc,
+ new AsyncCallback<PageList<MeasurementOOBComposite>>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError("Failed to load measurement OOB information",caught);
+ }
+
+ public void onSuccess(PageList<MeasurementOOBComposite> result) {
+ response.setData(buildRecords(result));
+ response.setTotalRows(result.getTotalSize());
+ processResponse(request.getRequestId(), response);
+ }
+ }
+ );
+
+ }
+
+ @Override
+ public MeasurementOOBComposite copyValues(ListGridRecord from) {
+ throw new UnsupportedOperationException("OOBs Read only");
+ }
+
+
+ @Override
+ public ListGridRecord[] buildRecords(Collection<MeasurementOOBComposite> list) {
+ for (MeasurementOOBComposite oob : list) {
+ if (oob.getFactor() > maximumFactor)
+ maximumFactor = oob.getFactor();
+ }
+
+ return super.buildRecords(list);
+ }
+
+ @Override
+ public ListGridRecord copyValues(MeasurementOOBComposite from) {
+ applyFormatting(from);
+
+ ListGridRecord record = new ListGridRecord();
+
+ record.setAttribute("scheduleId", from.getScheduleId());
+ record.setAttribute("scheduleName", from.getScheduleName());
+ record.setAttribute("definitionId", from.getDefinitionId());
+ record.setAttribute("resourceId", from.getResourceId());
+ record.setAttribute("resourceName", from.getResourceName());
+
+ record.setAttribute("factor", from.getFactor());
+ record.setAttribute("formattedBaseband", from.getFormattedBaseband());
+ record.setAttribute("formattedOutlier", from.getFormattedOutlier());
+ record.setAttribute("blMin", from.getBlMin());
+ record.setAttribute("blMax", from.getBlMax());
+ record.setAttribute("parentId", from.getParentId());
+ record.setAttribute("parentName", from.getParentName());
+
+ int factorRankingWidth = (int) (((double)from.getFactor())/ (double)maximumFactor * 100d);
+
+ record.setBackgroundComponent(
+ new HTMLFlow(
+ "<div style=\"width: " + factorRankingWidth + "%; height: 100%; background-color: #A5B391;\"> </div>"));
+
+ return record;
+
+ }
+
+
+ private void applyFormatting(MeasurementOOBComposite oob) {
+ oob.setFormattedOutlier(MeasurementConverterClient.format(oob.getOutlier(), oob.getUnits(), true));
+ formatBaseband(oob);
+ }
+
+ private void formatBaseband(MeasurementOOBComposite oob) {
+ String min = MeasurementConverterClient.format(oob.getBlMin(), oob.getUnits(), true);
+ String max = MeasurementConverterClient.format(oob.getBlMax(), oob.getUnits(), true);
+ oob.setFormattedBaseband(min + ", " + max);
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java
new file mode 100644
index 0000000..0b16677
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBView.java
@@ -0,0 +1,61 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.report.measurement;
+
+import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+import org.rhq.core.domain.resource.Resource;
+import org.rhq.enterprise.gui.coregui.client.components.table.Table;
+
+/**
+ * @author Greg Hinkle
+ */
+public class MeasurementOOBView extends Table {
+
+
+ public MeasurementOOBView() {
+ super("Suspect Metrics");
+
+
+ setDataSource(new MeasurementOOBDataSource());
+
+ getListGrid().setAlternateRecordStyles(false);
+
+
+ }
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+
+ getListGrid().getField("resourceName").setCellFormatter(new CellFormatter() {
+ public String format(Object o, ListGridRecord listGridRecord, int i, int i1) {
+ return "<a href=\"#Resource/" + listGridRecord.getAttribute("resourceId") + "\">" + o + "</a>";
+ }
+ });
+
+
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java
index 5749dc4..2514bd6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java
@@ -30,13 +30,16 @@ import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.calltime.CallTimeDataComposite;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
+import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTService;
import org.rhq.enterprise.gui.coregui.server.util.SerialUtility;
import org.rhq.enterprise.server.measurement.CallTimeDataManagerLocal;
+import org.rhq.enterprise.server.measurement.MeasurementBaselineManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementDataManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementDefinitionManagerLocal;
+import org.rhq.enterprise.server.measurement.MeasurementOOBManagerLocal;
import org.rhq.enterprise.server.measurement.MeasurementScheduleManagerLocal;
import org.rhq.enterprise.server.util.LookupUtil;
@@ -49,6 +52,7 @@ public class MeasurementDataGWTServiceImpl extends AbstractGWTServiceImpl implem
private MeasurementDataManagerLocal dataManager = LookupUtil.getMeasurementDataManager();
private CallTimeDataManagerLocal callTimeDataManager = LookupUtil.getCallTimeDataManager();
+ private MeasurementOOBManagerLocal measurementOOBManager = LookupUtil.getOOBManager();
private MeasurementScheduleManagerLocal scheduleManager = LookupUtil.getMeasurementScheduleManager();
private MeasurementDefinitionManagerLocal definitionManager = LookupUtil.getMeasurementDefinitionManager();
@@ -84,4 +88,25 @@ public class MeasurementDataGWTServiceImpl extends AbstractGWTServiceImpl implem
return SerialUtility.prepare(scheduleManager.findSchedulesByCriteria(getSessionSubject(), criteria),
"MeasurementDataService.findMeasurementSchedulesByCriteria");
}
+
+
+ public PageList<MeasurementOOBComposite> getSchedulesWithOOBs(String metricNameFilter, String resourceNameFilter, String parentNameFilter, PageControl pc) {
+ return SerialUtility.prepare(
+ measurementOOBManager.getSchedulesWithOOBs(
+ getSessionSubject(),
+ metricNameFilter,
+ resourceNameFilter,
+ parentNameFilter,
+ pc),
+ "MeasurementDataService.getSchedulesWithOOBs");
+ }
+
+ public PageList<MeasurementOOBComposite> getHighestNOOBsForResource(int resourceId, int n) {
+ return SerialUtility.prepare(
+ measurementOOBManager.getHighestNOOBsForResource(
+ getSessionSubject(),
+ resourceId,
+ n),
+ "MeasurementDataService.getHighestNOOBsForResource");
+ }
}
commit cb605f26aa5ca97754f5518c82fdee35c7265ae5
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu Jul 29 17:45:19 2010 -0400
gwt serialization compatibility
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
index f32c07b..d7cdcef 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementOOBComposite.java
@@ -50,6 +50,9 @@ public class MeasurementOOBComposite implements Serializable {
private String formattedOutlier;
private String formattedBaseband;
+ public MeasurementOOBComposite() {
+ }
+
public MeasurementOOBComposite(String resourceName, int resourceId, String scheduleName, int scheduleId,
long timestamp, int definitionId, int factor, double blMin, double blMax, MeasurementUnits units,
String parentName, Integer parentId) {
commit 9368e87552fb67fb7076295c8cd12ce7aa4d1e30
Author: Greg Hinkle <ghinkle(a)redhat.com>
Date: Thu Jul 29 17:45:06 2010 -0400
Criteria query support for looking up ResourceConfigurationUpdate's
Security fix for null resource history lookup
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceConfigurationUpdateCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceConfigurationUpdateCriteria.java
new file mode 100644
index 0000000..af4f3b9
--- /dev/null
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceConfigurationUpdateCriteria.java
@@ -0,0 +1,162 @@
+/*
+ * 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, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.core.domain.criteria;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
+import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
+import org.rhq.core.domain.util.PageOrdering;
+
+/**
+ * @author Greg Hinkle
+ */
+@XmlRootElement
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@SuppressWarnings("unused")
+public class ResourceConfigurationUpdateCriteria extends Criteria {
+ private static final long serialVersionUID = 1L;
+
+ public static final String SORT_FIELD_CTIME = "ctime";
+ public static final String SORT_FIELD_RESOURCE_NAME = "name";
+ public static final String SORT_FIELD_STATUS = "status";
+ public static final String SORT_FIELD_RESOURCE_ID = "resourceId";
+
+ private Integer filterId;
+ private Long filterStartTime; // requires overrides
+ private Long filterEndTime; // requires overrides
+ private ConfigurationUpdateStatus filterStatus;
+ private String filterResourceTypeId; // requires overrides
+ private String filterResourceTypeName; // requires overrides
+ private List<Integer> filterResourceIds; // requires overrides
+ private List<Integer> filterResourceGroupIds; // requires overrides
+
+ private boolean fetchResource;
+ private boolean fetchGroupConfigurationUpdate;
+ private boolean fetchConfiguration;
+
+ private PageOrdering sortCtime;
+ private PageOrdering sortName; // requires sort override
+ private PageOrdering sortPriority; // requires sort override
+ private PageOrdering sortResourceId; // requires sort override
+
+ public ResourceConfigurationUpdateCriteria() {
+
+ filterOverrides.put("startTime", "ctime >= ?");
+ filterOverrides.put("endTime", "ctime <= ?");
+ filterOverrides.put("resourceTypeId", "resource.resourceType.id = ?");
+ filterOverrides.put("resourceTypeName", "resource.resourceType.name like ?");
+ filterOverrides.put("resourceIds", "resource.id IN ( ? )");
+ filterOverrides.put("resourceGroupIds", "resource.id IN " //
+ + "( SELECT res.id " //
+ + " FROM ResourceGroup rg " //
+ + " JOIN rg.explicitResources res " //
+ + " WHERE rg.id = ? )");
+
+ sortOverrides.put(SORT_FIELD_RESOURCE_NAME, "resource.name");
+ sortOverrides.put(SORT_FIELD_STATUS, "status");
+ sortOverrides.put(SORT_FIELD_RESOURCE_ID, "resource.id");
+ }
+
+ @Override
+ public Class getPersistentClass() {
+ return ResourceConfigurationUpdate.class;
+ }
+
+ // filters
+
+ public void addFilterId(Integer filterId) {
+ this.filterId = filterId;
+ }
+
+ public void addFilterStartTime(Long filterStartTime) {
+ this.filterStartTime = filterStartTime;
+ }
+
+ public void addFilterEndTime(Long filterEndTime) {
+ this.filterEndTime = filterEndTime;
+ }
+
+ public void addFilterStatus(ConfigurationUpdateStatus status) {
+ this.filterStatus = status;
+ }
+
+ public void addFilterResourceTypeId(String filterResourceTypeId) {
+ this.filterResourceTypeId = filterResourceTypeId;
+ }
+
+ public void addFilterResourceTypeName(String filterResourceTypeName) {
+ this.filterResourceTypeName = filterResourceTypeName;
+ }
+
+ public void addFilterResourceIds(Integer... filterResourceIds) {
+ this.filterResourceIds = Arrays.asList(filterResourceIds);
+ }
+
+ public void addFilterResourceGroupIds(Integer... filterResourceGroupIds) {
+ this.filterResourceGroupIds = Arrays.asList(filterResourceGroupIds);
+ }
+
+
+ // Fetches
+
+ public void fetchResource(boolean fetchResource) {
+ this.fetchResource = fetchResource;
+ }
+
+ public void fetchGroupConfigurationUpdate(boolean fetchGroupConfigurationUpdate) {
+ this.fetchGroupConfigurationUpdate = fetchGroupConfigurationUpdate;
+ }
+
+ public void fetchConfiguration(boolean configuration) {
+ this.fetchConfiguration = configuration;
+ }
+
+
+ // Sorts
+
+ public void addSortCtime(PageOrdering sortCtime) {
+ addSortField(SORT_FIELD_CTIME);
+ this.sortCtime = sortCtime;
+ }
+
+ public void addSortResourceName(PageOrdering sortName) {
+ addSortField(SORT_FIELD_RESOURCE_NAME);
+ this.sortName = sortName;
+ }
+
+ public void addSortPriority(PageOrdering sortPriority) {
+ addSortField(SORT_FIELD_STATUS);
+ this.sortPriority = sortPriority;
+ }
+
+ public void addSortResourceId(PageOrdering sortResourceId) {
+ addSortField(SORT_FIELD_RESOURCE_ID);
+ this.sortResourceId = sortResourceId;
+ }
+}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
index 5f7203a..64c7d3b 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java
@@ -67,6 +67,7 @@ import org.rhq.core.domain.configuration.group.AbstractGroupConfigurationUpdate;
import org.rhq.core.domain.configuration.group.GroupPluginConfigurationUpdate;
import org.rhq.core.domain.configuration.group.GroupResourceConfigurationUpdate;
import org.rhq.core.domain.content.PackageType;
+import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.domain.resource.Resource;
@@ -105,6 +106,8 @@ import org.rhq.enterprise.server.resource.group.ResourceGroupNotFoundException;
import org.rhq.enterprise.server.resource.group.ResourceGroupUpdateException;
import org.rhq.enterprise.server.scheduler.SchedulerLocal;
import org.rhq.enterprise.server.system.ServerVersion;
+import org.rhq.enterprise.server.util.CriteriaQueryGenerator;
+import org.rhq.enterprise.server.util.CriteriaQueryRunner;
import org.rhq.enterprise.server.util.QuartzUtil;
/**
@@ -853,7 +856,10 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
public PageList<ResourceConfigurationUpdate> findResourceConfigurationUpdates(Subject subject, Integer resourceId,
Long beginDate, Long endDate, boolean suppressOldest, PageControl pc) {
- if (!authorizationManager.hasResourcePermission(subject, Permission.CONFIGURE_READ, resourceId)) {
+ if (resourceId == null && !authorizationManager.isInventoryManager(subject)) {
+ throw new PermissionException("User[" + subject.getName() + "] Must be an inventory manager to query " +
+ "without a resource id.");
+ } else if (!authorizationManager.hasResourcePermission(subject, Permission.CONFIGURE_READ, resourceId)) {
throw new PermissionException("User[" + subject.getName()
+ "] does not have permission to view configuration history for resource[id=" + resourceId + "]");
}
@@ -2025,4 +2031,23 @@ public class ConfigurationManagerBean implements ConfigurationManagerLocal, Conf
return out;
}
+
+
+ @SuppressWarnings("unchecked")
+ public PageList<ResourceConfigurationUpdate> findResourceConfigurationUpdatesByCriteria(
+ Subject subject, ResourceConfigurationUpdateCriteria criteria) {
+ CriteriaQueryGenerator generator = new CriteriaQueryGenerator(subject, criteria);
+ if (!authorizationManager.isInventoryManager(subject)) {
+ generator.setAuthorizationResourceFragment(
+ CriteriaQueryGenerator.AuthorizationTokenType.RESOURCE, "resource", subject.getId());
+ }
+
+ CriteriaQueryRunner<ResourceConfigurationUpdate> queryRunner =
+ new CriteriaQueryRunner(criteria, generator, entityManager);
+
+ PageList<ResourceConfigurationUpdate> updates = queryRunner.execute();
+
+
+ return updates;
+ }
}
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java
index 4242153..a82241d 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java
@@ -39,6 +39,7 @@ import org.rhq.core.domain.configuration.definition.ConfigurationTemplate;
import org.rhq.core.domain.configuration.group.AbstractGroupConfigurationUpdate;
import org.rhq.core.domain.configuration.group.GroupPluginConfigurationUpdate;
import org.rhq.core.domain.configuration.group.GroupResourceConfigurationUpdate;
+import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.domain.util.PageControl;
@@ -497,4 +498,8 @@ public interface ConfigurationManagerLocal {
boolean fromStructured) throws ResourceNotFoundException, TranslationNotSupportedException;
Configuration mergeConfiguration(Configuration config);
+
+
+ PageList<ResourceConfigurationUpdate> findResourceConfigurationUpdatesByCriteria(
+ Subject subject, ResourceConfigurationUpdateCriteria criteria);
}
\ No newline at end of file
13 years, 9 months
[rhq] modules/core
by Jay Shaughnessy
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 23 ++++++++--
1 file changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 483a1e8352f7fc0d8ade726a8b045488c4190826
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu Jul 29 09:10:56 2010 -0400
[BZ 619135] For manual add ensure that component start does not prevent
necessary server sync.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index 0c86f8f..720d1ab 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -283,7 +283,7 @@ public class InventoryManager extends AgentService implements ContainerService,
return results;
} catch (TimeoutException te) {
log.warn("Discovery for Resources of [" + context.getResourceType() + "] has been running for more than "
- + timeout + " milliseconds. This may be a plugin bug.", te);
+ + timeout + " milliseconds. This may be a plugin bug.", te);
return null;
} catch (BlacklistedException be) {
// Discovery did not run, because the ResourceType was blacklisted during a prior discovery scan.
@@ -316,8 +316,8 @@ public class InventoryManager extends AgentService implements ContainerService,
return result;
} catch (TimeoutException te) {
log.warn("Manual add of Resource of type [" + context.getResourceType() + "] with plugin configuration ["
- + pluginConfig.toString(true) + "] has been running for more than "
- + timeout + " milliseconds. This may be a plugin bug.", te);
+ + pluginConfig.toString(true) + "] has been running for more than " + timeout
+ + " milliseconds. This may be a plugin bug.", te);
return null;
} catch (BlacklistedException be) {
log.debug(ThrowableUtil.getAllMessages(be));
@@ -601,6 +601,8 @@ public class InventoryManager extends AgentService implements ContainerService,
MergeResourceResponse mergeResourceResponse;
Resource resource = null;
boolean resourceAlreadyExisted = false;
+ Throwable startError = null;
+
try {
ResourceContainer parentResourceContainer = getResourceContainer(parentResourceId);
ResourceComponent parentResourceComponent = parentResourceContainer.getResourceComponent();
@@ -692,7 +694,14 @@ public class InventoryManager extends AgentService implements ContainerService,
if (log.isDebugEnabled()) {
log.debug("Activating resource [" + resource + "]...");
}
- activateResource(resource, resourceContainer, newPluginConfig);
+ // if it fails to start keep going, we already have the resource in inventory and
+ // need to coordinate with the server. The new resource will be unavailable but at least
+ // it will be accessible and editable by the user. Report the start exception at the end.
+ try {
+ activateResource(resource, resourceContainer, newPluginConfig);
+ } catch (Throwable t) {
+ startError = t;
+ }
// NOTE: We don't mess with inventory status - that's the server's responsibility.
@@ -708,6 +717,12 @@ public class InventoryManager extends AgentService implements ContainerService,
newResources.add(resource);
postProcessNewlyCommittedResources(newResources);
performServiceScan(resource.getId());
+
+ if (null != startError) {
+ throw new PluginContainerException("The resource [" + resource
+ + "] has been added but could not be started. Verify the supplied configuration values: ",
+ startError);
+ }
}
// Catch any other RuntimeExceptions or Errors, so the server doesn't have to worry about deserializing or
13 years, 9 months
[rhq] 2 commits - etc/cli-scripts
by John Sanda
etc/cli-scripts/reset_conn_props.js | 59 +++++++++++++++++++++++++++++++-----
1 file changed, 52 insertions(+), 7 deletions(-)
New commits:
commit 4e7a5da9176eb3198f2b3497e966352818642a80
Merge: a2addce... 148c25c...
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Jul 28 16:54:04 2010 -0400
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit a2addcee76d260a82fff7faf848773a5932bd803
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Jul 28 16:50:02 2010 -0400
[BZ 573034] Updating script to not retrieve defaults from default template
The script originally fetched the default values for connection properties from the default
template and used the values from the default template to apply default values to connection
properties of resources. This is a nice solution because it is generic and applicable
across resource types; however, since 2.3.1 does not have the code changes in the plugin
upgrade code, the new properties do not exist in the default template in 2.3.1.
Consequently, the values are essentially hard-coded on a per resource type basis.
diff --git a/etc/cli-scripts/reset_conn_props.js b/etc/cli-scripts/reset_conn_props.js
index bb2ac46..274bc5c 100644
--- a/etc/cli-scripts/reset_conn_props.js
+++ b/etc/cli-scripts/reset_conn_props.js
@@ -31,8 +31,13 @@ function log(msg) {
println("DEBUG " + msg);
}
+function loadPluginConfiguration(resource) {
+ log("Loading plugin configuration for " + resource);
+ return ConfigurationManager.getPluginConfiguration(resource.id);
+}
+
function loadPluginConfigDef(resourceTypeName, pluginName) {
- log("Loading plugin configuration for [resourceType=" + resourceTypeName + ", plugin=" +
+ log("Loading plugin configuration definition for [resourceType=" + resourceTypeName + ", plugin=" +
pluginName + "]");
var resourceType = ResourceTypeManager.getResourceTypeByNameAndPlugin(resourceTypeName,
pluginName);
@@ -64,6 +69,10 @@ function findResourcesByTypeAndPlugin(resourceType, plugin) {
log("Found " + resources.size() + " " + resourceType + " resources ");
+ iterate(resources, function(resource) {
+ resource.pluginConfiguration = loadPluginConfiguration(resource);
+ });
+
return resources;
}
@@ -171,7 +180,6 @@ function getJBossSnapshotPropertyNames() {
set.add('snapshotDataRecursive');
set.add('snapshotAdditionalFilesEnabled');
set.add('snapshotAdditionalFilesDirectory');
- set.add('snapshotAdditionalFilesRegex');
set.add('snapshotAdditionalFilesRecursive');
return set;
@@ -197,7 +205,7 @@ function getAgentSnapshotPropertyNames() {
* param: snapshotDefaults: The names of the plugin configuration properties to reset. This
* is expected to be a java.util.Collection.
*/
-function resetPluginConfigProps(resources, snapshotDefaults) {
+function resetPluginConfigPropsFromTemplate(pluginConfigDef, resources, snapshotDefaults) {
iterate(resources, function(resource) {
log("Preparing to reset plugin configuration properties for " + resource);
var simpleProperties = flattenProperties(resource.pluginConfiguration);
@@ -208,6 +216,7 @@ function resetPluginConfigProps(resources, snapshotDefaults) {
iterate(snapshotProperties, function(property) {
var defaultProperty = snapshotDefaults.get(property.name);
property.stringValue = defaultProperty.stringValue;
+ log("Set property " + property.name + " to " + property.stringValue);
});
ConfigurationManager.updatePluginConfiguration(resource.id, resource.pluginConfiguration);
@@ -215,14 +224,44 @@ function resetPluginConfigProps(resources, snapshotDefaults) {
});
}
+function resetPluginConfigProps(resources, applyDefaults) {
+ iterate(resources, function(resource) {
+ applyDefaults(resource.pluginConfiguration);
+ ConfigurationManager.updatePluginConfiguration(resource.id, resource.pluginConfiguration);
+ log("Updated plugin configuration for " + resource);
+ });
+}
+
function resetJBossPluginConfigProps() {
var jbossResourceTypeName = 'JBossAS Server';
var jbossPluginName = 'JBossAS';
var jbossServers = findResourcesByTypeAndPlugin(jbossResourceTypeName, jbossPluginName);
var jbossPluginConfigDef = loadPluginConfigDef(jbossResourceTypeName, jbossPluginName);
- resetPluginConfigProps(jbossServers, loadSnapshotDefaults(jbossPluginConfigDef,
- getJBossSnapshotPropertyNames()));
+ //resetPluginConfigProps(jbossServers, loadSnapshotDefaults(jbossPluginConfigDef,
+ // getJBossSnapshotPropertyNames()));
+
+ resetPluginConfigProps(jbossServers, function(pluginConfig) {
+ pluginConfig.put(PropertySimple('snapshotConfigEnabled', true));
+ pluginConfig.put(PropertySimple('snapshotConfigDirectory', 'config'));
+ pluginConfig.put(PropertySimple('snapshotConfigRecursive', true));
+ pluginConfig.put(PropertySimple('snapshotLogEnabled', true));
+ pluginConfig.put(PropertySimple('snapshotLogDirectory', 'log'));
+ pluginConfig.put(PropertySimple('snapshotLogRecursive', false));
+ pluginConfig.put(PropertySimple('snapshotDataEnabled', false));
+ pluginConfig.put(PropertySimple('snapshotDataDirectory', 'data'));
+ pluginConfig.put(PropertySimple('snapshotDataRecursive', true));
+
+ var propertyMap = PropertyMap('snapshotAdditionalFilesMap');
+ propertyMap.put(PropertySimple('snapshotAdditionalFilesEnabled', true));
+ propertyMap.put(PropertySimple('snapshotAdditionalFilesDirectory', ''));
+ propertyMap.put(PropertySimple('snapshotAdditionalFilesRecursive', true));
+
+ var propertyList = PropertyList('snapshotAdditionalFilesList');
+ propertyList.list.add(propertyMap);
+
+ pluginConfig.put(propertyList);
+ });
}
function resetAgentPluginConfigProps() {
@@ -231,8 +270,14 @@ function resetAgentPluginConfigProps() {
var agents = findResourcesByTypeAndPlugin(agentResourceTypeName, agentPluginName);
var agentPluginConfigDef = loadPluginConfigDef(agentResourceTypeName, agentPluginName);
- resetPluginConfigProps(agents, loadSnapshotDefaults(agentPluginConfigDef,
- getAgentSnapshotPropertyNames()));
+ //resetPluginConfigProps(agents, loadSnapshotDefaults(agentPluginConfigDef,
+ // getAgentSnapshotPropertyNames()));
+
+ resetPluginConfigProps(agents, function(pluginConfig) {
+ pluginConfig.put(PropertySimple('snapshotConfigEnabled', true));
+ pluginConfig.put(PropertySimple('snapshotLogEnabled', true));
+ pluginConfig.put(PropertySimple('snapshotDataEnabled', true));
+ });
}
//////////////
13 years, 9 months
[rhq] Branch 'release-3.0.0' - modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml
by ips
modules/common/ant-bundle/pom.xml | 2 +-
modules/common/filetemplate-bundle/pom.xml | 2 +-
modules/common/jboss-as/pom.xml | 2 +-
modules/common/pom.xml | 2 +-
modules/core/client-api/pom.xml | 2 +-
modules/core/comm-api/pom.xml | 2 +-
modules/core/dbutils/pom.xml | 2 +-
modules/core/domain/pom.xml | 2 +-
modules/core/gui/pom.xml | 2 +-
modules/core/native-system/pom.xml | 2 +-
modules/core/plugin-api/pom.xml | 2 +-
modules/core/plugin-container/pom.xml | 2 +-
modules/core/plugin-validator/pom.xml | 2 +-
modules/core/plugindoc/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/util/pom.xml | 2 +-
modules/enterprise/agent/pom.xml | 2 +-
modules/enterprise/agentupdate/pom.xml | 2 +-
modules/enterprise/comm/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-war/pom.xml | 2 +-
modules/enterprise/gui/content_http-war/pom.xml | 2 +-
modules/enterprise/gui/coregui/pom.xml | 2 +-
modules/enterprise/gui/installer-war/pom.xml | 2 +-
modules/enterprise/gui/pom.xml | 2 +-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/gui/webdav-war/pom.xml | 2 +-
modules/enterprise/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/ear/pom.xml | 2 +-
modules/enterprise/server/jar/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-email/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-irc/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-microblog/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-operations/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-roles/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-snmp/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-subject/pom.xml | 2 +-
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 2 +-
modules/enterprise/server/plugins/disk/pom.xml | 2 +-
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +-
modules/enterprise/server/plugins/pom.xml | 2 +-
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 +-
modules/enterprise/server/plugins/url/pom.xml | 2 +-
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +-
modules/enterprise/server/plugins/yum/pom.xml | 2 +-
modules/enterprise/server/safe-invoker/pom.xml | 2 +-
modules/enterprise/server/sars/agent-sar/pom.xml | 2 +-
modules/enterprise/server/sars/pom.xml | 2 +-
modules/enterprise/server/xml-schemas/pom.xml | 2 +-
modules/helpers/pluginAnnotations/pom.xml | 2 +-
modules/helpers/pluginGen/pom.xml | 2 +-
modules/helpers/pom.xml | 2 +-
modules/helpers/rtfilter/pom.xml | 2 +-
modules/plugins/aliases/pom.xml | 2 +-
modules/plugins/ant-bundle/pom.xml | 2 +-
modules/plugins/apache/pom.xml | 2 +-
modules/plugins/augeas/pom.xml | 2 +-
modules/plugins/cobbler/pom.xml | 2 +-
modules/plugins/cron/pom.xml | 2 +-
modules/plugins/database/pom.xml | 2 +-
modules/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/plugins/grub/pom.xml | 2 +-
modules/plugins/hibernate/pom.xml | 2 +-
modules/plugins/hosts/pom.xml | 2 +-
modules/plugins/hudson/pom.xml | 2 +-
modules/plugins/iis/pom.xml | 2 +-
modules/plugins/jboss-as-5/pom.xml | 2 +-
modules/plugins/jboss-as/pom.xml | 2 +-
modules/plugins/jboss-cache-v3/pom.xml | 2 +-
modules/plugins/jboss-cache/pom.xml | 2 +-
modules/plugins/jmx/pom.xml | 2 +-
modules/plugins/mysql/pom.xml | 2 +-
modules/plugins/netservices/pom.xml | 2 +-
modules/plugins/oracle/pom.xml | 2 +-
modules/plugins/perftest/pom.xml | 2 +-
modules/plugins/platform/pom.xml | 2 +-
modules/plugins/pom.xml | 2 +-
modules/plugins/postfix/pom.xml | 2 +-
modules/plugins/postgres/pom.xml | 2 +-
modules/plugins/rhq-agent/pom.xml | 2 +-
modules/plugins/rhq-server/pom.xml | 2 +-
modules/plugins/samba/pom.xml | 2 +-
modules/plugins/script/pom.xml | 2 +-
modules/plugins/snmptrapd/pom.xml | 2 +-
modules/plugins/sshd/pom.xml | 2 +-
modules/plugins/sudoers/pom.xml | 2 +-
modules/plugins/tomcat/pom.xml | 2 +-
modules/plugins/twitter/pom.xml | 2 +-
modules/plugins/validate-all-plugins/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/test-utils/pom.xml | 2 +-
pom.xml | 2 +-
103 files changed, 103 insertions(+), 103 deletions(-)
New commits:
commit 1f72fc36df296aee0f093c012276a520edcc40f6
Author: hudson auto <wnstb(a)yahoo.com>
Date: Wed Jul 28 15:12:01 2010 -0400
[maven-release-plugin] prepare for next development iteration
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 97ef93b..eda9133 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 3b26a39..bc7965b 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 688d5e4..2cf950b 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index 2ddc4af..ee81a94 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index a27161b..d177f9e 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index 4589d42..a51f92b 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index d7559da..7ff6a10 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index dc75145..e0ced84 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index b535306..0911918 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index f72bc2f..d47d4c8 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index 967b21a..e1ce7ef 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index fbab223..2e58102 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 996cd8f..7739177 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml
index 8a95e51..eeb7e81 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index b0c399b..7aad64c 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 37bcda5..bc41dc5 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index 3fc1344..d9f1c1c 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 127b06f..8942239 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index 9f09ff1..8b9da9c 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 95b62cd..611eb9d 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index c1c297f..798a8ca 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index 6be8d8d..df05645 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 709bfe3..acbe21f 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index 8d33ef0..1beadca 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index bf6a9a4..0c529ba 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index d9f0c15..a794cd6 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml
index 9bdfc91..aa880be 100644
--- a/modules/enterprise/gui/webdav-war/pom.xml
+++ b/modules/enterprise/gui/webdav-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 77a5685..3b0dbb8 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index dff57e7..05187c7 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-cli</artifactId>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index 6008df1..e86ef41 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-client-api</artifactId>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index 68d51c0..910b617 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-parent</artifactId>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 444256d..2ea73ee 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>rhq-remoting-webservices</artifactId>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index f09e063..2c98817 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index b4d2146..3fd11e8 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index c063211..bf15866 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index ddff575..79fdc38 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index ea1eb7b..dd5bc18 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index 363ac0a..c0973f3 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index b4751ba..a62fee8 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index b0a0c3b..3193539 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index 6d35aed..e69bfbc 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index cbd7334..ca33bb7 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index 6398092..af75153 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index ebac52c..09839b8 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 30efb5a..73f405e 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/cobbler/pom.xml b/modules/enterprise/server/plugins/cobbler/pom.xml
index 8464662..4c44f10 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index 40ab2a2..0033d1b 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
index 0c5fb51..61965f2 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 3f1e165..7451668 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index 25917cc..0ac61d3 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index 40c066f..5a78451 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 9832288..2b16f4a 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index 26e985a..e4ab9b2 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index 14e52de..a6cba32 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
index e160aa6..9c7cc74 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/yum/pom.xml b/modules/enterprise/server/plugins/yum/pom.xml
index 344a215..ebdd3da 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index bb1abdd..06c8981 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index 2458369..aa278b8 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index 4ac7f43..0cc2084 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 21ccc78..14738d0 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml
index 366d1aa..d056f74 100644
--- a/modules/helpers/pluginAnnotations/pom.xml
+++ b/modules/helpers/pluginAnnotations/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml
index d992e29..28dc9b1 100644
--- a/modules/helpers/pluginGen/pom.xml
+++ b/modules/helpers/pluginGen/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index c5e5ae2..a0721a9 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index ffac476..5d327ee 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index c475e5e..c37598e 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 5fa4596..cc160c9 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 88db42f..700a6af 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 51580cd..915106a 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index a140f5d..d920440 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 9119492..d5aaad5 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 714ad7a..30889f7 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index e01b311..b79645d 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index aef1858..f7cf265 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index 4f87dfe..acb08ef 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 157119f..7dd0fde 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index eed10bc..65fa7b8 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 9a9c2f0..853c020 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index befe74c..a0ade77 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index ac9b3f6..b9ed2b3 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 61f4e11..b3846fa 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index 684e8e3..443e524 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index a9874cc..ac9885a 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index 5a02364..d0c9053 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 3d937e7..06ae2ae 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index e915511..1acdb0f 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index f65ad5a..39c75da 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index aadd8bf..97b83b0 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index f32c52d..85d6105 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 639838b..283ab6a 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index beb98f2..5a4466c 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index fdb0991..a190dcd 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 8fb6fee..8f4e675 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 9411143..0d41574 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 0ec4d51..7719b14 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index f5106f0..2d9d715 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index b637f0d..3579496 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 55c3b49..41df1b8 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 9de8802..205d5b0 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index 9ee6ac3..e299efa 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/validate-all-plugins/pom.xml b/modules/plugins/validate-all-plugins/pom.xml
index 93e847c..b3d5e87 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>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index a6af192..bc96ae3 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 5b243a9..2235687 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>test-utils</artifactId>
<name>RHQ Test Utils</name>
diff --git a/pom.xml b/pom.xml
index 5e2dc43..7ff85bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RHQ</name>
13 years, 9 months
[rhq] Changes to 'refs/tags/RHQ_3_0_0_GA'
by ips
Tag 'RHQ_3_0_0_GA' created by hudson auto <wnstb(a)yahoo.com> at 2010-07-28 19:11 +0000
[maven-release-plugin] copy for tag RHQ_3_0_0_GA
Changes since RHQ_3_0_0:
Filip Drabek (5):
Apache Unit tests update.
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
[apache] tests will use xerces XMLSerializer.
BZ-618230 - absolute path in apache configuration file, breaks discovery.
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
Greg Hinkle (7):
Cache bug fix moved to release branch
We have to release without user.agent specific builds to have proper multiple browser support!
Switch menubar border overrides to css !important for bug in IE dom editing
fully qualified image path for other context path usage
Protect against invalid events
IE6 XMLHttpRequest workaround for the searchgui
Tests with the ListGridFieldType.LINK
Heiko W. Rupp (9):
BZ 611432 - Re-enable sorting on columns
BZ610179
Deliver less call time data, enable events. Put some variance in schedules for metrics to not have all always fire at the same time.
Fix typos
BZ 604716,604714 - disable alerts and favorites in the Footer.
Don't print to stdout, but use a logger.
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
BZ 617131 - roll back the 'channel' -> 'repo' renaming introduced in 29a4fadac497136b7a6360eed0821984baf35c55
BZ 617718 - follow the OID -> oid change in the last commit as property names are case specific.
Ian Springer (23):
when in production mode, provide a way to specifiy jboss.org credentials, which can be used to publish the release Maven artifacts to the JBoss Nexus repo
fix malformed XML
Jeremy Perry: here are some replacement icons for servers and services that should give them the appropriate visual weight in the tree.
copy new Server/Service icons into coregui war too; remove redundant Service icons from images/resources dir in coregui war, since they already exist in the images/types dir
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
fix so user with Bundle perm can view Content>Bundles menu item but so user with Inventory perm and not Bundle perm cannot (fix for https://bugzilla.redhat.com/show_bug.cgi?id=611760)
add i18n infrastructure to coregui and i19n about box as an example; expose product info properties via a server SLSB API that can be used by coregui - the properties are stored in a properties file, which can easily be replaced in the JON build - this allows us to display the correct product name, version, and build number in the coregui About box (fix for https://bugzilla.redhat.com/show_bug.cgi?id=604679)
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
fix logic bug in getURL()
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
fix so unset checkbox works for textarea fields (for longString props) (https://bugzilla.redhat.com/show_bug.cgi?id=609456); call prepareInputsForSubmission() JS function upon submission of form on update alert sender config page
mask values of type="password" props in HTML source on both group resource config and group plugin config pages (fix for https://bugzilla.redhat.com/show_bug.cgi?id=601892)
fix so vertical scrolling of right content div on resource/group pages works correctly in IE7 (https://bugzilla.redhat.com/show_bug.cgi?id=601744)
fix NPE that occurred when trying to view a group configuration update (https://bugzilla.redhat.com/show_bug.cgi?id=614886)
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
Revert "fix so vertical scrolling of right content div on resource/group pages works correctly in IE7 (https://bugzilla.redhat.com/show_bug.cgi?id=601744)"
fix error in description of snmpAgentPort plugin config prop
disable tests, and publishing of Maven artifacts for enterprise builds
fix so unsynced (invStatus!=COMMITED || id==0) Resources are not included in avail reports sent by the PC (fixes half of https://bugzilla.redhat.com/show_bug.cgi?id=618879)
fix so that when the Server moves a Resource to a new parent as a result of that Resource's type's parent type changing, that Resource also gets moved to the new parent in the plugin container's local inventory the next time the PC InventoryManager performs an inventory sync (fix for second half of https://bugzilla.redhat.com/show_bug.cgi?id=618879)
a few cosmetic + javadoc changes
Revert "fix so that when the Server moves a Resource to a new parent as a result of that Resource's type's parent type changing, that Resource also gets moved to the new parent in the plugin container's local inventory the next time the PC InventoryManager performs an inventory sync (fix for second half of https://bugzilla.redhat.com/show_bug.cgi?id=618879)"
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
Jay Shaughnessy (35):
fix jdoc
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
Turn the generic AbstractBundleWizard into AbstractWizard, impementing
[BZ 608732] Remove unnecessary stack sections from bundle view. Note,
[BZ 612121, 612115, 608732, 611436, 611411, 604710, 601175]
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
Merge branch 'release-3.0.0' into release-3.0.0-jay
[BZ 611468] Add message to create wizard.
[BZ 611411] Fix a different failure message scenario for this
Merge branch 'release-3.0.0' into release-3.0.0-jay
Added previousPage() to WizardStep interface. This is analogous to the
As part of the research for BZ 611456 (delete bundle issue) I found that
[BZ 612100] Work to better inform the bundle create wizard
Merge branch 'release-3.0.0' into release-3.0.0-jay
[bz 611749] Get the BundleSelector search filter to work more like
Merge branch 'release-3.0.0' into release-3.0.0-jay
Add ignoreError attribute for schemaSpecTasks to
A bunch of changes to handle discrepencies between
Merge branch 'release-3.0.0' into release-3.0.0-jay
trivial - fix up some comments
Merge branch 'release-3.0.0' into release-3.0.0-jay
Postgres seems to have some different transaction semantics
Merge branch 'release-3.0.0' into release-3.0.0-jay
remove the previous bundle version field, it wasn't available w/o
[BZ 613918] Further ensure manage_bundle permission is sufficient
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
Up the timeout for upload servlet session
[bz 616395] reduce the default # of threads used for plugin deployment
Merge branch 'release-3.0.0' into release-3.0.0-work
[bz 616978] extend transactional timeout to compensate for removal of an
Merge branch 'release-3.0.0' into release-3.0.0-work
Fix compile error in ws test code due to removal of getConfiguration
Commentedt out test class until
John Mazzitelli (9):
BZ 612358 - when uploading recipe and then uploading bundle files, need to make the bundle files wiht the same version as the bundle
BZ 601214 - fix classloading issue when a child deep in the hierarchy exists and the direct parents of two services are the same but the resources actually belong to two different servers (which is only known by looking higher up in ancestry)
BZ 605648 - temporarily disable all gwt views except for bundle/tag related ones
remove the chkconfig headers - its a copy-paste from the server script - doesn't make sense to have it here in the generate db passwd script
redirect error stream of readlink to dev/null when starting standalone pc
BZ 535784 - pass in -e argument to readlink to support the "double linked" problem where rc.3.d has a symlink to init.d which in turn is a symlink to rhq-agent-wrapper.sh. Need -e so readlink recursively walks the symlinks to reach the actual script file
BZ 614886
BZ 595482 - add new JDBC login module to prohibit LDAP look if there is already an RHQ principal defined in the database
LDAP module needs to be REQUISITE
John Sanda (10):
[BZ 601153] Modifying configu update logic to avoid TransientObjectException
[BZ 598951] Increasing log level to WARN when java_home cannot be determined
[BZ 604744] Correcting list field property name for sorting
[BZ 604744] Correcting property name for resource category field
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
Removing unecessary comments that were present only for review
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
Fixing unit test failures
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
[BZ 617718] Changing property name to lower case since plugin is accessing wrong property name
Joseph Marques (74):
BZ-599515: by default, do not show auto-backing-cluster results in group browser
prevnet global saved searches from appearing in the menu bar
fix typo in exception message
disallow creation of global saved searches, which will minimize upgrade burden later
removed obsolete auto-complete / search suggestion components
BZ-612612: only suggest names for visible groups
BZ-610155: relax suggestion matching, suppress "empty" results
remove main method used for debugging long ago
BZ-610107: ensure search expression for translation into JPQL is whitespace-trimmed and non-null
BZ-601354: only offer resource/group suggestions specific to the active sub-tab (if any)
do not recalculate global searches
interpret "all" tab as the absence of a category filter
BZ-613222: only display saved searches for the current/active search subsystem
display the count of results in the saved searches drop-down
compute the result counts for the group-specific saved searches
show result counts for saved searches in the suggestions pop-up
fix whitespace padding
fix failing unit test
do not propogate faces messages for ajax requests
cache user preferences uibean in the page
BZ-610228: allow search expression errors to bubble up to the inventory browser
add missing quote for attribute
remove main method
BZ-614087, BZ-614090: fix selection/deletion of saved searches
BZ-614165: do not try to parameter-replace UNSET configuration properties
BZ-614176: fix for selecting resource/group saved searches from the menu bar
BZ-613939: fix link for "recent group operation" section from the dashboard
ensure the "location" column for various dashboard portlets always renders
BZ-613918: allow bundle managers without MANAGE_INVENTORY perm to create/delete bundles
BZ-614688: support searching for values that contain single-quotes
BZ-614591: fix inventory sync issues that manifest during specific timings of async uninventory
BZ-614693: suppress search suggestions for hidden/password parameters/values
BZ-614693: ignore search terms that attempt to filter using hidden/password properties
BZ-614529: support search expressions containing ':'
BZ-610120: respect user-chosen quoting style
BZ-610135: provide intelligent quoting for suggestions
do not escape enums in search
BZ-615017: enhance search suggestion/execution support for boundary matching
support suggesting "null" values without quotes, which **is** a valid search term value
only add fragments to the generation suggestion-JPQL as necessary
fix the highlighting strategy to respect ^ and $ boundary characters
parenthesize saved search results counts on all screens
BZ-612739: ensure that search suggestions never overflow drop-down boundaries
BZ-612739: use more sophisticated highlighting mechanism that respects line breaks
remove unnecessary debugging constructs
don't try to reload the data page upon authorization failures, just let it bubble up
BZ-614886: fix permissions necessary for resource/plugin configuration updates
BZ-614845: ensure that the form is submitted after the ajax-selection completes
user must be able to view resource in order to see plugin configuration
BZ-615351: respect user's authorization when displaying suggestions
BZ-615351: respect user's authorization when display suggestions
BZ-615619: properly activate the saved search when selected from the suggestions
BZ-615245: only set the sender columns to NON-NULL after the CustomAlertSenderUpgradeTask completes
BZ-614886: add secondary permission for configuration subsystem
BZ-614886: update view/edit role page to accomodate new read/write config permissions
BZ-614886: fix all callpaths originating from existing UI to respect configuration authorization
BZ-614886: finally, perform necessary upgrade tasks so users see no upgrade impact
BZ-614886: respect authz when displaying configUpdates in subsystem view
BZ-615952: ensure old alertNotification/Log rows are removed during upgrade
BZ-610228: pretty up SearchBar error messages
BZ-615017: fix QueryException when using connection-based search terms
Merge branch 'release-3.0.0' into config-permissions
this default error handling for value-completion is obsolete, removing it
use db-upgrade properly
BZ-616233: use MODIFY_RESOURCE to protect edit of group plugin config
BZ-616400: fix alert notification log custom upgrade task
BZ-616465: fix delimiter for email-based alert notifications
BZ-616465: remove beginning/trailing commas around email-based notifications
BZ-616661: keep alert notifications sticky to the definitions that defined them
remove ability to sort by type/plugin columns on group browser
BZ-617257: windows does not open on IE if name includes whitespace
BZ-617567: don't use nested forms
BZ-617773: only show resource-level alert definitions in the subsystem view
BZ-616656: BZ-601189: fix searching and pagination on IE6
Lukas Krejci (4):
BZ 604032 - Adding a little bit of margin between resource type and resource name in the disambiguated lists.
BZ 612189 - reverting the resource keys of apache server and vhost resource types to the format used in the last released version of JON.
BZ 601744 - backing out the position:relative part of the original fix in main.xhtml. This effectively reverts the page to the state it was before we had the rich:tabPanel, which was eventually removed.
BZ 618741 - add the configuration name to the name of the JBoss AS (4 and 5) server resources.
Simeon Pinder (3):
BZ 604792: fix bundle left nav update issue.
Merge branch 'release-3.0.0' into spinder-provisioning
updating WS version string to indicate remote model/interface changes.
hudson auto (6):
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release RHQ_3_0_0_GA
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release RHQ_3_0_0_GA
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release RHQ_3_0_0_GA
---
dev/null |binary
etc/standalone-pc/standalone.sh | 2
modules/common/ant-bundle/pom.xml | 2
modules/common/filetemplate-bundle/pom.xml | 2
modules/common/jboss-as/pom.xml | 2
modules/common/pom.xml | 2
modules/core/client-api/pom.xml | 2
modules/core/comm-api/pom.xml | 2
modules/core/dbutils/pom.xml | 4
modules/core/dbutils/src/main/java/org/rhq/core/db/ant/dbupgrade/SchemaSpec.java | 29
modules/core/dbutils/src/main/java/org/rhq/core/db/ant/dbupgrade/SchemaSpecTask.java | 17
modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java | 38 -
modules/core/dbutils/src/main/scripts/dbsetup/alert-schema.xml | 3
modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 20
modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml | 8
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 121 +++-
modules/core/domain/pom.xml | 2
modules/core/domain/src/main/java/org/rhq/core/domain/alert/AlertDefinition.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java | 12
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/Bundle.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/common/ProductInfo.java | 121 ++++
modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdate.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/content/AdvisoryCVE.java | 3
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleResourceDeploymentCriteria.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceGroupCriteria.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceComposite.java | 16
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourcePermission.java | 91 +--
modules/core/domain/src/main/java/org/rhq/core/domain/search/SavedSearch.java | 2
modules/core/domain/src/main/java/org/rhq/core/domain/search/SearchSuggestion.java | 14
modules/core/gui/pom.xml | 2
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/propset/ConfigurationSet.java | 17
modules/core/native-system/pom.xml | 2
modules/core/plugin-api/pom.xml | 2
modules/core/plugin-container/pom.xml | 2
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java | 170 ++---
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java | 2
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/CanonicalResourceKey.java | 170 ++---
modules/core/plugin-container/src/test/java/org/rhq/core/pc/plugin/CanonicalResourceKeyTest.java | 155 +++++
modules/core/plugin-validator/pom.xml | 2
modules/core/plugindoc/pom.xml | 2
modules/core/pom.xml | 2
modules/core/util/pom.xml | 2
modules/core/util/src/main/java/org/rhq/core/util/exception/ThrowableUtil.java | 52 -
modules/enterprise/agent/pom.xml | 2
modules/enterprise/agent/src/etc/rhq-agent-wrapper.sh | 24
modules/enterprise/agent/src/etc/rhq-agent.sh | 14
modules/enterprise/agentupdate/pom.xml | 2
modules/enterprise/comm/pom.xml | 2
modules/enterprise/gui/base-perspective-jar/pom.xml | 2
modules/enterprise/gui/base-perspective-war/pom.xml | 2
modules/enterprise/gui/content_http-war/pom.xml | 2
modules/enterprise/gui/coregui/pom.xml | 45 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 65 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/SearchGUI.java | 45 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/AbstractBundleWizard.java | 87 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleSelector.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/AbstractBundleCreateWizard.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleSummaryStep.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDataStep.java | 49 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java | 38 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadRecipeStep.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/AbstractBundleDeployWizard.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/DeployStep.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentInfoStep.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentOptionsStep.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDestinationStep.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleStep.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/SelectBundleVersionStep.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 16
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesWithLatestVersionDataSource.java | 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/AbstractBundleRevertWizard.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/ConfirmationStep.java | 36 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/GetRevertInfoStep.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/revert/RevertStep.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/AboutModalWindow.java | 28
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleDistributionFileUploadForm.java | 77 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/BundleFileUploadForm.java | 85 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizard.java | 82 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/AbstractWizardStep.java | 36 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardStep.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java | 51 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SearchGWTService.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SystemGWTService.java | 29
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateStep.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupCreateWizard.java | 40 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/wizard/GroupMembersStep.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDataSourceField.java | 63 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 57 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationCreateWizard.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationParametersStep.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/create/OperationSchedulingStep.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ConfigurationStep.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ConfigurationTemplateStep.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java | 85 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceGroupSelector.java | 21
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/selection/ResourceSelector.java | 34 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java | 18
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/SearchBarPane.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchBar.java | 104 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/SearchLogger.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchGrid.java | 20
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/favorites/SavedSearchManager.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestResultsListBox.java | 158 -----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox.java | 301 ----------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v2.java | 166 -----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/suggest/SuggestTextBox_v3.java | 196 ++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RPCManager.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/AlertGWTServiceImpl.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/FileUploadServlet.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SearchGWTServiceImpl.java | 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SystemGWTServiceImpl.java | 35 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/util/SerialUtility.java | 11
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 19
modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css | 4
modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 8
modules/enterprise/gui/coregui/src/main/webapp/images/types/Server_down_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Server_up_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Service_down_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Service_down_24.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Service_up_16.png |binary
modules/enterprise/gui/coregui/src/main/webapp/images/types/Service_up_24.png |binary
modules/enterprise/gui/installer-war/pom.xml | 2
modules/enterprise/gui/pom.xml | 2
modules/enterprise/gui/portal-war/pom.xml | 11
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authentication/SessionAccessServlet.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/authorization/GlobalPermissionsUIBean.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/FaceletRedirectionViewHandler.java | 3
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/FacesMessagePropogationPhaseListener.java | 9
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/framework/UserPreferencesUIBean.java | 4
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/paging/PagedListDataModel.java | 3
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java | 8
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/AbstractGroupResourceConfigurationUIBean.java | 3
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/EditGroupResourceConfigurationUIBean.java | 6
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationHistoryDetailsUIBean.java | 7
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/GroupResourceConfigurationHistoryUIBean.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java | 103 +--
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseGroupsUIBean.java | 31 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/browse/BrowseResourcesUIBean.java | 35 -
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/AbstractGroupPluginConfigurationUIBean.java | 3
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/EditGroupPluginConfigurationUIBean.java | 3
modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties | 10
modules/enterprise/gui/portal-war/src/main/webapp/admin/role/RolePermissionsForm.jsp | 90 ++
modules/enterprise/gui/portal-war/src/main/webapp/css/win.css | 1
modules/enterprise/gui/portal-war/src/main/webapp/images/icons/Server_down_16.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icons/Server_unknown_16.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icons/Server_up_16.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icons/Service_down_16.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icons/Service_down_24.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icons/Service_unknown_16.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icons/Service_unknown_24.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icons/Service_up_16.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/images/icons/Service_up_24.png |binary
modules/enterprise/gui/portal-war/src/main/webapp/js/adminEditRole_checkAll.js | 25
modules/enterprise/gui/portal-war/src/main/webapp/js/rhq.js | 2
modules/enterprise/gui/portal-war/src/main/webapp/portlet/controlactions/View.jsp | 4
modules/enterprise/gui/portal-war/src/main/webapp/portlet/problemResources/View.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/portlet/resourceHealth/View.jsp | 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/alert/notification/details.xhtml | 7
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/menu/menu.xhtml | 20
modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/searchInterface.xhtml | 3
modules/enterprise/gui/portal-war/src/main/webapp/rhq/entity/layout/main.xhtml | 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/configuration/editCurrent.xhtml | 18
modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/configuration/history.xhtml | 10
modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/configuration/viewCurrent.xhtml | 19
modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/inventory/view-connection.xhtml | 4
modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseGroups.xhtml | 34 -
modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/browseResources.xhtml | 31 -
modules/enterprise/gui/portal-war/src/main/webapp/rhq/inventory/layout/main.xhtml | 26
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/edit.xhtml | 25
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/history.xhtml | 18
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/raw.xhtml | 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/structured.xhtml | 2
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml | 26
modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/summary/overview.xhtml | 14
modules/enterprise/gui/webdav-war/pom.xml | 2
modules/enterprise/pom.xml | 2
modules/enterprise/remoting/cli/pom.xml | 2
modules/enterprise/remoting/client-api/pom.xml | 2
modules/enterprise/remoting/pom.xml | 2
modules/enterprise/remoting/webservices/pom.xml | 2
modules/enterprise/remoting/webservices/src/test/java/org/rhq/enterprise/server/ws/WsConfigurationManagerTest.java | 11
modules/enterprise/server/container-lib/pom.xml | 2
modules/enterprise/server/container/pom.xml | 2
modules/enterprise/server/container/src/main/bin-resources/bin/generate-db-password.sh | 5
modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh | 12
modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 3
modules/enterprise/server/ear/pom.xml | 2
modules/enterprise/server/jar/pom.xml | 9
modules/enterprise/server/jar/src/main/antlr3/org/rhq/enterprise/server/search/RHQL.g | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 44 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 69 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java | 12
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java | 5
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServer.java | 34 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerMBean.java | 8
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CustomJaasDeploymentService.java | 16
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/jaas/JDBCPrincipalCheckLoginModule.java | 150 ++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 45 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDefinitionManagerBean.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 47 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceTypeManagerBean.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/definition/GroupDefinitionManagerBean.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java | 47 -
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/AsyncResourceDeleteJob.java | 74 +-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/scheduler/jobs/SavedSearchResultCountRecalculationJob.java | 40 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SavedSearchManagerBean.java | 10
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/SearchExpressionException.java | 47 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/AbstractSearchAssistant.java | 45 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/GroupSearchAssistant.java | 37 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java | 127 +++-
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/SearchAssistantFactory.java | 17
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/TabAwareSearchAssistant.java | 18
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/common/SearchQueryGenerationUtility.java | 90 ++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchAssistManager.java | 117 +++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/execution/SearchTranslationManager.java | 21
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/AbstractSearchTranslator.java | 81 --
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/GroupSearchTranslator.java | 12
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java | 46 +
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/SearchTranslatorFactory.java | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/ServerVersion.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerBean.java | 7
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerLocal.java | 3
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/system/SystemManagerRemote.java | 5
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/tagging/TagManagerBean.java | 14
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 30
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/QueryUtility.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java | 6
modules/enterprise/server/jar/src/main/resources/org/rhq/enterprise/server/core/ProductInfo.properties | 9
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/authz/test/AuthorizationManagerBeanTest.java | 38 -
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanUnitTest.java | 32 -
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/search/GenericSearchAssistTest.java | 2
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/search/TestAutoCompletionManager.java | 12
modules/enterprise/server/plugins/alert-email/pom.xml | 2
modules/enterprise/server/plugins/alert-irc/pom.xml | 2
modules/enterprise/server/plugins/alert-microblog/pom.xml | 2
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 2
modules/enterprise/server/plugins/alert-operations/pom.xml | 2
modules/enterprise/server/plugins/alert-operations/src/main/java/org/rhq/enterprise/server/plugins/alertOperations/OperationsSender.java | 3
modules/enterprise/server/plugins/alert-operations/src/main/resources/operations.xhtml | 2
modules/enterprise/server/plugins/alert-roles/pom.xml | 2
modules/enterprise/server/plugins/alert-roles/src/main/resources/roles.xhtml | 2
modules/enterprise/server/plugins/alert-snmp/pom.xml | 2
modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpInfo.java | 2
modules/enterprise/server/plugins/alert-snmp/src/main/java/org/rhq/enterprise/server/plugins/alertSnmp/SnmpTrapSender.java | 2
modules/enterprise/server/plugins/alert-snmp/src/main/resources/META-INF/rhq-serverplugin.xml | 2
modules/enterprise/server/plugins/alert-subject/pom.xml | 2
modules/enterprise/server/plugins/alert-subject/src/main/resources/subjects.xhtml | 2
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2
modules/enterprise/server/plugins/cobbler/pom.xml | 2
modules/enterprise/server/plugins/disk/pom.xml | 2
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2
modules/enterprise/server/plugins/jboss-software/pom.xml | 2
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2
modules/enterprise/server/plugins/pom.xml | 2
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2
modules/enterprise/server/plugins/url/pom.xml | 2
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2
modules/enterprise/server/plugins/yum/pom.xml | 2
modules/enterprise/server/safe-invoker/pom.xml | 2
modules/enterprise/server/sars/agent-sar/pom.xml | 2
modules/enterprise/server/sars/pom.xml | 2
modules/enterprise/server/xml-schemas/pom.xml | 2
modules/helpers/pluginAnnotations/pom.xml | 2
modules/helpers/pluginGen/pom.xml | 2
modules/helpers/pom.xml | 2
modules/helpers/rtfilter/pom.xml | 2
modules/plugins/aliases/pom.xml | 2
modules/plugins/ant-bundle/pom.xml | 2
modules/plugins/apache/pom.xml | 10
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java | 12
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java | 12
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java | 143 ++--
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java | 111 +++
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/mapping/ApacheAugeasMapping.java | 2
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheParserImpl.java | 16
modules/plugins/apache/src/main/resources/META-INF/rhq-plugin.xml | 2
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApacheAugeasTest.java | 123 ++++
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApacheAugeasUtil.java | 172 +++++
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java | 11
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApacheTestConstants.java | 47 +
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/Components.java | 125 ++++
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/UnitTestException.java | 21
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/helper/LensFilter.java | 23
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/helper/LensHelper.java | 109 +++
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/ApacheConfigurationUtil.java | 228 +++++++
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/util/StandAloneContainer.java | 75 ++
modules/plugins/apache/src/test/resources/httpd.aug | 58 +
modules/plugins/apache/src/test/resources/httpd.conf | 41 +
modules/plugins/apache/src/test/resources/included.conf | 13
modules/plugins/apache/src/test/resources/loadconfig/Apache | 2
modules/plugins/apache/src/test/resources/loadconfig/Directory0 | 2
modules/plugins/apache/src/test/resources/loadconfig/Directory1 | 2
modules/plugins/apache/src/test/resources/loadconfig/Directory2 | 2
modules/plugins/apache/src/test/resources/loadconfig/IfModule | 2
modules/plugins/apache/src/test/resources/loadconfig/IfModule0 | 2
modules/plugins/apache/src/test/resources/loadconfig/IfModule1 | 2
modules/plugins/apache/src/test/resources/nested.conf | 12
modules/plugins/apache/src/test/resources/updateconfig/httpd.aug | 58 +
modules/plugins/apache/src/test/resources/updateconfig/httpd.conf | 10
modules/plugins/apache/src/test/resources/updateconfig/included.conf | 4
modules/plugins/apache/src/test/resources/updateconfig/nested.conf | 3
modules/plugins/augeas/pom.xml | 2
modules/plugins/augeas/src/main/java/org/rhq/augeas/util/Glob.java | 19
modules/plugins/cobbler/pom.xml | 2
modules/plugins/cron/pom.xml | 2
modules/plugins/database/pom.xml | 2
modules/plugins/filetemplate-bundle/pom.xml | 2
modules/plugins/grub/pom.xml | 2
modules/plugins/hibernate/pom.xml | 2
modules/plugins/hosts/pom.xml | 2
modules/plugins/hudson/pom.xml | 2
modules/plugins/iis/pom.xml | 2
modules/plugins/jboss-as-5/pom.xml | 2
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java | 9
modules/plugins/jboss-as/pom.xml | 2
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASDiscoveryComponent.java | 8
modules/plugins/jboss-cache-v3/pom.xml | 2
modules/plugins/jboss-cache/pom.xml | 2
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelComponent.java | 64 ++
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsChannelDiscovery.java | 143 ++++
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoComponent.java | 64 --
modules/plugins/jboss-cache/src/main/java/org/rhq/plugins/jbosscache/JGroupsRepoDiscovery.java | 143 ----
modules/plugins/jboss-cache/src/main/resources/META-INF/rhq-plugin.xml | 106 +--
modules/plugins/jmx/pom.xml | 2
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/MBeanResourceComponent.java | 3
modules/plugins/mysql/pom.xml | 2
modules/plugins/netservices/pom.xml | 2
modules/plugins/oracle/pom.xml | 2
modules/plugins/perftest/pom.xml | 2
modules/plugins/perftest/src/main/resources/META-INF/rhq-plugin.xml | 13
modules/plugins/platform/pom.xml | 2
modules/plugins/pom.xml | 2
modules/plugins/postfix/pom.xml | 2
modules/plugins/postgres/pom.xml | 2
modules/plugins/rhq-agent/pom.xml | 2
modules/plugins/rhq-server/pom.xml | 2
modules/plugins/samba/pom.xml | 2
modules/plugins/script/pom.xml | 2
modules/plugins/snmptrapd/pom.xml | 2
modules/plugins/sshd/pom.xml | 2
modules/plugins/sudoers/pom.xml | 2
modules/plugins/tomcat/pom.xml | 2
modules/plugins/twitter/pom.xml | 2
modules/plugins/validate-all-plugins/pom.xml | 2
modules/pom.xml | 2
modules/test-utils/pom.xml | 2
pom.xml | 20
release.sh | 30
368 files changed, 5444 insertions(+), 2547 deletions(-)
---
13 years, 9 months
[rhq] Branch 'release-3.0.0' - modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml
by ips
modules/common/ant-bundle/pom.xml | 2 +-
modules/common/filetemplate-bundle/pom.xml | 2 +-
modules/common/jboss-as/pom.xml | 2 +-
modules/common/pom.xml | 2 +-
modules/core/client-api/pom.xml | 2 +-
modules/core/comm-api/pom.xml | 2 +-
modules/core/dbutils/pom.xml | 2 +-
modules/core/domain/pom.xml | 2 +-
modules/core/gui/pom.xml | 2 +-
modules/core/native-system/pom.xml | 2 +-
modules/core/plugin-api/pom.xml | 2 +-
modules/core/plugin-container/pom.xml | 2 +-
modules/core/plugin-validator/pom.xml | 2 +-
modules/core/plugindoc/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
modules/core/util/pom.xml | 2 +-
modules/enterprise/agent/pom.xml | 2 +-
modules/enterprise/agentupdate/pom.xml | 2 +-
modules/enterprise/comm/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-jar/pom.xml | 2 +-
modules/enterprise/gui/base-perspective-war/pom.xml | 2 +-
modules/enterprise/gui/content_http-war/pom.xml | 2 +-
modules/enterprise/gui/coregui/pom.xml | 2 +-
modules/enterprise/gui/installer-war/pom.xml | 2 +-
modules/enterprise/gui/pom.xml | 2 +-
modules/enterprise/gui/portal-war/pom.xml | 2 +-
modules/enterprise/gui/webdav-war/pom.xml | 2 +-
modules/enterprise/pom.xml | 2 +-
modules/enterprise/remoting/cli/pom.xml | 2 +-
modules/enterprise/remoting/client-api/pom.xml | 2 +-
modules/enterprise/remoting/pom.xml | 2 +-
modules/enterprise/remoting/webservices/pom.xml | 2 +-
modules/enterprise/server/container-lib/pom.xml | 2 +-
modules/enterprise/server/container/pom.xml | 2 +-
modules/enterprise/server/ear/pom.xml | 2 +-
modules/enterprise/server/jar/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-email/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-irc/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-microblog/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-mobicents/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-operations/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-roles/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-snmp/pom.xml | 2 +-
modules/enterprise/server/plugins/alert-subject/pom.xml | 2 +-
modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/cobbler/pom.xml | 2 +-
modules/enterprise/server/plugins/disk/pom.xml | 2 +-
modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +-
modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +-
modules/enterprise/server/plugins/pom.xml | 2 +-
modules/enterprise/server/plugins/rhnhosted/pom.xml | 2 +-
modules/enterprise/server/plugins/url/pom.xml | 2 +-
modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +-
modules/enterprise/server/plugins/yum/pom.xml | 2 +-
modules/enterprise/server/safe-invoker/pom.xml | 2 +-
modules/enterprise/server/sars/agent-sar/pom.xml | 2 +-
modules/enterprise/server/sars/pom.xml | 2 +-
modules/enterprise/server/xml-schemas/pom.xml | 2 +-
modules/helpers/pluginAnnotations/pom.xml | 2 +-
modules/helpers/pluginGen/pom.xml | 2 +-
modules/helpers/pom.xml | 2 +-
modules/helpers/rtfilter/pom.xml | 2 +-
modules/plugins/aliases/pom.xml | 2 +-
modules/plugins/ant-bundle/pom.xml | 2 +-
modules/plugins/apache/pom.xml | 2 +-
modules/plugins/augeas/pom.xml | 2 +-
modules/plugins/cobbler/pom.xml | 2 +-
modules/plugins/cron/pom.xml | 2 +-
modules/plugins/database/pom.xml | 2 +-
modules/plugins/filetemplate-bundle/pom.xml | 2 +-
modules/plugins/grub/pom.xml | 2 +-
modules/plugins/hibernate/pom.xml | 2 +-
modules/plugins/hosts/pom.xml | 2 +-
modules/plugins/hudson/pom.xml | 2 +-
modules/plugins/iis/pom.xml | 2 +-
modules/plugins/jboss-as-5/pom.xml | 2 +-
modules/plugins/jboss-as/pom.xml | 2 +-
modules/plugins/jboss-cache-v3/pom.xml | 2 +-
modules/plugins/jboss-cache/pom.xml | 2 +-
modules/plugins/jmx/pom.xml | 2 +-
modules/plugins/mysql/pom.xml | 2 +-
modules/plugins/netservices/pom.xml | 2 +-
modules/plugins/oracle/pom.xml | 2 +-
modules/plugins/perftest/pom.xml | 2 +-
modules/plugins/platform/pom.xml | 2 +-
modules/plugins/pom.xml | 2 +-
modules/plugins/postfix/pom.xml | 2 +-
modules/plugins/postgres/pom.xml | 2 +-
modules/plugins/rhq-agent/pom.xml | 2 +-
modules/plugins/rhq-server/pom.xml | 2 +-
modules/plugins/samba/pom.xml | 2 +-
modules/plugins/script/pom.xml | 2 +-
modules/plugins/snmptrapd/pom.xml | 2 +-
modules/plugins/sshd/pom.xml | 2 +-
modules/plugins/sudoers/pom.xml | 2 +-
modules/plugins/tomcat/pom.xml | 2 +-
modules/plugins/twitter/pom.xml | 2 +-
modules/plugins/validate-all-plugins/pom.xml | 2 +-
modules/pom.xml | 2 +-
modules/test-utils/pom.xml | 2 +-
pom.xml | 2 +-
103 files changed, 103 insertions(+), 103 deletions(-)
New commits:
commit 8fb6059a9db07d40b827ae6358dbfcebcc7fdac9
Author: hudson auto <wnstb(a)yahoo.com>
Date: Wed Jul 28 15:10:27 2010 -0400
[maven-release-plugin] prepare release RHQ_3_0_0_GA
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index eda9133..97ef93b 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index bc7965b..3b26a39 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index 2cf950b..688d5e4 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index ee81a94..2ddc4af 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index d177f9e..a27161b 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml
index a51f92b..4589d42 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 7ff6a10..d7559da 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index e0ced84..dc75145 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index 0911918..b535306 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index d47d4c8..f72bc2f 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index e1ce7ef..967b21a 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index 2e58102..fbab223 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml
index 7739177..996cd8f 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml
index eeb7e81..8a95e51 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 7aad64c..b0c399b 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index bc41dc5..37bcda5 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index d9f1c1c..3fc1344 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 8942239..127b06f 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index 8b9da9c..9f09ff1 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml
index 611eb9d..95b62cd 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml
index 798a8ca..c1c297f 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml
index df05645..6be8d8d 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index acbe21f..709bfe3 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index 1beadca..8d33ef0 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 0c529ba..bf6a9a4 100644
--- a/modules/enterprise/gui/pom.xml
+++ b/modules/enterprise/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index a794cd6..d9f0c15 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/webdav-war/pom.xml b/modules/enterprise/gui/webdav-war/pom.xml
index aa880be..9bdfc91 100644
--- a/modules/enterprise/gui/webdav-war/pom.xml
+++ b/modules/enterprise/gui/webdav-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 3b0dbb8..77a5685 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index 05187c7..dff57e7 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<artifactId>rhq-remoting-cli</artifactId>
diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml
index e86ef41..6008df1 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<artifactId>rhq-remoting-client-api</artifactId>
diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml
index 910b617..68d51c0 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<artifactId>rhq-remoting-parent</artifactId>
diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml
index 2ea73ee..444256d 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<artifactId>rhq-remoting-webservices</artifactId>
diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml
index 2c98817..f09e063 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 3fd11e8..b4d2146 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml
index bf15866..c063211 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 79fdc38..ddff575 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml
index dd5bc18..ea1eb7b 100644
--- a/modules/enterprise/server/plugins/alert-email/pom.xml
+++ b/modules/enterprise/server/plugins/alert-email/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml
index c0973f3..363ac0a 100644
--- a/modules/enterprise/server/plugins/alert-irc/pom.xml
+++ b/modules/enterprise/server/plugins/alert-irc/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml
index a62fee8..b4751ba 100644
--- a/modules/enterprise/server/plugins/alert-microblog/pom.xml
+++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
index 3193539..b0a0c3b 100644
--- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml
+++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index e69bfbc..6d35aed 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml
index ca33bb7..cbd7334 100644
--- a/modules/enterprise/server/plugins/alert-roles/pom.xml
+++ b/modules/enterprise/server/plugins/alert-roles/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml
index af75153..6398092 100644
--- a/modules/enterprise/server/plugins/alert-snmp/pom.xml
+++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml
index 09839b8..ebac52c 100644
--- a/modules/enterprise/server/plugins/alert-subject/pom.xml
+++ b/modules/enterprise/server/plugins/alert-subject/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml
index 73f405e..30efb5a 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</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 4c44f10..8464662 100644
--- a/modules/enterprise/server/plugins/cobbler/pom.xml
+++ b/modules/enterprise/server/plugins/cobbler/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml
index 0033d1b..40ab2a2 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</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 61965f2..0c5fb51 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</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 7451668..3f1e165 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
index 0ac61d3..25917cc 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml
index 5a78451..40c066f 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml
index 2b16f4a..9832288 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index e4ab9b2..26e985a 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index a6cba32..14e52de 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</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 9c7cc74..e160aa6 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</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 ebdd3da..344a215 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml
index 06c8981..bb1abdd 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml
index aa278b8..2458369 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml
index 0cc2084..4ac7f43 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 14738d0..21ccc78 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml
index d056f74..366d1aa 100644
--- a/modules/helpers/pluginAnnotations/pom.xml
+++ b/modules/helpers/pluginAnnotations/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/pluginGen/pom.xml b/modules/helpers/pluginGen/pom.xml
index 28dc9b1..d992e29 100644
--- a/modules/helpers/pluginGen/pom.xml
+++ b/modules/helpers/pluginGen/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index a0721a9..c5e5ae2 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml
index 5d327ee..ffac476 100644
--- a/modules/helpers/rtfilter/pom.xml
+++ b/modules/helpers/rtfilter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq.helpers</groupId>
<artifactId>rhq-helpers</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index c37598e..c475e5e 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index cc160c9..5fa4596 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 700a6af..88db42f 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 915106a..51580cd 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index d920440..a140f5d 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index d5aaad5..9119492 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 30889f7..714ad7a 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index b79645d..e01b311 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index f7cf265..aef1858 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index acb08ef..4f87dfe 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index 7dd0fde..157119f 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 65fa7b8..eed10bc 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 853c020..9a9c2f0 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</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 a0ade77..befe74c 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index b9ed2b3..ac9b3f6 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</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 b3846fa..61f4e11 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index 443e524..684e8e3 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index ac9885a..a9874cc 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index d0c9053..5a02364 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 06ae2ae..3d937e7 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 1acdb0f..e915511 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 39c75da..f65ad5a 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 97b83b0..aadd8bf 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 85d6105..f32c52d 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 283ab6a..639838b 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index 5a4466c..beb98f2 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index a190dcd..fdb0991 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 8f4e675..8fb6fee 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 0d41574..9411143 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 7719b14..0ec4d51 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 2d9d715..f5106f0 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index 3579496..b637f0d 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 41df1b8..55c3b49 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 205d5b0..9de8802 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.jboss.on</groupId>
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index e299efa..9ee6ac3 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</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 b3d5e87..93e847c 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>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index bc96ae3..a6af192 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 2235687..5b243a9 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -4,7 +4,7 @@
<parent>
<artifactId>rhq-modules-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
</parent>
<artifactId>test-utils</artifactId>
<name>RHQ Test Utils</name>
diff --git a/pom.xml b/pom.xml
index 7ff85bb..5e2dc43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.0.GA</version>
<packaging>pom</packaging>
<name>RHQ</name>
13 years, 9 months
[rhq] modules/enterprise
by mazz
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 14 ++
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/InventoryPromptCommand.java | 65 +++++++++-
2 files changed, 73 insertions(+), 6 deletions(-)
New commits:
commit 148c25cc279be5f96923c149fc0530512afdb9a0
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Jul 28 14:24:20 2010 -0400
bz 619138 - add "inventory --sync" command
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
index 7e621e8..eadb493 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java
@@ -1922,7 +1922,7 @@ public interface AgentI18NResourceKeys {
@I18NMessage("inventory")
String INVENTORY = "PromptCommand.inventory";
- @I18NMessage("inventory [--xml] [--export=<file>] [--norecurse]\\n\\\n"
+ @I18NMessage("inventory [--sync] [--xml] [--export=<file>] [--norecurse]\\n\\\n"
+ "\\ [--id=<#>] | --types | <inventory-binary-file>]")
String INVENTORY_SYNTAX = "PromptCommand.inventory.syntax";
@@ -1931,6 +1931,9 @@ public interface AgentI18NResourceKeys {
@I18NMessage("This will allow you to view the resources currently in inventory.\\n\\\n"
+ "The valid command line arguments are:\\n\\\n"
+ + "\\ -s, --sync : Purges the agent's inventory and re-syncs it with the server.\\n\\\n"
+ + "\\ This forces the agent's plugin container to restart.\\n\\\n"
+ + "\\ All other options are ignored if this is specified.\\n\\\n"
+ "\\ -e, --export=file : Writes the inventory information to the given file.\\n\\\n"
+ "\\ If this is not specified, the output will go to the\\n\\\n"
+ "\\ console window.\\n\\\n"
@@ -1980,6 +1983,15 @@ public interface AgentI18NResourceKeys {
+ "two are mutually exclusive")
String INVENTORY_ID_AND_DUMP_TYPES_SPECIFIED = "PromptCommand.inventory.id-and-dump-types-specified";
+ @I18NMessage("Cannot sync inventory - not currently able to talk to the RHQ Server.")
+ String INVENTORY_ERROR_NOT_SENDING = "PromptCommand.inventory.error-not-sending";
+
+ @I18NMessage("Purged the persisted inventory found at [{0}], sync will occur when plugin container restarts")
+ String INVENTORY_DATA_FILE_DELETED = "PromptCommand.inventory.data-file-deleted";
+
+ @I18NMessage("Failed to purge the inventory data file [{0}], sync may fail.")
+ String INVENTORY_DATA_FILE_DELETION_FAILURE = "PromptCommand.inventory.data-file-deletion-failure";
+
@I18NMessage("avail")
String AVAILABILITY = "PromptCommand.availability";
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/InventoryPromptCommand.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/InventoryPromptCommand.java
index cb48f38..661a84a 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/InventoryPromptCommand.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/InventoryPromptCommand.java
@@ -20,11 +20,14 @@ package org.rhq.enterprise.agent.promptcmd;
import gnu.getopt.Getopt;
import gnu.getopt.LongOpt;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintWriter;
import java.util.Set;
+
import mazz.i18n.Msg;
+
import org.rhq.core.clientapi.agent.PluginContainerException;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.pc.PluginContainer;
@@ -34,6 +37,7 @@ import org.rhq.core.pc.util.InventoryPrinter;
import org.rhq.enterprise.agent.AgentMain;
import org.rhq.enterprise.agent.i18n.AgentI18NFactory;
import org.rhq.enterprise.agent.i18n.AgentI18NResourceKeys;
+import org.rhq.enterprise.communications.command.client.ClientCommandSender;
/**
* Provides a view into the inventory.
@@ -92,12 +96,15 @@ public class InventoryPromptCommand implements AgentPromptCommand {
boolean dumpTypesOnly = false;
Integer id = null;
boolean noRecurse = false;
+ boolean sync = false;
- String sopts = "-e:i:ntx";
- LongOpt[] lopts = { new LongOpt("export", LongOpt.REQUIRED_ARGUMENT, null, 'e'),
- new LongOpt("id", LongOpt.REQUIRED_ARGUMENT, null, 'i'),
- new LongOpt("norecurse", LongOpt.NO_ARGUMENT, null, 'n'),
- new LongOpt("types", LongOpt.NO_ARGUMENT, null, 't'), new LongOpt("xml", LongOpt.NO_ARGUMENT, null, 'x') };
+ String sopts = "-se:i:ntx";
+ LongOpt[] lopts = { new LongOpt("export", LongOpt.REQUIRED_ARGUMENT, null, 'e'), //
+ new LongOpt("id", LongOpt.REQUIRED_ARGUMENT, null, 'i'), //
+ new LongOpt("norecurse", LongOpt.NO_ARGUMENT, null, 'n'), //
+ new LongOpt("sync", LongOpt.NO_ARGUMENT, null, 's'), //
+ new LongOpt("types", LongOpt.NO_ARGUMENT, null, 't'), //
+ new LongOpt("xml", LongOpt.NO_ARGUMENT, null, 'x') };
Getopt getopt = new Getopt(getPromptCommandString(), args, sopts, lopts);
int code;
@@ -116,6 +123,11 @@ public class InventoryPromptCommand implements AgentPromptCommand {
break;
}
+ case 's': {
+ sync = true;
+ break;
+ }
+
case 'e': {
exportFile = getopt.getOptarg();
break;
@@ -156,6 +168,13 @@ public class InventoryPromptCommand implements AgentPromptCommand {
return;
}
+ // if being asked to sync, we shutdown the PC, delete inventory.dat and restart PC.
+ // all other options are ignored
+ if (sync) {
+ syncInventory(agent, out);
+ return;
+ }
+
if ((inventoryBinaryFile != null) && dumpTypesOnly) {
out.println(MSG.getMsg(AgentI18NResourceKeys.INVENTORY_DUMP_TYPES_AND_BINARY_FILE_SPECIFIED));
out.println(MSG.getMsg(AgentI18NResourceKeys.HELP_SYNTAX_LABEL, getSyntax()));
@@ -228,4 +247,40 @@ public class InventoryPromptCommand implements AgentPromptCommand {
return;
}
+
+ private void syncInventory(AgentMain agent, PrintWriter out) {
+ // if the PC is already started, we need to shut it down and restart it after we get the new plugins
+ boolean recyclePC = agent.isPluginContainerStarted();
+
+ // make sure our agent is currently in communications with the server
+ ClientCommandSender clientCommandSender = agent.getClientCommandSender();
+ if (clientCommandSender == null || !clientCommandSender.isSending()) {
+ out.println(MSG.getMsg(AgentI18NResourceKeys.INVENTORY_ERROR_NOT_SENDING));
+ return;
+ }
+
+ // use the PC prompt command to stop the PC - needed because the PC cannot hot-deploy plugins
+ if (recyclePC) {
+ executePCCommand(agent, "stop");
+ }
+
+ File dataDir = agent.getConfiguration().getPluginContainerConfiguration().getDataDirectory();
+ File inventoryDataFile = new File(dataDir, "inventory.dat");
+ inventoryDataFile.delete();
+ if (!inventoryDataFile.exists()) {
+ out.println(MSG.getMsg(AgentI18NResourceKeys.INVENTORY_DATA_FILE_DELETED, inventoryDataFile));
+ } else {
+ out.println(MSG.getMsg(AgentI18NResourceKeys.INVENTORY_DATA_FILE_DELETION_FAILURE, inventoryDataFile));
+ }
+
+ if (recyclePC) {
+ executePCCommand(agent, "start");
+ }
+ }
+
+ private void executePCCommand(AgentMain agent, String startOrStop) {
+ PluginContainerPromptCommand command = new PluginContainerPromptCommand();
+ command.execute(agent, new String[] { command.getPromptCommandString(), startOrStop });
+ }
+
}
\ No newline at end of file
13 years, 9 months
[rhq] Branch 'release-3.0.0' - 5 commits - modules/core
by ips
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java | 170 ++++------
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java | 2
2 files changed, 81 insertions(+), 91 deletions(-)
New commits:
commit 551ec3b94fd778e1756d827b2aa2ae1530433c44
Merge: ac089af... 94090ca...
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Jul 28 13:58:42 2010 -0400
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
commit ac089af2c4b4471876e4b84b9d45169cf7cb9cce
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Jul 28 13:56:56 2010 -0400
Revert "fix so that when the Server moves a Resource to a new parent as a result of that Resource's type's parent type changing, that Resource also gets moved to the new parent in the plugin container's local inventory the next time the PC InventoryManager performs an inventory sync (fix for second half of https://bugzilla.redhat.com/show_bug.cgi?id=618879)"
This reverts commit e60acb24efe12dc9aac8e0b5f708c551c17a6768.
This fix is attached to https://bugzilla.redhat.com/show_bug.cgi?id=618879 as a patch, which we'll most likely apply after JON 2.4 has been released.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index 6e9a503..0c86f8f 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -237,7 +237,6 @@ public class InventoryManager extends AgentService implements ContainerService,
inventoryThreadPoolExecutor.scheduleWithFixedDelay(serviceScanExecutor, configuration
.getServiceDiscoveryInitialDelay(), configuration.getServiceDiscoveryPeriod(), TimeUnit.SECONDS);
}
-
} finally {
inventoryLock.writeLock().unlock();
}
@@ -2258,41 +2257,22 @@ public class InventoryManager extends AgentService implements ContainerService,
if (log.isDebugEnabled()) {
log.debug("Merging [" + resource + "] into local inventory...");
}
- Resource passedResource = resource; // Keep a reference to the passed Resource for debugging purposes.
-
- ResourceContainer existingResourceContainer = getResourceContainer(resource);
- if (existingResourceContainer == null) {
- existingResourceContainer = getResourceContainer(resource.getId());
- }
- Resource existingResourceViaContainer = (existingResourceContainer != null) ?
- existingResourceContainer.getResource() : null;
- Resource existingParent = (existingResourceViaContainer != null) ?
- existingResourceViaContainer.getParentResource() : null;
-
- Resource newParent;
+ Resource passedResource = resource; // always keep a reference to the passed resource
+ Resource parentResource;
if (resource.getParentResource() != null) {
ResourceContainer parentResourceContainer = getResourceContainer(resource.getParentResource());
if (parentResourceContainer == null) {
parentResourceContainer = getResourceContainer(resource.getParentResource().getId());
}
- if (parentResourceContainer != null) {
- newParent = parentResourceContainer.getResource();
- } else {
- newParent = null; // TODO right thing to do? Or directly return?
- }
+ if (parentResourceContainer != null)
+ parentResource = parentResourceContainer.getResource();
+ else
+ parentResource = null; // TODO right thing to do? Or directly return?
} else {
- newParent = null;
+ parentResource = null;
}
-
- if (newParent != null && existingParent != null &&
- !matches(newParent, existingParent)) {
- // The Server must have moved the Resource to a new parent - remove it from its old parent in our
- // local inventory. We'll add
- existingParent.removeChildResource(existingResourceViaContainer);
- }
-
- Resource existingResourceViaParent = findMatchingChildResource(resource, newParent);
- if (newParent == null && existingResourceViaParent == null) {
+ Resource existingResource = findMatchingChildResource(resource, parentResource);
+ if (parentResource == null && existingResource == null) {
// This should never happen, but add a check so we'll know if it ever does.
log.error("Existing platform [" + this.platform + "] has different Resource type and/or Resource key than "
+ "platform in Server inventory: " + resource);
@@ -2301,31 +2281,31 @@ public class InventoryManager extends AgentService implements ContainerService,
boolean pluginConfigUpdated = false;
this.inventoryLock.writeLock().lock();
try {
- if (existingResourceViaParent != null) {
+ if (existingResource != null) {
// First grab the existing Resource's container, so we can reuse it.
- resourceContainer = this.resourceContainers.remove(existingResourceViaParent.getUuid());
+ resourceContainer = this.resourceContainers.remove(existingResource.getUuid());
if (resourceContainer != null) {
this.resourceContainers.put(resource.getUuid(), resourceContainer);
}
- if (newParent != null) {
+ if (parentResource != null) {
// It's critical to remove the existing Resource from the parent's child Set if the UUID has
// changed (i.e. altering the hashCode of an item in a Set == BAD), so just always remove it.
- newParent.removeChildResource(existingResourceViaParent);
+ parentResource.removeChildResource(existingResource);
}
// Now merge the new Resource into the existing Resource...
- pluginConfigUpdated = mergeResource(resource, existingResourceViaParent);
- resource = existingResourceViaParent;
+ pluginConfigUpdated = mergeResource(resource, existingResource);
+ resource = existingResource;
}
- if (newParent != null) {
- newParent.addChildResource(resource);
+ if (parentResource != null) {
+ parentResource.addChildResource(resource);
} else {
this.platform = resource;
}
// Replace the stripped-down ResourceType that came from the Server with the full ResourceType - it's
// critical to do this before refreshing the state (i.e. calling start on the ResourceComponent)
- // and critical to do this before initializing the container (since it's needed for the classloader creation).
+ // and critical to do this before initializing the container (since its needed for the classloader creation).
ResourceType fullResourceType = this.pluginManager.getMetadataManager().getType(resource.getResourceType());
if (fullResourceType == null) {
log.error("Unable to merge Resource " + resource + " - its type is unknown - perhaps the ["
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 3d1ddd7..185562a 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
@@ -622,21 +622,14 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
// parent to that type.
if (validParentTypes.contains(resourceParentType)) {
- log.debug("Moving " + existingResource + " from old parent " + existingResource.getParentResource()
- + " to new parent " + resource.getParentResource() + "...");
if (existingResource.getParentResource() != null) {
existingResource.getParentResource().removeChildResource(existingResource);
}
if (resource.getParentResource() != null) {
parentResource = getExistingResource(resource.getParentResource());
parentResource.addChildResource(existingResource);
-
}
existingResource.setParentResource(resource.getParentResource());
-
- // IMPORTANT: Update the Resource's mtime, so the Agent will know to update the Resource's parent during
- // its inventory sync.
- existingResource.setMtime(System.currentTimeMillis());
} else {
log.debug("Existing Resource " + existingResource + " has invalid parent type ("
+ existingResourceParentType + ") and so does plugin-reported Resource " + resource + " ("
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
index a0b01ac..64e9afd 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
@@ -843,16 +843,10 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
}
}
if (newParent != null) {
- log.debug("Moving " + resource + " from old parent " + resource.getParentResource() + " to new parent "
- + newParent + "...");
if (resource.getParentResource() != null) {
resource.getParentResource().removeChildResource(resource);
}
newParent.addChildResource(resource);
-
- // IMPORTANT: Update the Resource's mtime, so the Agent will know to update the Resource's parent during
- // its inventory sync.
- resource.setMtime(System.currentTimeMillis());
} else {
log.debug("We were unable to move " + resource + " from invalid parent " + resource.getParentResource()
+ " to a new valid parent with one of the following types: " + newParentTypes);
commit 87316df996bb23032a68861f47639f90b5dda532
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Jul 28 13:54:35 2010 -0400
a few cosmetic + javadoc changes
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
index 04e1fb3..b1e39f8 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
@@ -99,11 +99,12 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo
*
* <p>This will return <code>null</code> if there is no committed inventory and thus no availability reports should
* be sent. This will rarely happen - only if this is a brand new agent whose inventory hasn't been committed yet or
- * if the platform and all its children have been deleted (in which case the agent should be uninstalled or the user
+ * if the platform and all its children have been deleted (in which case the agent should be uninstalled, or the user
* will want to re-import the platform). In either case, it will be in rare, corner cases that this will ever return
* null, and the condition that caused the null should eventually go away.</p>
*
- * @return the report containing all the availabilities that need to be sent to the Server
+ * @return the report containing all the availabilities that need to be sent to the Server, or <code>null</code> if
+ * there is no committed inventory and thus no availability reports should be sent
*
* @throws Exception if failed to create and prepare the report
*/
@@ -153,16 +154,16 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo
}
private void checkInventory(Resource resource, AvailabilityReport availabilityReport, boolean reportChangesOnly,
- boolean checkChildren, boolean parentIsDown) {
+ boolean checkChildren, boolean parentIsDown) {
// Only report avail for committed Resources - that's all the Server cares about.
- if (resource.getInventoryStatus() != InventoryStatus.COMMITTED) {
+ if (resource.getId() == 0 || resource.getInventoryStatus() != InventoryStatus.COMMITTED) {
return;
}
ResourceContainer resourceContainer = this.inventoryManager.getResourceContainer(resource);
// Only report avail for synchronized Resources, otherwise chances are the Server will know nothing of the
// Resource.
- if (resourceContainer == null ||
- resourceContainer.getSynchronizationState() != ResourceContainer.SynchronizationState.SYNCHRONIZED) {
+ if (resourceContainer == null
+ || resourceContainer.getSynchronizationState() != ResourceContainer.SynchronizationState.SYNCHRONIZED) {
return;
}
AvailabilityFacet resourceComponent;
@@ -177,17 +178,17 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo
return;
}
- AvailabilityType current = null;
-
- // Find out what the avail was the last time we checked it.
- Availability previous = this.inventoryManager.getAvailabilityIfKnown(resource);
+ // If this is a changed-only report, find out what the avail was the last time we checked it.
+ Availability previous = (reportChangesOnly) ? this.inventoryManager.getAvailabilityIfKnown(resource) : null;
+ AvailabilityType current;
if (parentIsDown) {
// If the resource's parent is down, the rules are that the resource and all of the parent's other
// descendants, must also be down, so there's no need to even ask the resource component for its
// current availability - its current avail is DOWN and that's that.
current = AvailabilityType.DOWN;
} else {
+ current = null;
try {
// if the component is started, ask what its current availability is as of right now;
// if it's not started, then assume it's down, and the next time we check,
commit e60acb24efe12dc9aac8e0b5f708c551c17a6768
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Jul 28 13:11:02 2010 -0400
fix so that when the Server moves a Resource to a new parent as a result of that Resource's type's parent type changing, that Resource also gets moved to the new parent in the plugin container's local inventory the next time the PC InventoryManager performs an inventory sync (fix for second half of https://bugzilla.redhat.com/show_bug.cgi?id=618879)
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
index 0c86f8f..6e9a503 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java
@@ -237,6 +237,7 @@ public class InventoryManager extends AgentService implements ContainerService,
inventoryThreadPoolExecutor.scheduleWithFixedDelay(serviceScanExecutor, configuration
.getServiceDiscoveryInitialDelay(), configuration.getServiceDiscoveryPeriod(), TimeUnit.SECONDS);
}
+
} finally {
inventoryLock.writeLock().unlock();
}
@@ -2257,22 +2258,41 @@ public class InventoryManager extends AgentService implements ContainerService,
if (log.isDebugEnabled()) {
log.debug("Merging [" + resource + "] into local inventory...");
}
- Resource passedResource = resource; // always keep a reference to the passed resource
- Resource parentResource;
+ Resource passedResource = resource; // Keep a reference to the passed Resource for debugging purposes.
+
+ ResourceContainer existingResourceContainer = getResourceContainer(resource);
+ if (existingResourceContainer == null) {
+ existingResourceContainer = getResourceContainer(resource.getId());
+ }
+ Resource existingResourceViaContainer = (existingResourceContainer != null) ?
+ existingResourceContainer.getResource() : null;
+ Resource existingParent = (existingResourceViaContainer != null) ?
+ existingResourceViaContainer.getParentResource() : null;
+
+ Resource newParent;
if (resource.getParentResource() != null) {
ResourceContainer parentResourceContainer = getResourceContainer(resource.getParentResource());
if (parentResourceContainer == null) {
parentResourceContainer = getResourceContainer(resource.getParentResource().getId());
}
- if (parentResourceContainer != null)
- parentResource = parentResourceContainer.getResource();
- else
- parentResource = null; // TODO right thing to do? Or directly return?
+ if (parentResourceContainer != null) {
+ newParent = parentResourceContainer.getResource();
+ } else {
+ newParent = null; // TODO right thing to do? Or directly return?
+ }
} else {
- parentResource = null;
+ newParent = null;
}
- Resource existingResource = findMatchingChildResource(resource, parentResource);
- if (parentResource == null && existingResource == null) {
+
+ if (newParent != null && existingParent != null &&
+ !matches(newParent, existingParent)) {
+ // The Server must have moved the Resource to a new parent - remove it from its old parent in our
+ // local inventory. We'll add
+ existingParent.removeChildResource(existingResourceViaContainer);
+ }
+
+ Resource existingResourceViaParent = findMatchingChildResource(resource, newParent);
+ if (newParent == null && existingResourceViaParent == null) {
// This should never happen, but add a check so we'll know if it ever does.
log.error("Existing platform [" + this.platform + "] has different Resource type and/or Resource key than "
+ "platform in Server inventory: " + resource);
@@ -2281,31 +2301,31 @@ public class InventoryManager extends AgentService implements ContainerService,
boolean pluginConfigUpdated = false;
this.inventoryLock.writeLock().lock();
try {
- if (existingResource != null) {
+ if (existingResourceViaParent != null) {
// First grab the existing Resource's container, so we can reuse it.
- resourceContainer = this.resourceContainers.remove(existingResource.getUuid());
+ resourceContainer = this.resourceContainers.remove(existingResourceViaParent.getUuid());
if (resourceContainer != null) {
this.resourceContainers.put(resource.getUuid(), resourceContainer);
}
- if (parentResource != null) {
+ if (newParent != null) {
// It's critical to remove the existing Resource from the parent's child Set if the UUID has
// changed (i.e. altering the hashCode of an item in a Set == BAD), so just always remove it.
- parentResource.removeChildResource(existingResource);
+ newParent.removeChildResource(existingResourceViaParent);
}
// Now merge the new Resource into the existing Resource...
- pluginConfigUpdated = mergeResource(resource, existingResource);
- resource = existingResource;
+ pluginConfigUpdated = mergeResource(resource, existingResourceViaParent);
+ resource = existingResourceViaParent;
}
- if (parentResource != null) {
- parentResource.addChildResource(resource);
+ if (newParent != null) {
+ newParent.addChildResource(resource);
} else {
this.platform = resource;
}
// Replace the stripped-down ResourceType that came from the Server with the full ResourceType - it's
// critical to do this before refreshing the state (i.e. calling start on the ResourceComponent)
- // and critical to do this before initializing the container (since its needed for the classloader creation).
+ // and critical to do this before initializing the container (since it's needed for the classloader creation).
ResourceType fullResourceType = this.pluginManager.getMetadataManager().getType(resource.getResourceType());
if (fullResourceType == null) {
log.error("Unable to merge Resource " + resource + " - its type is unknown - perhaps the ["
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 185562a..3d1ddd7 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
@@ -622,14 +622,21 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot
// parent to that type.
if (validParentTypes.contains(resourceParentType)) {
+ log.debug("Moving " + existingResource + " from old parent " + existingResource.getParentResource()
+ + " to new parent " + resource.getParentResource() + "...");
if (existingResource.getParentResource() != null) {
existingResource.getParentResource().removeChildResource(existingResource);
}
if (resource.getParentResource() != null) {
parentResource = getExistingResource(resource.getParentResource());
parentResource.addChildResource(existingResource);
+
}
existingResource.setParentResource(resource.getParentResource());
+
+ // IMPORTANT: Update the Resource's mtime, so the Agent will know to update the Resource's parent during
+ // its inventory sync.
+ existingResource.setMtime(System.currentTimeMillis());
} else {
log.debug("Existing Resource " + existingResource + " has invalid parent type ("
+ existingResourceParentType + ") and so does plugin-reported Resource " + resource + " ("
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
index 64e9afd..a0b01ac 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java
@@ -843,10 +843,16 @@ public class ResourceMetadataManagerBean implements ResourceMetadataManagerLocal
}
}
if (newParent != null) {
+ log.debug("Moving " + resource + " from old parent " + resource.getParentResource() + " to new parent "
+ + newParent + "...");
if (resource.getParentResource() != null) {
resource.getParentResource().removeChildResource(resource);
}
newParent.addChildResource(resource);
+
+ // IMPORTANT: Update the Resource's mtime, so the Agent will know to update the Resource's parent during
+ // its inventory sync.
+ resource.setMtime(System.currentTimeMillis());
} else {
log.debug("We were unable to move " + resource + " from invalid parent " + resource.getParentResource()
+ " to a new valid parent with one of the following types: " + newParentTypes);
commit 5cb61cd55e617104661544da182e47d197fdf401
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jul 27 23:07:57 2010 -0400
fix so unsynced (invStatus!=COMMITED || id==0) Resources are not included in avail reports sent by the PC (fixes half of https://bugzilla.redhat.com/show_bug.cgi?id=618879)
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
index d916bbc..04e1fb3 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/AvailabilityExecutor.java
@@ -1,6 +1,6 @@
/*
* RHQ Management Platform
- * Copyright (C) 2005-2008 Red Hat, Inc.
+ * Copyright (C) 2005-2010 Red Hat, Inc.
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -48,7 +48,8 @@ import org.rhq.core.pluginapi.availability.AvailabilityFacet;
* Runs a periodic scan for resource availability.
*
* @author Greg Hinkle
- * @author John Mazzitelli
+ * @author John Mazzitelli
+ * @author Ian Springer
*/
public class AvailabilityExecutor implements Runnable, Callable<AvailabilityReport> {
// the get-availability-timeout will rarely, if ever, want to be overridden. It will default to be 5 seconds
@@ -94,15 +95,15 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo
}
/**
- * Returns the availability report that should be sent to the server.
+ * Returns the availability report that should be sent to the Server.
*
* <p>This will return <code>null</code> if there is no committed inventory and thus no availability reports should
* be sent. This will rarely happen - only if this is a brand new agent whose inventory hasn't been committed yet or
* if the platform and all its children have been deleted (in which case the agent should be uninstalled or the user
* will want to re-import the platform). In either case, it will be in rare, corner cases that this will ever return
- * null and the condition that caused the null should eventually go away.</p>
+ * null, and the condition that caused the null should eventually go away.</p>
*
- * @return the report containing all the availabilities that need to be sent to the server
+ * @return the report containing all the availabilities that need to be sent to the Server
*
* @throws Exception if failed to create and prepare the report
*/
@@ -122,13 +123,13 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo
long start = System.currentTimeMillis();
checkInventory(inventoryManager.getPlatform(), availabilityReport,
- availabilityReport.isChangesOnlyReport(), true);
+ availabilityReport.isChangesOnlyReport(), true, false);
// In enterprise mode, the server will need at least one resource so it can derive what agent
// is sending this report. If the report is empty (meaning, nothing has changed since the last
// availability check), let's add the platform record to the report
- if (availabilityReport.getResourceAvailability().size() == 0) {
- checkInventory(inventoryManager.getPlatform(), availabilityReport, false, false);
+ if (availabilityReport.getResourceAvailability().isEmpty()) {
+ checkInventory(inventoryManager.getPlatform(), availabilityReport, false, false, false);
}
// if we have non-platform resources in the report, the agent has had
@@ -152,103 +153,91 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo
}
private void checkInventory(Resource resource, AvailabilityReport availabilityReport, boolean reportChangesOnly,
- boolean checkChildren) {
+ boolean checkChildren, boolean parentIsDown) {
+ // Only report avail for committed Resources - that's all the Server cares about.
+ if (resource.getInventoryStatus() != InventoryStatus.COMMITTED) {
+ return;
+ }
ResourceContainer resourceContainer = this.inventoryManager.getResourceContainer(resource);
- AvailabilityFacet resourceComponent = null;
- if (resourceContainer != null && resource.getInventoryStatus() == InventoryStatus.COMMITTED) {
- try {
- resourceComponent = resourceContainer.createResourceComponentProxy(AvailabilityFacet.class,
- FacetLockType.NONE, GET_AVAILABILITY_TIMEOUT, true, false);
- } catch (PluginContainerException e) {
- if (log.isDebugEnabled()) {
- log.debug("Could not create resource component proxy for " + resource + " due to " + e);
- }
+ // Only report avail for synchronized Resources, otherwise chances are the Server will know nothing of the
+ // Resource.
+ if (resourceContainer == null ||
+ resourceContainer.getSynchronizationState() != ResourceContainer.SynchronizationState.SYNCHRONIZED) {
+ return;
+ }
+ AvailabilityFacet resourceComponent;
+ try {
+ resourceComponent = resourceContainer.createResourceComponentProxy(AvailabilityFacet.class,
+ FacetLockType.NONE, GET_AVAILABILITY_TIMEOUT, true, false);
+ } catch (PluginContainerException e) {
+ // TODO (ips): Why aren't we logging this as an error?
+ if (log.isDebugEnabled()) {
+ log.debug("Could not create resource component proxy for " + resource + ".", e);
}
+ return;
}
- if (resourceComponent != null) {
- AvailabilityType current = null;
-
- // Only report availability for committed resources; don't bother with new, ignored or deleted resources.
- if (resource.getInventoryStatus() == InventoryStatus.COMMITTED) {
+ AvailabilityType current = null;
- // this is what we think the availability is, based on a previous check
- Availability previous = this.inventoryManager.getAvailabilityIfKnown(resource);
+ // Find out what the avail was the last time we checked it.
+ Availability previous = this.inventoryManager.getAvailabilityIfKnown(resource);
- try {
- // if the component is started, ask what its current availability is as of right now
- // if its not started, then assume its down, our next time checking we'll see if its
- // started and check for real then - otherwise, keep assuming its down (this is for
- // the case when a plugin component can't start for whatever reason or is just slow
- // to start)
+ if (parentIsDown) {
+ // If the resource's parent is down, the rules are that the resource and all of the parent's other
+ // descendants, must also be down, so there's no need to even ask the resource component for its
+ // current availability - its current avail is DOWN and that's that.
+ current = AvailabilityType.DOWN;
+ } else {
+ try {
+ // if the component is started, ask what its current availability is as of right now;
+ // if it's not started, then assume it's down, and the next time we check,
+ // we'll see if it's started and check for real then - otherwise, keep assuming it's
+ // down (this is for the case when a plugin component can't start for whatever reason
+ // or is just slow to start)
+ if (resourceContainer.getResourceComponentState() == ResourceComponentState.STARTED) {
+ current = resourceComponent.getAvailability();
+ } else {
+ this.inventoryManager.activateResource(resource, resourceContainer, false);
if (resourceContainer.getResourceComponentState() == ResourceComponentState.STARTED) {
current = resourceComponent.getAvailability();
- } else {
- this.inventoryManager.activateResource(resource, resourceContainer, false);
- if (resourceContainer.getResourceComponentState() == ResourceComponentState.STARTED) {
- current = resourceComponent.getAvailability();
- }
}
- } catch (Throwable t) {
- ResourceError resourceError = new ResourceError(resource, ResourceErrorType.AVAILABILITY_CHECK, t,
- System.currentTimeMillis());
- this.inventoryManager.sendResourceErrorToServer(resourceError);
- // TODO GH: Put errors in report, rather than sending them to the Server separately.
- if (log.isDebugEnabled()) {
- if (t instanceof TimeoutException)
- // no need to log the stack trace for timeouts...
- log.debug("Failed to collect availability on resource " + resource + " (call timed out)");
- else
- log.debug("Failed to collect availability on resource " + resource, t);
- }
- }
-
- if (current == null) {
- current = AvailabilityType.DOWN;
}
-
- if (resourceContainer.getSynchronizationState() == ResourceContainer.SynchronizationState.SYNCHRONIZED) {
- Availability availability = this.inventoryManager.updateAvailability(resource, current);
-
- // only add the availability to the report if it changed from its previous state
- // if this is the first time we've been executed, reportChangesOnly will be false
- // and we will send a full report as our very first report
- if ((previous == null) || (previous.getAvailabilityType() != current) || !reportChangesOnly) {
- availabilityReport.addAvailability(availability);
+ } catch (Throwable t) {
+ ResourceError resourceError = new ResourceError(resource, ResourceErrorType.AVAILABILITY_CHECK, t,
+ System.currentTimeMillis());
+ this.inventoryManager.sendResourceErrorToServer(resourceError);
+ // TODO GH: Put errors in report, rather than sending them to the Server separately.
+ if (log.isDebugEnabled()) {
+ if (t instanceof TimeoutException) {
+ // no need to log the stack trace for timeouts...
+ log.debug("Failed to collect availability on " + resource + " (call timed out)");
+ } else {
+ log.debug("Failed to collect availability on " + resource, t);
}
}
}
-
- if (checkChildren) {
- // Wrap in a fresh HashSet to avoid ConcurrentModificationExceptions.
- Set<Resource> children = new HashSet<Resource>(resource.getChildResources());
- if (current == AvailabilityType.UP) {
- for (Resource child : children)
- checkInventory(child, availabilityReport, reportChangesOnly, true);
- } else {
- for (Resource child : children)
- markDown(child, availabilityReport, reportChangesOnly);
- }
+ if (current == null) {
+ current = AvailabilityType.DOWN;
}
}
- return;
- }
-
- /**
- * Marks the specified Resource and all its descendants as DOWN for the report.
- */
- private void markDown(Resource resource, AvailabilityReport availabilityReport, boolean changesOnly) {
- Availability previous = this.inventoryManager.getAvailabilityIfKnown(resource);
- if (!changesOnly || previous == null || previous.getAvailabilityType() != AvailabilityType.DOWN) {
- Availability availability = this.inventoryManager.updateAvailability(resource, AvailabilityType.DOWN);
+ // Only add the availability to the report if it changed from its previous state.
+ // If this is the first time we've been executed, reportChangesOnly will be false,
+ // and we will send a full report as our very first report.
+ if ((previous == null) || (previous.getAvailabilityType() != current) || !reportChangesOnly) {
+ Availability availability = this.inventoryManager.updateAvailability(resource, current);
availabilityReport.addAvailability(availability);
}
- // Wrap in a fresh HashSet to avoid ConcurrentModificationExceptions.
- Set<Resource> children = new HashSet(resource.getChildResources());
- for (Resource child : children) {
- markDown(child, availabilityReport, changesOnly);
+
+ if (checkChildren) {
+ // Wrap in a fresh HashSet to avoid ConcurrentModificationExceptions.
+ Set<Resource> children = new HashSet<Resource>(resource.getChildResources());
+ for (Resource child : children) {
+ checkInventory(child, availabilityReport, reportChangesOnly, true, current == AvailabilityType.DOWN);
+ }
}
+
+ return;
}
/**
@@ -267,4 +256,4 @@ public class AvailabilityExecutor implements Runnable, Callable<AvailabilityRepo
void sendChangedOnlyReportNextTime() {
this.sendChangedOnlyReport.set(true);
}
-}
\ No newline at end of file
+}
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java
index 3d27295..ab8d30e 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ResourceContainer.java
@@ -299,7 +299,7 @@ public class ResourceContainer implements Serializable {
* @param daemonThread whether or not the thread used for the invocation should be a daemon thread
* @param onlyIfStarted if <code>true</code>, and the component is not started, an exception is thrown
*
- * @return a proxy that wraps the given component and exposes the given facet interface
+ * @return a proxy that wraps the given component and exposes the given facet interface; will never be null
*
* @throws PluginContainerException if the component does not exist or does not implement the interface
*/
13 years, 9 months
[rhq] Branch 'nagios' - 3 commits - modules/core modules/plugins
by Heiko W. Rupp
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java | 44 +++++-----
modules/plugins/pom.xml | 2
modules/plugins/twitter/src/main/java/org/rhq/plugins/twitter/FeedComponent.java | 25 ++++-
3 files changed, 44 insertions(+), 27 deletions(-)
New commits:
commit 440f9cb6105d66367389b72f58e76744c361a076
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Jul 28 12:08:34 2010 +0200
Small refactoring to be less verbose.
Don't retrhow the plugin container exception
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
index 6d58302..e090b51 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/ChildResourceTypeDiscoveryRunner.java
@@ -6,6 +6,7 @@ import java.util.concurrent.Callable;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.rhq.core.clientapi.agent.PluginContainerException;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceCategory;
@@ -24,9 +25,9 @@ public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceTy
//private MeasurementManager measurementManager;
//private int resourceId;
- //TODO: maybe to be implemented for later usage
+ //TODO: maybe to be implemented for later usage
// public ChildResourceTypeDiscoveryRunner(MeasurementManager measurementManager) {
- //
+ //
// }
// public ChildResourceTypeDiscoveryRunner(int resourceId) {
@@ -56,29 +57,31 @@ public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceTy
InventoryManager im = PluginContainer.getInstance().getInventoryManager();
log.info("InventoryManager instance created");
- //TODO: Do testing and split code to more than one method if it works well
+ //TODO: Do testing and split code to more than one method if it works well
// Run a full scan for all resources in the inventory
Resource platform = im.getPlatform();
log.info("Platform returned with name: " + platform.getName());
// Next discover all other services and non-top-level servers
- Set<Resource> servers = platform.getChildResources();
- log.info("Platform " + platform.getName() + " has " + servers.size() + " ChildResources");
-
- if (servers != null) {
- for (Resource server : servers) {
- log.info("Name of server: " + server.getName());
- log.info("Id of server: " + server.getId());
- log.info("Category of server: " + server.getResourceType().getCategory().toString());
+ Set<Resource> children = platform.getChildResources();
+ log.info("Platform " + platform.getName() + " has " + children.size() + " ChildResources");
+
+ if (children != null) {
+ for (Resource child : children) {
+ if (log.isDebugEnabled()) {
+ log.debug("Name of server: " + child.getName());
+ log.debug("Id of server: " + child.getId());
+ log.debug("Category of server: " + child.getResourceType().getCategory().toString());
+ }
//Check if really is of Category SERVER
- if (server.getResourceType().getCategory() == ResourceCategory.SERVER) {
+ if (child.getResourceType().getCategory() == ResourceCategory.SERVER) {
- log.info("Server " + server.getName() + "has passed the Server Category test succesfull");
+ log.info("Server " + child.getName() + "has passed the Server Category test succesfull");
//ChildResourceTypeDiscoveryFacet.class.isAssignableFrom(server.getClass())
//check if child resource implements the interface ChildResourceTypeDiscoveryFacet
- //if (server instanceof ChildResourceTypeDiscoveryFacet)
+ //if (server instanceof ChildResourceTypeDiscoveryFacet)
//if (ChildResourceTypeDiscoveryFacet.class.isAssignableFrom(server.getClass())) {
@@ -86,9 +89,9 @@ public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceTy
// + " implements the interface ChildResourceTypeDiscoveryFacet");
// //Get ResourceContainer for each server instance
- ResourceContainer container = im.getResourceContainer(server.getId());
+ ResourceContainer container = im.getResourceContainer(child.getId());
- log.info("Server " + server.getName() + " is running in ResourceContainer " + container.toString());
+ log.info("Server " + child.getName() + " is running in ResourceContainer " + container.toString());
if (container.getResourceComponentState() != ResourceContainer.ResourceComponentState.STARTED
|| container.getAvailability() == null
@@ -101,7 +104,7 @@ public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceTy
try {
- ChildResourceTypeDiscoveryFacet discoveryComponent = ComponentUtil.getComponent(server
+ ChildResourceTypeDiscoveryFacet discoveryComponent = ComponentUtil.getComponent(child
.getId(), ChildResourceTypeDiscoveryFacet.class, FacetLockType.READ, 30 * 1000, true,
true);
@@ -111,9 +114,12 @@ public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceTy
//Iterate over all the ResourceTypes contained in the Set
for (ResourceType type : resourceTypes) {
- //Create a new ResourceType in the DB for the selected type
+ //Create a new ResourceType in the DB for the selected type
im.createNewResourceType(type.getName(), type.getName() + "Metric");
}
+ } catch (PluginContainerException pce) {
+ // This is expected when the ResourceComponent does not implement the ChildResourceTypeDiscoveryFacet
+ log.warn("Error submitting service scan: " + pce.getMessage());
} catch (Exception e) {
throw new RuntimeException("Error submitting service scan", e);
}
@@ -134,7 +140,7 @@ public class ChildResourceTypeDiscoveryRunner implements Callable<Set<ResourceTy
}
/**
- *
+ *
* @param discoveryComponent
* @return
*/
commit 2dc344c10e0e88630229900405d5bc4951b09c01
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Jul 28 12:05:31 2010 +0200
Re-enable twitter plugin
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 204c00c..84dfda0 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -178,7 +178,7 @@
<module>perftest</module>
<module>script2</module>
<module>snmptrapd</module>
- <!--<module>twitter</module>-->
+ <module>twitter</module>
<module>virt</module>
<module>kickstart</module>
commit 5075f68e6a2c383e1352c57dc6e04a3baed131f3
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Jun 24 22:14:13 2010 +0200
Fix last compile error.
diff --git a/modules/plugins/twitter/src/main/java/org/rhq/plugins/twitter/FeedComponent.java b/modules/plugins/twitter/src/main/java/org/rhq/plugins/twitter/FeedComponent.java
index 8c7da3a..9f7bfc4 100644
--- a/modules/plugins/twitter/src/main/java/org/rhq/plugins/twitter/FeedComponent.java
+++ b/modules/plugins/twitter/src/main/java/org/rhq/plugins/twitter/FeedComponent.java
@@ -19,6 +19,7 @@
package org.rhq.plugins.twitter;
import java.util.List;
+import java.util.Properties;
import java.util.Set;
import twitter4j.Paging;
@@ -27,6 +28,8 @@ import twitter4j.QueryResult;
import twitter4j.Status;
import twitter4j.Tweet;
import twitter4j.Twitter;
+import twitter4j.TwitterFactory;
+import twitter4j.conf.PropertyConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -61,10 +64,9 @@ public class FeedComponent implements ResourceComponent<TwitterComponent>, Measu
private boolean isSearch = false;
private String keyword;
private TwitterEventPoller eventPoller;
- private String serverUrl;
- private String searchBase;
+ private TwitterFactory tFactory;
- /**
+ /**
* Return availability of this resource
* @see org.rhq.core.pluginapi.inventory.ResourceComponent#getAvailability()
*/
@@ -86,13 +88,23 @@ public class FeedComponent implements ResourceComponent<TwitterComponent>, Measu
isSearch = true;
keyword = conf.getSimpleValue("keyword","Jopr"); // Jopr is fallback .. just in case
- serverUrl = context.getParentResourceComponent().getServerUrl();
- searchBase = context.getParentResourceComponent().getSearchUrl();
+ String serverUrl = context.getParentResourceComponent().getServerUrl();
+ String searchBase = context.getParentResourceComponent().getSearchUrl();
eventContext = context.getEventContext();
eventPoller = new TwitterEventPoller(TOPIC_EVENT);
eventContext.registerEventPoller(eventPoller, 63);
+ Properties props = new Properties();
+ props.put(PropertyConfiguration.SOURCE,"Jopr");
+ props.put(PropertyConfiguration.HTTP_USER_AGENT,"Jopr");
+ props.put(PropertyConfiguration.SEARCH_BASE_URL, searchBase);
+ props.put(PropertyConfiguration.REST_BASE_URL, serverUrl);
+ twitter4j.conf.Configuration tconf = new PropertyConfiguration(props);
+
+ tFactory = new TwitterFactory(tconf);
+
+
}
@@ -116,12 +128,11 @@ public class FeedComponent implements ResourceComponent<TwitterComponent>, Measu
for (MeasurementScheduleRequest req : metrics) {
if (req.getName().equals("tweetCount")) {
- Twitter twitter = new Twitter(serverUrl);
+ Twitter twitter = tFactory.getInstance();
Paging paging = new Paging();
MeasurementDataNumeric res;
if (isSearch) {
- twitter.setSearchBaseURL(searchBase);
Query q = new Query(keyword);
q.setSinceId(lastId);
if (lastId == NOT_YET_SET)
13 years, 9 months