[rhq] modules/enterprise
by mazz
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e99b4de787ff039b342610aa7fa85e7689a84c54
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Jan 25 18:15:06 2011 -0500
allow 10m for the bundle to download from a URL
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
index 4678bbe..3ed578a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/create/BundleUploadDistroFileStep.java
@@ -214,7 +214,7 @@ public class BundleUploadDistroFileStep extends AbstractWizardStep {
return;
}
- BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService();
+ BundleGWTServiceAsync bundleServer = GWTServiceLookup.getBundleService(10 * 60 * 1000); // if upload takes more than 10m, you have other things to worry about
bundleServer.createBundleVersionViaURL(urlString, new AsyncCallback<BundleVersion>() {
public void onSuccess(BundleVersion result) {
CoreGUI.getMessageCenter().notify(
13 years, 3 months
[rhq] modules/enterprise
by mazz
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2482cface3242f76a6bda12506b26f926ea67fea
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Jan 25 17:50:59 2011 -0500
use overlord to get the agent client
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
index a81ded5..157a55d 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java
@@ -1016,7 +1016,7 @@ public class BundleManagerBean implements BundleManagerLocal, BundleManagerRemot
Resource platform, boolean isCleanDeployment, boolean isRevert) throws Exception {
int platformId = platform.getId();
- AgentClient agentClient = agentManager.getAgentClient(subject, platformId);
+ AgentClient agentClient = agentManager.getAgentClient(subjectManager.getOverlord(), platformId);
BundleAgentService bundleAgentService = agentClient.getBundleAgentService();
// The BundleResourceDeployment record must exist in the db before the agent request because the agent may try
13 years, 3 months
[rhq] 2 commits - modules/enterprise
by ips
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ListOrderChangedEvent.java | 20 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ListOrderChangedHandler.java | 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java | 177 ++++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TimestampCellFormatter.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java | 93 +++++
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java | 12
6 files changed, 312 insertions(+), 3 deletions(-)
New commits:
commit 1ef99fb331b3754bec5c6114948997c02b7421f9
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jan 25 15:55:49 2011 -0500
more work on group ops
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ListOrderChangedEvent.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ListOrderChangedEvent.java
new file mode 100644
index 0000000..aeb8e66
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ListOrderChangedEvent.java
@@ -0,0 +1,20 @@
+package org.rhq.enterprise.gui.coregui.client.components.sorter;
+
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+/**
+ *
+ */
+public class ListOrderChangedEvent {
+
+ private ListGridRecord[] items;
+
+ public ListOrderChangedEvent(ListGridRecord[] items) {
+ this.items = items;
+ }
+
+ public ListGridRecord[] getItems() {
+ return this.items;
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ListOrderChangedHandler.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ListOrderChangedHandler.java
new file mode 100644
index 0000000..cad63cf
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ListOrderChangedHandler.java
@@ -0,0 +1,10 @@
+package org.rhq.enterprise.gui.coregui.client.components.sorter;
+
+/**
+ *
+ */
+public interface ListOrderChangedHandler {
+
+ void onListOrderChanged(ListOrderChangedEvent event);
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java
new file mode 100644
index 0000000..b0b1214
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java
@@ -0,0 +1,177 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.components.sorter;
+
+import com.google.gwt.event.shared.HandlerRegistration;
+import com.smartgwt.client.types.ListGridFieldType;
+import com.smartgwt.client.types.SelectionStyle;
+import com.smartgwt.client.widgets.grid.ListGridField;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+import com.smartgwt.client.widgets.grid.events.RecordDropEvent;
+import com.smartgwt.client.widgets.grid.events.RecordDropHandler;
+import com.smartgwt.client.widgets.layout.HLayout;
+import com.smartgwt.client.widgets.layout.SectionStack;
+import com.smartgwt.client.widgets.layout.SectionStackSection;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableListGrid;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Ian Springer
+ */
+public class ReorderableList extends LocatableVLayout {
+
+ protected ListGridRecord[] initialSelection;
+ protected HLayout hlayout;
+ protected LocatableListGrid listGrid;
+ /** an icon displayed next to each item in the list grids, or null if no icon should be displayed */
+ private String itemIcon;
+ /** the item title (i.e. display name), which should be plural and capitalized, e.g. "Resource Groups", "Roles". */
+ private String itemTitle;
+
+ private Set<ListOrderChangedHandler> listOrderChangedHandlers = new HashSet<ListOrderChangedHandler>();
+
+ private boolean isReadOnly;
+
+ public ReorderableList(String locatorId, ListGridRecord[] records, String itemTitle, String itemIcon) {
+ this(locatorId, false, records, itemTitle, itemIcon);
+ }
+
+ public ReorderableList(String locatorId, boolean isReadOnly, ListGridRecord[] records, String itemTitle, String itemIcon) {
+ super(locatorId);
+
+ this.isReadOnly = isReadOnly;
+
+ setWidth100();
+ setMargin(7);
+
+ this.hlayout = new HLayout();
+ this.listGrid = new LocatableListGrid(extendLocatorId("listGrid"));
+ this.initialSelection = records;
+ this.listGrid.setRecords(records);
+
+ if (this.isReadOnly) {
+ this.listGrid.setSelectionType(SelectionStyle.NONE);
+ }
+
+ this.itemTitle = itemTitle;
+ this.itemIcon = itemIcon;
+ }
+
+ /**
+ * Returns the {@link com.smartgwt.client.data.Record record}s in the order currently specified by the user.
+ *
+ * @return the {@link com.smartgwt.client.data.Record record}s in the order currently specified by the user
+ */
+ public ListGridRecord[] getRecords() {
+ return this.listGrid.getRecords();
+ }
+
+ @Override
+ protected void onInit() {
+ super.onInit();
+
+ SectionStack itemsStack = buildItemsSectionStack();
+ hlayout.addMember(itemsStack);
+
+ addMember(this.hlayout);
+ }
+
+ private SectionStack buildItemsSectionStack() {
+ SectionStack itemsSectionStack = new SectionStack();
+ itemsSectionStack.setWidth(300);
+ itemsSectionStack.setHeight(250);
+
+ SectionStackSection itemsSection = new SectionStackSection(getItemTitle());
+ itemsSection.setCanCollapse(false);
+ itemsSection.setExpanded(true);
+
+ this.listGrid.setCanReorderRecords(true);
+ this.listGrid.setLoadingMessage(MSG.common_msg_loading());
+ this.listGrid.setEmptyMessage(MSG.common_msg_noItemsToShow());
+ this.listGrid.addRecordDropHandler(new RecordDropHandler() {
+ @Override
+ public void onRecordDrop(RecordDropEvent event) {
+ notifyListOrderChangedHandlers();
+ }
+ });
+
+ List<ListGridField> fields = new ArrayList<ListGridField>();
+ String itemIcon = getItemIcon();
+ if (itemIcon != null) {
+ ListGridField iconField = new ListGridField("icon", 25);
+ iconField.setType(ListGridFieldType.ICON);
+ iconField.setCellIcon(itemIcon);
+ iconField.setShowDefaultContextMenu(false);
+ fields.add(iconField);
+ }
+ ListGridField nameField = new ListGridField(getNameField(), MSG.common_title_name());
+ fields.add(nameField);
+ this.listGrid.setFields(fields.toArray(new ListGridField[fields.size()]));
+
+ itemsSection.setItems(this.listGrid);
+ itemsSectionStack.addSection(itemsSection);
+
+ return itemsSectionStack;
+ }
+
+ private void notifyListOrderChangedHandlers() {
+ for (ListOrderChangedHandler handler : this.listOrderChangedHandlers) {
+ handler.onListOrderChanged(new ListOrderChangedEvent(this.listGrid.getSelection()));
+ }
+ }
+
+ public void reset() {
+ this.listGrid.setData(this.initialSelection);
+ }
+
+ public HandlerRegistration addListOrderChangedHandler(final ListOrderChangedHandler handler) {
+ this.listOrderChangedHandlers.add(handler);
+ return new HandlerRegistration() {
+ @Override
+ public void removeHandler() {
+ listOrderChangedHandlers.remove(handler);
+ }
+ };
+ }
+
+ protected String getNameField() {
+ return "name";
+ }
+
+ public String getItemTitle() {
+ return itemTitle;
+ }
+
+ protected String getItemIcon() {
+ return itemIcon;
+ }
+
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+
+ this.listGrid.destroy();
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TimestampCellFormatter.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TimestampCellFormatter.java
index 086d7be..b08c0ee 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TimestampCellFormatter.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TimestampCellFormatter.java
@@ -23,7 +23,8 @@ public class TimestampCellFormatter implements CellFormatter {
* even if the caller doesn't have data from a cell or list grid. This can keep date formatting
* consistent across the app, whether the data is in a cell or not.
*
- * @param date the date to format as a Date, Long, Integer or a String
+ * @param value the date to format as a Date, Long, Integer or a String
+ *
* @return the formatted date string
*/
public static String format(Object value) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java
index b6a37bf..59cb90c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java
@@ -1,16 +1,107 @@
package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.schedule;
+import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.data.DSCallback;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
+import com.smartgwt.client.data.Record;
+import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.form.DynamicForm;
+import com.smartgwt.client.widgets.form.fields.CheckboxItem;
+import com.smartgwt.client.widgets.form.fields.RadioGroupItem;
+import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;
+import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
+import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.components.sorter.ReorderableList;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleDetailsView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
+
+import java.util.LinkedHashMap;
/**
- *
+ * @author Ian Springer
*/
public class GroupOperationScheduleDetailsView extends AbstractOperationScheduleDetailsView {
+ private ResourceGroupComposite groupComposite;
+ private ListGridRecord[] memberResourceRecords;
+
public GroupOperationScheduleDetailsView(String locatorId, ResourceGroupComposite groupComposite, int scheduleId) {
super(locatorId, new GroupOperationScheduleDataSource(groupComposite),
groupComposite.getResourceGroup().getResourceType(), scheduleId);
+ this.groupComposite = groupComposite;
+ }
+
+ @Override
+ protected void init(final boolean isReadOnly) {
+ if (isNewRecord()) {
+ ResourceDatasource resourceDatasource = new ResourceDatasource();
+ Criteria criteria = new Criteria(ResourceDatasource.FILTER_GROUP_ID,
+ String.valueOf(this.groupComposite.getResourceGroup().getId()));
+ resourceDatasource.fetchData(criteria, new DSCallback() {
+ public void execute(DSResponse response, Object rawData, DSRequest request) {
+ if (response.getStatus() != DSResponse.STATUS_SUCCESS) {
+ throw new RuntimeException("Failed to load group member Resources.");
+ }
+ Record[] data = response.getData();
+ memberResourceRecords = new ListGridRecord[data.length];
+ for (int i = 0, dataLength = data.length; i < dataLength; i++) {
+ Record record = data[i];
+ ListGridRecord listGridRecord = (ListGridRecord) record;
+ memberResourceRecords[i] = listGridRecord;
+ }
+ GroupOperationScheduleDetailsView.super.init(isReadOnly);
+ }
+ });
+ }
}
+ @Override
+ protected LocatableVLayout buildContentPane() {
+ LocatableVLayout contentPane = super.buildContentPane();
+
+ HTMLFlow hr = new HTMLFlow("<p/><hr/><p/>");
+ contentPane.addMember(hr);
+
+ DynamicForm executionModeForm = new DynamicForm();
+ executionModeForm.setColWidths("250", "*");
+
+ RadioGroupItem executionModeItem = new RadioGroupItem("executionMode", "Member Resource Execution Order");
+ LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>(2);
+ valueMap.put("parallel", "Execute in parallel");
+ valueMap.put("sequential", "Execute in the order specified below");
+ executionModeItem.setValueMap(valueMap);
+ executionModeItem.setDefaultValue("parallel");
+
+ final CheckboxItem haltOnFailureItem = new CheckboxItem("haltOnFailure", "Halt on Failure?");
+ haltOnFailureItem.setDefaultValue(false);
+ haltOnFailureItem.setVisible(false);
+ haltOnFailureItem.setLabelAsTitle(true);
+
+ executionModeItem.addChangedHandler(new ChangedHandler() {
+ public void onChanged(ChangedEvent event) {
+ if (event.getValue().equals("parallel")) {
+ haltOnFailureItem.hide();
+ } else {
+ haltOnFailureItem.show();
+ }
+ }
+ });
+
+ executionModeForm.setFields(executionModeItem, haltOnFailureItem);
+
+ contentPane.addMember(executionModeForm);
+
+ ResourceCategory resourceCategory = this.groupComposite.getResourceGroup().getResourceType().getCategory();
+ String memberIcon = ImageManager.getResourceIcon(resourceCategory);
+ ReorderableList memberExecutionOrderer = new ReorderableList(extendLocatorId("MemberExecutionOrderer"),
+ this.memberResourceRecords, "Member Resources", memberIcon);
+ contentPane.addMember(memberExecutionOrderer);
+
+ return contentPane;
+ }
}
commit 6cd53e7d6a9d96ea540a7061a653956c00b21f5e
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Jan 25 15:54:34 2011 -0500
fix bug where existing roles associated with a new role's subjects were removed from those subjects (https://bugzilla.redhat.com/show_bug.cgi?id=672684)
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java
index 93b1ca8..eba8968 100644
--- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java
+++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -155,13 +156,22 @@ public class RoleManagerBean implements RoleManagerLocal, RoleManagerRemote {
// Now we must merge subjects and resource groups, since those fields in Role do not have persist cascade
// enabled.
+ int[] subjectIds = new int[newRole.getSubjects().size()];
+ int i = 0;
for (Subject subject : newRole.getSubjects()) {
- entityManager.merge(subject);
+ subjectIds[i++] = subject.getId();
}
+ addSubjectsToRole(whoami, newRole.getId(), subjectIds);
for (ResourceGroup resourceGroup : newRole.getResourceGroups()) {
entityManager.merge(resourceGroup);
}
+ int[] resourceGroupIds = new int[newRole.getResourceGroups().size()];
+ i = 0;
+ for (ResourceGroup resourceGroup : newRole.getResourceGroups()) {
+ resourceGroupIds[i++] = resourceGroup.getId();
+ }
+ addResourceGroupsToRole(whoami, newRole.getId(), resourceGroupIds);
return newRole;
}
13 years, 3 months
[rhq] modules/enterprise
by mazz
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java | 32 +++++-----
1 file changed, 16 insertions(+), 16 deletions(-)
New commits:
commit c52bdcd299b21043ad1c8ef70174053bc372b265
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Jan 25 14:55:14 2011 -0500
forgot to add "g" to the short options so "-g" is valid cmd line option to the agent
diff --git a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
index fc2b8f3..955832c 100644
--- a/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
+++ b/modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java
@@ -1668,8 +1668,8 @@ public class AgentMain {
try {
shutdown();
} catch (Throwable t) {
- LOG.error(t, "The plugin container has requested the agent be restarted but the shutdown " +
- "operation failed.");
+ LOG.error(t, "The plugin container has requested the agent be restarted but the shutdown "
+ + "operation failed.");
}
if (isStarted()) {
// Pause for a few seconds and try to shut down one more time.
@@ -1677,44 +1677,44 @@ public class AgentMain {
Thread.sleep(3000);
shutdown();
} catch (Throwable t) {
- LOG.error(t, "The plugin container has requested the agent be restarted but the shutdown " +
- "operation failed again.");
+ LOG.error(t, "The plugin container has requested the agent be restarted but the shutdown "
+ + "operation failed again.");
}
}
if (isStarted()) {
// At this point agent shut down failed twice. We can get by with rebooting the plugin container
// so we will try that as last ditch effort.
- LOG.warn("The agent shut down operation has failed twice. Attempting to reboot the plugin " +
- "container so that stale resource types and deleted plugins are removed.");
+ LOG.warn("The agent shut down operation has failed twice. Attempting to reboot the plugin "
+ + "container so that stale resource types and deleted plugins are removed.");
try {
rebootPluginContainer();
} catch (Throwable t) {
// If rebooting the plugin container fails as well, there is not much else we can do besides
// reporting the failures. Manual intervention is needed.
- LOG.error("The agent could not be shut down and rebooting the plugin container failed. " +
- "Please check the logs for errors and manually restart the agent as soon as " +
- "possible.");
+ LOG.error("The agent could not be shut down and rebooting the plugin container failed. "
+ + "Please check the logs for errors and manually restart the agent as soon as "
+ + "possible.");
return;
}
} else {
try {
cleanDataDirectory();
} catch (Throwable t) {
- LOG.warn(t, "The plugin container has requested the agent be restarted but purging the " +
- "data directory failed.");
+ LOG.warn(t, "The plugin container has requested the agent be restarted but purging the "
+ + "data directory failed.");
}
try {
start();
} catch (Throwable t) {
- LOG.warn(t, "An error occurred while trying to restart the agent. Attempting restart " +
- "one more time");
+ LOG.warn(t, "An error occurred while trying to restart the agent. Attempting restart "
+ + "one more time");
try {
shutdown();
start();
} catch (Throwable t1) {
- LOG.error(t1, "Restarting the agent has failed. Please check the logs for errors and " +
- "manually restart the agent as soon as possible.");
+ LOG.error(t1, "Restarting the agent has failed. Please check the logs for errors and "
+ + "manually restart the agent as soon as possible.");
return;
}
}
@@ -2887,7 +2887,7 @@ public class AgentMain {
* @throws HelpException if help was requested and the agent should not be created
*/
private void processArguments(String[] args) throws Exception {
- String sopts = "-:hdlasntuD:i:o:c:p:e:";
+ String sopts = "-:hdlasntguD:i:o:c:p:e:";
LongOpt[] lopts = { new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'),
new LongOpt("input", LongOpt.REQUIRED_ARGUMENT, null, 'i'),
new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'),
13 years, 3 months
[rhq] 2 commits - modules/plugins
by mazz
modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java | 148 +++++++++-
modules/plugins/ant-bundle/src/test/resources/test-bundle-no-manage-root-dir.xml | 16 +
2 files changed, 159 insertions(+), 5 deletions(-)
New commits:
commit efa84c45d1c5dc485d288662ec1e32f1e3a86d22
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Jan 25 13:51:54 2011 -0500
test both purge and the "unmanaged root dir" feature.
diff --git a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
index a969164..9f2c846 100644
--- a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
+++ b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
@@ -55,6 +55,8 @@ import org.rhq.core.domain.resource.group.ResourceGroup;
import org.rhq.core.pluginapi.bundle.BundleDeployRequest;
import org.rhq.core.pluginapi.bundle.BundleDeployResult;
import org.rhq.core.pluginapi.bundle.BundleManagerProvider;
+import org.rhq.core.pluginapi.bundle.BundlePurgeRequest;
+import org.rhq.core.pluginapi.bundle.BundlePurgeResult;
import org.rhq.core.pluginapi.inventory.ResourceContext;
import org.rhq.core.system.SystemInfoFactory;
import org.rhq.core.util.file.FileUtil;
@@ -165,7 +167,7 @@ public class AntBundlePluginComponentTest {
// test that the prop was replaced in raw file test.properties
Properties realizedProps = new Properties();
- realizedProps.load(new FileInputStream(new File(this.destDir, "config/test.properties")));
+ loadProperties(realizedProps, new FileInputStream(new File(this.destDir, "config/test.properties")));
assert customPropValue.equals(realizedProps.getProperty(customPropName)) : "didn't replace prop";
// test that the archive was extracted properly. These are the files in the archive:
@@ -279,7 +281,7 @@ public class AntBundlePluginComponentTest {
// test that the prop was replaced in raw file test.properties
Properties realizedProps = new Properties();
- realizedProps.load(new FileInputStream(new File(this.destDir, "config/test.properties")));
+ loadProperties(realizedProps, new FileInputStream(new File(this.destDir, "config/test.properties")));
assert customPropValue.equals(realizedProps.getProperty(customPropName)) : "didn't replace prop";
// test that the archive was extracted properly. These are the files in the archive:
@@ -364,15 +366,134 @@ public class AntBundlePluginComponentTest {
// test that the prop was replaced in test.properties
Properties realizedProps = new Properties();
- realizedProps.load(new FileInputStream(new File(this.destDir, "config/test.properties")));
+ loadProperties(realizedProps, new FileInputStream(new File(this.destDir, "config/test.properties")));
assert realPropValue.equals(realizedProps.getProperty("custom.prop1")) : "didn't replace prop";
// test that the prop was not replaced in noreplace.properties
Properties notrealizedProps = new Properties();
- notrealizedProps.load(new FileInputStream(new File(this.destDir, "config/noreplace.properties")));
+ loadProperties(notrealizedProps, new FileInputStream(new File(this.destDir, "config/noreplace.properties")));
assert "@@custom.prop1(a)@".equals(notrealizedProps.getProperty("custom.prop1")) : "replaced prop when it shouldn't";
}
+ /**
+ * Test deployment of an RHQ bundle recipe where the deploy directory is not to be fully managed.
+ */
+ @Test(enabled = true)
+ public void testAntBundleNoManageRootDir() throws Exception {
+ ResourceType resourceType = new ResourceType("testNoManageRootDirBundle", "plugin", ResourceCategory.SERVER,
+ null);
+ BundleType bundleType = new BundleType("testNoManageRootDirBundle", resourceType);
+ Repo repo = new Repo("testNoManageRootDirBundle");
+ PackageType packageType = new PackageType("testNoManageRootDirBundle", resourceType);
+ Bundle bundle = new Bundle("testNoManageRootDirBundle", bundleType, repo, packageType);
+ BundleVersion bundleVersion = new BundleVersion("testNoManageRootDirBundle", "1.0", bundle,
+ getRecipeFromFile("test-bundle-no-manage-root-dir.xml"));
+ BundleDestination destination = new BundleDestination(bundle, "testNoManageRootDirBundle", new ResourceGroup(
+ "testNoManageRootDirBundle"), this.destDir.getAbsolutePath());
+ Configuration config = new Configuration();
+
+ BundleDeployment deployment = new BundleDeployment();
+ deployment.setName("test bundle deployment name");
+ deployment.setBundleVersion(bundleVersion);
+ deployment.setConfiguration(config);
+ deployment.setDestination(destination);
+
+ // create bundle test files
+ File file0 = new File(this.bundleFilesDir, "zero.properties");
+ Properties props = new Properties();
+ props.setProperty("zero", "0");
+ FileOutputStream outputStream = new FileOutputStream(file0);
+ props.store(outputStream, "zero file");
+ outputStream.close();
+
+ File file1 = new File(this.bundleFilesDir, "one.properties");
+ props.clear();
+ props.setProperty("one", "1");
+ outputStream = new FileOutputStream(file1);
+ props.store(outputStream, "one file");
+ outputStream.close();
+
+ File file2 = new File(this.bundleFilesDir, "two.properties");
+ props.clear();
+ props.setProperty("two", "2");
+ outputStream = new FileOutputStream(file2);
+ props.store(outputStream, "two file");
+ outputStream.close();
+
+ // create some external test files that don't belong to the bundle but are in the dest dir (which is not fully managed by the bundle)
+ this.destDir.mkdirs();
+ File external1 = new File(this.destDir, "external1.properties");
+ props.clear();
+ props.setProperty("external1", "1");
+ outputStream = new FileOutputStream(external1);
+ props.store(outputStream, "external1 file");
+ outputStream.close();
+
+ File external2 = new File(this.destDir, "extdir/external2.properties");
+ external2.getParentFile().mkdirs();
+ props.clear();
+ props.setProperty("external2", "2");
+ outputStream = new FileOutputStream(external2);
+ props.store(outputStream, "external2 file");
+ outputStream.close();
+
+ // deploy the bundle
+ BundleDeployRequest request = new BundleDeployRequest();
+ request.setBundleFilesLocation(this.bundleFilesDir);
+ request.setResourceDeployment(new BundleResourceDeployment(deployment, null));
+ request.setBundleManagerProvider(new MockBundleManagerProvider());
+
+ BundleDeployResult results = plugin.deployBundle(request);
+
+ assertResultsSuccess(results);
+
+ // test that files were deployed in the proper place
+ props.clear();
+ loadProperties(props, new FileInputStream(new File(this.destDir, "zero.properties")));
+ assert "0".equals(props.getProperty("zero")) : "did not deploy bundle correctly 0";
+ loadProperties(props, new FileInputStream(new File(this.destDir, "subdir1/one.properties")));
+ assert "1".equals(props.getProperty("one")) : "did not deploy bundle correctly 1";
+ loadProperties(props, new FileInputStream(new File(this.destDir, "subdir2/two.properties")));
+ assert "2".equals(props.getProperty("two")) : "did not deploy bundle correctly 2";
+
+ DeploymentsMetadata metadata = new DeploymentsMetadata(this.destDir);
+ assert metadata.isManaged() == true : "missing metadata directory";
+ assert metadata.getCurrentDeploymentProperties().getManageRootDir() == false : "should not be managing root dir";
+
+ // make sure our unmanaged files/directories weren't removed
+ props.clear();
+ loadProperties(props, new FileInputStream(new File(this.destDir, "external1.properties")));
+ assert "1".equals(props.getProperty("external1")) : "bundle deployment removed our unmanaged file 1";
+ loadProperties(props, new FileInputStream(new File(this.destDir, "extdir/external2.properties")));
+ assert "2".equals(props.getProperty("external2")) : "bundle deployment removed our unmanaged file 2";
+
+ // now purge the bundle - this should only purge those files that were laid down by the bundle plus the metadata directory
+ BundlePurgeRequest purgeRequest = new BundlePurgeRequest();
+ purgeRequest.setLiveResourceDeployment(new BundleResourceDeployment(deployment, null));
+ purgeRequest.setBundleManagerProvider(new MockBundleManagerProvider());
+
+ BundlePurgeResult purgeResults = plugin.purgeBundle(purgeRequest);
+ assertResultsSuccess(purgeResults);
+
+ // make sure our bundle files have been completely purged; the metadata directory should have been purged too
+ assert new File(this.destDir, "zero.properties").exists() == false;
+ assert new File(this.destDir, "subdir1/one.properties").exists() == false;
+ assert new File(this.destDir, "subdir2/two.properties").exists() == false;
+ assert new File(this.destDir, "subdir1").exists() == false;
+ assert new File(this.destDir, "subdir2").exists() == false;
+ assert this.destDir.exists() == true : "deploy dir should still exist, we were told not to fully manage it";
+
+ metadata = new DeploymentsMetadata(this.destDir);
+ assert metadata.getMetadataDirectory().exists() == false : "metadata directory should not exist";
+
+ // make sure our external, unmanaged files still exist - the purge should not have deleted these
+ props.clear();
+ loadProperties(props, new FileInputStream(new File(this.destDir, "external1.properties")));
+ assert "1".equals(props.getProperty("external1")) : "bundle purge removed our unmanaged file 1";
+ loadProperties(props, new FileInputStream(new File(this.destDir, "extdir/external2.properties")));
+ assert "2".equals(props.getProperty("external2")) : "bundle purge removed our unmanaged file 2";
+ }
+
private void upgrade(boolean clean) throws Exception {
testAntBundleInitialInstall(); // install a bundle first
cleanPluginDirs(); // clean everything but the dest dir - we want to upgrade the destination
@@ -441,7 +562,7 @@ public class AntBundlePluginComponentTest {
// test that the prop was replaced in raw file test.properties
Properties realizedProps = new Properties();
- realizedProps.load(new FileInputStream(new File(this.destDir, "config/test.properties")));
+ loadProperties(realizedProps, new FileInputStream(new File(this.destDir, "config/test.properties")));
assert customPropValue.equals(realizedProps.getProperty(customPropName)) : "didn't replace prop";
// test that the archive was extracted properly. These are the files in the archive or removed from original:
@@ -499,6 +620,11 @@ public class AntBundlePluginComponentTest {
assert results.isSuccess() : "Failed to process bundle!: [" + results.getErrorMessage() + "]";
}
+ private void assertResultsSuccess(BundlePurgeResult results) {
+ assert (results.getErrorMessage() == null) : "Failed to purge bundle: [" + results.getErrorMessage() + "]";
+ assert results.isSuccess() : "Failed to purge bundle!: [" + results.getErrorMessage() + "]";
+ }
+
private String getRecipeFromFile(String filename) {
InputStream stream = getClass().getClassLoader().getResourceAsStream(filename);
@@ -510,6 +636,14 @@ public class AntBundlePluginComponentTest {
return new String(StreamUtil.slurp(new FileInputStream(file)));
}
+ private void loadProperties(Properties realizedProps, FileInputStream fileInputStream) throws Exception {
+ try {
+ realizedProps.load(fileInputStream);
+ } finally {
+ fileInputStream.close();
+ }
+ }
+
private class MockBundleManagerProvider implements BundleManagerProvider {
public void auditDeployment(BundleResourceDeployment deployment, String action, String info,
BundleResourceDeploymentHistory.Category category, BundleResourceDeploymentHistory.Status status,
diff --git a/modules/plugins/ant-bundle/src/test/resources/test-bundle-no-manage-root-dir.xml b/modules/plugins/ant-bundle/src/test/resources/test-bundle-no-manage-root-dir.xml
new file mode 100644
index 0000000..6b20bf2
--- /dev/null
+++ b/modules/plugins/ant-bundle/src/test/resources/test-bundle-no-manage-root-dir.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<project name="simple-build" default="main"
+ xmlns:rhq="antlib:org.rhq.bundle">
+
+ <rhq:bundle name="testNoManageRootDirBundle" version="1.0">
+ <rhq:deployment-unit name="simulated-war" manageRootDir="false">
+ <rhq:file name="zero.properties" destinationFile="zero.properties"/>
+ <rhq:file name="one.properties" destinationFile="subdir1/one.properties"/>
+ <rhq:file name="two.properties" destinationFile="subdir2/two.properties"/>
+ </rhq:deployment-unit>
+ </rhq:bundle>
+
+ <target name="main"/>
+
+</project>
\ No newline at end of file
commit 83d54210f5f40c2a0d9c66dc175327beb6af2360
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Jan 25 12:23:57 2011 -0500
test the new manage root dir prop
diff --git a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
index ae06f0d..a969164 100644
--- a/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
+++ b/modules/plugins/ant-bundle/src/test/java/org/rhq/plugins/ant/AntBundlePluginComponentTest.java
@@ -199,6 +199,7 @@ public class AntBundlePluginComponentTest {
assert deploymentProps.getDeploymentId() == deployment.getId();
assert deploymentProps.getBundleName().equals(bundle.getName());
assert deploymentProps.getBundleVersion().equals(bundleVersion.getVersion());
+ assert deploymentProps.getManageRootDir() == true;
DeploymentProperties currentProps = metadata.getCurrentDeploymentProperties();
assert deploymentProps.equals(currentProps);
@@ -300,6 +301,7 @@ public class AntBundlePluginComponentTest {
assert deploymentProps.getDeploymentId() == deployment.getId();
assert deploymentProps.getBundleName().equals(bundle.getName());
assert deploymentProps.getBundleVersion().equals(bundleVersion.getVersion());
+ assert deploymentProps.getManageRootDir() == true;
DeploymentProperties currentProps = metadata.getCurrentDeploymentProperties();
assert deploymentProps.equals(currentProps);
DeploymentProperties previousProps = metadata.getPreviousDeploymentProperties(deployment.getId());
@@ -471,6 +473,7 @@ public class AntBundlePluginComponentTest {
assert deploymentProps.getDeploymentId() == deployment.getId();
assert deploymentProps.getBundleName().equals(bundle.getName());
assert deploymentProps.getBundleVersion().equals(bundleVersion.getVersion());
+ assert deploymentProps.getManageRootDir() == true;
DeploymentProperties currentProps = metadata.getCurrentDeploymentProperties();
assert deploymentProps.equals(currentProps);
@@ -488,6 +491,7 @@ public class AntBundlePluginComponentTest {
assert previousProps.getDeploymentId() == 123 : "bad previous deployment metadata"; // testAntBundleInitialInstall used 123
assert previousProps.getBundleName().equals(deploymentProps.getBundleName());
assert previousProps.getBundleVersion().equals("2.5"); // testAntBundleInitialInstall deployed version 2.5
+ assert previousProps.getManageRootDir() == true;
}
private void assertResultsSuccess(BundleDeployResult results) {
13 years, 3 months
[rhq] 2 commits - modules/core
by Heiko W. Rupp
modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a4c5c2432c68c27ecc43abfb0352cd47408ca02e
Merge: a71b855... f149eac...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Jan 25 15:13:53 2011 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit a71b855a4c26a94114e583b2639fff36450948ed
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Jan 25 15:13:16 2011 +0100
Better mark that the resource in parens is the parent.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java
index 25b5394..42600be 100644
--- a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java
+++ b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java
@@ -542,7 +542,7 @@ public class StandaloneContainer {
Set<Resource> resources = getResources();
for (Resource res : resources) {
if (res.getName().matches(pattern)) {
- System.out.println(res.getId() + ": " + res.getName() + " ( " + res.getParentResource() + " )");
+ System.out.println(res.getId() + ": " + res.getName() + " (parent= " + res.getParentResource() + " )");
dollarR = res.getId();
}
}
13 years, 3 months
[rhq] modules/common modules/core modules/enterprise modules/plugins
by mazz
modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java | 14 -
modules/core/util/src/main/java/org/rhq/core/util/updater/DeploymentProperties.java | 20 ++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 5
modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java | 97 +++++++---
4 files changed, 104 insertions(+), 32 deletions(-)
New commits:
commit f149eacf6233511341a81b1c6b67b8754217da2f
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Jan 24 17:33:08 2011 -0500
don't blindly remove the full deploy dir if we were told not to fully manage the deploy dir
this is to support ear/war bundle deployment into a jboss-as deploy/ dir
diff --git a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java
index 162ba4d..189c420 100644
--- a/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java
+++ b/modules/common/ant-bundle/src/main/java/org/rhq/bundle/ant/type/DeploymentUnitType.java
@@ -102,6 +102,13 @@ public class DeploymentUnitType extends AbstractBundleType {
try {
boolean dryRun = getProject().isDryRun();
+ boolean willManageRootDir = Boolean.parseBoolean(this.manageRootDir);
+ File deployDir = getProject().getDeployDir();
+ TemplateEngine templateEngine = createTemplateEngine();
+ int deploymentId = getProject().getDeploymentId();
+ DeploymentProperties deploymentProps = new DeploymentProperties(deploymentId, getProject().getBundleName(),
+ getProject().getBundleVersion(), getProject().getBundleDescription());
+ deploymentProps.setManageRootDir(willManageRootDir);
if (this.preinstallTarget != null) {
getProject().auditLog(AuditStatus.SUCCESS, "Pre-Install Started", "The pre install target will start",
@@ -126,12 +133,6 @@ public class DeploymentUnitType extends AbstractBundleType {
"The pre install target has finished", null, null);
}
- int deploymentId = getProject().getDeploymentId();
- DeploymentProperties deploymentProps = new DeploymentProperties(deploymentId, getProject().getBundleName(),
- getProject().getBundleVersion(), getProject().getBundleDescription());
- File deployDir = getProject().getDeployDir();
- TemplateEngine templateEngine = createTemplateEngine();
-
boolean haveSomethingToDo = false;
if (!this.files.isEmpty()) {
haveSomethingToDo = true;
@@ -154,7 +155,6 @@ public class DeploymentUnitType extends AbstractBundleType {
"You must specify at least one file to deploy via nested file, archive, url-file, url-archive types in your recipe");
}
- boolean willManageRootDir = Boolean.parseBoolean(this.manageRootDir);
if (willManageRootDir) {
log("Managing the root directory of this deployment unit - unrelated files found will be removed",
Project.MSG_VERBOSE);
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/updater/DeploymentProperties.java b/modules/core/util/src/main/java/org/rhq/core/util/updater/DeploymentProperties.java
index c476988..3553413 100644
--- a/modules/core/util/src/main/java/org/rhq/core/util/updater/DeploymentProperties.java
+++ b/modules/core/util/src/main/java/org/rhq/core/util/updater/DeploymentProperties.java
@@ -34,11 +34,15 @@ import java.util.Properties;
public class DeploymentProperties extends Properties {
private static final long serialVersionUID = 1L;
+ // required properties that must always exist
private static final String DEPLOYMENT_ID = "deployment.id";
private static final String BUNDLE_NAME = "bundle.name";
private static final String BUNDLE_VERSION = "bundle.version";
private static final String BUNDLE_DESCRIPTION = "bundle.description";
+ // optional properties
+ private static final String MANAGE_ROOT_DIR = "manage.root.dir";
+
public static DeploymentProperties loadFromFile(File file) throws Exception {
DeploymentProperties props = new DeploymentProperties();
FileInputStream is = new FileInputStream(file);
@@ -190,4 +194,20 @@ public class DeploymentProperties extends Properties {
setProperty(BUNDLE_DESCRIPTION, description);
}
}
+
+ /**
+ * @return the flag to indicate if the entire root directory content is to be managed.
+ * If there is no property, this method returns a default of <code>true</code>
+ */
+ public boolean getManageRootDir() {
+ String str = getProperty(MANAGE_ROOT_DIR);
+ if (str == null) {
+ return true;
+ }
+ return Boolean.parseBoolean(str);
+ }
+
+ public void setManageRootDir(boolean willManageRootDir) {
+ setProperty(MANAGE_ROOT_DIR, Boolean.toString(willManageRootDir));
+ }
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
index 71d5e06..da52896 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java
@@ -218,8 +218,9 @@ public class BundleDestinationView extends LocatableVLayout implements Bookmarka
CoreGUI.getMessageCenter().notify(
new Message(MSG.view_bundle_dest_purgeSuccessful(destination.getName()),
Message.Severity.Info));
- // Bundle destination is purged, go back to bundle destinations root view
- CoreGUI.goToView(LinkManager.getBundleDestinationLink(bundle.getId(), 0), true);
+ // Bundle destination is purged, go back to bundle destination view
+ CoreGUI.goToView(LinkManager.getBundleDestinationLink(bundle.getId(), destination
+ .getId()), true);
}
});
}
diff --git a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
index 817b647..201d212 100644
--- a/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
+++ b/modules/plugins/ant-bundle/src/main/java/org/rhq/plugins/ant/AntBundlePluginComponent.java
@@ -180,67 +180,118 @@ public class AntBundlePluginComponent implements ResourceComponent, BundleFacet
String deployDirAbsolutePath = deployDir.getAbsolutePath();
BundleManagerProvider bundleManagerProvider = request.getBundleManagerProvider();
+ boolean manageAllDeployDir = true;
+ boolean errorPurgingDeployDirContent = false;
+ File metadataDirectoryToPurge = null;
+
// If the receipe copied file(s) outside of the deployment directory (external, raw files), they will still exist.
// Let's get the metadata information that tells us if such files exist, and if so, remove them.
+ // Since we are iterating over the manage files anyway, let's also remove the files/subdirs under the deploy directory too.
DeploymentsMetadata metadata = new DeploymentsMetadata(deployDir);
if (metadata.isManaged()) {
+ metadataDirectoryToPurge = metadata.getMetadataDirectory();
+ manageAllDeployDir = metadata.getCurrentDeploymentProperties().getManageRootDir();
int totalExternalFiles = 0;
- ArrayList<String> deleteSuccesses = new ArrayList<String>(0);
- ArrayList<String> deleteFailures = new ArrayList<String>(0);
- FileHashcodeMap fileHashcodes = metadata.getCurrentDeploymentFileHashcodes();
- for (String filePath : fileHashcodes.keySet()) {
+ ArrayList<String> externalDeleteSuccesses = new ArrayList<String>(0);
+ ArrayList<String> externalDeleteFailures = new ArrayList<String>(0);
+ FileHashcodeMap deployDirFileHashcodes = metadata.getCurrentDeploymentFileHashcodes();
+ for (String filePath : deployDirFileHashcodes.keySet()) {
File file = new File(filePath);
if (file.isAbsolute()) {
totalExternalFiles++;
if (file.exists()) {
if (file.delete()) {
- deleteSuccesses.add(filePath);
+ externalDeleteSuccesses.add(filePath);
} else {
- deleteFailures.add(filePath);
+ externalDeleteFailures.add(filePath);
}
} else {
- deleteSuccesses.add(filePath); // someone already deleted it, consider it removed successfully
+ externalDeleteSuccesses.add(filePath); // someone already deleted it, consider it removed successfully
+ }
+ } else {
+ // a relative path means it is inside the deploy dir (i.e. its relative to deployDir).
+ // note that we only remove child directories and files that are direct children of the deploy dir itself;
+ // we do not purge the deploy dir itself, in case we are not managing the full deploy dir.
+ String parentDir = file.getParent();
+ if (parentDir == null) {
+ // this file is directly in the deploy dir
+ file = new File(deployDir, filePath);
+ file.delete();
+ } else {
+ // this file is under some subdirectory under the deploy dir - purge the subdirectory completely
+ file = new File(deployDir, parentDir);
+ FileUtil.purge(file, true);
+ }
+ if (file.exists()) {
+ errorPurgingDeployDirContent = true;
}
}
}
if (totalExternalFiles > 0) {
- if (!deleteSuccesses.isEmpty()) {
+ if (!externalDeleteSuccesses.isEmpty()) {
StringBuilder deleteSuccessesDetails = new StringBuilder();
- for (String path : deleteSuccesses) {
+ for (String path : externalDeleteSuccesses) {
deleteSuccessesDetails.append(path).append("\n");
}
bundleManagerProvider.auditDeployment(deploymentToPurge, "Purge", "External files were purged",
- Category.AUDIT_MESSAGE, Status.SUCCESS, "[" + deleteSuccesses.size() + "] of ["
+ Category.AUDIT_MESSAGE, Status.SUCCESS, "[" + externalDeleteSuccesses.size() + "] of ["
+ totalExternalFiles
+ "] external files were purged. See attached details for the list",
deleteSuccessesDetails.toString());
}
- if (!deleteFailures.isEmpty()) {
+ if (!externalDeleteFailures.isEmpty()) {
StringBuilder deleteFailuresDetails = new StringBuilder();
- for (String path : deleteFailures) {
+ for (String path : externalDeleteFailures) {
deleteFailuresDetails.append(path).append("\n");
}
bundleManagerProvider.auditDeployment(deploymentToPurge, "Purge",
"External files failed to be purged", Category.AUDIT_MESSAGE, Status.FAILURE, "["
- + deleteFailures.size() + "] of [" + totalExternalFiles
+ + externalDeleteFailures.size() + "] of [" + totalExternalFiles
+ "] external files failed to be purged. See attached details for the list",
deleteFailuresDetails.toString());
}
}
}
- // completely purge the deployment directory.
- FileUtil.purge(deployDir, true);
-
- if (!deployDir.exists()) {
- bundleManagerProvider.auditDeployment(deploymentToPurge, "Purge",
- "The destination directory has been purged", Category.AUDIT_MESSAGE, Status.SUCCESS,
- "Directory purged: " + deployDirAbsolutePath, null);
+ // if we are managing the full deploy dir, completely purge the deployment directory.
+ // otherwise, just report that we deleted what we were responsible for.
+ if (manageAllDeployDir) {
+ FileUtil.purge(deployDir, true);
+ if (!deployDir.exists()) {
+ bundleManagerProvider.auditDeployment(deploymentToPurge, "Purge",
+ "The destination directory has been purged", Category.AUDIT_MESSAGE, Status.SUCCESS,
+ "Directory purged: " + deployDirAbsolutePath, null);
+ } else {
+ bundleManagerProvider.auditDeployment(deploymentToPurge, "Purge",
+ "The destination directory failed to be purged", Category.AUDIT_MESSAGE, Status.FAILURE,
+ "The directory that failed to be purged: " + deployDirAbsolutePath, null);
+ }
} else {
- bundleManagerProvider.auditDeployment(deploymentToPurge, "Purge",
- "The destination directory failed to be purged", Category.AUDIT_MESSAGE, Status.FAILURE,
- "The directory that failed to be purged: " + deployDirAbsolutePath, null);
+ if (!errorPurgingDeployDirContent) {
+ bundleManagerProvider.auditDeployment(deploymentToPurge, "Purge",
+ "The managed bundle content was removed from the destination directory; "
+ + "other unmanaged content may still remain", Category.AUDIT_MESSAGE, Status.SUCCESS,
+ "Deploy Directory: " + deployDirAbsolutePath, null);
+ } else {
+ bundleManagerProvider.auditDeployment(deploymentToPurge, "Purge",
+ "Not all managed bundle content was able to be removed from the destination directory. "
+ + "That managed content along with other unmanaged content still remain",
+ Category.AUDIT_MESSAGE, Status.FAILURE, "Deploy Directory: " + deployDirAbsolutePath, null);
+ }
+
+ // make sure we remove the metadata directory, too - since it may still have sensitive files that were backed up
+ if (metadataDirectoryToPurge != null) {
+ FileUtil.purge(metadataDirectoryToPurge, true);
+ if (metadataDirectoryToPurge.exists()) {
+ bundleManagerProvider.auditDeployment(deploymentToPurge, "Purge",
+ "Failed to purge the metadata directory from the destination directory. "
+ + "It may still contain backed up files from previous bundle deployments.",
+ Category.AUDIT_MESSAGE, Status.FAILURE, "Metadata Directory: "
+ + metadataDirectoryToPurge.getAbsolutePath(), null);
+ }
+ }
}
+
} catch (Throwable t) {
log.error("Failed to purge bundle [" + request + "]", t);
result.setErrorMessage(t);
13 years, 3 months
[rhq] modules/enterprise
by ips
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 284 ++++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationScheduleDataSource.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/ResourceOperationScheduleDetailsView.java | 284 ----------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDataSource.java | 105 +++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java | 16
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java | 54 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java | 18
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 20
10 files changed, 515 insertions(+), 289 deletions(-)
New commits:
commit aeac14f0fd67d08b39b33d6feeccb453a7ad5aa5
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Jan 24 22:35:38 2011 -0500
partial impl of group Operations>Schedule subtab
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
new file mode 100644
index 0000000..db32a81
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java
@@ -0,0 +1,284 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2010-2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.Record;
+import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.form.fields.FormItem;
+import com.smartgwt.client.widgets.form.fields.SelectItem;
+import com.smartgwt.client.widgets.form.fields.StaticTextItem;
+import com.smartgwt.client.widgets.form.fields.TextAreaItem;
+import com.smartgwt.client.widgets.form.fields.TextItem;
+import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;
+import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
+
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.core.domain.operation.OperationDefinition;
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
+import org.rhq.enterprise.gui.coregui.client.ViewPath;
+import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
+import org.rhq.enterprise.gui.coregui.client.components.form.AbstractRecordEditor;
+import org.rhq.enterprise.gui.coregui.client.components.form.EnhancedDynamicForm;
+import org.rhq.enterprise.gui.coregui.client.components.trigger.JobTriggerEditor;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.schedule.ResourceOperationScheduleDataSource;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
+
+/**
+ * @author Ian Springer
+ */
+public abstract class AbstractOperationScheduleDetailsView extends AbstractRecordEditor {
+
+ private static final String FIELD_OPERATION_DESCRIPTION = "operationDescription";
+ private static final String FIELD_OPERATION_PARAMETERS = "operationParameters";
+
+ private Map<String, String> operationNameToDescriptionMap = new HashMap<String, String>();
+ private Map<String, ConfigurationDefinition> operationNameToParametersDefinitionMap =
+ new HashMap<String, ConfigurationDefinition>();
+ private StaticTextItem operationDescriptionItem;
+ private StaticTextItem operationParametersItem;
+ private LocatableHLayout operationParametersConfigurationHolder;
+ private JobTriggerEditor triggerEditor;
+ private Configuration parameters;
+ private EnhancedDynamicForm notesForm;
+
+ public AbstractOperationScheduleDetailsView(String locatorId, OperationScheduleDataSource dataSource,
+ ResourceType resourceType, int scheduleId) {
+ super(locatorId, dataSource, scheduleId, "Scheduled Operation", null);
+
+ Set<OperationDefinition> operationDefinitions = resourceType.getOperationDefinitions();
+ for (OperationDefinition operationDefinition : operationDefinitions) {
+ this.operationNameToDescriptionMap.put(operationDefinition.getName(), operationDefinition.getDescription());
+ this.operationNameToParametersDefinitionMap.put(operationDefinition.getName(),
+ operationDefinition.getParametersConfigurationDefinition());
+ }
+ }
+
+ @Override
+ public void renderView(ViewPath viewPath) {
+ super.renderView(viewPath);
+
+ // Existing schedules are not editable. This may change in the future.
+ boolean isReadOnly = (getRecordId() != 0);
+ init(isReadOnly);
+ }
+
+ @Override
+ protected List<FormItem> createFormItems(EnhancedDynamicForm form) {
+ List<FormItem> items = new ArrayList<FormItem>();
+
+ SelectItem operationNameItem = new SelectItem(ResourceOperationScheduleDataSource.Field.OPERATION_NAME);
+ items.add(operationNameItem);
+ operationNameItem.addChangedHandler(new ChangedHandler() {
+ public void onChanged(ChangedEvent event) {
+ refreshOperationDescriptionItem();
+ refreshOperationParametersItem();
+ }
+ });
+
+ this.operationDescriptionItem = new StaticTextItem(FIELD_OPERATION_DESCRIPTION, "Operation Description");
+ items.add(this.operationDescriptionItem);
+
+ this.operationParametersItem = new StaticTextItem(FIELD_OPERATION_PARAMETERS, "Operation Parameters");
+ items.add(this.operationParametersItem);
+
+ return items;
+ }
+
+ @Override
+ protected LocatableVLayout buildContentPane() {
+ LocatableVLayout contentPane = super.buildContentPane();
+
+ this.operationParametersConfigurationHolder = new LocatableHLayout(extendLocatorId("ConfigHolder"));
+ this.operationParametersConfigurationHolder.setVisible(false);
+ contentPane.addMember(this.operationParametersConfigurationHolder);
+
+ HTMLFlow hr = new HTMLFlow("<p/><hr/><p/>");
+ contentPane.addMember(hr);
+
+ if (isNewRecord()) {
+ this.triggerEditor = new JobTriggerEditor(extendLocatorId("TriggerEditor"));
+ contentPane.addMember(this.triggerEditor);
+ hr = new HTMLFlow("<p/><hr/><p/>");
+ contentPane.addMember(hr);
+ }
+
+ this.notesForm = new EnhancedDynamicForm(extendLocatorId("NotesForm"), isReadOnly(),
+ isNewRecord());
+ this.notesForm.setWidth100();
+
+ List<FormItem> notesFields = new ArrayList<FormItem>();
+
+ if (!isNewRecord()) {
+ StaticTextItem nextFireTimeItem = new StaticTextItem(OperationScheduleDataSource.Field.NEXT_FIRE_TIME);
+ notesFields.add(nextFireTimeItem);
+ }
+
+ TextItem timeoutItem = new TextItem(OperationScheduleDataSource.Field.TIMEOUT, "Timeout (in seconds)");
+ notesFields.add(timeoutItem);
+
+ TextAreaItem notesItem = new TextAreaItem(ResourceOperationScheduleDataSource.Field.DESCRIPTION, "Notes");
+ notesItem.setWidth(450);
+ notesItem.setHeight(150);
+ notesFields.add(notesItem);
+
+ this.notesForm.setFields(notesFields.toArray(new FormItem[notesFields.size()]));
+
+ contentPane.addMember(this.notesForm);
+
+ return contentPane;
+ }
+
+ @Override
+ protected void onDraw() {
+ super.onDraw();
+ refreshOperationDescriptionItem();
+ refreshOperationParametersItem();
+ }
+
+ @Override
+ protected String getTitleFieldName() {
+ return ResourceOperationScheduleDataSource.Field.OPERATION_DISPLAY_NAME;
+ }
+
+ @Override
+ protected Record createNewRecord() {
+ Record record = super.createNewRecord();
+ Subject sessionSubject = UserSessionManager.getSessionSubject();
+ OperationScheduleDataSource.SubjectRecord subjectRecord =
+ new OperationScheduleDataSource.SubjectRecord(sessionSubject);
+ record.setAttribute(ResourceOperationScheduleDataSource.Field.SUBJECT, subjectRecord);
+ return record;
+ }
+
+ @Override
+ protected void editRecord(Record record) {
+ refreshOperationDescriptionItem();
+ refreshOperationParametersItem();
+
+ if (!isNewRecord()) {
+ FormItem nextFireTimeItem = this.notesForm.getField(ResourceOperationScheduleDataSource.Field.NEXT_FIRE_TIME);
+ nextFireTimeItem.setValue(getForm().getValue(ResourceOperationScheduleDataSource.Field.NEXT_FIRE_TIME));
+ }
+
+ FormItem notesItem = this.notesForm.getField(ResourceOperationScheduleDataSource.Field.DESCRIPTION);
+ notesItem.setValue(getForm().getValue(ResourceOperationScheduleDataSource.Field.DESCRIPTION));
+
+ super.editRecord(record);
+ }
+
+ @Override
+ protected void save(DSRequest requestProperties) {
+ requestProperties.setAttribute("parameters", this.parameters);
+
+ if (!this.triggerEditor.validate()) {
+ // TODO: print error Message
+ return;
+ }
+ EnhancedDynamicForm form = getForm();
+
+ Record jobTriggerRecord = new ListGridRecord();
+
+ Date startTime = this.triggerEditor.getStartTime();
+ jobTriggerRecord.setAttribute(ResourceOperationScheduleDataSource.Field.START_TIME, startTime);
+
+ Date endTime = this.triggerEditor.getEndTime();
+ jobTriggerRecord.setAttribute(ResourceOperationScheduleDataSource.Field.END_TIME, endTime);
+
+ Integer repeatCount = this.triggerEditor.getRepeatCount();
+ jobTriggerRecord.setAttribute(ResourceOperationScheduleDataSource.Field.REPEAT_COUNT, repeatCount);
+
+ Long repeatInterval = this.triggerEditor.getRepeatInterval();
+ jobTriggerRecord.setAttribute(ResourceOperationScheduleDataSource.Field.REPEAT_INTERVAL, repeatInterval);
+
+ String cronExpression = this.triggerEditor.getCronExpression();
+ jobTriggerRecord.setAttribute(ResourceOperationScheduleDataSource.Field.CRON_EXPRESSION, cronExpression);
+
+ form.setValue("jobTrigger", jobTriggerRecord);
+
+ FormItem notesItem = this.notesForm.getField(ResourceOperationScheduleDataSource.Field.DESCRIPTION);
+ form.setValue(ResourceOperationScheduleDataSource.Field.DESCRIPTION, (String)notesItem.getValue());
+
+ super.save(requestProperties);
+ }
+
+ private void refreshOperationDescriptionItem() {
+ String operationName = getSelectedOperationName();
+ String value;
+ if (operationName == null) {
+ value = "<i>Select an operation.</i>";
+ } else {
+ value = this.operationNameToDescriptionMap.get(operationName);
+ }
+ this.operationDescriptionItem.setValue(value);
+ }
+
+ private void refreshOperationParametersItem() {
+ String operationName = getSelectedOperationName();
+ String value;
+ if (operationName == null) {
+ value = "<i>Select an operation.</i>";
+ } else {
+ ConfigurationDefinition parametersDefinition = this.operationNameToParametersDefinitionMap.get(operationName);
+ if (parametersDefinition == null || parametersDefinition.getPropertyDefinitions().isEmpty()) {
+ value = "<i>" + MSG.view_operationCreateWizard_parametersStep_noParameters() + "</i>";
+
+ for (Canvas child : this.operationParametersConfigurationHolder.getChildren()) {
+ child.destroy();
+ }
+ this.operationParametersConfigurationHolder.hide();
+ } else {
+ value = isNewRecord() ? "<i>Enter parameters below...</i>" : "";
+
+ for (Canvas child : this.operationParametersConfigurationHolder.getChildren()) {
+ child.destroy();
+ }
+ Configuration defaultConfiguration = (parametersDefinition.getDefaultTemplate() != null) ?
+ parametersDefinition.getDefaultTemplate().createConfiguration() : new Configuration();
+ ConfigurationEditor configurationEditor = new ConfigurationEditor("ParametersEditor", parametersDefinition,
+ defaultConfiguration);
+ configurationEditor.setReadOnly(isReadOnly());
+ this.parameters = configurationEditor.getConfiguration();
+ this.operationParametersConfigurationHolder.addMember(configurationEditor);
+ this.operationParametersConfigurationHolder.show();
+ }
+ }
+ this.operationParametersItem.setValue(value);
+ }
+
+ private String getSelectedOperationName() {
+ FormItem operationNameItem = getForm().getField(ResourceOperationScheduleDataSource.Field.OPERATION_NAME);
+ return (String)operationNameItem.getValue();
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationScheduleDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationScheduleDataSource.java
index ec95731..3813b98 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationScheduleDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationScheduleDataSource.java
@@ -35,6 +35,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.common.JobTrigger;
import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.operation.OperationDefinition;
import org.rhq.core.domain.operation.bean.OperationSchedule;
import org.rhq.core.domain.resource.ResourceType;
@@ -57,6 +58,7 @@ public abstract class OperationScheduleDataSource<T extends OperationSchedule> e
public static final String SUBJECT = "subject";
public static final String DESCRIPTION = "description";
public static final String NEXT_FIRE_TIME = "nextFireTime";
+ public static final String TIMEOUT = "timeout";
// job trigger fields
public static final String START_TIME = "startTime";
@@ -112,6 +114,10 @@ public abstract class OperationScheduleDataSource<T extends OperationSchedule> e
DataSourceDateTimeField nextFireTimeField = new DataSourceDateTimeField(Field.NEXT_FIRE_TIME,
"Next Scheduled Execution");
nextFireTimeField.setCanEdit(false);
+ fields.add(nextFireTimeField);
+
+ DataSourceIntegerField timeoutField = createIntegerField(Field.TIMEOUT, "Timeout (in seconds)", 30, null, false);
+ fields.add(timeoutField);
return fields;
}
@@ -127,11 +133,15 @@ public abstract class OperationScheduleDataSource<T extends OperationSchedule> e
to.setJobGroup(from.getAttribute(Field.JOB_GROUP));
SubjectRecord subjectRecord = (SubjectRecord) from.getAttributeAsRecord(Field.SUBJECT);
to.setSubject(subjectRecord.toSubject());
- to.setParameters((Configuration)from.getAttributeAsObject(Field.PARAMETERS));
+ Configuration parameters = (Configuration) from.getAttributeAsObject(Field.PARAMETERS);
+ to.setParameters(parameters);
to.setOperationName(from.getAttribute(Field.OPERATION_NAME));
to.setOperationDisplayName(from.getAttribute(Field.OPERATION_DISPLAY_NAME));
to.setDescription(from.getAttribute(Field.DESCRIPTION));
to.setNextFireTime(from.getAttributeAsDate(Field.NEXT_FIRE_TIME));
+ if (parameters != null) {
+ parameters.put(new PropertySimple(OperationDefinition.TIMEOUT_PARAM_NAME, from.getAttributeAsInt(Field.TIMEOUT)));
+ }
to.setJobTrigger(createJobTrigger(from.getAttributeAsRecord("jobTrigger")));
@@ -152,6 +162,7 @@ public abstract class OperationScheduleDataSource<T extends OperationSchedule> e
to.setAttribute(Field.OPERATION_DISPLAY_NAME, from.getOperationDisplayName());
to.setAttribute(Field.DESCRIPTION, from.getDescription());
to.setAttribute(Field.NEXT_FIRE_TIME, from.getNextFireTime());
+ to.setAttribute(Field.TIMEOUT, from.getParameters().getSimpleValue(OperationDefinition.TIMEOUT_PARAM_NAME, null));
JobTrigger jobTrigger = from.getJobTrigger();
Record jobTriggerRecord = new ListGridRecord();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/ResourceOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/ResourceOperationScheduleDetailsView.java
deleted file mode 100644
index bc405b1..0000000
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/ResourceOperationScheduleDetailsView.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright 2010-2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.smartgwt.client.data.DSRequest;
-import com.smartgwt.client.data.Record;
-import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.HTMLFlow;
-import com.smartgwt.client.widgets.form.fields.FormItem;
-import com.smartgwt.client.widgets.form.fields.SelectItem;
-import com.smartgwt.client.widgets.form.fields.StaticTextItem;
-import com.smartgwt.client.widgets.form.fields.TextAreaItem;
-import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;
-import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
-
-import com.smartgwt.client.widgets.grid.ListGridRecord;
-import org.rhq.core.domain.auth.Subject;
-import org.rhq.core.domain.configuration.Configuration;
-import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
-import org.rhq.core.domain.operation.OperationDefinition;
-import org.rhq.core.domain.resource.ResourceType;
-import org.rhq.core.domain.resource.composite.ResourceComposite;
-import org.rhq.enterprise.gui.coregui.client.UserSessionManager;
-import org.rhq.enterprise.gui.coregui.client.ViewPath;
-import org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
-import org.rhq.enterprise.gui.coregui.client.components.form.AbstractRecordEditor;
-import org.rhq.enterprise.gui.coregui.client.components.form.EnhancedDynamicForm;
-import org.rhq.enterprise.gui.coregui.client.components.trigger.JobTriggerEditor;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.schedule.ResourceOperationScheduleDataSource;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
-
-/**
- * @author Ian Springer
- */
-public class ResourceOperationScheduleDetailsView extends AbstractRecordEditor {
-
- private static final String FIELD_OPERATION_DESCRIPTION = "operationDescription";
- private static final String FIELD_OPERATION_PARAMETERS = "operationParameters";
-
- private ResourceComposite resourceComposite;
- private Map<String, String> operationNameToDescriptionMap = new HashMap<String, String>();
- private Map<String, ConfigurationDefinition> operationNameToParametersDefinitionMap =
- new HashMap<String, ConfigurationDefinition>();
- private StaticTextItem operationDescriptionItem;
- private StaticTextItem operationParametersItem;
- private LocatableHLayout operationParametersConfigurationHolder;
- private JobTriggerEditor triggerEditor;
- private Configuration parameters;
- private EnhancedDynamicForm notesForm;
-
- public ResourceOperationScheduleDetailsView(String locatorId, ResourceComposite resourceComposite, int scheduleId) {
- super(locatorId, new ResourceOperationScheduleDataSource(resourceComposite), scheduleId, "Scheduled Operation", null);
-
- this.resourceComposite = resourceComposite;
- ResourceType resourceType = this.resourceComposite.getResource().getResourceType();
- Set<OperationDefinition> operationDefinitions = resourceType.getOperationDefinitions();
- for (OperationDefinition operationDefinition : operationDefinitions) {
- this.operationNameToDescriptionMap.put(operationDefinition.getName(), operationDefinition.getDescription());
- this.operationNameToParametersDefinitionMap.put(operationDefinition.getName(),
- operationDefinition.getParametersConfigurationDefinition());
- }
- }
-
- @Override
- public void renderView(ViewPath viewPath) {
- super.renderView(viewPath);
-
- // Existing schedules are not editable. This may change in the future.
- boolean isReadOnly = (getRecordId() != 0);
- init(isReadOnly);
- }
-
- @Override
- protected List<FormItem> createFormItems(EnhancedDynamicForm form) {
- List<FormItem> items = new ArrayList<FormItem>();
-
- SelectItem operationNameItem = new SelectItem(ResourceOperationScheduleDataSource.Field.OPERATION_NAME);
- items.add(operationNameItem);
- operationNameItem.addChangedHandler(new ChangedHandler() {
- public void onChanged(ChangedEvent event) {
- refreshOperationDescriptionItem();
- refreshOperationParametersItem();
- }
- });
-
- this.operationDescriptionItem = new StaticTextItem(FIELD_OPERATION_DESCRIPTION, "Operation Description");
- items.add(this.operationDescriptionItem);
-
- this.operationParametersItem = new StaticTextItem(FIELD_OPERATION_PARAMETERS, "Operation Parameters");
- items.add(this.operationParametersItem);
-
- return items;
- }
-
- @Override
- protected LocatableVLayout buildContentPane() {
- LocatableVLayout contentPane = super.buildContentPane();
-
- this.operationParametersConfigurationHolder = new LocatableHLayout(extendLocatorId("ConfigHolder"));
- this.operationParametersConfigurationHolder.setVisible(false);
- contentPane.addMember(this.operationParametersConfigurationHolder);
-
- HTMLFlow hr = new HTMLFlow("<p/><hr/><p/>");
- contentPane.addMember(hr);
-
- if (isNewRecord()) {
- this.triggerEditor = new JobTriggerEditor(extendLocatorId("TriggerEditor"));
- contentPane.addMember(this.triggerEditor);
- hr = new HTMLFlow("<p/><hr/><p/>");
- contentPane.addMember(hr);
- }
-
- this.notesForm = new EnhancedDynamicForm(extendLocatorId("NotesForm"), isReadOnly(),
- isNewRecord());
- this.notesForm.setWidth100();
-
- List<FormItem> notesFields = new ArrayList<FormItem>();
-
- if (!isNewRecord()) {
- StaticTextItem nextFireTimeItem = new StaticTextItem(ResourceOperationScheduleDataSource.Field.NEXT_FIRE_TIME,
- "Next Scheduled Execution");
- notesFields.add(nextFireTimeItem);
- }
-
- TextAreaItem notesItem = new TextAreaItem(ResourceOperationScheduleDataSource.Field.DESCRIPTION, "Notes");
- notesItem.setWidth(450);
- notesItem.setHeight(150);
- notesFields.add(notesItem);
-
- this.notesForm.setFields(notesFields.toArray(new FormItem[notesFields.size()]));
-
- contentPane.addMember(this.notesForm);
-
- return contentPane;
- }
-
- @Override
- protected void onDraw() {
- super.onDraw();
- refreshOperationDescriptionItem();
- refreshOperationParametersItem();
- }
-
- @Override
- protected String getTitleFieldName() {
- return ResourceOperationScheduleDataSource.Field.OPERATION_DISPLAY_NAME;
- }
-
- @Override
- protected Record createNewRecord() {
- Record record = super.createNewRecord();
- Subject sessionSubject = UserSessionManager.getSessionSubject();
- OperationScheduleDataSource.SubjectRecord subjectRecord =
- new OperationScheduleDataSource.SubjectRecord(sessionSubject);
- record.setAttribute(ResourceOperationScheduleDataSource.Field.SUBJECT, subjectRecord);
- return record;
- }
-
- @Override
- protected void editRecord(Record record) {
- refreshOperationDescriptionItem();
- refreshOperationParametersItem();
-
- if (!isNewRecord()) {
- FormItem nextFireTimeItem = this.notesForm.getField(ResourceOperationScheduleDataSource.Field.NEXT_FIRE_TIME);
- nextFireTimeItem.setValue(getForm().getValue(ResourceOperationScheduleDataSource.Field.NEXT_FIRE_TIME));
- }
-
- FormItem notesItem = this.notesForm.getField(ResourceOperationScheduleDataSource.Field.DESCRIPTION);
- notesItem.setValue(getForm().getValue(ResourceOperationScheduleDataSource.Field.DESCRIPTION));
-
- super.editRecord(record);
- }
-
- @Override
- protected void save(DSRequest requestProperties) {
- requestProperties.setAttribute("parameters", this.parameters);
-
- if (!this.triggerEditor.validate()) {
- // TODO: print error Message
- return;
- }
- EnhancedDynamicForm form = getForm();
-
- Record jobTriggerRecord = new ListGridRecord();
-
- Date startTime = this.triggerEditor.getStartTime();
- jobTriggerRecord.setAttribute(ResourceOperationScheduleDataSource.Field.START_TIME, startTime);
-
- Date endTime = this.triggerEditor.getEndTime();
- jobTriggerRecord.setAttribute(ResourceOperationScheduleDataSource.Field.END_TIME, endTime);
-
- Integer repeatCount = this.triggerEditor.getRepeatCount();
- jobTriggerRecord.setAttribute(ResourceOperationScheduleDataSource.Field.REPEAT_COUNT, repeatCount);
-
- Long repeatInterval = this.triggerEditor.getRepeatInterval();
- jobTriggerRecord.setAttribute(ResourceOperationScheduleDataSource.Field.REPEAT_INTERVAL, repeatInterval);
-
- String cronExpression = this.triggerEditor.getCronExpression();
- jobTriggerRecord.setAttribute(ResourceOperationScheduleDataSource.Field.CRON_EXPRESSION, cronExpression);
-
- form.setValue("jobTrigger", jobTriggerRecord);
-
- FormItem notesItem = this.notesForm.getField(ResourceOperationScheduleDataSource.Field.DESCRIPTION);
- form.setValue(ResourceOperationScheduleDataSource.Field.DESCRIPTION, (String)notesItem.getValue());
-
- super.save(requestProperties);
- }
-
- private void refreshOperationDescriptionItem() {
- String operationName = getSelectedOperationName();
- String value;
- if (operationName == null) {
- value = "<i>Select an operation.</i>";
- } else {
- value = this.operationNameToDescriptionMap.get(operationName);
- }
- this.operationDescriptionItem.setValue(value);
- }
-
- private void refreshOperationParametersItem() {
- String operationName = getSelectedOperationName();
- String value;
- if (operationName == null) {
- value = "<i>Select an operation.</i>";
- } else {
- ConfigurationDefinition parametersDefinition = this.operationNameToParametersDefinitionMap.get(operationName);
- if (parametersDefinition == null || parametersDefinition.getPropertyDefinitions().isEmpty()) {
- value = "<i>" + MSG.view_operationCreateWizard_parametersStep_noParameters() + "</i>";
-
- for (Canvas child : this.operationParametersConfigurationHolder.getChildren()) {
- child.destroy();
- }
- this.operationParametersConfigurationHolder.hide();
- } else {
- value = isNewRecord() ? "<i>Enter parameters below...</i>" : "";
-
- for (Canvas child : this.operationParametersConfigurationHolder.getChildren()) {
- child.destroy();
- }
- Configuration defaultConfiguration = (parametersDefinition.getDefaultTemplate() != null) ?
- parametersDefinition.getDefaultTemplate().createConfiguration() : new Configuration();
- ConfigurationEditor configurationEditor = new ConfigurationEditor("ParametersEditor", parametersDefinition,
- defaultConfiguration);
- configurationEditor.setReadOnly(isReadOnly());
- this.parameters = configurationEditor.getConfiguration();
- this.operationParametersConfigurationHolder.addMember(configurationEditor);
- this.operationParametersConfigurationHolder.show();
- }
- }
- this.operationParametersItem.setValue(value);
- }
-
- private String getSelectedOperationName() {
- FormItem operationNameItem = getForm().getField(ResourceOperationScheduleDataSource.Field.OPERATION_NAME);
- return (String)operationNameItem.getValue();
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index 8c4d6a2..9b18b47 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -57,6 +57,7 @@ import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.inventory.H
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.inventory.MembersView;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.schedules.SchedulesView;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.traits.TraitsView;
+import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.schedule.GroupOperationScheduleListView;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.summary.ActivityView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
@@ -295,8 +296,9 @@ public class ResourceGroupDetailView extends AbstractTwoLevelTabSetView<Resource
private void updateOperationsTab(int groupId, GroupCategory groupCategory, Set<ResourceTypeFacet> facets) {
if (updateTab(this.operationsTab, groupCategory == GroupCategory.COMPATIBLE
&& facets.contains(ResourceTypeFacet.OPERATION), true)) {
- updateSubTab(this.operationsTab, this.operationsSchedule, new FullHTMLPane(this.operationsSchedule.extendLocatorId("View"),
- "/rhq/group/operation/groupOperationSchedules-plain.xhtml?groupId=" + groupId), true, true);
+ updateSubTab(this.operationsTab, this.operationsSchedule,
+ new GroupOperationScheduleListView(this.operationsSchedule.extendLocatorId("View"),
+ this.groupComposite), true, true);
updateSubTab(this.operationsTab, this.operationsHistory, new FullHTMLPane(this.operationsHistory.extendLocatorId("View"),
"/rhq/group/operation/groupOperationHistory-plain.xhtml?groupId=" + groupId), true, true);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDataSource.java
new file mode 100644
index 0000000..d104eb2
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDataSource.java
@@ -0,0 +1,105 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.schedule;
+
+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.Record;
+import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.operation.bean.GroupOperationSchedule;
+import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.OperationScheduleDataSource;
+
+import java.util.List;
+
+/**
+ * A DataSource for {@link org.rhq.core.domain.operation.bean.GroupOperationSchedule}s for a given
+ * {@link org.rhq.core.domain.resource.group.ResourceGroup}.
+ *
+ * @author Ian Springer
+ */
+public class GroupOperationScheduleDataSource extends OperationScheduleDataSource<GroupOperationSchedule> {
+
+ private ResourceGroupComposite groupComposite;
+
+ public GroupOperationScheduleDataSource(ResourceGroupComposite groupComposite) {
+ super(groupComposite.getResourceGroup().getResourceType());
+ this.groupComposite = groupComposite;
+ }
+
+ @Override
+ protected GroupOperationSchedule createOperationSchedule() {
+ GroupOperationSchedule groupOperationSchedule = new GroupOperationSchedule();
+ groupOperationSchedule.setGroup(this.groupComposite.getResourceGroup());
+ return groupOperationSchedule;
+ }
+
+ @Override
+ protected void executeFetch(final DSRequest request, final DSResponse response) {
+ operationService.findScheduledGroupOperations(this.groupComposite.getResourceGroup().getId(),
+ new AsyncCallback<List<GroupOperationSchedule>>() {
+ public void onSuccess(List<GroupOperationSchedule> result) {
+ Record[] records = buildRecords(result);
+ response.setData(records);
+ processResponse(request.getRequestId(), response);
+ }
+
+ public void onFailure(Throwable caught) {
+ throw new RuntimeException("Failed to find scheduled operations for "
+ + groupComposite.getResourceGroup() + ".", caught);
+ }
+ });
+ }
+
+ @Override
+ protected void executeAdd(Record recordToAdd, final DSRequest request, final DSResponse response) {
+ Configuration parameters = (Configuration) request.getAttributeAsObject("parameters");
+ recordToAdd.setAttribute(Field.PARAMETERS, parameters);
+ final GroupOperationSchedule scheduleToAdd = copyValues(recordToAdd);
+ // TODO
+ /*operationService.scheduleResourceOperation(scheduleToAdd, new AsyncCallback<Integer>() {
+ public void onSuccess(Integer scheduleId) {
+ scheduleToAdd.setId(scheduleId);
+ sendSuccessResponse(request, response, scheduleToAdd);
+ }
+
+ public void onFailure(Throwable caught) {
+ throw new RuntimeException("Failed to add " + scheduleToAdd, caught);
+ }
+ });*/
+ }
+
+ @Override
+ protected void executeRemove(Record recordToRemove, final DSRequest request, final DSResponse response) {
+ final GroupOperationSchedule scheduleToRemove = copyValues(recordToRemove);
+ // TODO
+ /*operationService.unscheduleResourceOperation(scheduleToRemove, new AsyncCallback<Void>() {
+ public void onSuccess(Void result) {
+ sendSuccessResponse(request, response, scheduleToRemove);
+ }
+
+ public void onFailure(Throwable caught) {
+ throw new RuntimeException(caught);
+ }
+ });*/
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java
new file mode 100644
index 0000000..b6a37bf
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java
@@ -0,0 +1,16 @@
+package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.schedule;
+
+import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleDetailsView;
+
+/**
+ *
+ */
+public class GroupOperationScheduleDetailsView extends AbstractOperationScheduleDetailsView {
+
+ public GroupOperationScheduleDetailsView(String locatorId, ResourceGroupComposite groupComposite, int scheduleId) {
+ super(locatorId, new GroupOperationScheduleDataSource(groupComposite),
+ groupComposite.getResourceGroup().getResourceType(), scheduleId);
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
new file mode 100644
index 0000000..f3b376b
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
@@ -0,0 +1,54 @@
+/*
+ * RHQ Management Platform
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.operation.schedule;
+
+import com.smartgwt.client.widgets.Canvas;
+import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleDetailsView;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.OperationScheduleDataSource;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.OperationScheduleListView;
+import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.schedule.ResourceOperationScheduleDataSource;
+
+/**
+ * @author Ian Springer
+ */
+public class GroupOperationScheduleListView extends OperationScheduleListView {
+
+ private static final String TITLE = null;
+
+ private ResourceGroupComposite groupComposite;
+
+ public GroupOperationScheduleListView(String locatorId, ResourceGroupComposite groupComposite) {
+ super(locatorId, new GroupOperationScheduleDataSource(groupComposite), TITLE);
+ this.groupComposite = groupComposite;
+ }
+
+ @Override
+ protected boolean hasControlPermission() {
+ return this.groupComposite.getResourcePermission().isControl();
+ }
+
+ @Override
+ public Canvas getDetailsView(int scheduleId) {
+ return new GroupOperationScheduleDetailsView(extendLocatorId("DetailsView"),
+ this.groupComposite, scheduleId);
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java
new file mode 100644
index 0000000..70f2c18
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java
@@ -0,0 +1,18 @@
+package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.schedule;
+
+import org.rhq.core.domain.resource.ResourceType;
+import org.rhq.core.domain.resource.composite.ResourceComposite;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleDetailsView;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.OperationScheduleDataSource;
+
+/**
+ *
+ */
+public class ResourceOperationScheduleDetailsView extends AbstractOperationScheduleDetailsView {
+
+ public ResourceOperationScheduleDetailsView(String locatorId, ResourceComposite resourceComposite, int scheduleId) {
+ super(locatorId, new ResourceOperationScheduleDataSource(resourceComposite),
+ resourceComposite.getResource().getResourceType(), scheduleId);
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
index 14bb294..0e362f0 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
@@ -23,7 +23,7 @@ import com.smartgwt.client.widgets.Canvas;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.OperationScheduleListView;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.ResourceOperationScheduleDetailsView;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.schedule.AbstractOperationScheduleDetailsView;
/**
* @author Ian Springer
@@ -46,7 +46,7 @@ public class ResourceOperationScheduleListView extends OperationScheduleListView
@Override
public Canvas getDetailsView(int scheduleId) {
- return new ResourceOperationScheduleDetailsView(extendLocatorId("DetailsView"),
+ return new ResourceOperationScheduleDetailsView(extendLocatorId("DetailsView"),
this.resourceComposite, scheduleId);
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java
index f43417f..47d9d49 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java
@@ -36,14 +36,17 @@ import com.smartgwt.client.data.DSResponse;
import com.smartgwt.client.data.DataSource;
import com.smartgwt.client.data.DataSourceField;
import com.smartgwt.client.data.Record;
+import com.smartgwt.client.data.fields.DataSourceIntegerField;
import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.rpc.RPCResponse;
import com.smartgwt.client.types.DSDataFormat;
import com.smartgwt.client.types.DSProtocol;
import com.smartgwt.client.util.JSOHelper;
+import com.smartgwt.client.widgets.form.validator.IntegerRangeValidator;
import com.smartgwt.client.widgets.form.validator.LengthRangeValidator;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import org.hibernate.validator.RangeValidator;
import org.rhq.core.domain.alert.AlertPriority;
import org.rhq.core.domain.event.EventSeverity;
import org.rhq.core.domain.resource.ResourceCategory;
@@ -553,4 +556,21 @@ public abstract class RPCDataSource<T> extends DataSource {
return textField;
}
+ protected DataSourceIntegerField createIntegerField(String name, String title, Integer minValue, Integer maxValue,
+ Boolean required) {
+ DataSourceIntegerField textField = new DataSourceIntegerField(name, title);
+ textField.setRequired(required);
+ if (minValue != null || maxValue != null) {
+ IntegerRangeValidator integerRangeValidator = new IntegerRangeValidator();
+ if (minValue != null) {
+ integerRangeValidator.setMin(minValue);
+ }
+ if (maxValue != null) {
+ integerRangeValidator.setMax(maxValue);
+ }
+ textField.setValidators(integerRangeValidator);
+ }
+ return textField;
+ }
+
}
13 years, 3 months
[rhq] Branch 'release-3.0.0-test-build' - modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml
by Simeon Pinder
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 1d1ffc0f207a126ed0ef7b6657848661176ed4fc
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Mon Jan 24 19:26:06 2011 -0500
[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 6479a13..0833b2a 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 59e5802..7f7127c 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 45c4f50..d69311c 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-common-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/common/pom.xml b/modules/common/pom.xml
index dec6fd5..c6a6dab 100644
--- a/modules/common/pom.xml
+++ b/modules/common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 b513ee5..ae391f8 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>4.0.0.QA</version>
+ <version>4.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 60d3e07..f52e92d 100644
--- a/modules/core/comm-api/pom.xml
+++ b/modules/core/comm-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index c16f709..7892321 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>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index bac6316..700912d 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml
index f8c262e..5293ae1 100644
--- a/modules/core/gui/pom.xml
+++ b/modules/core/gui/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 9b3197e..b3a20e2 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 90fba0e..d9c8d4c 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 afd763d..bc886fe 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>4.0.0.QA</version>
+ <version>4.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 67d1da9..dfcdfde 100644
--- a/modules/core/plugin-validator/pom.xml
+++ b/modules/core/plugin-validator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml
index b426bcb..5831bc4 100644
--- a/modules/core/plugindoc/pom.xml
+++ b/modules/core/plugindoc/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index e754b38..b895d04 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>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 6761e16..405eaed 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-core-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml
index e258e39..70d6f6e 100644
--- a/modules/enterprise/agent/pom.xml
+++ b/modules/enterprise/agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml
index 605b27d..342369a 100644
--- a/modules/enterprise/agentupdate/pom.xml
+++ b/modules/enterprise/agentupdate/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index d851e50..93931da 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 737fed8..172ba27 100644
--- a/modules/enterprise/gui/base-perspective-jar/pom.xml
+++ b/modules/enterprise/gui/base-perspective-jar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 cc6da1b..d3c0764 100644
--- a/modules/enterprise/gui/base-perspective-war/pom.xml
+++ b/modules/enterprise/gui/base-perspective-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 f67485c..57a30b9 100644
--- a/modules/enterprise/gui/content_http-war/pom.xml
+++ b/modules/enterprise/gui/content_http-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-gui-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 17b8008..82cddb6 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>4.0.0.QA</version>
+ <version>4.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 53318ad..9a29f14 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml
index 96820af..072ac8f 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>4.0.0.QA</version>
+ <version>4.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 70ba9e9..cd485f1 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 eea48bd..095ada1 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>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index a7a0de3..89f283c 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 2dd7010..5453a41 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 4d9b29b..1bc500a 100644
--- a/modules/enterprise/remoting/client-api/pom.xml
+++ b/modules/enterprise/remoting/client-api/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 44f056d..3879afd 100644
--- a/modules/enterprise/remoting/pom.xml
+++ b/modules/enterprise/remoting/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 bd168be..393d2e9 100644
--- a/modules/enterprise/remoting/webservices/pom.xml
+++ b/modules/enterprise/remoting/webservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 89de04e..9a2a929 100644
--- a/modules/enterprise/server/container-lib/pom.xml
+++ b/modules/enterprise/server/container-lib/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 f39320e..4748aa3 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 b4e152d..5e8343f 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 4e7d957..a897a53 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>4.0.0.QA</version>
+ <version>4.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 16d1c57..b51ba25 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>4.0.0.QA</version>
+ <version>4.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 8df30ea..471e73f 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>4.0.0.QA</version>
+ <version>4.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 75ef3eb..c8235e7 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>4.0.0.QA</version>
+ <version>4.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 43679f4..40bc578 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>4.0.0.QA</version>
+ <version>4.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 ce2aa4c..232f907 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>4.0.0.QA</version>
+ <version>4.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 fabe19a..43cd398 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>4.0.0.QA</version>
+ <version>4.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 19f9532..7e6da01 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>4.0.0.QA</version>
+ <version>4.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 103332f..6ba6f85 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>4.0.0.QA</version>
+ <version>4.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 a5502ab..45280cd 100644
--- a/modules/enterprise/server/plugins/ant-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 6ac95b6..d816e25 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>4.0.0.QA</version>
+ <version>4.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 1091107..621f3e5 100644
--- a/modules/enterprise/server/plugins/disk/pom.xml
+++ b/modules/enterprise/server/plugins/disk/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 87ddd11..da8e8e7 100644
--- a/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
+++ b/modules/enterprise/server/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 c76da08..8d1e368 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 25b65b0..f5fbeb1 100644
--- a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 ca1bd76..b7f3be7 100644
--- a/modules/enterprise/server/plugins/perspectives/core/pom.xml
+++ b/modules/enterprise/server/plugins/perspectives/core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 db1c2b0..07be817 100644
--- a/modules/enterprise/server/plugins/pom.xml
+++ b/modules/enterprise/server/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 ac0a8a7..c1187d1 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>4.0.0.QA</version>
+ <version>4.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 4e4c973..9ada86c 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 ac80b24..ab4f217 100644
--- a/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
+++ b/modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 94e8fe0..243eed4 100644
--- a/modules/enterprise/server/plugins/yum/pom.xml
+++ b/modules/enterprise/server/plugins/yum/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 75a3ba8..24dd98a 100644
--- a/modules/enterprise/server/safe-invoker/pom.xml
+++ b/modules/enterprise/server/safe-invoker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 99d3efd..e933c81 100644
--- a/modules/enterprise/server/sars/agent-sar/pom.xml
+++ b/modules/enterprise/server/sars/agent-sar/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-enterprise-server-sars-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 f78308e..786cead 100644
--- a/modules/enterprise/server/sars/pom.xml
+++ b/modules/enterprise/server/sars/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 94f0b1c..5990106 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>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/helpers/pluginAnnotations/pom.xml b/modules/helpers/pluginAnnotations/pom.xml
index 226e657..8dab254 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>4.0.0.QA</version>
+ <version>4.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 78376ca..41d2820 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>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq.helpers</groupId>
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index 23489ee..154fc0f 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 0590691..99ece1c 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>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 668b04f..0370302 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 bc39c40..d7e6d8a 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index b233031..9f46fc9 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml
index 326d781..4a78b61 100644
--- a/modules/plugins/augeas/pom.xml
+++ b/modules/plugins/augeas/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index 38facb0..1082bb3 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 4339a94..9371766 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index 41c5e57..c72f79a 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 d80f1ab..0b85a57 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index c4fd8da..d783ffc 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index d9fcc13..a7bac31 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<!-- Bypass the jopr-plugins-parent which can not have children. It must build after the plugins in order to execute integration tests on them. -->
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 a317231..ef32374 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 84acc4d..285f316 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>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index 0d3a151..ad90e83 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 12f7eb1..2766efd 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 a12be62..31d5fbc 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 f3f9e8b..b09a9aa 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 f57dc5c..e9dca27 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 4445455..83e3030 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index a6cedd0..5152236 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 04b4394..67d24a0 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 25f88ff..be37d2b 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 45527e8..136770c 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>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index b4c643c..5597a30 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 5928440..4859ad7 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 9f193c9..2130abe 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index d72ce50..beab355 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 4e545b3..3aa3bb6 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 5e3af16..d0ef9fe 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 59bc78f..a338a98 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index ba0ce39..05cb816 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index dd4b39d..89178cc 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>rhq-plugins-parent</artifactId>
<groupId>org.rhq</groupId>
- <version>4.0.0.QA</version>
+ <version>4.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 30decd7..a68e444 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 6e28cce..0353f4f 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index f40e5d7..4c93bb3 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 cf40656..9adaca6 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.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 dcf2aa5..4f1c4c3 100644
--- a/modules/plugins/validate-all-plugins/pom.xml
+++ b/modules/plugins/validate-all-plugins/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-plugins-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/pom.xml b/modules/pom.xml
index d163344..e363555 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<groupId>org.rhq</groupId>
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index da3a64b..5f96131 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>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<artifactId>test-utils</artifactId>
<name>RHQ Test Utils</name>
diff --git a/pom.xml b/pom.xml
index da17bca..46ae63b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.0.0.QA</version>
+ <version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RHQ</name>
13 years, 3 months
[rhq] Changes to 'refs/tags/RHQ_4_0_0_QA'
by Simeon Pinder
Tag 'RHQ_4_0_0_QA' created by Simeon Pinder <spinder(a)redhat.com> at 2011-01-25 00:25 +0000
[maven-release-plugin] copy for tag RHQ_4_0_0_QA
Changes since 3_0_1_EC2_B01:
Filip Drabek (14):
BZ - 617603,617649,617653 - permission checks.
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
BZ-617649 'DELETE SELECTED' button visible only when you can MODIFY_RESOURCE.
BZ-617649 permissions update
BZ-550046 (httpd) new virtual host creation fails if Resource Name is string.
reverting of BZ-648790 - user needs only View Group permission to see Group Plugin Configuration Update
BZ-618314 - fix of apache tests
BZ-642641 fix issue in collecting metrics after metric template update.
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
BZ-655149 Deleting resource plugin config update from audit trail checks wrong permission.
BZ 535772 Internet Explorer (IE) problem with Advanced Settings
BZ 638216 - (AS5 plugin) Reconecting to profile service when connection is defunct.
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
BZ 638216 - fix for AS4 messaging components - logging and collection of metrics
Heiko W. Rupp (3):
BZ 614300 - Add a notification type for the trap itself
BZ 663987 - disable direct path insert for the key, as direct path insert does not support select(<same table>) in the same Tx.
Enable tests again and pull over some fixes that have been issued on master already.
Ian Springer (4):
make PC more forgiving if a discovery component returns a Resource details
only ask discovery components for additional classpath URLs (i.e. client jars) if per-resource classloaders are enabled in the plugin container config
jboss-as-5 plugin: jboss-reflect.jar is required by some profileservice client calls and so should be included in the list of client jars returned by ApplicationServerDiscoveryComponent.getAdditionalClasspathUrls() (https://bugzilla.redhat.com/show_bug.cgi?id=647669)
comment out some code that was causing the following unit test failure:
Jay Shaughnessy (5):
Perf Work on the AS-5 Plugin to try and reduce avail and metric gathering
Fix dependency
remove explicit path from dep lib
[BZ 655187]
[BZ-610859] Fix issue in AS5 plugin discovery component that initializes
John Mazzitelli (6):
BZ 650201 - increase collection intervals - they should be no less than 10m
we need to remove the disabled resource's IDs from the callers set - removing resources from our internal resource set is useless
clean up some things that we forgot to clean up at shutdown - to help GC
BZ 615377 workaround sun bug http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6727821
BZ 615377 - use a new feature in EMS 1.2.13 that lets us clear the EMS classloader factory cache of classloaders and jar files. we now do this in the jmx plugin lifecycle listener.
paranoia - we might hit sun bug http://bugs.sun.com/view_bug.do?bug_id=6735255 so we explicitly close the input stream prior to closing the jar file
John Sanda (18):
[maven-release-plugin] prepare for next development iteration
[BZ 536549] Removing unused js code
Revert "[maven-release-plugin] prepare release 3_0_1_EC2_B01"
Merge branch 'ec2' into release-3.0.0
Putting build number generation plugins in profile to facilitate building in mead
Adding profile to generate build number by specifying it manually
[BZ 614251] Making multiple changes so that live metric data can be fetched and displayed
[BZ 614251] Forgot to include updated interface in previous commit
[BZ 619781] Handling more scenarios for settting connection properties to default values
Adding version to gmaven plugin in pluginManagement section
Merge branch 'release-3.0.0' of ssh://git.fedorahosted.org/git/rhq/rhq into release-3.0.0
Applying brew build patches
Upgrading release plugin to version 2.1
Make sure release number gets included in artifacts in brew builds
[maven-release-plugin] prepare release RHQ_4_0_0_QA
[maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare release RHQ_4_0_0_QA
[maven-release-plugin] prepare for next development iteration
Joseph Marques (2):
BZ-649057: re-introduce AvailabilityReport customized serialization for performance
BZ-661203: improve inventory browser load efficiency
Lukas Krejci (33):
fix for the rare NPE in the disambiguation which could happen in the views that contained multiple results for single resource (e.g. list of alert history across all resources)
BZ 642588 - config is reloaded if ServerRoot is redefined in config
BZ 642591 - make sure we always have the same resource keys as in old plugin version.
BZ 642610 - directives found in included files aren't duplicated anymore
BZ 642622 - Adding the ability to extract the scheme and port from the ServerName so that proper ping URLs can be discovered.
BZ 617218 - always passing in the -d <serverroot> -f <conf-file> as parameters to the apache control script so that a correct instance is acted upon.
formatting
Refactored the ScriptDiscoveryComponent to use ManulAddFacet instead of the deprecated mechanism.
formatting
BZ 568917 - Enable creation of as5 scripts by uploading them to the server's bin. Also added support to delete arbitrary script.
removed a wrong @Override annotation so that this actually compiles in Java5.
BZ 651826 - Do not log the connection failures during auto-discovery on INFO level.
Code formatting
Removed unnecessary method in the postgres discovery component.
mvn package apparently isn't enough to check that something compiles :(
BZ 568917 - Implementing ContentFacet on ScriptComponent so that the support for uploading a new script is complete.
BZ 643919 - Unspecified condition (that appears after clicking "Add Another Condition") doesn't cause an exception on alert saving. A proper error message appears instead.
BZ 655156 - cherrypick of commit f6409557d36ab77f8baa69cb4dc4d11c5fedc39c with
a couple of robustness enhancements to the apache plugin:
BZ 657232
BZ 618214 - Create a temporary entry in RHQ_PLUGIN table for the snmp-alert plugin in case we need to add something to its configuration during db-upgrade.
BZ 659578 - Upgrade the Seam version to 2.2.1.CR2 to address the security vulnerability https://jira.jboss.org/browse/JBSEAM-4676. Also remove the custom SeamELResolver.class that contained a couple of fixes not present in 2.1.0.SP1.
BZ 610859 - Deleting an entry from a property list doesn't confuse the unset properties anymore.
BZ 659778 - fixing an NPE while adding a new entry into an open map.
BZ 662662 - restore the ability to view/edit open maps by "faking" property definitions for the individual properties in the open map.
BZ 663377 - Updating group config doesn't introduce "foreign" properties in open maps of individual resources.
BZ 656471 - add index on the timestamp of the RHQ_MEASUREMENT_DATA_NUM_1D table to speed up the data compression
BZ 663745 - refactor the apache discovery to continue processing the rest of process scan results after an error during processing one of them.
BZ 656471 - adding missing index definition in db setup.
BZ 665215 - xml-escaping the stacktraces to protect against XSS via malicious code inserted into the exception messages.
code formatting
BZ 665855 - try to find the control script file only on the OSes that actually have a chance of having it.
BZ 663998 - Write out an INFO message when a database plugin is about to be updated by a new version with different file name.
Simeon Pinder (7):
[maven-release-plugin] prepare release RHQ_4_0_0_QA
[maven-release-plugin] prepare for next development iteration
BZ:672174 moving safeinvoker pkgs out of org.rhq.enterprise.server to avoid signing conflicts.
[maven-release-plugin] prepare release RHQ_4_0_0_QA
[maven-release-plugin] prepare for next development iteration
Merge branch 'release-3.0.0-test-build' of ssh://spinder@git.fedorahosted.org/git/rhq/rhq into release-3.0.0-test-build
[maven-release-plugin] prepare release RHQ_4_0_0_QA
root (2):
[maven-release-plugin] prepare release RHQ_4_0_0_QA
[maven-release-plugin] prepare for next development iteration
---
.classpath | 2
dev/null |binary
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/client-api/src/main/java/org/rhq/core/clientapi/agent/measurement/MeasurementAgentService.java | 4
modules/core/comm-api/pom.xml | 2
modules/core/dbutils/pom.xml | 4
modules/core/dbutils/src/main/java/org/rhq/core/db/upgrade/CustomAlertSenderUpgradeTask.java | 163
modules/core/dbutils/src/main/scripts/dbsetup/cluster-schema.xml | 2
modules/core/dbutils/src/main/scripts/dbsetup/inventory-schema.xml | 5
modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml | 4
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 55
modules/core/domain/pom.xml | 2
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeployment.java | 3
modules/core/domain/src/main/java/org/rhq/core/domain/bundle/BundleResourceDeploymentHistory.java | 6
modules/core/domain/src/main/java/org/rhq/core/domain/discovery/AvailabilityReport.java | 141
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataRequest.java | 61
modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 16
modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/ResourceComposite.java | 4
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/Group.java | 65
modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/composite/ResourceGroupComposite.java | 33
modules/core/domain/src/test/java/org/rhq/core/domain/test/SerializableTest.java | 2
modules/core/gui/pom.xml | 4
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigRenderer.java | 6
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/helper/ConfigurationUtility.java | 11
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/helper/PropertyRenderingUtility.java | 8
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/propset/ConfigurationSet.java | 75
modules/core/gui/src/main/java/org/rhq/core/gui/configuration/propset/PropertySetRenderer.java | 2
modules/core/native-system/pom.xml | 2
modules/core/plugin-api/pom.xml | 2
modules/core/plugin-api/src/main/java/org/rhq/core/pluginapi/inventory/DiscoveredResourceDetails.java | 41
modules/core/plugin-container/pom.xml | 2
modules/core/plugin-container/src/main/java/org/rhq/core/pc/PluginContainer.java | 23
modules/core/plugin-container/src/main/java/org/rhq/core/pc/StandaloneContainer.java | 8
modules/core/plugin-container/src/main/java/org/rhq/core/pc/inventory/InventoryManager.java | 30
modules/core/plugin-container/src/main/java/org/rhq/core/pc/measurement/MeasurementManager.java | 13
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/ClassLoaderManager.java | 15
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginComponentFactory.java | 7
modules/core/plugin-container/src/main/java/org/rhq/core/pc/plugin/PluginManager.java | 7
modules/core/plugin-validator/pom.xml | 2
modules/core/plugindoc/pom.xml | 38
modules/core/pom.xml | 2
modules/core/util/pom.xml | 2
modules/enterprise/agent/pom.xml | 40
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentManagement.java | 16
modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/promptcmd/AvailabilityPromptCommand.java | 20
modules/enterprise/agentupdate/pom.xml | 2
modules/enterprise/comm/pom.xml | 2
modules/enterprise/gui/base-perspective-jar/pom.xml | 6
modules/enterprise/gui/base-perspective-war/pom.xml | 2
modules/enterprise/gui/content_http-war/pom.xml | 2
modules/enterprise/gui/coregui/pom.xml | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/util/SerialUtility.java | 2
modules/enterprise/gui/installer-war/pom.xml | 2
modules/enterprise/gui/pom.xml | 2
modules/enterprise/gui/portal-war/pom.xml | 4
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/metric/MetricRenderer.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/group/EditGroupResourceConfigurationUIBean.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ExistingResourceConfigurationAddNewOpenMapMemberPropertyUIBean.java | 18
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/ResourceConfigurationViewer.java | 3
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/test/EditTestConfigurationUIBean.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/EditGroupPluginConfigurationUIBean.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ResourceGroupUIBean.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/ResourceUIBean.java | 10
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/GroupController.java | 2
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/alerts/config/condition/ConverterValidatorManager.java | 7
modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/startup/ExternalizableStrategyCommandListener.java | 2
modules/enterprise/gui/portal-war/src/main/webapp-filtered/WEB-INF/classes/ApplicationResources.properties | 1
modules/enterprise/gui/portal-war/src/main/webapp/common/Error.jsp | 8
modules/enterprise/gui/portal-war/src/main/webapp/common/GenericError.jsp | 6
modules/enterprise/gui/portal-war/src/main/webapp/js/popup.js | 118
modules/enterprise/gui/portal-war/src/main/webapp/resource/common/monitor/alerts/config/DefinitionCondition.jsp | 4
modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/inventory/connectionHistory.xhtml | 3
modules/enterprise/gui/portal-war/src/main/webapp/rhq/group/inventory/view.xhtml | 3
modules/enterprise/gui/webdav-war/pom.xml | 2
modules/enterprise/pom.xml | 2
modules/enterprise/remoting/cli/pom.xml | 2
modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientProxy.java | 4
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 | 4
modules/enterprise/server/container/src/main/resources/etc/RHQ-mib.txt | 58
modules/enterprise/server/ear/pom.xml | 4
modules/enterprise/server/jar/pom.xml | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/agentclient/impl/AgentClientImpl.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleManagerBean.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/bundle/BundleServerServiceImpl.java | 4
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java | 159
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationDefinitionUpdateReport.java | 17
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/metadata/ConfigurationMetadataManagerBean.java | 8
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/comm/ServerCommunicationsService.java | 12
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/plugin/AgentPluginScanner.java | 15
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 9
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/AvailabilityManagerBean.java | 20
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/CallTimeDataManagerBean.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 17
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementScheduleManagerBean.java | 6
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteSafeInvocationHandler.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/remote/RemoteWsInvocationHandler.java | 2
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceManagerBean.java | 67
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/disambiguation/Disambiguator.java | 15
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/disambiguation/MutableDisambiguationReport.java | 25
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/group/ResourceGroupManagerBean.java | 65
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBean.java | 19
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/test/DiscoveryTestBean.java | 6
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/measurement/test/AvailabilityManagerTest.java | 36
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/test/UpdateSubsytemTestBase.java | 8
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/TestAgentClient.java | 7
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 | 3
modules/enterprise/server/plugins/alert-roles/pom.xml | 3
modules/enterprise/server/plugins/alert-snmp/pom.xml | 2
modules/enterprise/server/plugins/alert-subject/pom.xml | 3
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/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/EJB3SafeEndpointInvoker.java | 60
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/EJB3SafeEndpointInvokerDeploymentAspect.java | 60
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/safeinvoker/HibernateDetachUtility.java | 359 +
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/EJB3SafeEndpointInvoker.java | 58
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/EJB3SafeEndpointInvokerDeploymentAspect.java | 59
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java | 359 -
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 | 23
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java | 77
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerDiscoveryComponent.java | 197
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerOperationsDelegate.java | 29
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceComponent.java | 125
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheVirtualHostServiceDiscoveryComponent.java | 91
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/ApacheAugeasNode.java | 12
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasConfigurationApache.java | 61
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/augeas/AugeasTreeBuilderApache.java | 10
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/parser/ApacheParserImpl.java | 4
modules/plugins/apache/src/main/java/org/rhq/plugins/apache/util/HttpdAddressUtility.java | 170
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApacheAugeasTest.java | 11
modules/plugins/apache/src/test/java/org/rhq/plugins/apache/ApachePluginTest.java | 13
modules/plugins/augeas/pom.xml | 2
modules/plugins/augeas/src/main/java/org/rhq/augeas/util/Glob.java | 4
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/AbstractManagedDeploymentComponent.java | 10
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerComponent.java | 129
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ApplicationServerDiscoveryComponent.java | 86
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/Ejb2BeanComponent.java | 14
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/ManagedComponentComponent.java | 80
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/TxConnectionFactoryComponent.java | 42
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/AbstractDeployer.java | 196
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/LocalDeployer.java | 56
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/LocalDownloader.java | 42
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ManagedComponentDeployer.java | 183
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/PackageDownloader.java | 36
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/RemoteDeployer.java | 144
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/RemoteDownloader.java | 121
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/deploy/ScriptDeployer.java | 151
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/helper/CreateChildResourceFacetDelegate.java | 32
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptComponent.java | 479 +-
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptDiscoveryComponent.java | 193
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/script/ScriptFileFinder.java | 100
modules/plugins/jboss-as-5/src/main/java/org/rhq/plugins/jbossas5/util/ManagedComponentUtils.java | 99
modules/plugins/jboss-as-5/src/main/resources/META-INF/rhq-plugin.xml | 93
modules/plugins/jboss-as-5/testsuite/src/main/java/org/rhq/plugins/jbossas5/JBossServerTest.java | 13
modules/plugins/jboss-as/pom.xml | 2
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/AbstractMessagingComponent.java | 8
modules/plugins/jboss-as/src/main/java/org/rhq/plugins/jbossas/JBossASServerComponent.java | 14
modules/plugins/jboss-as/src/main/resources/META-INF/rhq-plugin.xml | 16
modules/plugins/jboss-cache-v3/pom.xml | 2
modules/plugins/jboss-cache/pom.xml | 2
modules/plugins/jmx/pom.xml | 2
modules/plugins/jmx/src/main/java/org/rhq/plugins/jmx/JMXPluginLifecycleListener.java | 52
modules/plugins/jmx/src/main/resources/META-INF/rhq-plugin.xml | 1
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/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDatabaseComponent.java | 13
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresDiscoveryComponent.java | 107
modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresServerComponent.java | 4
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 | 2275 +++++-----
228 files changed, 4892 insertions(+), 3606 deletions(-)
---
13 years, 3 months