March 2011 - rhq-commits - Fedora Mailing-Lists

[rhq] 23 commits - .classpath modules/core modules/enterprise

by mazz

.classpath | 310 +++++----- modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java | 25 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java | 15 modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 26 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java | 119 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/SearchBarItem.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 44 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java | 79 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/PortletAlertSelector.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 43 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java | 56 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 40 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java | 228 +++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java | 18 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java | 250 ++++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java | 13 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java | 58 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java | 29 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 10 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 26 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/GroupSearchAssistant.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java | 12 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/GroupSearchTranslator.java | 5 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java | 13 33 files changed, 1137 insertions(+), 350 deletions(-) New commits: commit fab2f8d7bb195c82377d47a9fa8b123db42a87eb Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Mar 7 13:28:37 2011 -0500 avoid exception when refreshing a group page and no node was selected diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java index a056ca1..15945c6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java @@ -211,7 +211,6 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka if (groupId == this.rootGroupId) { // Still looking at the same compat-recursive tree - // TODO reselect tree to selected node TreeNode selectedNode; if (this.selectedGroup.getClusterKey() != null) { //selectedNode = treeGrid.getTree().findById(this.selectedGroup.getClusterKey()); @@ -219,11 +218,14 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka } else { selectedNode = treeGrid.getTree().findById(String.valueOf(this.selectedGroup.getId())); } - TreeNode[] parents = treeGrid.getTree().getParents(selectedNode); - treeGrid.getTree().openFolders(parents); - treeGrid.getTree().openFolder(selectedNode); - treeGrid.selectRecord(selectedNode); + // TODO reselect tree to selected node + if (selectedNode != null) { + TreeNode[] parents = treeGrid.getTree().getParents(selectedNode); + treeGrid.getTree().openFolders(parents); + treeGrid.getTree().openFolder(selectedNode); + treeGrid.selectRecord(selectedNode); + } } else { this.rootGroupId = groupId; GWTServiceLookup.getClusterService().getClusterTree(groupId, new AsyncCallback<ClusterFlyweight>() { commit 13db60ccacb019aaed676138452bb27eb55d5298 Merge: 5775f02... 806847a... Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Mar 7 12:54:19 2011 -0500 Merge commit 'origin/master' into group-fixes commit 5775f02179822076f905bfe20eb0d8f57eafe020 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Mar 7 12:51:03 2011 -0500 get stack traces to show up prettier in message center dialog window diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java index f464421..e54ee38 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/ErrorHandler.java @@ -20,6 +20,8 @@ package org.rhq.enterprise.gui.coregui.client.util; import java.util.ArrayList; +import com.allen_sauer.gwt.log.client.Log; + import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.Messages; import org.rhq.enterprise.gui.coregui.client.util.message.Message; @@ -30,6 +32,9 @@ import org.rhq.enterprise.gui.coregui.client.util.message.Message; */ public class ErrorHandler { + private static final String NL = " "; // \n if not going to use html + private static final String INDENT = "    "; // \t if not going to use html + protected static final Messages MSG = CoreGUI.getMessages(); public void handleError(String message) { @@ -41,24 +46,33 @@ public class ErrorHandler { CoreGUI.getMessageCenter().notify(errorMessage); if (t != null) { - System.err.println(message); - t.printStackTrace(); + Log.warn(message, t); } } public static String getAllMessages(Throwable t) { - StringBuffer results = new StringBuffer(); + return getAllMessages(t, false); + } + + public static String getAllMessages(Throwable t, boolean includeStackTrace) { + StringBuilder results = new StringBuilder(); if (t != null) { String[] msgs = getAllMessagesArray(t); results.append(msgs[0]); - String indent = " "; + String indent = INDENT; for (int i = 1; i < msgs.length; i++) { - results.append("\n").append(indent); + results.append(NL).append(indent); results.append(msgs[i]); - indent = indent + " "; + indent = indent + INDENT; + } + + if (includeStackTrace) { + results.append(NL).append(MSG.view_messageCenter_stackTraceFollows()).append(NL); + getStackTrace(t, results); } + } else { results.append(">> " + MSG.util_errorHandler_nullException() + " <<"); } @@ -82,4 +96,36 @@ public class ErrorHandler { return list.toArray(new String[list.size()]); } + public static String getStackTrace(Throwable t, StringBuilder s) { + if (s == null) { + s = new StringBuilder(); + } + + s.append(t.getMessage()).append(NL); + + for (Object line : t.getStackTrace()) { + s.append(INDENT).append("at ").append(line).append(NL); + } + + Throwable cause = t.getCause(); + if (cause != null && cause != t) { + getStackTraceAsCause(t, s, cause); + } + + return s.toString(); + } + + private static void getStackTraceAsCause(Throwable t, StringBuilder s, Throwable cause) { + s.append("Caused by: " + cause.getMessage()).append(NL); + + for (Object line : cause.getStackTrace()) { + s.append(INDENT).append("at ").append(line).append(NL); + } + + Throwable nextCause = cause.getCause(); + if (nextCause != null && nextCause != cause) { + getStackTraceAsCause(t, s, nextCause); + } + } + } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java index c03b508..96e1740 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/Message.java @@ -112,7 +112,7 @@ public class Message { } public Message(String conciseMessage, Throwable details, Severity severity, EnumSet<Option> options) { - this(conciseMessage, ErrorHandler.getAllMessages(details), severity, options); + this(conciseMessage, ErrorHandler.getAllMessages(details, true), severity, options); } public Message(String conciseMessage, String detailedMessage, Severity severity, EnumSet<Option> options) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java index 2564e1f..a96b25a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java @@ -22,12 +22,13 @@ import java.util.List; import com.allen_sauer.gwt.log.client.Log; import com.smartgwt.client.types.Alignment; -import com.smartgwt.client.types.TitleOrientation; +import com.smartgwt.client.types.VerticalAlignment; import com.smartgwt.client.widgets.Window; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; +import com.smartgwt.client.widgets.events.CloseClickHandler; +import com.smartgwt.client.widgets.events.CloseClientEvent; import com.smartgwt.client.widgets.form.DynamicForm; -import com.smartgwt.client.widgets.form.fields.ButtonItem; import com.smartgwt.client.widgets.form.fields.FormItemIcon; import com.smartgwt.client.widgets.form.fields.StaticTextItem; import com.smartgwt.client.widgets.menu.IMenuButton; @@ -97,8 +98,9 @@ public class MessageCenterView extends LocatableVLayout implements MessageCenter private void showDetails(Message message) { DynamicForm form = new LocatableDynamicForm(extendLocatorId("Details")); form.setWrapItemTitles(false); + form.setAlign(Alignment.LEFT); - StaticTextItem title = new StaticTextItem("title", MSG.view_messageCenter_messageTitle()); + StaticTextItem title = new StaticTextItem("theMessage", MSG.common_title_message()); title.setValue(message.conciseMessage); StaticTextItem severity = new StaticTextItem("severity", MSG.view_messageCenter_messageSeverity()); @@ -111,29 +113,26 @@ public class MessageCenterView extends LocatableVLayout implements MessageCenter date.setValue(message.fired); StaticTextItem detail = new StaticTextItem("detail", MSG.view_messageCenter_messageDetail()); - detail.setTitleOrientation(TitleOrientation.TOP); + detail.setTitleVAlign(VerticalAlignment.TOP); detail.setValue(message.detailedMessage); - detail.setColSpan(2); - ButtonItem okButton = new ButtonItem("ok", MSG.common_button_ok()); - okButton.setColSpan(2); - okButton.setAlign(Alignment.CENTER); + form.setItems(title, severity, date, detail); - form.setItems(title, severity, date, detail, okButton); - - final Window window = new LocatableWindow(this.extendLocatorId("Message")); - window.setTitle(message.conciseMessage); + final Window window = new LocatableWindow(this.extendLocatorId("MessageWindow")); + window.setTitle(MSG.view_messageCenter_messageTitle()); window.setWidth(600); window.setHeight(400); window.setIsModal(true); window.setShowModalMask(true); window.setCanDragResize(true); + window.setShowMaximizeButton(true); + window.setShowMinimizeButton(false); window.centerInPage(); window.addItem(form); window.show(); - okButton.focusInItem(); - okButton.addClickHandler(new com.smartgwt.client.widgets.form.fields.events.ClickHandler() { - public void onClick(com.smartgwt.client.widgets.form.fields.events.ClickEvent clickEvent) { + window.addCloseClickHandler(new CloseClickHandler() { + @Override + public void onCloseClick(CloseClientEvent event) { window.destroy(); } }); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 4084486..52bc84e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -2056,3 +2056,4 @@ view_messageCenter_messageTitle = Message Center view_messageCenter_messageSeverity = Severity view_messageCenter_messageTime = Time view_messageCenter_messageDetail = Detail +view_messageCenter_stackTraceFollows = --- STACK TRACE FOLLOWS --- commit 1a0a556717ea4cce6919295470072bf35b81cc8b Merge: 0907571... 77ad7aa... Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Mar 7 09:17:49 2011 -0500 Merge commit 'origin/master' into group-fixes commit 09075715b22fbf2a98126e5dafd99d2ded324137 Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Mar 7 09:15:50 2011 -0500 rearrange .classpath so its more orderly diff --git a/.classpath b/.classpath index 9b0acd5..1cb3205 100644 --- a/.classpath +++ b/.classpath @@ -1,161 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="modules/common/jboss-as/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/packagetype-cli/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-cli/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/client-api/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/binding/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/irc/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/hadoop/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/remoting/webservices/src/test/java"/> - <classpathentry kind="src" path="modules/common/ant-bundle/src/main/java"/> - <classpathentry kind="src" path="modules/common/ant-bundle/src/test/java"/> - <classpathentry kind="src" path="modules/common/filetemplate-bundle/src/main/java"/> - <classpathentry kind="src" path="modules/common/filetemplate-bundle/src/test/java"/> - <classpathentry kind="src" path="modules/enterprise/gui/base-perspective-jar/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/gui/coregui/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/gui/coregui/target/generated-sources/gwt"/> - <classpathentry kind="src" path="modules/plugins/nss/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/jboss-software/src/test/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/jboss-software/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/remoting/client-api/src/main/java"/> - <classpathentry kind="src" path="modules/common/jboss-as/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/jboss-as/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/jboss-as/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/jboss-as-5/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/jboss-as-5/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/hibernate/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/hibernate/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/rhq-server/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/tomcat/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/tomcat/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/jboss-cache/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/jboss-cache-v3/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/jar/target/generated-sources/antlr3"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-subject/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-operations/src/main/java"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.SP1/jboss-profileservice-spi-5.1.0.SP1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar" sourcepath="/M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.12/jaxb-impl-2.1.12.jar"/> - <classpathentry kind="src" path="modules/core/util/src/main/java"/> - <classpathentry kind="src" path="modules/core/util/src/test/java"/> - <classpathentry kind="src" path="modules/core/dbutils/src/main/java"/> - <classpathentry kind="src" path="modules/core/dbutils/src/test/java"/> - <classpathentry kind="src" path="modules/core/native-system/src/main/java"/> - <classpathentry kind="src" path="modules/core/native-system/src/test/java"/> - <classpathentry kind="src" path="modules/core/domain/src/main/java"/> - <classpathentry kind="src" path="modules/core/domain/src/test/java"/> - <classpathentry kind="src" path="modules/core/plugin-api/src/main/java"/> - <classpathentry kind="src" path="modules/core/plugin-api/src/test/java"/> - <classpathentry kind="src" path="modules/core/plugin-container/src/main/java"/> - <classpathentry kind="src" path="modules/core/plugin-container/src/test/java"/> - <classpathentry kind="src" path="modules/core/plugindoc/src/main/java"/> - <classpathentry kind="src" path="modules/core/client-api/src/main/java"/> - <classpathentry kind="src" path="modules/core/client-api/src/test/java"/> - <classpathentry kind="src" path="modules/core/client-api/target/generated-sources/xjc"/> - <classpathentry kind="src" path="modules/core/comm-api/src/main/java"/> - <classpathentry kind="src" path="modules/core/gui/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/comm/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/comm/src/test/java"/> - <classpathentry kind="src" path="modules/enterprise/agent/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/agent/src/test/java"/> - <classpathentry kind="src" path="modules/enterprise/agentupdate/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/xml-schemas/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/xml-schemas/src/test/java"/> - <classpathentry kind="src" path="modules/enterprise/server/xml-schemas/target/generated-sources/xjc"/> - <classpathentry kind="src" path="modules/enterprise/server/jar/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/jar/src/test/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/disk/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/url/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/url/src/test/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/yum/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/rhnhosted/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/rhnhosted/src/test/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/rhnhosted/target/classes/generated-source"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-email/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-roles/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-snmp/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-irc/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-microblog/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-mobicents/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/cobbler/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/ant-bundle/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/plugins/filetemplate-bundle/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/gui/portal-war/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/gui/portal-war/src/test/java"/> - <classpathentry kind="src" path="modules/enterprise/gui/installer-war/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/gui/webdav-war/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/gui/content_http-war/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/remoting/cli/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/remoting/cli/src/test/java"/> - <classpathentry kind="src" path="modules/enterprise/remoting/webservices/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/sars/agent-sar/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/safe-invoker/src/main/java"/> - <classpathentry kind="src" path="modules/enterprise/server/container-lib/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/platform/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/rhq-agent/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/rhq-agent/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/database/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/postgres/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/postgres/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/mysql/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/jmx/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/jmx/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/apache/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/apache/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/netservices/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/iis/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/perftest/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/perftest/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/perftest/target/generated-sources/xjc"/> - <classpathentry kind="src" path="modules/plugins/sshd/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/hardware/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/oracle/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/grub/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/grub/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/samba/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/samba/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/sudoers/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/sudoers/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/postfix/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/postfix/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/cron/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/cron/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/hudson/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/platform/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/hosts/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/hosts/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/cobbler/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/cobbler/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/virt/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/kickstart/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/aliases/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/aliases/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/snmptrapd/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/script/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/byteman/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/lsof/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/jdbctrace/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/augeas/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/augeas/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/ant-bundle/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/ant-bundle/src/test/java"/> - <classpathentry kind="src" path="modules/plugins/filetemplate-bundle/src/main/java"/> - <classpathentry kind="src" path="modules/plugins/filetemplate-bundle/src/test/java"/> - <classpathentry kind="src" path="modules/helpers/rtfilter/src/main/java"/> - <classpathentry kind="src" path="modules/helpers/pluginAnnotations/src/main/java"/> - <classpathentry kind="src" path="modules/helpers/pluginGen/src/main/java"/> - <classpathentry kind="src" path="modules/helpers/perftest-support/src/main/java"/> - <classpathentry kind="src" path="etc/samples/skeleton-plugin/src/main/java"/> - <classpathentry kind="src" path="etc/samples/custom-serverplugin/src/main/java"/> - <classpathentry kind="src" path="etc/samples/simplereport-serverplugin/src/main/java"/> - <classpathentry kind="src" path="etc/agentspawn/src/main/java"/> - <classpathentry kind="src" path="modules/test-utils/src/main/java"/> - <classpathentry excluding="**" kind="src" path="modules/enterprise/comm/src/test/resources"/> - <classpathentry excluding="**" kind="src" path="modules/enterprise/agent/src/main/resources"/> - <classpathentry excluding="**" kind="src" path="modules/enterprise/agent/src/test/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <accessrules> <accessrule kind="accessible" pattern="sun/misc/**"/> @@ -164,6 +8,11 @@ <accessrule kind="accessible" pattern="com/sun/org/apache/bcel/internal/generic/**"/> </accessrules> </classpathentry> + <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.SP1/jboss-profileservice-spi-5.1.0.SP1.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.1.GA/jboss-metatype-2.1.1.GA.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar" sourcepath="/M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/> + <classpathentry exported="true" kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.1.12/jaxb-impl-2.1.12.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/i18nlog/i18nlog/1.0.10/i18nlog-1.0.10.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.13/getopt-1.0.13.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.0.1/commons-httpclient-3.0.1.jar"/> @@ -249,7 +98,6 @@ <classpathentry exported="true" kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar"/> - <classpathentry exported="true" kind="lib" path="modules/enterprise/remoting/webservices/target/rhq-remoting-webservices-4.0.0-SNAPSHOT/wsconsume-output"/> <classpathentry exported="true" kind="var" path="M2_REPO/jboss/web/jbossweb/2.0.1.GA/jbossweb-2.0.1.GA.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/libvirt/libvirt/0.4.1/libvirt-0.4.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman/1.2.1/byteman-1.2.1.jar"/> @@ -267,5 +115,157 @@ <classpathentry exported="true" kind="var" path="M2_REPO/org/unitils/unitils-dbunit/3.1/unitils-dbunit-3.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/unitils/unitils-orm/3.1/unitils-orm-3.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/unitils/unitils-testng/3.1/unitils-testng-3.1.jar"/> + <classpathentry exported="true" kind="lib" path="modules/enterprise/remoting/webservices/target/rhq-remoting-webservices-4.0.0-SNAPSHOT/wsconsume-output"/> + <classpathentry kind="src" path="modules/common/ant-bundle/src/main/java"/> + <classpathentry kind="src" path="modules/common/ant-bundle/src/test/java"/> + <classpathentry kind="src" path="modules/common/filetemplate-bundle/src/main/java"/> + <classpathentry kind="src" path="modules/common/filetemplate-bundle/src/test/java"/> + <classpathentry kind="src" path="modules/common/jboss-as/src/main/java"/> + <classpathentry kind="src" path="modules/common/jboss-as/src/test/java"/> + <classpathentry kind="src" path="modules/core/util/src/main/java"/> + <classpathentry kind="src" path="modules/core/util/src/test/java"/> + <classpathentry kind="src" path="modules/core/dbutils/src/main/java"/> + <classpathentry kind="src" path="modules/core/dbutils/src/test/java"/> + <classpathentry kind="src" path="modules/core/native-system/src/main/java"/> + <classpathentry kind="src" path="modules/core/native-system/src/test/java"/> + <classpathentry kind="src" path="modules/core/domain/src/main/java"/> + <classpathentry kind="src" path="modules/core/domain/src/test/java"/> + <classpathentry kind="src" path="modules/core/plugin-api/src/main/java"/> + <classpathentry kind="src" path="modules/core/plugin-api/src/test/java"/> + <classpathentry kind="src" path="modules/core/plugin-container/src/main/java"/> + <classpathentry kind="src" path="modules/core/plugin-container/src/test/java"/> + <classpathentry kind="src" path="modules/core/plugindoc/src/main/java"/> + <classpathentry kind="src" path="modules/core/client-api/src/main/java"/> + <classpathentry kind="src" path="modules/core/client-api/src/test/java"/> + <classpathentry kind="src" path="modules/core/client-api/target/generated-sources/xjc"/> + <classpathentry kind="src" path="modules/core/comm-api/src/main/java"/> + <classpathentry kind="src" path="modules/core/gui/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/comm/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/comm/src/test/java"/> + <classpathentry kind="src" path="modules/enterprise/agent/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/agent/src/test/java"/> + <classpathentry kind="src" path="modules/enterprise/agentupdate/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/xml-schemas/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/xml-schemas/src/test/java"/> + <classpathentry kind="src" path="modules/enterprise/server/xml-schemas/target/generated-sources/xjc"/> + <classpathentry kind="src" path="modules/enterprise/server/jar/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/jar/src/test/java"/> + <classpathentry kind="src" path="modules/enterprise/server/jar/target/generated-sources/antlr3"/> + <classpathentry kind="src" path="modules/enterprise/binding/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/gui/coregui/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/gui/coregui/target/generated-sources/gwt"/> + <classpathentry kind="src" path="modules/enterprise/gui/portal-war/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/gui/portal-war/src/test/java"/> + <classpathentry kind="src" path="modules/enterprise/gui/installer-war/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/gui/base-perspective-jar/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/gui/content_http-war/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/gui/webdav-war/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/client-api/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/remoting/client-api/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/remoting/webservices/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/remoting/webservices/src/test/java"/> + <classpathentry kind="src" path="modules/enterprise/remoting/cli/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/remoting/cli/src/test/java"/> + <classpathentry kind="src" path="modules/enterprise/server/sars/agent-sar/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/safe-invoker/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/container-lib/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/ant-bundle/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/filetemplate-bundle/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-subject/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-roles/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-email/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-operations/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-cli/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-snmp/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-irc/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-microblog/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-mobicents/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/jboss-software/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/jboss-software/src/test/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/disk/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/url/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/url/src/test/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/yum/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/packagetype-cli/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/cobbler/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/rhnhosted/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/rhnhosted/src/test/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/rhnhosted/target/classes/generated-source"/> + <classpathentry kind="src" path="modules/plugins/platform/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/platform/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/jmx/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/jmx/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/rhq-agent/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/rhq-agent/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/jboss-as/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/jboss-as/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/jboss-as-5/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/jboss-as-5/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/hibernate/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/hibernate/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/rhq-server/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/tomcat/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/tomcat/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/jboss-cache/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/jboss-cache-v3/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/database/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/postgres/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/postgres/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/mysql/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/oracle/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/apache/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/apache/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/script/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/netservices/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/ant-bundle/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/ant-bundle/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/filetemplate-bundle/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/filetemplate-bundle/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/snmptrapd/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/byteman/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/iis/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/sshd/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/jdbctrace/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/lsof/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/augeas/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/augeas/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/virt/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/hardware/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/grub/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/grub/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/samba/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/samba/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/sudoers/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/sudoers/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/postfix/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/postfix/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/cron/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/cron/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/hudson/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/hosts/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/hosts/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/cobbler/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/cobbler/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/kickstart/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/aliases/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/aliases/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/irc/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/hadoop/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/nss/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/perftest/src/main/java"/> + <classpathentry kind="src" path="modules/plugins/perftest/src/test/java"/> + <classpathentry kind="src" path="modules/plugins/perftest/target/generated-sources/xjc"/> + <classpathentry kind="src" path="modules/helpers/rtfilter/src/main/java"/> + <classpathentry kind="src" path="modules/helpers/pluginAnnotations/src/main/java"/> + <classpathentry kind="src" path="modules/helpers/pluginGen/src/main/java"/> + <classpathentry kind="src" path="modules/helpers/perftest-support/src/main/java"/> + <classpathentry kind="src" path="etc/samples/skeleton-plugin/src/main/java"/> + <classpathentry kind="src" path="etc/samples/custom-serverplugin/src/main/java"/> + <classpathentry kind="src" path="etc/samples/simplereport-serverplugin/src/main/java"/> + <classpathentry kind="src" path="etc/agentspawn/src/main/java"/> + <classpathentry kind="src" path="modules/test-utils/src/main/java"/> + <classpathentry excluding="**" kind="src" path="modules/enterprise/comm/src/test/resources"/> + <classpathentry excluding="**" kind="src" path="modules/enterprise/agent/src/main/resources"/> + <classpathentry excluding="**" kind="src" path="modules/enterprise/agent/src/test/resources"/> <classpathentry kind="output" path="eclipse-classes"/> </classpath> commit e34d75e60c7c1fad8fed377fd788a60e1c22442a Author: John Mazzitelli <mazz(a)redhat.com> Date: Mon Mar 7 08:32:25 2011 -0500 add new deps due to the new alerts cli work diff --git a/.classpath b/.classpath index 911691e..9b0acd5 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="modules/common/jboss-as/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/packagetype-cli/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/plugins/alert-cli/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/server/client-api/src/main/java"/> + <classpathentry kind="src" path="modules/enterprise/binding/src/main/java"/> <classpathentry kind="src" path="modules/plugins/irc/src/main/java"/> <classpathentry kind="src" path="modules/plugins/hadoop/src/main/java"/> <classpathentry kind="src" path="modules/enterprise/remoting/webservices/src/test/java"/> commit 71024acf82aaaaf4ed52cbaef1939dd0bf2af4ba Merge: dfe064f... 3b070f3... Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Mar 4 18:43:53 2011 -0500 Merge commit 'origin/master' into group-fixes commit dfe064f82c42bd60d3c4185cfe0643cefe395a0a Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Mar 4 18:40:06 2011 -0500 put the category icon to the left of name to be consistent with everything else make the row normal height by default diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java index 617bffe..a1a1578 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupsDataSource.java @@ -77,12 +77,10 @@ public class ResourceGroupsDataSource extends RPCDataSource<ResourceGroup> { fields.add(idDataField); DataSourceTextField nameDataField = new DataSourceTextField(NAME.propertyName(), NAME.title(), 200); - nameDataField.setCanEdit(false); fields.add(nameDataField); DataSourceTextField descriptionDataField = new DataSourceTextField(DESCRIPTION.propertyName(), DESCRIPTION .title()); - descriptionDataField.setCanEdit(false); fields.add(descriptionDataField); DataSourceTextField typeNameDataField = new DataSourceTextField(TYPE.propertyName(), TYPE.title()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java index e4b3fcf..865e03b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java @@ -35,6 +35,7 @@ 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.types.Alignment; import com.smartgwt.client.types.DSOperationType; import com.smartgwt.client.types.ListGridFieldType; import com.smartgwt.client.widgets.IButton; @@ -234,12 +235,11 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm }); } - class DynaGroupChildrenView extends Table { + class DynaGroupChildrenView extends Table<ResourceGroupsDataSource> { public DynaGroupChildrenView(String locatorId, int groupDefinitionId) { super(locatorId, MSG.view_dynagroup_children(), new Criteria("groupDefinitionId", String .valueOf(groupDefinition.getId()))); setDataSource(ResourceGroupsDataSource.getInstance()); - setMinHeight(250); } @Override @@ -251,7 +251,7 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm idField.setWidth("50"); ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title()); - nameField.setWidth("300"); + nameField.setWidth("*"); nameField.setCellFormatter(new CellFormatter() { @Override public String format(Object value, ListGridRecord record, int rowNum, int colNum) { @@ -262,7 +262,7 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm }); ListGridField descriptionField = new ListGridField(DESCRIPTION.propertyName(), DESCRIPTION.title()); - descriptionField.setWidth("100"); + descriptionField.setWidth("300"); ListGridField typeNameField = new ListGridField(TYPE.propertyName(), TYPE.title()); typeNameField.setWidth("100"); @@ -271,7 +271,9 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm pluginNameField.setWidth("100"); ListGridField categoryField = new ListGridField(CATEGORY.propertyName(), CATEGORY.title()); - categoryField.setWidth("100"); + categoryField.setWidth("30"); + categoryField.setAlign(Alignment.CENTER); + categoryField.setTitle(" "); categoryField.setType(ListGridFieldType.ICON); HashMap<String, String> categoryImages = new HashMap<String, String>(2); categoryImages.put(GroupCategory.COMPATIBLE.name(), ImageManager.getGroupIcon(GroupCategory.COMPATIBLE)); @@ -292,7 +294,7 @@ public class SingleGroupDefinitionView extends LocatableVLayout implements Bookm } }); - setListGridFields(idField, nameField, descriptionField, typeNameField, pluginNameField, categoryField); + setListGridFields(idField, categoryField, nameField, descriptionField, typeNameField, pluginNameField); setListGridDoubleClickHandler(new DoubleClickHandler() { @Override public void onDoubleClick(DoubleClickEvent event) { commit fd023ef35da89dcbf82130c9960a56258b390a46 Merge: abe4bbe... 6bed862... Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Mar 4 18:17:26 2011 -0500 Merge commit 'origin/master' into group-fixes commit abe4bbe63f9912ed65e40ab72d65c22cd1a9dbb8 Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Mar 4 17:16:40 2011 -0500 remove category columns - the icons already tell us the category add hovers to give i18n'd name of the category type (for groups: compatible, mixed, for resources: platform, server, service) put the group cat icon before the name so it is consistent with the resource lists diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java index 09fee9b..8ed410d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java @@ -35,6 +35,7 @@ import com.smartgwt.client.widgets.events.CloseClientEvent; import com.smartgwt.client.widgets.events.DoubleClickEvent; import com.smartgwt.client.widgets.events.DoubleClickHandler; import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.HoverCustomizer; import com.smartgwt.client.widgets.grid.ListGrid; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; @@ -42,6 +43,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord; import org.rhq.core.domain.resource.group.GroupCategory; import org.rhq.core.domain.search.SearchSubsystem; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction; import org.rhq.enterprise.gui.coregui.client.components.table.Table; @@ -99,7 +101,38 @@ public class ResourceGroupListView extends Table<ResourceGroupCompositeDataSourc @Override protected void configureTable() { ListGridField idField = new ListGridField("id", MSG.common_title_id()); - idField.setWidth(10); + idField.setWidth(50); + + ListGridField categoryField = new ListGridField(CATEGORY.propertyName()); + categoryField.setTitle(" "); + categoryField.setWidth(25); + categoryField.setAlign(Alignment.CENTER); + categoryField.setCellFormatter(new CellFormatter() { + public String format(Object value, ListGridRecord record, int rowNum, int colNum) { + String categoryName = (String) value; + GroupCategory category = GroupCategory.valueOf(categoryName); + String icon = ImageManager.getGroupIcon(category); + return "<img src=\"" + ImageManager.getFullImagePath(icon) + "\" />"; + } + }); + categoryField.setShowHover(true); + categoryField.setHoverCustomizer(new HoverCustomizer() { + @Override + public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { + String categoryName = record.getAttribute(CATEGORY.propertyName()); + GroupCategory category = GroupCategory.valueOf(categoryName); + String displayName = null; + switch (category) { + case COMPATIBLE: + displayName = MSG.view_group_summary_compatible(); + break; + case MIXED: + displayName = MSG.view_group_summary_mixed(); + break; + } + return displayName; + } + }); ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title()); nameField.setWidth("40%"); @@ -121,25 +154,6 @@ public class ResourceGroupListView extends Table<ResourceGroupCompositeDataSourc ListGridField pluginNameField = new ListGridField(PLUGIN.propertyName(), PLUGIN.title()); pluginNameField.setWidth("10%"); - ListGridField categoryField = new ListGridField(CATEGORY.propertyName(), CATEGORY.title()); - categoryField.setWidth(70); - categoryField.setCellFormatter(new CellFormatter() { - public String format(Object value, ListGridRecord record, int rowNum, int colNum) { - String categoryName = (String) value; - GroupCategory category = GroupCategory.valueOf(categoryName); - String displayName = ""; - switch (category) { - case COMPATIBLE: - displayName = MSG.view_group_summary_compatible(); - break; - case MIXED: - displayName = MSG.view_group_summary_mixed(); - break; - } - return displayName; - } - }); - ListGridField availabilityChildrenField = new ListGridField("availabilityChildren", MSG .view_inventory_groups_children(), 120); // 120 due to the html in ResourceGroupCompositeDataSource.getAlignedAvailabilityResults availabilityChildrenField.setWrap(false); @@ -150,7 +164,7 @@ public class ResourceGroupListView extends Table<ResourceGroupCompositeDataSourc availabilityDescendantsField.setWrap(false); availabilityDescendantsField.setAlign(Alignment.CENTER); - setListGridFields(nameField, descriptionField, typeNameField, pluginNameField, categoryField, + setListGridFields(idField, categoryField, nameField, descriptionField, typeNameField, pluginNameField, availabilityChildrenField, availabilityDescendantsField); if (this.showDeleteButton) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java index 6f7863b..bf3fdba 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java @@ -107,6 +107,7 @@ public class ResourceDatasource extends RPCDataSource<Resource> { fields.add(pluginNameDataField); DataSourceTextField categoryDataField = new DataSourceTextField(CATEGORY.propertyName(), CATEGORY.title()); + categoryDataField.setHidden(true); // our icon will show this, no need to make this visible by default fields.add(categoryDataField); DataSourceImageField availabilityDataField = new DataSourceImageField(AVAILABILITY.propertyName(), AVAILABILITY diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java index 2497ca7..93f02e1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java @@ -36,6 +36,7 @@ import com.smartgwt.client.types.ListGridFieldType; import com.smartgwt.client.widgets.events.DoubleClickEvent; import com.smartgwt.client.widgets.events.DoubleClickHandler; import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.HoverCustomizer; import com.smartgwt.client.widgets.grid.ListGrid; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; @@ -120,11 +121,27 @@ public class ResourceSearchView extends Table { @Override protected void configureTable() { - ListGridField iconField = new ListGridField("icon", MSG.common_title_icon(), 26); + ListGridField iconField = new ListGridField("icon", MSG.common_title_icon(), 25); iconField.setType(ListGridFieldType.IMAGE); iconField.setShowDefaultContextMenu(false); iconField.setCanSort(false); iconField.setTitle(" "); + iconField.setShowHover(true); + iconField.setHoverCustomizer(new HoverCustomizer() { + @Override + public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { + String resCat = record.getAttribute(CATEGORY.propertyName()); + switch (ResourceCategory.valueOf(resCat)) { + case PLATFORM: + return MSG.common_title_platform(); + case SERVER: + return MSG.common_title_server(); + case SERVICE: + return MSG.common_title_service(); + } + return null; + } + }); ListGridField nameField = new ListGridField(NAME.propertyName(), NAME.title(), 250); nameField.setCellFormatter(new CellFormatter() { @@ -160,6 +177,7 @@ public class ResourceSearchView extends Table { return displayName; } }); + categoryField.setHidden(true); // the icon field already shows us this, no need to show it in another column ListGridField availabilityField = new ListGridField(AVAILABILITY.propertyName(), AVAILABILITY.title(), 70); availabilityField.setType(ListGridFieldType.IMAGE); @@ -199,25 +217,6 @@ public class ResourceSearchView extends Table { } } }); - - /*searchBox.addKeyPressHandler(new KeyPressHandler() { - public void onKeyPress(KeyPressEvent event) { - if ((event.getCharacterValue() != null) && (event.getCharacterValue() == KeyCodes.KEY_ENTER)) { - datasource.setQuery((String) searchBox.getValue()); - - Criteria c = getListGrid().getCriteria(); - if (c == null) { - c = new Criteria(); - } - - c.addCriteria("name", (String) searchBox.getValue()); - - long start = System.currentTimeMillis(); - getListGrid().fetchData(c); - com.allen_sauer.gwt.log.client.Log.info("Loaded in: " + (System.currentTimeMillis() - start)); - } - } - });*/ } public int getMatches() { commit a4f949f72f876dca70357276db13487f35db09c2 Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Mar 4 15:26:36 2011 -0500 inventory summary query doesn't lend itself to show only resources user is authorized for. it requires MANAGE_INVENTORY so disable the inventory summary link in the Reports page unless the user has that perm diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java index 2bac264..186a5b7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java @@ -150,7 +150,7 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView { public Canvas createView() { return new ResourceInstallReport(extendLocatorId(ResourceInstallReport.VIEW_ID.getName())); } - }); + }, getGlobalPermissions().contains(Permission.MANAGE_INVENTORY)); NavigationItem platformSystemInfoItem = new NavigationItem(PlatformSummaryPortlet.VIEW_ID, ImageManager .getResourceIcon(ResourceCategory.PLATFORM), new ViewFactory() { commit 485b83f74d4783fbe3bd32db5c7f52f80f4ab87c Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Mar 4 15:25:45 2011 -0500 fix error message diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java index f9ee0cb..0ad0278 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java @@ -239,7 +239,7 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka @Override public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_group_pluginConfig_table_failFetch(), caught); + CoreGUI.getErrorHandler().handleError(MSG.view_reports_inventorySummary_failFetch(), caught); response.setStatus(DSResponse.STATUS_FAILURE); processResponse(request.getRequestId(), response); } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index bbb7c96..4084486 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -1979,6 +1979,8 @@ view_tagCloud_title = Tag Cloud view_tagCloud_error_fetchFailure = Failed to load tags. view_tagCloud_error_tagUsedCount = Tag used {0} times. +view_reports_inventorySummary_failFetch = Failed to get inventory summary + view_taggedResources_title = Tagged Resources view_reports_alertDefinitions_parentHover = Click to go to the parent alert definition commit dc17e4f45904ac213c05ff5bc8fa89afadd88feb Merge: ef6bdd3... 7fbb1b0... Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Mar 4 14:25:29 2011 -0500 Merge commit 'origin/master' into group-fixes Conflicts: modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java diff --cc modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java index 83162b2,e8b6895..e0b3d20 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java @@@ -53,9 -54,8 +54,10 @@@ public class AlertDefinitionCriteria ex private List<Integer> filterResourceGroupIds; // requires overrides private Boolean filterEnabled; private Boolean filterDeleted = false; // find enabled definitions by default + private NonBindingOverrideFilter filterResourceOnly; // requires overrides - finds only those associated with a resource + private NonBindingOverrideFilter filterResourceTypeOnly; // requires overrides - finds only alert templates - + private List<String> filterNotificationSenderNames; + private boolean fetchAlerts; private boolean fetchGroupAlertDefinition; private boolean fetchConditions; @@@ -71,9 -69,11 +73,13 @@@ filterOverrides.put("alertTemplateResourceTypeId", "resourceType.id = ?"); filterOverrides.put("alertTemplateResourceTypeName", "resourceType.name like ?"); filterOverrides.put("resourceIds", "resource.id IN ( ? )"); - filterOverrides.put("resourceGroupIds", "resourceGroup.id IN ( ? )"); + filterOverrides.put("resourceGroupIds", "resourceGroup.id IN ( ? )"); + filterOverrides.put("resourceOnly", "resource IS NOT NULL"); + filterOverrides.put("resourceTypeOnly", "resourceType IS NOT NULL"); + filterOverrides.put("notificationSenderNames", "id IN (" + + "SELECT notif.alertDefinition.id FROM AlertNotification notif " + + "WHERE notif.senderName IN ( ? ))"); + filterOverrides.put("filterIds", "id IN ( ? )"); } @Override @@@ -125,15 -129,11 +135,20 @@@ this.filterDeleted = filterDeleted; } + public void addFilterResourceOnly(boolean filterResourceOnly) { + this.filterResourceOnly = (filterResourceOnly ? NonBindingOverrideFilter.ON : NonBindingOverrideFilter.OFF); + } + + public void addFilterResourceTypeOnly(boolean filterResourceTypeOnly) { + this.filterResourceTypeOnly = (filterResourceTypeOnly ? NonBindingOverrideFilter.ON + : NonBindingOverrideFilter.OFF); + } + + public void addFilterNotificationNames(String... notificationNames) { + fetchAlertNotifications(true); + this.filterNotificationSenderNames = Arrays.asList(notificationNames); + } + public void fetchAlerts(boolean fetchAlerts) { this.fetchAlerts = fetchAlerts; } commit ef6bdd3ce21b7250f29614febd665d62e21be0ef Author: John Mazzitelli <mazz(a)redhat.com> Date: Fri Mar 4 13:40:32 2011 -0500 impl reports>alert defs diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java index ea7bfe0..83162b2 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java @@ -60,6 +60,7 @@ public class AlertDefinitionCriteria extends Criteria { private boolean fetchGroupAlertDefinition; private boolean fetchConditions; private boolean fetchAlertNotifications; + private boolean fetchResource; private boolean fetchResourceType; private PageOrdering sortName; @@ -149,6 +150,10 @@ public class AlertDefinitionCriteria extends Criteria { this.fetchAlertNotifications = fetchAlertNotifications; } + public void fetchResource(boolean fetchResource) { + this.fetchResource = fetchResource; + } + public void fetchResourceType(boolean fetchResourceType) { this.fetchResourceType = fetchResourceType; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java new file mode 100644 index 0000000..6396acd --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java @@ -0,0 +1,228 @@ +package org.rhq.enterprise.gui.coregui.client.report; + +import java.util.ArrayList; +import java.util.List; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DataSourceField; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.data.fields.DataSourceTextField; +import com.smartgwt.client.util.SC; +import com.smartgwt.client.widgets.events.DoubleClickEvent; +import com.smartgwt.client.widgets.events.DoubleClickHandler; +import com.smartgwt.client.widgets.grid.CellFormatter; +import com.smartgwt.client.widgets.grid.HoverCustomizer; +import com.smartgwt.client.widgets.grid.ListGrid; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; +import com.smartgwt.client.widgets.grid.events.RecordClickEvent; +import com.smartgwt.client.widgets.grid.events.RecordClickHandler; + +import org.rhq.core.domain.alert.AlertDefinition; +import org.rhq.core.domain.criteria.AlertDefinitionCriteria; +import org.rhq.core.domain.criteria.ResourceCriteria; +import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.util.PageControl; +import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.LinkManager; +import org.rhq.enterprise.gui.coregui.client.alert.definitions.AbstractAlertDefinitionsDataSource; +import org.rhq.enterprise.gui.coregui.client.components.table.Table; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; + +/** + * A tabular report that shows alert definitions on all resources in inventory. + * + * @author John Mazzitelli + */ +public class AlertDefinitionReportView extends Table<AlertDefinitionReportView.DataSource> { + + public static final ViewName VIEW_ID = new ViewName("AlertDefinitions", MSG.view_reports_alertDefinitions()); + + public AlertDefinitionReportView(String locatorId) { + super(locatorId); + setDataSource(new DataSource()); + } + + @Override + protected void configureTable() { + ListGrid listGrid = getListGrid(); + listGrid.setFields(getDataSource().getListGridFields().toArray(new ListGridField[0])); + + setListGridDoubleClickHandler(new DoubleClickHandler() { + @Override + public void onDoubleClick(DoubleClickEvent event) { + ListGrid lg = (ListGrid) event.getSource(); + ListGridRecord selected = lg.getSelectedRecord(); + SC.say(selected.getAttribute("name")); // TODO deleteme + } + }); + } + + class DataSource extends AbstractAlertDefinitionsDataSource { + + private static final String FIELD_PARENT = "parent"; + private static final String FIELD_RESOURCE = "resource"; + + @Override + protected AlertDefinitionCriteria getCriteria(DSRequest request) { + AlertDefinitionCriteria criteria = new AlertDefinitionCriteria(); + criteria.addFilterResourceOnly(true); // guarantees that all alert defs we get will have a non-null Resource object + criteria.setPageControl(getPageControl(request)); + criteria.fetchResource(true); + criteria.fetchGroupAlertDefinition(true); + return criteria; + } + + @Override + protected AlertDefinitionCriteria getSimpleCriteriaForAll() { + AlertDefinitionCriteria criteria = new AlertDefinitionCriteria(); + criteria.addFilterResourceOnly(true); + criteria.setPageControl(PageControl.getUnlimitedInstance()); + return criteria; + } + + @Override + public ArrayList<ListGridField> getListGridFields() { + ArrayList<ListGridField> fields = super.getListGridFields(); + + // hide the created/modified fields, we don't need to show them by default + // add cell formatter on the name field so we can make it a link + for (ListGridField field : fields) { + String fieldName = field.getName(); + if (fieldName.equals(FIELD_CTIME) || fieldName.equals(FIELD_MTIME)) { + field.setHidden(true); + } else if (fieldName.equals(FIELD_NAME)) { + field.setCellFormatter(new CellFormatter() { + @Override + public String format(Object value, ListGridRecord record, int rowNum, int colNum) { + AlertDefinition alertDef = copyValues(record); + int resourceId = alertDef.getResource().getId(); + int alertDefId = alertDef.getId(); + String link = LinkManager.getSubsystemAlertDefinitionLink(resourceId, alertDefId); + return "<a href=\"" + link + "\">" + alertDef.getName() + "</a>"; + } + }); + } + } + + // add more columns + ListGridField resourceField = new ListGridField(FIELD_RESOURCE, MSG.common_title_resource()); + resourceField.setCellFormatter(new CellFormatter() { + @Override + public String format(Object value, ListGridRecord record, int rowNum, int colNum) { + AlertDefinition alertDef = copyValues(record); + Resource resource = alertDef.getResource(); + String link = LinkManager.getResourceLink(resource.getId()); + // TODO: need disambiguation + return "<a href=\"" + link + "\">" + resource.getName() + "</a>"; + } + }); + fields.add(resourceField); + + ListGridField parentField = new ListGridField(FIELD_PARENT, MSG.view_alerts_field_parent()); + parentField.setWidth(100); + parentField.setShowHover(true); + parentField.setHoverCustomizer(new HoverCustomizer() { + @Override + public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { + if (record.getAttribute(FIELD_PARENT) != null) { + return MSG.view_reports_alertDefinitions_parentHover(); + } + return null; + } + }); + parentField.addRecordClickHandler(new RecordClickHandler() { + @Override + public void onRecordClick(RecordClickEvent event) { + // we only do something if we really have a parent. + // if we have a template parent, we have to get the resource's type and go to the template page for that type + // if we have a group parent, we can directly go to the group's alert def page + Record record = event.getRecord(); + AlertDefinition alertDef = copyValues(record); + if (alertDef.getParentId() != null && alertDef.getParentId().intValue() > 0) { + final Integer templateId = alertDef.getParentId().intValue(); + final Integer resourceId = alertDef.getResource().getId(); + + ResourceCriteria resCriteria = new ResourceCriteria(); + resCriteria.addFilterId(resourceId); + resCriteria.fetchResourceType(true); + + GWTServiceLookup.getResourceService().findResourcesByCriteria(resCriteria, + new AsyncCallback<PageList<Resource>>() { + @Override + public void onSuccess(PageList<Resource> result) { + if (result == null || result.size() != 1) { + CoreGUI.getErrorHandler().handleError( + MSG.view_reports_alertDefinitions_resTypeLoadError()); + } else { + int typeId = result.get(0).getResourceType().getId(); + CoreGUI.goToView(LinkManager.getAdminTemplatesLink() + "/Alert/" + typeId + "/" + + templateId); + } + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError( + MSG.view_reports_alertDefinitions_resTypeLoadError(), caught); + } + }); + } else if (alertDef.getGroupAlertDefinition() != null) { + AlertDefinition groupAlertDef = alertDef.getGroupAlertDefinition(); + CoreGUI.goToView(LinkManager.getResourceGroupLink(groupAlertDef.getResourceGroup().getId()) + + "/Alerts/Definitions/" + groupAlertDef.getId()); + } + } + }); + + fields.add(parentField); + + return fields; + } + + @Override + public ListGridRecord copyValues(AlertDefinition from) { + // in order to support sorting our list grid on the parent and resource columns, + // we have to assign these to something that is sortable + ListGridRecord record = super.copyValues(from); + + record.setAttribute(FIELD_RESOURCE, from.getResource().getName()); + + Integer parentId = from.getParentId(); // a valid non-zero number means the alert def came from a template + AlertDefinition groupAlertDefinition = from.getGroupAlertDefinition(); + + if (parentId != null && parentId.intValue() > 0) { + record.setAttribute(FIELD_PARENT, "" + MSG.view_alert_definition_for_type() + ""); + } else if (groupAlertDefinition != null) { + record.setAttribute(FIELD_PARENT, "" + MSG.view_alert_definition_for_group() + ""); + } + + return record; + } + + @Override + protected List<DataSourceField> addDataSourceFields() { + List<DataSourceField> fields = super.addDataSourceFields(); + + // hide the created/modified fields, we don't need to show them by default + for (DataSourceField field : fields) { + String fieldName = field.getName(); + if (fieldName.equals(FIELD_CTIME) || fieldName.equals(FIELD_MTIME)) { + field.setHidden(true); + } + } + + // add more columns + DataSourceField resourceField = new DataSourceTextField(FIELD_RESOURCE); + fields.add(resourceField); + + DataSourceField parentField = new DataSourceTextField(FIELD_RESOURCE); + fields.add(parentField); + + return fields; + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java index 70a3060..2bac264 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java @@ -32,7 +32,6 @@ import com.smartgwt.client.widgets.layout.VLayout; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.enterprise.gui.coregui.client.ImageManager; -import org.rhq.enterprise.gui.coregui.client.admin.templates.ResourceTypeTreeView; import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView; import org.rhq.enterprise.gui.coregui.client.alert.SubsystemResourceAlertView; import org.rhq.enterprise.gui.coregui.client.components.TitleBar; @@ -137,8 +136,7 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView { NavigationItem alertDefinitionsItem = new NavigationItem(new ViewName("AlertDefinitions", MSG .view_reports_alertDefinitions()), "subsystems/alert/Alerts_16.png", new ViewFactory() { public Canvas createView() { - // TODO this isn't really want we want - we need to impl a true view with all alert definitions in a table - return new ResourceTypeTreeView(extendLocatorId(ResourceTypeTreeView.VIEW_ID.getName())); + return new AlertDefinitionReportView(extendLocatorId(AlertDefinitionReportView.VIEW_ID.getName())); } }); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index c8a07f4..7b73467 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -1967,6 +1967,8 @@ view_tagCloud_error_tagUsedCount = Tag used {0} times. view_taggedResources_title = Tagged Resources +view_reports_alertDefinitions_parentHover = Click to go to the parent alert definition +view_reports_alertDefinitions_resTypeLoadError = Cannot get the template resource type - unable to view the alert template. #==================== Help ====================== commit 55dfd69797a1d256f1a818dbd0377211614c9798 Author: John Mazzitelli <mazz(a)redhat.com> Date: Thu Mar 3 20:30:51 2011 -0500 add the concept of a non-binding filter to criteria API. need this for alert definition criteria diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java index 5c84c62..ea7bfe0 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java @@ -53,11 +53,14 @@ public class AlertDefinitionCriteria extends Criteria { private List<Integer> filterResourceGroupIds; // requires overrides private Boolean filterEnabled; private Boolean filterDeleted = false; // find enabled definitions by default + private NonBindingOverrideFilter filterResourceOnly; // requires overrides - finds only those associated with a resource + private NonBindingOverrideFilter filterResourceTypeOnly; // requires overrides - finds only alert templates private boolean fetchAlerts; private boolean fetchGroupAlertDefinition; private boolean fetchConditions; private boolean fetchAlertNotifications; + private boolean fetchResourceType; private PageOrdering sortName; private PageOrdering sortPriority; @@ -68,6 +71,8 @@ public class AlertDefinitionCriteria extends Criteria { filterOverrides.put("alertTemplateResourceTypeName", "resourceType.name like ?"); filterOverrides.put("resourceIds", "resource.id IN ( ? )"); filterOverrides.put("resourceGroupIds", "resourceGroup.id IN ( ? )"); + filterOverrides.put("resourceOnly", "resource IS NOT NULL"); + filterOverrides.put("resourceTypeOnly", "resourceType IS NOT NULL"); } @Override @@ -119,6 +124,15 @@ public class AlertDefinitionCriteria extends Criteria { this.filterDeleted = filterDeleted; } + public void addFilterResourceOnly(boolean filterResourceOnly) { + this.filterResourceOnly = (filterResourceOnly ? NonBindingOverrideFilter.ON : NonBindingOverrideFilter.OFF); + } + + public void addFilterResourceTypeOnly(boolean filterResourceTypeOnly) { + this.filterResourceTypeOnly = (filterResourceTypeOnly ? NonBindingOverrideFilter.ON + : NonBindingOverrideFilter.OFF); + } + public void fetchAlerts(boolean fetchAlerts) { this.fetchAlerts = fetchAlerts; } @@ -135,6 +149,10 @@ public class AlertDefinitionCriteria extends Criteria { this.fetchAlertNotifications = fetchAlertNotifications; } + public void fetchResourceType(boolean fetchResourceType) { + this.fetchResourceType = fetchResourceType; + } + public void addSortName(PageOrdering sortName) { addSortField("name"); this.sortName = sortName; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java index 04814e8..ac30ab2 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/criteria/Criteria.java @@ -46,6 +46,21 @@ public abstract class Criteria implements Serializable { } /** + * This is the type of a filter value when the override for that filter does not + * define any query parameter. ON means the filter is enabled and will take effect, + * OFF means the filter will not be used in the query. + * Example, from AlertDefinitionCriteria: + * private NonBindingOverrideFilter filterResourceOnly; // requires overrides - finds only those associated with a resource + * ... + * filterOverrides.put("resourceTypeOnly", "resourceType IS NOT NULL"); // notice no ? parameter + * + * Note: Typically a null value is analogous to OFF. + */ + public enum NonBindingOverrideFilter { + ON, OFF; + } + + /** * Apply a restriction to reduce the cost of the {@link Criteria}-based query generation and execution routines. */ public enum Restriction { diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java index 5547731..0ee5ad2 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java @@ -427,6 +427,15 @@ public final class CriteriaQueryGenerator { StringBuilder conjunctiveResults = new StringBuilder(); boolean firstCrit = true; for (Map.Entry<String, Object> filterField : filterFields.entrySet()) { + Object filterFieldValue = filterField.getValue(); + + // if this filter field is non-binding (that is, the query has no parameter whose value is to be bound for the field) + // and that filter field is turned off, do nothing and continue to the next filter. + // this in effect does not filter on this field at all. + if (Criteria.NonBindingOverrideFilter.OFF.equals(filterFieldValue)) { + continue; + } + if (firstCrit) { firstCrit = false; } else { @@ -439,7 +448,7 @@ public final class CriteriaQueryGenerator { fragment = fixFilterOverride(override, fieldName); } else { String operator = "="; - if (filterField.getValue() instanceof String) { + if (filterFieldValue instanceof String) { operator = "like"; if (wantCaseInsensitiveMatch) { fragment = "LOWER( " + alias + "." + fieldName + " ) " + operator + " :" + fieldName; @@ -754,6 +763,8 @@ public final class CriteriaQueryGenerator { query.setParameter("tagSemantic", tag.getSemantic()); query.setParameter("tagName", tag.getName()); + } else if (value instanceof Criteria.NonBindingOverrideFilter) { + // skip this one - do nothing since there is no parameter binding for this value } else { if (value instanceof String) { value = prepareStringBindValue((String) value); commit d1704b831928db1c8a120c52879b9ffdeaffe653 Author: John Mazzitelli <mazz(a)redhat.com> Date: Thu Mar 3 15:51:07 2011 -0500 i18n initially hide the category column since the name column icon tells us this info already diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java index ee04115..ea355c4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/ResourceTypeTreeView.java @@ -18,16 +18,19 @@ */ package org.rhq.enterprise.gui.coregui.client.admin.templates; +import java.util.HashMap; import java.util.Map; import com.smartgwt.client.data.Record; import com.smartgwt.client.types.Alignment; +import com.smartgwt.client.types.ListGridFieldType; import com.smartgwt.client.types.SelectionStyle; import com.smartgwt.client.types.VisibilityMode; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.ImgButton; import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; +import com.smartgwt.client.widgets.grid.HoverCustomizer; import com.smartgwt.client.widgets.grid.ListGrid; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; @@ -132,17 +135,17 @@ public class ResourceTypeTreeView extends LocatableVLayout implements Bookmarkab sectionStack.setVisibilityMode(VisibilityMode.MULTIPLE); ListGrid platformsList = new CustomResourceTypeListGrid(extendLocatorId("platformsList")); - SectionStackSection platforms = new SectionStackSection("Platforms"); + SectionStackSection platforms = new SectionStackSection(MSG.view_adminTemplates_platforms()); platforms.setExpanded(true); platforms.addItem(platformsList); ListGrid platformServicesList = new CustomResourceTypeListGrid(extendLocatorId("platformServicesList")); - SectionStackSection platformServices = new SectionStackSection("Platform Services"); + SectionStackSection platformServices = new SectionStackSection(MSG.view_adminTemplates_platformServices()); platformServices.setExpanded(true); platformServices.addItem(platformServicesList); TreeGrid serversTreeGrid = new CustomResourceTypeTreeGrid(extendLocatorId("serversTree")); - SectionStackSection servers = new SectionStackSection("Servers"); + SectionStackSection servers = new SectionStackSection(MSG.view_adminTemplates_servers()); servers.setExpanded(true); servers.addItem(serversTreeGrid); @@ -245,39 +248,43 @@ public class ResourceTypeTreeView extends LocatableVLayout implements Bookmarkab setWrapCells(true); setFixedRecordHeights(false); setShowRollOverCanvas(true); - setEmptyMessage("Loading..."); + setEmptyMessage(MSG.common_msg_loading()); setSelectionType(SelectionStyle.NONE); - final ListGridField name = new ListGridField(ResourceTypeTreeNodeBuilder.ATTRIB_NAME, "Name"); - final ListGridField plugin = new ListGridField(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN, "Plugin"); - final ListGridField category = new ListGridField(ResourceTypeTreeNodeBuilder.ATTRIB_CATEGORY, "Category"); + final ListGridField name = new ListGridField(ResourceTypeTreeNodeBuilder.ATTRIB_NAME, MSG + .common_title_name()); + final ListGridField plugin = new ListGridField(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN, MSG + .common_title_plugin()); + final ListGridField category = new ListGridField(ResourceTypeTreeNodeBuilder.ATTRIB_CATEGORY, MSG + .common_title_category()); final ListGridField enabledAlertTemplates = new ListGridField( - ResourceTypeTreeNodeBuilder.ATTRIB_ENABLED_ALERT_TEMPLATES, "Enabled Alert Templates"); + ResourceTypeTreeNodeBuilder.ATTRIB_ENABLED_ALERT_TEMPLATES, MSG + .view_adminTemplates_enabledAlertTemplates()); final ListGridField disabledAlertTemplates = new ListGridField( - ResourceTypeTreeNodeBuilder.ATTRIB_DISABLED_ALERT_TEMPLATES, "Disabled Alert Templates"); + ResourceTypeTreeNodeBuilder.ATTRIB_DISABLED_ALERT_TEMPLATES, MSG + .view_adminTemplates_disabledAlertTemplates()); final ListGridField enabledMetricTemplates = new ListGridField( - ResourceTypeTreeNodeBuilder.ATTRIB_ENABLED_METRIC_TEMPLATES, "Enabled Metric Templates"); + ResourceTypeTreeNodeBuilder.ATTRIB_ENABLED_METRIC_TEMPLATES, MSG + .view_adminTemplates_enabledMetricTemplates()); final ListGridField disabledMetricTemplates = new ListGridField( - ResourceTypeTreeNodeBuilder.ATTRIB_DISABLED_METRIC_TEMPLATES, "Disabled Metric Templates"); + ResourceTypeTreeNodeBuilder.ATTRIB_DISABLED_METRIC_TEMPLATES, MSG + .view_adminTemplates_disabledMetricTemplates()); plugin.setHidden(true); category.setHidden(true); - name.setWidth("40%"); + name.setWidth("*"); plugin.setWidth("10%"); - category.setWidth("10%"); + category.setWidth("5%"); enabledAlertTemplates.setWidth("10%"); disabledAlertTemplates.setWidth("10%"); enabledMetricTemplates.setWidth("10%"); disabledMetricTemplates.setWidth("10%"); - enabledAlertTemplates.setPrompt("Number of alert templates that are enabled on this resource type"); - disabledAlertTemplates - .setPrompt("Number of alert templates that are created but disabled on this resource type"); - enabledMetricTemplates - .setPrompt("Number of metric schedules that are enabled by default on this resource type"); - disabledMetricTemplates - .setPrompt("Number of metric schedules that are disabled by default on this resource type"); + enabledAlertTemplates.setPrompt(MSG.view_adminTemplates_prompt_enabledAlertTemplates()); + disabledAlertTemplates.setPrompt(MSG.view_adminTemplates_prompt_disabledAlertTemplates()); + enabledMetricTemplates.setPrompt(MSG.view_adminTemplates_prompt_enabledMetricTemplates()); + disabledMetricTemplates.setPrompt(MSG.view_adminTemplates_prompt_disabledMetricTemplates()); setFields(name, plugin, category, enabledAlertTemplates, disabledAlertTemplates, enabledMetricTemplates, disabledMetricTemplates); @@ -298,7 +305,7 @@ public class ResourceTypeTreeView extends LocatableVLayout implements Bookmarkab metricTemplateImg.setShowRollOver(false); metricTemplateImg.setLayoutAlign(Alignment.CENTER); metricTemplateImg.setSrc(ImageManager.getMetricEditIcon()); - metricTemplateImg.setPrompt("Edit Metric Template"); + metricTemplateImg.setPrompt(MSG.view_adminTemplates_editMetricTemplate()); metricTemplateImg.setHeight(16); metricTemplateImg.setWidth(16); metricTemplateImg.addClickHandler(new ClickHandler() { @@ -312,7 +319,7 @@ public class ResourceTypeTreeView extends LocatableVLayout implements Bookmarkab alertTemplateImg.setShowRollOver(false); alertTemplateImg.setLayoutAlign(Alignment.CENTER); alertTemplateImg.setSrc(ImageManager.getAlertEditIcon()); - alertTemplateImg.setPrompt("Edit Alert Template"); + alertTemplateImg.setPrompt(MSG.view_adminTemplates_editAlertTemplate()); alertTemplateImg.setHeight(16); alertTemplateImg.setWidth(16); alertTemplateImg.addClickHandler(new ClickHandler() { @@ -343,37 +350,67 @@ public class ResourceTypeTreeView extends LocatableVLayout implements Bookmarkab setWrapCells(true); setFixedRecordHeights(false); setShowRollOverCanvas(true); - setEmptyMessage("Loading..."); + setEmptyMessage(MSG.common_msg_loading()); setSelectionType(SelectionStyle.NONE); setAnimateFolders(false); - final TreeGridField name = new TreeGridField(ResourceTypeTreeNodeBuilder.ATTRIB_NAME, "Name"); - final TreeGridField plugin = new TreeGridField(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN, "Plugin"); - final TreeGridField category = new TreeGridField(ResourceTypeTreeNodeBuilder.ATTRIB_CATEGORY, "Category"); + final TreeGridField name = new TreeGridField(ResourceTypeTreeNodeBuilder.ATTRIB_NAME, MSG + .common_title_name()); + final TreeGridField plugin = new TreeGridField(ResourceTypeTreeNodeBuilder.ATTRIB_PLUGIN, MSG + .common_title_plugin()); + final TreeGridField category = new TreeGridField(ResourceTypeTreeNodeBuilder.ATTRIB_CATEGORY, MSG + .common_title_category()); final TreeGridField enabledAlertTemplates = new TreeGridField( - ResourceTypeTreeNodeBuilder.ATTRIB_ENABLED_ALERT_TEMPLATES, "Enabled Alert Templates"); + ResourceTypeTreeNodeBuilder.ATTRIB_ENABLED_ALERT_TEMPLATES, MSG + .view_adminTemplates_enabledAlertTemplates()); final TreeGridField disabledAlertTemplates = new TreeGridField( - ResourceTypeTreeNodeBuilder.ATTRIB_DISABLED_ALERT_TEMPLATES, "Disabled Alert Templates"); + ResourceTypeTreeNodeBuilder.ATTRIB_DISABLED_ALERT_TEMPLATES, MSG + .view_adminTemplates_disabledAlertTemplates()); final TreeGridField enabledMetricTemplates = new TreeGridField( - ResourceTypeTreeNodeBuilder.ATTRIB_ENABLED_METRIC_TEMPLATES, "Enabled Metric Templates"); + ResourceTypeTreeNodeBuilder.ATTRIB_ENABLED_METRIC_TEMPLATES, MSG + .view_adminTemplates_enabledMetricTemplates()); final TreeGridField disabledMetricTemplates = new TreeGridField( - ResourceTypeTreeNodeBuilder.ATTRIB_DISABLED_METRIC_TEMPLATES, "Disabled Metric Templates"); + ResourceTypeTreeNodeBuilder.ATTRIB_DISABLED_METRIC_TEMPLATES, MSG + .view_adminTemplates_disabledMetricTemplates()); + + category.setType(ListGridFieldType.ICON); + category.setShowValueIconOnly(true); + HashMap<String, String> categoryIcons = new HashMap<String, String>(3); + categoryIcons + .put(ResourceCategory.PLATFORM.name(), ImageManager.getResourceIcon(ResourceCategory.PLATFORM)); + categoryIcons.put(ResourceCategory.SERVER.name(), ImageManager.getResourceIcon(ResourceCategory.SERVER)); + categoryIcons.put(ResourceCategory.SERVICE.name(), ImageManager.getResourceIcon(ResourceCategory.SERVICE)); + category.setValueIcons(categoryIcons); + category.setShowHover(true); + category.setHoverCustomizer(new HoverCustomizer() { + @Override + public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { + String cat = record.getAttribute(ResourceTypeTreeNodeBuilder.ATTRIB_CATEGORY); + if (ResourceCategory.PLATFORM.name().equals(cat)) { + return MSG.common_title_platform(); + } else if (ResourceCategory.SERVER.name().equals(cat)) { + return MSG.common_title_server(); + } else if (ResourceCategory.SERVICE.name().equals(cat)) { + return MSG.common_title_service(); + } + return ""; + } + }); + + category.setHidden(true); - name.setWidth("40%"); + name.setWidth("*"); plugin.setWidth("10%"); - category.setWidth("10%"); + category.setWidth("5%"); enabledAlertTemplates.setWidth("10%"); disabledAlertTemplates.setWidth("10%"); enabledMetricTemplates.setWidth("10%"); disabledMetricTemplates.setWidth("10%"); - enabledAlertTemplates.setPrompt("Number of alert templates that are enabled on this resource type"); - disabledAlertTemplates - .setPrompt("Number of alert templates that are created but disabled on this resource type"); - enabledMetricTemplates - .setPrompt("Number of metric schedules that are enabled by default on this resource type"); - disabledMetricTemplates - .setPrompt("Number of metric schedules that are disabled by default on this resource type"); + enabledAlertTemplates.setPrompt(MSG.view_adminTemplates_prompt_enabledAlertTemplates()); + disabledAlertTemplates.setPrompt(MSG.view_adminTemplates_prompt_disabledAlertTemplates()); + enabledMetricTemplates.setPrompt(MSG.view_adminTemplates_prompt_enabledMetricTemplates()); + disabledMetricTemplates.setPrompt(MSG.view_adminTemplates_prompt_disabledMetricTemplates()); setFields(name, plugin, category, enabledAlertTemplates, disabledAlertTemplates, enabledMetricTemplates, disabledMetricTemplates); @@ -394,7 +431,7 @@ public class ResourceTypeTreeView extends LocatableVLayout implements Bookmarkab metricTemplateImg.setShowRollOver(false); metricTemplateImg.setLayoutAlign(Alignment.CENTER); metricTemplateImg.setSrc(ImageManager.getMetricEditIcon()); - metricTemplateImg.setPrompt("Edit Metric Template"); + metricTemplateImg.setPrompt(MSG.view_adminTemplates_editMetricTemplate()); metricTemplateImg.setHeight(16); metricTemplateImg.setWidth(16); metricTemplateImg.addClickHandler(new ClickHandler() { @@ -408,7 +445,7 @@ public class ResourceTypeTreeView extends LocatableVLayout implements Bookmarkab alertTemplateImg.setShowRollOver(false); alertTemplateImg.setLayoutAlign(Alignment.CENTER); alertTemplateImg.setSrc(ImageManager.getAlertEditIcon()); - alertTemplateImg.setPrompt("Edit Alert Template"); + alertTemplateImg.setPrompt(MSG.view_adminTemplates_editAlertTemplate()); alertTemplateImg.setHeight(16); alertTemplateImg.setWidth(16); alertTemplateImg.addClickHandler(new ClickHandler() { diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 2b43eba..c8a07f4 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -598,6 +598,23 @@ view_adminConfig_templates = Templates view_adminContent_contentSources = Content Sources view_adminContent_repositories = Repositories +# Administration/Templates +#-------------------------------- + +view_adminTemplates_platforms = Platforms +view_adminTemplates_platformServices = Platform Services +view_adminTemplates_servers = Servers +view_adminTemplates_enabledAlertTemplates = Enabled Alert Templates +view_adminTemplates_disabledAlertTemplates = Disabled Alert Templates +view_adminTemplates_enabledMetricTemplates = Enabled Metric Templates +view_adminTemplates_disabledMetricTemplates = Disabled Metric Templates +view_adminTemplates_editAlertTemplate = Edit Alert Template +view_adminTemplates_editMetricTemplate = Edit Metric Template +view_adminTemplates_prompt_enabledAlertTemplates = Number of alert templates that are enabled on this resource type +view_adminTemplates_prompt_disabledAlertTemplates = Number of alert templates that are created but disabled on this resource type +view_adminTemplates_prompt_enabledMetricTemplates = Number of metric schedules that are enabled by default on this resource type +view_adminTemplates_prompt_disabledMetricTemplates = Number of metric schedules that are disabled by default on this resource type + # Administration/Security/Users #-------------------------------- view_adminUsersList_dataTypeName = user commit acc6b288be2322f5b54eda30dbfd1c66ab8085d2 Author: John Mazzitelli <mazz(a)redhat.com> Date: Thu Mar 3 14:50:21 2011 -0500 prepopulate some of the search bars diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java index a143cb7..f7b50a3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java @@ -226,7 +226,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { extendLocatorId(PAGE_COMPATIBLE_GROUPS.getName()), new Criteria( ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.COMPATIBLE.name()), PAGE_COMPATIBLE_GROUPS.getTitle(), ImageManager.getGroupLargeIcon(GroupCategory.COMPATIBLE)); - view.setInitialSearchBarSearchText("category=platform | category=server | category=service"); + view.setInitialSearchBarSearchText("groupCategory=compatible"); return view; } }); @@ -237,7 +237,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { ResourceGroupListView view = new ResourceGroupListView(extendLocatorId(PAGE_MIXED_GROUPS.getName()), new Criteria(ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.MIXED.name()), PAGE_MIXED_GROUPS.getTitle(), ImageManager.getGroupLargeIcon(GroupCategory.MIXED)); - //view.setInitialSearchBarSearchText(""); + view.setInitialSearchBarSearchText("groupCategory=mixed"); return view; } }); @@ -248,7 +248,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { ResourceGroupListView view = new ResourceGroupListView(extendLocatorId(PAGE_PROBLEM_GROUPS.getName()), new Criteria("downMemberCount", "1"), PAGE_PROBLEM_GROUPS.getTitle(), ImageManager .getGroupLargeIcon(GroupCategory.MIXED, 0.0d)); - //view.setInitialSearchBarSearchText(""); + //view.setInitialSearchBarSearchText("availability=down"); I don't think this matches exactly what the criteria returns view.setShowNewButton(false); return view; } commit b58804c9a5b89d8b38a45a7fa20682fb3ad0bd60 Author: John Mazzitelli <mazz(a)redhat.com> Date: Thu Mar 3 14:49:55 2011 -0500 enhance the search bar 1) the resource search bar now lets you search on version string 2) the group search bar now lets you search on group cat (compat/mixed) diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/GroupSearchAssistant.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/GroupSearchAssistant.java index e163230..01fbb72 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/GroupSearchAssistant.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/GroupSearchAssistant.java @@ -25,6 +25,7 @@ import java.util.List; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.measurement.AvailabilityType; import org.rhq.core.domain.resource.ResourceCategory; +import org.rhq.core.domain.resource.group.GroupCategory; import org.rhq.core.domain.search.SearchSubsystem; /** @@ -37,8 +38,8 @@ public class GroupSearchAssistant extends TabAwareSearchAssistant { static { parameterizedContexts = Collections.emptyList(); - simpleContexts = Collections.unmodifiableList(Arrays.asList("availability", "category", "type", "plugin", - "name")); + simpleContexts = Collections.unmodifiableList(Arrays.asList("availability", "groupCategory", "category", + "type", "plugin", "name")); } public GroupSearchAssistant(Subject subject, String tab) { @@ -75,6 +76,9 @@ public class GroupSearchAssistant extends TabAwareSearchAssistant { if (context.equals("availability")) { return filter(AvailabilityType.class, filter); + } else if (context.equals("groupCategory")) { + return filter(GroupCategory.class, filter); + } else if (context.equals("category")) { return filter(ResourceCategory.class, filter); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java index b8b1f1f..73e7d2a 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/assist/ResourceSearchAssistant.java @@ -43,7 +43,7 @@ public class ResourceSearchAssistant extends TabAwareSearchAssistant { parameterizedContexts = Collections.unmodifiableList(Arrays.asList("alerts", "connection", "configuration", "trait")); simpleContexts = Collections.unmodifiableList(Arrays.asList("availability", "category", "type", "plugin", - "name")); + "name", "version")); } public ResourceSearchAssistant(Subject subject, String tab) { @@ -165,6 +165,16 @@ public class ResourceSearchAssistant extends TabAwareSearchAssistant { + conditionallyAddAuthzFragment(getAuthzFragment()) // + " ORDER BY res.name "); + } else if (context.equals("version")) { + return execute("" // + + "SELECT DISTINCT res.version " // + + " FROM Resource res, ResourceType type " // + + " WHERE res.resourceType = type " // + + conditionallyAddJPQLString("res.name", filter) // + + conditionallyAddJPQLString("type.category", tab) // + + conditionallyAddAuthzFragment(getAuthzFragment()) // + + " ORDER BY res.version "); + } else if (context.equals("alerts")) { return filter(AlertPriority.class, filter, true); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/GroupSearchTranslator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/GroupSearchTranslator.java index 4422756..9512ecf 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/GroupSearchTranslator.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/GroupSearchTranslator.java @@ -22,6 +22,7 @@ import static org.rhq.enterprise.server.search.common.SearchQueryGenerationUtili import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.resource.ResourceCategory; +import org.rhq.core.domain.resource.group.GroupCategory; import org.rhq.enterprise.server.search.SearchExpressionException; import org.rhq.enterprise.server.search.translation.antlr.RHQLAdvancedTerm; import org.rhq.enterprise.server.search.translation.antlr.RHQLComparisonOperator; @@ -72,6 +73,10 @@ public class GroupSearchTranslator extends AbstractSearchTranslator { return new SearchFragment(SearchFragment.Type.WHERE_CLAUSE, // getJPQLForEnum(alias + ".resourceType.category", op, filter, ResourceCategory.class, false)); + } else if (path.equals("groupCategory")) { + return new SearchFragment(SearchFragment.Type.WHERE_CLAUSE, // + getJPQLForEnum(alias + ".groupCategory", op, filter, GroupCategory.class, false)); + } else if (path.equals("type")) { return new SearchFragment(SearchFragment.Type.WHERE_CLAUSE, // getJPQLForString(alias + ".resourceType.name", op, filter)); diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java index c25d12c..046935e 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/search/translation/ResourceSearchTranslator.java @@ -69,6 +69,10 @@ public class ResourceSearchTranslator extends AbstractSearchTranslator { return new SearchFragment(SearchFragment.Type.WHERE_CLAUSE, // getJPQLForString(alias + ".name", op, filter)); + } else if (path.equals("version")) { + return new SearchFragment(SearchFragment.Type.WHERE_CLAUSE, // + getJPQLForString(alias + ".version", op, filter)); + } else if (path.equals("alerts")) { return new SearchFragment( // SearchFragment.Type.PRIMARY_KEY_SUBQUERY, "SELECT res.id" // commit bb8e6f8b078fa8c1ebbded59b1320f37b5416bf0 Author: John Mazzitelli <mazz(a)redhat.com> Date: Thu Mar 3 14:48:54 2011 -0500 allow for owners of search bar to prepopulate the search box with a default search string diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/SearchBarItem.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/SearchBarItem.java index d43dc3f..a0a5689 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/SearchBarItem.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/SearchBarItem.java @@ -34,9 +34,13 @@ public class SearchBarItem extends CanvasItem { private FlexSearchBar searchBar; public SearchBarItem(String name, String title, SearchSubsystem subsystem) { + this(name, title, subsystem, null); + } + + public SearchBarItem(String name, String title, SearchSubsystem subsystem, String initialSearchText) { super(name, title); - searchBar = new FlexSearchBar(subsystem); + searchBar = new FlexSearchBar(subsystem, initialSearchText); searchBar.setHeight("30px"); canvas.addChild(searchBar); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java index c75b1a1..7b5d087 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java @@ -123,6 +123,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements private boolean autoFetchData; private boolean flexRowDisplay = true; private boolean hideSearchBar = false; + private String initialSearchBarSearchText = null; private DS dataSource; @@ -192,6 +193,14 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements this.hideSearchBar = flag; } + public String getInitialSearchBarSearchText() { + return this.initialSearchBarSearchText; + } + + public void setInitialSearchBarSearchText(String text) { + this.initialSearchBarSearchText = text; + } + public void setFlexRowDisplay(boolean flexRowDisplay) { this.flexRowDisplay = flexRowDisplay; } @@ -211,7 +220,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements } else { if (!this.hideSearchBar) { final SearchBarItem searchFilter = new SearchBarItem("search", MSG.common_button_search(), - getSearchSubsystem()); + getSearchSubsystem(), getInitialSearchBarSearchText()); setFilterFormItems(searchFilter); } } @@ -545,9 +554,16 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements } public void refresh() { + // if this table has a filter form (table filters OR search bar) + // we need to refresh it as per the filtering. If there are no filters, + // just do a allow for a default refresh by simply invalidating the cache if (null != this.listGrid) { - this.listGrid.invalidateCache(); - this.listGrid.markForRedraw(); + if (this.filterForm != null && this.filterForm.hasContent()) { + refresh(this.filterForm.getValuesAsCriteria()); + } else { + this.listGrid.invalidateCache(); + this.listGrid.markForRedraw(); + } } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java index 5b06567..a143cb7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java @@ -151,27 +151,34 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { NavigationItem platformsItem = new NavigationItem(PAGE_PLATFORMS, ImageManager.getResourceIcon( ResourceCategory.PLATFORM, Boolean.TRUE), new ViewFactory() { public Canvas createView() { - return new ResourceSearchView(extendLocatorId(PAGE_PLATFORMS.getName()), new Criteria( - ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.PLATFORM.name()), PAGE_PLATFORMS - .getTitle(), ImageManager.getResourceLargeIcon(ResourceCategory.PLATFORM, Boolean.TRUE)); + ResourceSearchView view = new ResourceSearchView(extendLocatorId(PAGE_PLATFORMS.getName()), + new Criteria(ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.PLATFORM.name()), + PAGE_PLATFORMS.getTitle(), ImageManager.getResourceLargeIcon(ResourceCategory.PLATFORM, + Boolean.TRUE)); + view.setInitialSearchBarSearchText("category=platform"); + return view; } }); NavigationItem serversItem = new NavigationItem(PAGE_SERVERS, ImageManager.getResourceIcon( ResourceCategory.SERVER, Boolean.TRUE), new ViewFactory() { public Canvas createView() { - return new ResourceSearchView(extendLocatorId(PAGE_SERVERS.getName()), new Criteria( + ResourceSearchView view = new ResourceSearchView(extendLocatorId(PAGE_SERVERS.getName()), new Criteria( ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.SERVER.name()), PAGE_SERVERS .getTitle(), ImageManager.getResourceLargeIcon(ResourceCategory.SERVER, Boolean.TRUE)); + view.setInitialSearchBarSearchText("category=server"); + return view; } }); NavigationItem servicesItem = new NavigationItem(PAGE_SERVICES, ImageManager.getResourceIcon( ResourceCategory.SERVICE, Boolean.TRUE), new ViewFactory() { public Canvas createView() { - return new ResourceSearchView(extendLocatorId(PAGE_SERVICES.getName()), new Criteria( - ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.SERVICE.name()), PAGE_SERVICES - .getTitle(), ImageManager.getResourceLargeIcon(ResourceCategory.SERVICE, Boolean.TRUE)); + ResourceSearchView view = new ResourceSearchView(extendLocatorId(PAGE_SERVICES.getName()), + new Criteria(ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.SERVICE.name()), + PAGE_SERVICES.getTitle(), ImageManager.getResourceLargeIcon(ResourceCategory.SERVICE, Boolean.TRUE)); + view.setInitialSearchBarSearchText("category=service"); + return view; } }); @@ -182,9 +189,11 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { AvailabilityType.DOWN.name()); criteria.addCriteria(ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.SERVER.name()); // TODO (ips, 10/28/10): Should we include down platforms too? - return new ResourceSearchView(extendLocatorId(PAGE_UNAVAIL_SERVERS.getName()), criteria, MSG - .view_inventory_unavailableServers(), ImageManager.getResourceLargeIcon(ResourceCategory.SERVER, - Boolean.FALSE)); + ResourceSearchView view = new ResourceSearchView(extendLocatorId(PAGE_UNAVAIL_SERVERS.getName()), + criteria, MSG.view_inventory_unavailableServers(), ImageManager.getResourceLargeIcon( + ResourceCategory.SERVER, Boolean.FALSE)); + view.setInitialSearchBarSearchText("category=server availability=down"); + return view; } }); @@ -213,18 +222,23 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { NavigationItem compatibleGroupsItem = new NavigationItem(PAGE_COMPATIBLE_GROUPS, ImageManager .getGroupIcon(GroupCategory.COMPATIBLE), new ViewFactory() { public Canvas createView() { - return new ResourceGroupListView(extendLocatorId(PAGE_COMPATIBLE_GROUPS.getName()), new Criteria( - ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.COMPATIBLE.name()), + ResourceGroupListView view = new ResourceGroupListView( + extendLocatorId(PAGE_COMPATIBLE_GROUPS.getName()), new Criteria( + ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.COMPATIBLE.name()), PAGE_COMPATIBLE_GROUPS.getTitle(), ImageManager.getGroupLargeIcon(GroupCategory.COMPATIBLE)); + view.setInitialSearchBarSearchText("category=platform | category=server | category=service"); + return view; } }); NavigationItem mixedGroupsItem = new NavigationItem(PAGE_MIXED_GROUPS, ImageManager .getGroupIcon(GroupCategory.MIXED), new ViewFactory() { public Canvas createView() { - return new ResourceGroupListView(extendLocatorId(PAGE_MIXED_GROUPS.getName()), new Criteria( - ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.MIXED.name()), + ResourceGroupListView view = new ResourceGroupListView(extendLocatorId(PAGE_MIXED_GROUPS.getName()), + new Criteria(ResourceGroupDataSourceField.CATEGORY.propertyName(), GroupCategory.MIXED.name()), PAGE_MIXED_GROUPS.getTitle(), ImageManager.getGroupLargeIcon(GroupCategory.MIXED)); + //view.setInitialSearchBarSearchText(""); + return view; } }); @@ -234,6 +248,7 @@ public class InventoryView extends AbstractSectionedLeftNavigationView { ResourceGroupListView view = new ResourceGroupListView(extendLocatorId(PAGE_PROBLEM_GROUPS.getName()), new Criteria("downMemberCount", "1"), PAGE_PROBLEM_GROUPS.getTitle(), ImageManager .getGroupLargeIcon(GroupCategory.MIXED, 0.0d)); + //view.setInitialSearchBarSearchText(""); view.setShowNewButton(false); return view; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java index 9aa8c82..7ec3956 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/search/FlexSearchBar.java @@ -124,6 +124,10 @@ public class FlexSearchBar extends AbstractSearchBar { } public FlexSearchBar(SearchSubsystem searchSubsystem) { + this(searchSubsystem, null); + } + + public FlexSearchBar(SearchSubsystem searchSubsystem, String initialSearchText) { Log.info("Loading SearchBar..."); this.searchSubsystem = searchSubsystem; @@ -161,11 +165,12 @@ public class FlexSearchBar extends AbstractSearchBar { setupArrowImage(); setupSavedSearches(); - if (defaultSearchText != null) { - this.autoCompletePatternField.setText(defaultSearchText); - } else if (defaultSavedSearchPatternId != null) { + setDefaultSearchText(initialSearchText); + if (getDefaultSearchText() != null) { + this.autoCompletePatternField.setText(getDefaultSearchText()); + } else if (getDefaultSavedSearchPatternId() != null) { try { - Integer savedSearchId = Integer.valueOf(defaultSavedSearchPatternId); + Integer savedSearchId = Integer.valueOf(getDefaultSavedSearchPatternId()); activateSavedSearch(savedSearchId); } catch (Exception e) { this.autoCompletePatternField.setText(MSG.view_searchBar_error_selectSavedSearch()); commit 3b13dc67cf704970d488f41224f2bb286e8e5289 Author: John Mazzitelli <mazz(a)redhat.com> Date: Thu Mar 3 12:04:09 2011 -0500 add link to first cell with type name don't show the search bar in the table diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java index aba8fdf..c75b1a1 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java @@ -122,6 +122,7 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements private String[] excludedFieldNames; private boolean autoFetchData; private boolean flexRowDisplay = true; + private boolean hideSearchBar = false; private DS dataSource; @@ -177,6 +178,20 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements this.autoFetchData = autoFetchData; } + /** + * If this returns true, then even if a {@link #getSearchSubsystem() search subsystem} + * is defined by the table class, the search bar will not be shown. + * + * @return true if the search bar is to be hidden (default is false) + */ + public boolean getHideSearchBar() { + return this.hideSearchBar; + } + + public void setHideSearchBar(boolean flag) { + this.hideSearchBar = flag; + } + public void setFlexRowDisplay(boolean flexRowDisplay) { this.flexRowDisplay = flexRowDisplay; } @@ -190,12 +205,15 @@ public class Table<DS extends RPCDataSource> extends LocatableHLayout implements /* * table filters and search bar are currently mutually exclusive */ + if (getSearchSubsystem() == null) { configureTableFilters(); } else { - final SearchBarItem searchFilter = new SearchBarItem("search", MSG.common_button_search(), - getSearchSubsystem()); - setFilterFormItems(searchFilter); + if (!this.hideSearchBar) { + final SearchBarItem searchFilter = new SearchBarItem("search", MSG.common_button_search(), + getSearchSubsystem()); + setFilterFormItems(searchFilter); + } } listGrid = new LocatableListGrid(getLocatorId()); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java index e65e779..f9ee0cb 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java @@ -11,6 +11,7 @@ import com.smartgwt.client.data.Record; import com.smartgwt.client.types.ListGridFieldType; import com.smartgwt.client.widgets.events.DoubleClickEvent; import com.smartgwt.client.widgets.events.DoubleClickHandler; +import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.HoverCustomizer; import com.smartgwt.client.widgets.grid.ListGrid; import com.smartgwt.client.widgets.grid.ListGridField; @@ -90,6 +91,7 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka private void showResourceList(Criteria criteria) { hideResourceList(); resourceList = new ResourceSearchView(extendLocatorId("resourceList"), criteria); + resourceList.setHideSearchBar(true); // we don't want to enable search - the contents of this table are very specific addMember(resourceList); markForRedraw(); } @@ -124,6 +126,18 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka fieldVersion.setWidth("*"); fieldCount.setWidth("10%"); + fieldTypeName.setCellFormatter(new CellFormatter() { + @Override + public String format(Object value, ListGridRecord record, int rowNum, int colNum) { + String url = getResourceTypeTableUrl(record); + if (url == null) { + return value.toString(); + } + + return "<a href=\"" + url + "\">" + value.toString() + "</a>"; + } + }); + fieldCategory.setType(ListGridFieldType.ICON); fieldCategory.setShowValueIconOnly(true); HashMap<String, String> categoryIcons = new HashMap<String, String>(3); @@ -153,14 +167,9 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka public void onDoubleClick(DoubleClickEvent event) { ListGrid lg = (ListGrid) event.getSource(); ListGridRecord selected = lg.getSelectedRecord(); - if (selected != null) { - int resourceTypeId = selected.getAttributeAsInt(DataSource.Field.TYPEID); - String version = selected.getAttribute(DataSource.Field.VERSION); - if (version == null) { - CoreGUI.goToView("#Reports/Inventory/InventorySummary/" + resourceTypeId); - } else { - CoreGUI.goToView("#Reports/Inventory/InventorySummary/" + resourceTypeId + "/" + version); - } + String url = getResourceTypeTableUrl(selected); + if (url != null) { + CoreGUI.goToView(url); } } }); @@ -168,6 +177,20 @@ public class ResourceInstallReport extends LocatableVLayout implements Bookmarka setListGridFields(fieldTypeName, fieldPlugin, fieldCategory, fieldVersion, fieldCount); } + private String getResourceTypeTableUrl(ListGridRecord selected) { + String url = null; + if (selected != null) { + int resourceTypeId = selected.getAttributeAsInt(DataSource.Field.TYPEID); + String version = selected.getAttribute(DataSource.Field.VERSION); + if (version == null) { + url = "#Reports/Inventory/InventorySummary/" + resourceTypeId; + } else { + url = "#Reports/Inventory/InventorySummary/" + resourceTypeId + "/" + version; + } + } + return url; + } + class DataSource extends RPCDataSource<ResourceInstallCount> { public class Field { commit f3f8c52fee42117089212b990310d32a3ae9b51d Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Mar 2 19:47:33 2011 -0500 fix these two queries - need to filter out all non-committed resources diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java index b83f44c..fff65b2 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java @@ -729,18 +729,20 @@ import org.rhq.core.domain.util.Summary; + "SELECT r.id FROM Resource AS r WHERE r.agent IS NULL"), @NamedQuery(name = Resource.QUERY_RESOURCE_REPORT, query = "" - + "SELECT new org.rhq.core.domain.resource.composite.ResourceInstallCount( " - + "r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, count(r))\n " - + "FROM Resource r\n " - + "GROUP BY r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id\n " - + "ORDER BY r.resourceType.category, r.resourceType.plugin, r.resourceType.name"), - - @NamedQuery(name = Resource.QUERY_RESOURCE_VERSION_REPORT, query = "" - + "SELECT new org.rhq.core.domain.resource.composite.ResourceInstallCount( " - + "r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, count(r), r.version)\n " - + "FROM Resource r\n " - + "GROUP BY r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, r.version\n " - + "ORDER BY r.resourceType.category, r.resourceType.plugin, r.resourceType.name, r.version") + + "SELECT new org.rhq.core.domain.resource.composite.ResourceInstallCount( " // + + "r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, count(r)) " // + + "FROM Resource r " // + + "WHERE r.inventoryStatus = 'COMMITTED' " // + + "GROUP BY r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id " // + + "ORDER BY r.resourceType.category, r.resourceType.plugin, r.resourceType.name "), + + @NamedQuery(name = Resource.QUERY_RESOURCE_VERSION_REPORT, query = "" // + + "SELECT new org.rhq.core.domain.resource.composite.ResourceInstallCount( " // + + "r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, count(r), r.version) " // + + "FROM Resource r " // + + "WHERE r.inventoryStatus = 'COMMITTED' " // + + "GROUP BY r.resourceType.name, r.resourceType.plugin, r.resourceType.category, r.resourceType.id, r.version " // + + "ORDER BY r.resourceType.category, r.resourceType.plugin, r.resourceType.name, r.version ") }) @SequenceGenerator(name = "RHQ_RESOURCE_SEQ", sequenceName = "RHQ_RESOURCE_ID_SEQ") commit 3447dbba47659a39b4de05a1965427218fe91346 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Mar 2 19:19:10 2011 -0500 gwt-i-fy the reports>inventory summary page diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/PortletAlertSelector.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/PortletAlertSelector.java index c6ffa2a..dae36c2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/PortletAlertSelector.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/PortletAlertSelector.java @@ -50,7 +50,6 @@ public class PortletAlertSelector extends ResourceSelector { //populate fields for grid. ListGridField nameField = new ListGridField("name", MSG.common_title_name()); ListGridField iconField = new ListGridField("icon", MSG.common_title_icon(), 50); - iconField.setImageURLPrefix("types/"); iconField.setType(ListGridFieldType.ICON); assignedGrid.setFields(iconField, nameField); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java index 68e5342..ccf6a0b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java @@ -34,6 +34,7 @@ import org.rhq.core.domain.resource.composite.DisambiguationReport; import org.rhq.core.domain.resource.composite.ProblemResourceComposite; import org.rhq.core.domain.resource.composite.RecentlyAddedResourceComposite; import org.rhq.core.domain.resource.composite.ResourceComposite; +import org.rhq.core.domain.resource.composite.ResourceInstallCount; import org.rhq.core.domain.resource.composite.ResourceLineageComposite; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; @@ -82,4 +83,5 @@ public interface ResourceGWTService extends RemoteService { List<Integer> uninventoryResources(int[] resourceIds) throws RuntimeException; + List<ResourceInstallCount> findResourceInstallCounts(boolean groupByVersions) throws RuntimeException; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java index 1b44b53..6cb947d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeDataSource.java @@ -68,7 +68,6 @@ public class ResourceCompositeDataSource extends RPCDataSource<ResourceComposite fields.add(idDataField); DataSourceImageField iconField = new DataSourceImageField("icon", ""); - iconField.setImageURLPrefix("types/"); fields.add(iconField); DataSourceTextField nameDataField = new DataSourceTextField(NAME.propertyName(), NAME.title(), 200); @@ -159,8 +158,8 @@ public class ResourceCompositeDataSource extends RPCDataSource<ResourceComposite record.setAttribute(TYPE.propertyName(), res.getResourceType().getId()); record.setAttribute(PLUGIN.propertyName(), res.getResourceType().getPlugin()); record.setAttribute(CATEGORY.propertyName(), res.getResourceType().getCategory().name()); - record.setAttribute("icon", res.getResourceType().getCategory().getDisplayName() + "_" - + (res.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "up" : "down") + "_16.png"); + record.setAttribute("icon", ImageManager.getResourceIcon(res.getResourceType().getCategory(), res + .getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP)); record.setAttribute(AVAILABILITY.propertyName(), ImageManager.getAvailabilityIconFromAvailType(res .getCurrentAvailability().getAvailabilityType())); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java index 31a517d..6f7863b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java @@ -177,6 +177,7 @@ public class ResourceDatasource extends RPCDataSource<Resource> { criteria.addFilterTagNamespace(getFilter(request, "tagNamespace", String.class)); criteria.addFilterTagSemantic(getFilter(request, "tagSemantic", String.class)); criteria.addFilterTagName(getFilter(request, "tagName", String.class)); + criteria.addFilterVersion(getFilter(request, "version", String.class)); criteria.setSearchExpression(getFilter(request, "search", String.class)); return criteria; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java index 8115654..2497ca7 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java @@ -122,7 +122,6 @@ public class ResourceSearchView extends Table { protected void configureTable() { ListGridField iconField = new ListGridField("icon", MSG.common_title_icon(), 26); iconField.setType(ListGridFieldType.IMAGE); - iconField.setImageURLPrefix("types/"); iconField.setShowDefaultContextMenu(false); iconField.setCanSort(false); iconField.setTitle(" "); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java index b82603f..70a3060 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java @@ -35,7 +35,6 @@ import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.admin.templates.ResourceTypeTreeView; import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView; import org.rhq.enterprise.gui.coregui.client.alert.SubsystemResourceAlertView; -import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane; import org.rhq.enterprise.gui.coregui.client.components.TitleBar; import org.rhq.enterprise.gui.coregui.client.components.view.AbstractSectionedLeftNavigationView; import org.rhq.enterprise.gui.coregui.client.components.view.NavigationItem; @@ -148,13 +147,12 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView { } private NavigationSection buildInventorySection() { - NavigationItem inventorySummaryItem = new NavigationItem(new ViewName("InventorySummary", MSG - .common_title_inventorySummary()), "subsystems/inventory/Inventory_16.png", new ViewFactory() { - public Canvas createView() { - return new FullHTMLPane(extendLocatorId("InventorySummary"), - "/rhq/admin/report/resourceInstallReport-body.xhtml"); - } - }); + NavigationItem inventorySummaryItem = new NavigationItem(ResourceInstallReport.VIEW_ID, + "subsystems/inventory/Inventory_16.png", new ViewFactory() { + public Canvas createView() { + return new ResourceInstallReport(extendLocatorId(ResourceInstallReport.VIEW_ID.getName())); + } + }); NavigationItem platformSystemInfoItem = new NavigationItem(PlatformSummaryPortlet.VIEW_ID, ImageManager .getResourceIcon(ResourceCategory.PLATFORM), new ViewFactory() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java new file mode 100644 index 0000000..e65e779 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ResourceInstallReport.java @@ -0,0 +1,227 @@ +package org.rhq.enterprise.gui.coregui.client.report; + +import java.util.HashMap; +import java.util.List; + +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.smartgwt.client.data.Criteria; +import com.smartgwt.client.data.DSRequest; +import com.smartgwt.client.data.DSResponse; +import com.smartgwt.client.data.Record; +import com.smartgwt.client.types.ListGridFieldType; +import com.smartgwt.client.widgets.events.DoubleClickEvent; +import com.smartgwt.client.widgets.events.DoubleClickHandler; +import com.smartgwt.client.widgets.grid.HoverCustomizer; +import com.smartgwt.client.widgets.grid.ListGrid; +import com.smartgwt.client.widgets.grid.ListGridField; +import com.smartgwt.client.widgets.grid.ListGridRecord; + +import org.rhq.core.domain.resource.ResourceCategory; +import org.rhq.core.domain.resource.composite.ResourceInstallCount; +import org.rhq.enterprise.gui.coregui.client.BookmarkableView; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.ImageManager; +import org.rhq.enterprise.gui.coregui.client.ViewPath; +import org.rhq.enterprise.gui.coregui.client.components.table.Table; +import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; +import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; +import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDataSourceField; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView; +import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; + +/** + * A tabular report that shows the types of resources are installed and how many + * of them are installed. + * + * @author John Mazzitelli + */ +public class ResourceInstallReport extends LocatableVLayout implements BookmarkableView { + + public static final ViewName VIEW_ID = new ViewName("InventorySummary", MSG.common_title_inventorySummary()); + + private ResourceSearchView resourceList; + + public ResourceInstallReport(String locatorId) { + super(locatorId); + setHeight100(); + setWidth100(); + } + + @Override + public void renderView(ViewPath viewPath) { + if (!viewPath.isEnd()) { + int resourceTypeId = Integer.parseInt(viewPath.getCurrent().getPath()); + viewPath.next(); + Criteria criteria; + if (!viewPath.isEnd()) { + String resourceVersion = viewPath.getCurrent().getPath(); + criteria = createResourceSearchViewCriteria(resourceTypeId, resourceVersion); + } else { + criteria = createResourceSearchViewCriteria(resourceTypeId); + } + showResourceList(criteria); + } else { + hideResourceList(); + } + } + + @Override + protected void onInit() { + super.onInit(); + + addMember(new ResourceInstallReportTable(extendLocatorId("table"))); + } + + protected Criteria createResourceSearchViewCriteria(int resourceTypeId) { + Criteria criteria = new Criteria(); + criteria.addCriteria(ResourceDataSourceField.TYPE.propertyName(), resourceTypeId); + return criteria; + } + + protected Criteria createResourceSearchViewCriteria(int resourceTypeId, String resourceVersion) { + Criteria criteria = new Criteria(); + criteria.addCriteria(ResourceDataSourceField.TYPE.propertyName(), resourceTypeId); + criteria.addCriteria("version", resourceVersion); + return criteria; + } + + private void showResourceList(Criteria criteria) { + hideResourceList(); + resourceList = new ResourceSearchView(extendLocatorId("resourceList"), criteria); + addMember(resourceList); + markForRedraw(); + } + + private void hideResourceList() { + if (resourceList != null) { + removeMember(resourceList); + resourceList.destroy(); + resourceList = null; + } + markForRedraw(); + } + + class ResourceInstallReportTable extends Table<ResourceInstallReportTable.DataSource> { + + public ResourceInstallReportTable(String locatorId) { + super(locatorId, VIEW_ID.getTitle()); + setDataSource(new DataSource()); + } + + @Override + protected void configureTable() { + ListGridField fieldTypeName = new ListGridField(DataSource.Field.TYPENAME, MSG.common_title_resource_type()); + ListGridField fieldPlugin = new ListGridField(DataSource.Field.TYPEPLUGIN, MSG.common_title_plugin()); + ListGridField fieldCategory = new ListGridField(DataSource.Field.CATEGORY, MSG.common_title_category()); + ListGridField fieldVersion = new ListGridField(DataSource.Field.VERSION, MSG.common_title_version()); + ListGridField fieldCount = new ListGridField(DataSource.Field.COUNT, MSG.common_title_count()); + + fieldTypeName.setWidth("35%"); + fieldPlugin.setWidth("10%"); + fieldCategory.setWidth("25"); + fieldVersion.setWidth("*"); + fieldCount.setWidth("10%"); + + fieldCategory.setType(ListGridFieldType.ICON); + fieldCategory.setShowValueIconOnly(true); + HashMap<String, String> categoryIcons = new HashMap<String, String>(3); + categoryIcons + .put(ResourceCategory.PLATFORM.name(), ImageManager.getResourceIcon(ResourceCategory.PLATFORM)); + categoryIcons.put(ResourceCategory.SERVER.name(), ImageManager.getResourceIcon(ResourceCategory.SERVER)); + categoryIcons.put(ResourceCategory.SERVICE.name(), ImageManager.getResourceIcon(ResourceCategory.SERVICE)); + fieldCategory.setValueIcons(categoryIcons); + fieldCategory.setShowHover(true); + fieldCategory.setHoverCustomizer(new HoverCustomizer() { + @Override + public String hoverHTML(Object value, ListGridRecord record, int rowNum, int colNum) { + String cat = record.getAttribute(DataSource.Field.CATEGORY); + if (ResourceCategory.PLATFORM.name().equals(cat)) { + return MSG.common_title_platform(); + } else if (ResourceCategory.SERVER.name().equals(cat)) { + return MSG.common_title_server(); + } else if (ResourceCategory.SERVICE.name().equals(cat)) { + return MSG.common_title_service(); + } + return ""; + } + }); + + setListGridDoubleClickHandler(new DoubleClickHandler() { + @Override + public void onDoubleClick(DoubleClickEvent event) { + ListGrid lg = (ListGrid) event.getSource(); + ListGridRecord selected = lg.getSelectedRecord(); + if (selected != null) { + int resourceTypeId = selected.getAttributeAsInt(DataSource.Field.TYPEID); + String version = selected.getAttribute(DataSource.Field.VERSION); + if (version == null) { + CoreGUI.goToView("#Reports/Inventory/InventorySummary/" + resourceTypeId); + } else { + CoreGUI.goToView("#Reports/Inventory/InventorySummary/" + resourceTypeId + "/" + version); + } + } + } + }); + + setListGridFields(fieldTypeName, fieldPlugin, fieldCategory, fieldVersion, fieldCount); + } + + class DataSource extends RPCDataSource<ResourceInstallCount> { + + public class Field { + public static final String COUNT = "count"; // long that we convert to int + public static final String TYPENAME = "typeName"; // String + public static final String TYPEPLUGIN = "typePlugin"; // String + public static final String CATEGORY = "category"; // ResourceCategory + public static final String TYPEID = "typeId"; // int + public static final String VERSION = "version"; // String + public static final String OBJECT = "object"; + } + + @Override + public ResourceInstallCount copyValues(Record from) { + return (ResourceInstallCount) from.getAttributeAsObject(DataSource.Field.OBJECT); + } + + @Override + public ListGridRecord copyValues(ResourceInstallCount from) { + ListGridRecord record = new ListGridRecord(); + + record.setAttribute(Field.COUNT, Long.valueOf(from.getCount()).intValue()); // we'll never have over Integer.MAX_VALUE, overflow not a worry + record.setAttribute(Field.TYPENAME, from.getTypeName()); + record.setAttribute(Field.TYPEPLUGIN, from.getTypePlugin()); + record.setAttribute(Field.CATEGORY, from.getCategory().name()); + record.setAttribute(Field.TYPEID, from.getTypeId()); + record.setAttribute(Field.VERSION, from.getVersion()); + + record.setAttribute(Field.OBJECT, from); + + return record; + } + + @Override + protected void executeFetch(final DSRequest request, final DSResponse response) { + ResourceGWTServiceAsync resourceService = GWTServiceLookup.getResourceService(); + + resourceService.findResourceInstallCounts(true, new AsyncCallback<List<ResourceInstallCount>>() { + + @Override + public void onSuccess(List<ResourceInstallCount> result) { + response.setData(buildRecords(result)); + response.setTotalRows(result.size()); + processResponse(request.getRequestId(), response); + } + + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_group_pluginConfig_table_failFetch(), caught); + response.setStatus(DSResponse.STATUS_FAILURE); + processResponse(request.getRequestId(), response); + } + }); + } + } + } +} diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java index 3f1ea36..bf501ec 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java @@ -41,6 +41,7 @@ import org.rhq.core.domain.resource.composite.DisambiguationReport; import org.rhq.core.domain.resource.composite.ProblemResourceComposite; import org.rhq.core.domain.resource.composite.RecentlyAddedResourceComposite; import org.rhq.core.domain.resource.composite.ResourceComposite; +import org.rhq.core.domain.resource.composite.ResourceInstallCount; import org.rhq.core.domain.resource.composite.ResourceLineageComposite; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; @@ -338,4 +339,13 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements Re } } + public List<ResourceInstallCount> findResourceInstallCounts(boolean groupByVersions) throws RuntimeException { + try { + List<ResourceInstallCount> result = resourceManager.findResourceInstallCounts(getSessionSubject(), + groupByVersions); + return SerialUtility.prepare(result, "ResourceService.findResourceInstallCounts"); + } catch (Throwable t) { + throw new RuntimeException(ThrowableUtil.getAllMessages(t)); + } + } } diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index 89e06df..2b43eba 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -100,6 +100,7 @@ common_title_configuration = Configuration common_title_compatibleGroups = Compatible Groups common_title_compatibleGroups_total = Compatible Group Total common_title_component_errors = Component errors +common_title_count = Count common_title_custom = Custom common_title_dashboard_name = Dashboard Name common_title_dateCreated = Date Created @@ -166,6 +167,7 @@ common_title_resourceGroups = Resource Groups common_title_resource_inventory = Resource Inventory common_title_resource_id = Resource ID common_title_resource_name = Resource Name +common_title_resource_type = Resource Type common_title_role = Role common_title_roles = Roles common_title_search = Search commit c634cf594803e8d45b401c1ce3af3ae45f9ae041 Author: John Mazzitelli <mazz(a)redhat.com> Date: Wed Mar 2 15:58:34 2011 -0500 make pretty the Reports>CPU/Memory utilization (which is also a dashboard "Platform Summary" portlet) this adds swap as another metric bar in the ui diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java index 1b0a325..84786cf 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformMetricDataSource.java @@ -55,7 +55,7 @@ public class PlatformMetricDataSource extends ResourceDatasource { fields.add(memoryField); DataSourceTextField swapField = new DataSourceTextField("swap", MSG.dataSource_platforms_field_swap()); - // todo swap + fields.add(swapField); return fields; } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java index 95dd1df..4b28abc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/platform/PlatformSummaryPortlet.java @@ -45,6 +45,7 @@ import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageList; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet; import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory; @@ -114,21 +115,48 @@ public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet private void buildUI() { - ListGridField nameField = new ListGridField("name", MSG.common_title_name(), 250); + ListGridField nameField = new ListGridField(ResourceDataSourceField.NAME.propertyName(), MSG + .common_title_name()); nameField.setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { - return "<a href=\"#Resource/" + listGridRecord.getAttribute("id") + "\">" + o + "</a>"; + return "<a href=\"" + LinkManager.getResourceLink(listGridRecord.getAttributeAsInt("id")) + "\">" + o + + "</a>"; } }); + nameField.setWidth("25%"); setFields(nameField); - getField("icon").setWidth(25); + // even though we hide this by default, a user could unhide it, so at least i18n in that case + getField(ResourceDataSourceField.CATEGORY.propertyName()).setCellFormatter(new CellFormatter() { + @Override + public String format(Object value, ListGridRecord record, int rowNum, int colNum) { + String catStr = record.getAttribute(ResourceDataSourceField.CATEGORY.propertyName()); + if (catStr == null) { + return "?"; + } + ResourceCategory cat = ResourceCategory.valueOf(catStr); + switch (cat) { + case PLATFORM: + return MSG.common_title_platform(); + case SERVER: + return MSG.common_title_server(); + case SERVICE: + return MSG.common_title_service(); + } + return "???"; + } + }); + + getField("cpu").setWidth("25%"); + getField("memory").setWidth("25%"); + getField("swap").setWidth("25%"); hideField("id"); - hideField("description"); - hideField("pluginName"); - hideField("category"); - hideField("currentAvailability"); + hideField(ResourceDataSourceField.TYPE.propertyName()); // we could show this, do we want to indicate the kind of platform? + hideField(ResourceDataSourceField.DESCRIPTION.propertyName()); // we could show this, but it makes the table wider + hideField(ResourceDataSourceField.PLUGIN.propertyName()); // its always the platform plugin, no need to show this + hideField(ResourceDataSourceField.CATEGORY.propertyName()); // we only ever show platforms, no need to show this + hideField(ResourceDataSourceField.AVAILABILITY.propertyName()); // the icon badging will indicate availability this.fetchData(new Criteria(ResourceDataSourceField.CATEGORY.propertyName(), ResourceCategory.PLATFORM.name())); } @@ -141,6 +169,7 @@ public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet // this can happen if the agent is down, don't crash out of the entire portlet record.setAttribute("cpu", MSG.common_val_na()); record.setAttribute("memory", MSG.common_val_na()); + record.setAttribute("swap", MSG.common_val_na()); setSortField(1); refreshFields(); @@ -148,22 +177,12 @@ public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet } public void onSuccess(Set<MeasurementData> result) { - for (MeasurementData data : result) { if (data instanceof MeasurementDataNumeric) { record.setAttribute(data.getName(), ((MeasurementDataNumeric) data).getValue()); } } - /*double idle = record.getAttributeAsDouble(CPUMetric.Idle.property); - record.setAttribute("cpu", 1 - idle); - - double totalMem = record.getAttributeAsDouble(MemoryMetric.Total.property); - double usedMem = record.getAttributeAsDouble(MemoryMetric.Used.property); - double percent = usedMem / totalMem; - record.setAttribute("memory", percent); - */ - setSortField(1); refreshFields(); markForRedraw(); @@ -276,7 +295,33 @@ public class PlatformSummaryPortlet extends LocatableListGrid implements Portlet return bar; } + } else if (fieldName.equals("swap")) { + if (listGridRecord.getAttribute(SwapMetric.Total.property) != null) { + HLayout bar = new HLayout(); + bar.setHeight(18); + bar.setWidth100(); + + double total = listGridRecord.getAttributeAsDouble(SwapMetric.Total.property); + double value = listGridRecord.getAttributeAsDouble(SwapMetric.Used.property); + double percent = value / total; + + HTMLFlow text = new HTMLFlow(MeasurementConverterClient.format(percent, + MeasurementUnits.PERCENTAGE, true)); + text.setAutoWidth(); + bar.addMember(text); + + Img first = new Img("availBar/up.png"); + first.setHeight(18); + first.setWidth((percent * 100) + "%"); + bar.addMember(first); + Img second = new Img("availBar/unknown.png"); + second.setHeight(18); + second.setWidth((100 - (percent * 100)) + "%"); + bar.addMember(second); + + return bar; + } } return null; diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java index 76edc27..31a517d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java @@ -87,8 +87,8 @@ public class ResourceDatasource extends RPCDataSource<Resource> { idDataField.setCanEdit(false); fields.add(idDataField); - DataSourceImageField iconField = new DataSourceImageField("icon", ""); - iconField.setImageURLPrefix("types/"); + DataSourceImageField iconField = new DataSourceImageField("icon", " "); + iconField.setWidth(25); fields.add(iconField); DataSourceTextField nameDataField = new DataSourceTextField(NAME.propertyName(), NAME.title(), 200); @@ -204,8 +204,8 @@ public class ResourceDatasource extends RPCDataSource<Resource> { record.setAttribute(TYPE.propertyName(), from.getResourceType().getId()); record.setAttribute(PLUGIN.propertyName(), from.getResourceType().getPlugin()); record.setAttribute(CATEGORY.propertyName(), from.getResourceType().getCategory().name()); - record.setAttribute("icon", from.getResourceType().getCategory().getDisplayName() + "_" - + (from.getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP ? "up" : "down") + "_16.png"); + record.setAttribute("icon", ImageManager.getResourceIcon(from.getResourceType().getCategory(), from + .getCurrentAvailability().getAvailabilityType() == AvailabilityType.UP)); record.setAttribute(AVAILABILITY.propertyName(), ImageManager.getAvailabilityIconFromAvailType(from .getCurrentAvailability().getAvailabilityType())); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index d6db964..89e06df 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -1936,7 +1936,7 @@ view_groupInventoryMembers_title_updateMembership = Update Membership view_reportsTop_title = Reports view_reportsTop_description = This section provides access to global reports. -view_reports_platforms = Cpu And Memory Utilization +view_reports_platforms = CPU And Memory Utilization view_reports_subsystems = Subsystems view_reports_alertDefinitions = Alert Definitions

13 years, 3 months

1
0
0 / 0

[rhq] modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml

by ips

modules/common/ant-bundle/pom.xml | 2 +- modules/common/filetemplate-bundle/pom.xml | 2 +- modules/common/jboss-as/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/core/client-api/pom.xml | 2 +- modules/core/comm-api/pom.xml | 2 +- modules/core/dbutils/pom.xml | 2 +- modules/core/domain/pom.xml | 2 +- modules/core/gui/pom.xml | 2 +- modules/core/native-system/pom.xml | 2 +- modules/core/plugin-api/pom.xml | 2 +- modules/core/plugin-container/pom.xml | 2 +- modules/core/plugin-validator/pom.xml | 2 +- modules/core/plugindoc/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/util/pom.xml | 2 +- modules/enterprise/agent/pom.xml | 2 +- modules/enterprise/agentupdate/pom.xml | 2 +- modules/enterprise/binding/pom.xml | 4 ++-- 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/pom.xml | 2 +- modules/enterprise/remoting/cli/pom.xml | 2 +- modules/enterprise/remoting/client-api/pom.xml | 2 +- modules/enterprise/remoting/client-deps/pom.xml | 2 +- modules/enterprise/remoting/pom.xml | 2 +- modules/enterprise/remoting/webservices/pom.xml | 2 +- modules/enterprise/server/client-api/pom.xml | 4 ++-- 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-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-email/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-irc/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-operations/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-roles/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 ++-- modules/enterprise/server/plugins/alert-subject/pom.xml | 4 ++-- modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/cobbler/pom.xml | 4 ++-- modules/enterprise/server/plugins/disk/pom.xml | 2 +- modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/groovy-script/pom.xml | 4 ++-- modules/enterprise/server/plugins/jboss-software/pom.xml | 2 +- modules/enterprise/server/plugins/packagetype-cli/pom.xml | 4 ++-- modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml | 2 +- modules/enterprise/server/plugins/perspectives/core/pom.xml | 2 +- modules/enterprise/server/plugins/pom.xml | 2 +- modules/enterprise/server/plugins/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/bundleGen/pom.xml | 4 ++-- modules/helpers/perftest-support/pom.xml | 4 ++-- 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/byteman/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/hadoop/pom.xml | 2 +- modules/plugins/hibernate/pom.xml | 2 +- modules/plugins/hosts/pom.xml | 2 +- modules/plugins/hudson/pom.xml | 4 ++-- modules/plugins/iis/pom.xml | 2 +- modules/plugins/irc/pom.xml | 2 +- modules/plugins/jboss-as-5/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/kickstart/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/script2/pom.xml | 2 +- modules/plugins/snmptrapd/pom.xml | 2 +- modules/plugins/sshd/pom.xml | 2 +- modules/plugins/sudoers/pom.xml | 2 +- modules/plugins/tomcat/pom.xml | 2 +- modules/plugins/twitter/pom.xml | 2 +- modules/plugins/validate-all-plugins/pom.xml | 2 +- modules/plugins/virt/pom.xml | 2 +- modules/pom.xml | 2 +- modules/test-utils/pom.xml | 2 +- pom.xml | 2 +- 115 files changed, 133 insertions(+), 133 deletions(-) New commits: commit 806847a9bdb9cb326da728635f263ab9241ba481 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Mar 7 12:01:40 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 7a46e4e..71f43e7 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.Beta1</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 d26a810..1c84528 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.Beta1</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 c2adf42..110c8a1 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.Beta1</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 ffe160e..bb61b03 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 55e917c..e5ea9a1 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.Beta1</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 724d965..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.Beta1</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 fe5f14e..e2b59a9 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.Beta1</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 5a398b4..2b84a8b 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.Beta1</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 3af1695..884e360 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.Beta1</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 7e51726..eb11f1a 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 672605c..18846ad 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.Beta1</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 df8b3f1..ad82fe0 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.Beta1</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 0abe942..5adfabf 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.Beta1</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 73f16d6..2e5c467 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.Beta1</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 84bc5dd..2bafeac 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 7705090..a080670 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.Beta1</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 65435a5..76c9071 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 74eed41..2d1ea0b 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index f5dd125..5b4ee27 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-script-bindings</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index 0920927..c029f62 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 926a6de..4d79169 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index ac085d0..877f9f5 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 29ab8ee..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.Beta1</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 c3da41e..09c58dd 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index f3130ea..c36a444 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index 9a731ca..f81b4c2 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 50c31f8..808b267 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index d36a2b4..b6461ea 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 0787238..1c5207c 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 6c4b1c5..872ac37 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index 67659ce..1630e51 100644 --- a/modules/enterprise/remoting/client-deps/pom.xml +++ b/modules/enterprise/remoting/client-deps/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 0dcf0dc..b7a9a46 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index ddea860..097e3c2 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index 0178789..fc4d0e7 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -5,13 +5,13 @@ <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index d07988b..2376311 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 27ea269..1ec4552 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 43e7561..220eee6 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 66747bd..5b9ff73 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index 871cccb..dadc2e4 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Script Alert Plugin</name> <description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index fb3d559..54891ae 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index 7ab811c..d9e695c 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index b63ac9f..a270432 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Log4J Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index aee9b42..3ebc711 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 2bcb08a..21a353d 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 3d04901..8be5518 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Opertions Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 3b3cc32..390b329 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index c288f5c..7b494d7 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 5152f39..635aa9c 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index fe15ded..13260a0 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.Beta1</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 8fc3b0c..b58a7ae 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 1683752..34f0e08 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.Beta1</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 48fe1cb..ebf0154 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml index 413ab87..e3c202b 100644 --- a/modules/enterprise/server/plugins/groovy-script/pom.xml +++ b/modules/enterprise/server/plugins/groovy-script/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>groovy-script-server-plugin</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server Groovy Script Plugin</name> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 9e1ade8..659622f 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index 5651294..bb8019d 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index 01e87de..f695982 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 57a1d3e..287d62e 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index e3d93ac..2ebb23e 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index ec9557d..1c8d17c 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.Beta1</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 4c5c608..56adc17 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.Beta1</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 2f1ff57..3ec9918 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.Beta1</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 0850e35..f22634e 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.Beta1</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 20c536a..12ea01d 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index 396fe2d..b1c400f 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.Beta1</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 822c82f..4ed8677 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index d50a64a..5dfa3a0 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 7e61cb5..49b64f7 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <build> <plugins> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index c1d68c9..b3085a3 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 3368bb3..15126b3 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 557ae38..612f9cd 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.Beta1</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 2397c63..4e89419 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.Beta1</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 080bec6..887eb25 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.Beta1</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 2b87c31..0cfa72c 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.Beta1</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 7cec1c5..48528ba 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 6dcb67d..d4111a3 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.0.0.Beta1</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 93e2785..bfd354f 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.Beta1</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 31a8ae3..eaf87a7 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.Beta1</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 e53bc25..4b0ec48 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.Beta1</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 7c0056e..32503ea 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.Beta1</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 bbeb0d7..02f0c58 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index 6df9776..4179f3d 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.0.0.Beta1</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 f7d68cf..1775ae1 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.0.0.Beta1</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 2a43773..e9f147d 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.Beta1</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 2b429ae..71c974a 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index cf4b03b..b58b28c 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index b399865..df8ea6b 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</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 08ee960..1e9183e 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.Beta1</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 f40c7a4..94e111a 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.Beta1</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 297c491..070ed5e 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.Beta1</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 c427b55..4d15790 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.Beta1</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 2738a2b..57d44c0 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index ab41a41..dd0035e 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.0.0.Beta1</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 9a0d0c3..cfbb26e 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.Beta1</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 26aa524..1987cfb 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.Beta1</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 ff8ff8c..e6d37b9 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.Beta1</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 a45a2e8..a84f95d 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.Beta1</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 6919e28..ed3f654 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.Beta1</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 774a3b0..f39e509 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index dcee192..b4c9c4c 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.Beta1</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 d39f06f..0e5b102 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.Beta1</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 537e456..37dfc09 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.Beta1</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 f42151f..60c4245 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.Beta1</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 a0ab798..00be871 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.Beta1</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 4b0eb9c..3627ab7 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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 2f5a6a9..d6fa9c4 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.0.0.Beta1</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 71e39e2..e0750eb 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.Beta1</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 e0698ed..f00f113 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.Beta1</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 d921388..8a88bb4 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.Beta1</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 5db064a..37d52a1 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.Beta1</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 441b462..1993f61 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.Beta1</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 c918dc2..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.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 82fe96b..c16d198 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index f9899a7..f760f66 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.Beta1</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 2e8d8ae..cb02492 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index 920c6a5..ba31907 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.0.0.Beta1</version> + <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name>

13 years, 3 months

1
0
0 / 0

[rhq] Changes to 'refs/tags/RHQ_4_0_0_Beta1'

by ips

Tag 'RHQ_4_0_0_Beta1' created by Ian Springer <ian.springer(a)redhat.com> at 2011-03-07 17:01 +0000 [maven-release-plugin] copy for tag RHQ_4_0_0_Beta1 Changes since RHQ_4_0_0_B03: Heiko W. Rupp (8): Update site plugin version Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq Put cobertura version in a variable. Update developer/contributor info. Prevent pulling an old version of TestNG through test-utils and the used unitils. Some more translations. Prevent an NPE if no Description is set. Fix two translation properties, which were missing placeholders Ian Springer (31): finish hooking up member execution order support to datasource on group operation schedule detail view (for both new and existing operation schedules); add support for displaying operation parameters on resource and group operation schedule details views for existing operation schedules; a couple small bug fixes to operations GUI fix a couple bugs in RoleManager, one of which was causing role creation to fail if the role had any associated resource groups a few locator fixes; clear message bar when user goes to a new url only clear the message bar if we're rendering a new view, rather than performing a refresh of the current view for list of maps where list is read-only or entire config is read-only, show a view icon, rather than an edit icon and enable the OK button in the popup map editor; add test views under #Test for read-only config editor and read-only group config editor change "get started" link from "/Login.do" to "/" (https://bugzilla.redhat.com/show_bug.cgi?id=664567) several small authz-related fixes to user edit view disable enable/disable/set-interval controls on metric schedule views if logged-in user does not have the required permissions (https://bugzilla.redhat.com/show_bug.cgi?id=536281) switch operations context menu on resource tree to link to operations>schedule subtab, rather than opening a wizard; delete the schedule-operation wizard classes, which are no longer used i18n all operations views fix so unset checkboxes are disabled when editor is in read-only mode (https://bugzilla.redhat.com/show_bug.cgi?id=642546) add "reloadable" boolean flag to config editor, which is set to true only if the constructor which places the config editor in charge of loading the config and config def is used redirect to config history subtab after a successful resource config update, and also include the config update id (i.e. "version") in the success message (https://bugzilla.redhat.com/show_bug.cgi?id=640270) hide button bar (i.e. Save button) on resource config edit view until the resource config has been successfully loaded (https://bugzilla.redhat.com/show_bug.cgi?id=561063) fix list of maps editing in config editor; fix several other minor config editor bugs make email-address validation regexp accept addresses with a non-qualified hostname portion (e.g. root@localhost) (https://bugzilla.redhat.com/show_bug.cgi?id=681621) upgrade ojdbc5 (Oracle JDBC driver) dep from 11.2.0.1.0 to 11.2.0.2.0 add javadoc fix various bugs related to open-maps in config editor; fix PropertyList entity so order of list elements is maintained when a list prop is loaded from the DB remove Redirecting to coregui.war message from portal-war redirect page to make redirect less obvious; remove commented-out Struts taglibs from portal-war web.xml; fix typo in config editor build sources and javadoc jars when release profile is activated cosmetic fix to git checkout don't build the tag, since we always want to do that from a Hudson job change some of the prop types in viewProcessList op's results from integer to long; make sure Save button is enabled on op schedule details page when fields not on the main form are changed fix layout bug in config editor that was causing op params and results not to be displayed on op history details view (may have also affected other views) (https://bugzilla.redhat.com/show_bug.cgi?id=682341) pass -DskipTests=true, rather than -Dmaven.test.skip=true fix parent pom move javadoc/sources jar publishing to 'publish' profile, rather than 'release' profile temporarily turn off test build and release:prepare dry run [maven-release-plugin] prepare release RHQ_4_0_0_Beta1 Jay Shaughnessy (8): Infrastructure for Dashboard-based group and resource summary pages. fix some jdoc links Combine the footer and the message bar such that all of the info is now Fix merge problems add back refresh protection for message bar clearing Lazy Create SubTab Views Width Handling for Dashboards Add Activity2 (Dashboard style) subtab for Summary Tab in John Mazzitelli (64): BZ 640423 - make save&recalculate button work BZ 645723 - format Id number without commas BZ 641180 "Down servers" is now labeled "unavailable servers" BZ 636714 - provide a new color picker component - uses less real estate and avoids picking invalid colors final clean up of dynagroup edit/new page: BZ 569824 add a basic email address validation regex don't launch a separate browser tab/window when clicking the parent link - keep in the same browser space BZ 561924 - make sure the modified time changes when updating an alert def BZ 571873 gracefully create the alert def even if the description is too long. just truncate the desc BZ 535780 - disable cache when user is downloading agent/cli/connectors/bundle tool BZ 535806 validate the number fields so they accept only decimals part of BZ 535817 - the Current resource config tab now gets the live config from the agent move ui pojos to domain module so coregui will be able to use these rename org.rhq.enterprise.server.measurement.uibean to org.rhq.core.domain.measurement.ui since these are now in the domain module add serial uid add new meas charts gwt service initial stab at gwt meas table view for resource the gwt date range component is now working. we need our ui pages to use it now. add meas schedule gwt service - use it to get all measurement schedules for monitor>tables view Merge commit 'origin/master' into metric-table-ui format the metric values finishing the work to support "live data" view. If you now go to the measurement table subtab, select one or more metrics and click "live data" button, you'll get a popup of all the live data as retreived from the agent this class already supports double-clicking to show details (TableSection). part of BZ 679130 - add rollback button to resource config history view bz 679130 more fixing of the res config history page bz 679130 - finish the resource config history page. ask for confirmation before rolling back give the id column the title of "version" to be consistent with a) the old JSF ui and b) the current group plugin config UI now that we no longer have tabs, we lost the ability to give a title to the config remove the ugly labels, use the new config editor title pad the search bar with a small amount of space the start of the resource plugin config history pages remove this file, the table will be the view now (will check that in separately) adding auth check to res config history views remove unused imports dont' refresh the entire ui, just the table more code to support plugin configuration history pages refactor the config history views to abstract out the parts that are reusable for plugin config views fix genrics compile problem fix some plugin config history things part of BZ 680167 - this illustrates how to fix this RefreshableView bug for those views that have this bug. be able to clear the gwt rpc statistics and to refresh the page be able to export the stats as CSV text. pops up the text in a window so you can copy-n-paste into your favorite spreadsheet software take spaces out of remote stats view url show stats in window so you can navigate around and see the stats add ability to set an auto-refresh timer. BZ 680167 - this follows the same pattern as did GroupResourceConfigurationEditView BZ 680167 - this has the bug too - after adding the refreshing stuff, it is working better now (no dup queries) BZ 680167 forgot to reset the refreshing flag on load error, otherwise it would never refresh again on load failure now if you hit control-shift-S, you will get the statistics table window BZ 680167 - do not perform multiple loads unnecessarily BZ 680167 - add load handler to config editor so we know when the config editor has fully loaded its config and config def when the window is closed, make sure we stop auto-refresh by canceling the timer I guess it would be good if I put the code in the correct close handler. BZ 680164 - you now see a info message rather than a ugly error/failure message BZ 680158 - if the canvas isn't visible yet, make it so via show() do not go to a different browser tab/window when clicking link rename view class so it is consistent with the names of the group/indiv resource/plugin config edit views Merge commit 'origin/master' into group-config-history Merge commit 'origin/master' into group-config-history Merge commit 'origin/master' into group-config-history firs try at group resource config history Merge commit 'origin/master' into group-config-history fix for legacy support - it seems the old UI persisted empty strings for some preference values. John Sanda (1): [maven-release-plugin] prepare for next development iteration Lukas Krejci (88): Adding the new maven module for the cli alert plugin Starting to rip out common ScriptEngine bindings out of the CLI code into a reusable component that could be used on the serverside without a standard input attached. The scripting engine can now be initialized with the standard bindings in a reusable way without being tied to remoting and CLI "user interface". don't blow up on the pretty printing of empty property lists adding the test-jar dependency on core.domain to make the tests work again. bind the controller's methods in the global scope of CLI unbreak the interactive configuration editors in the resource proxies. Merge branch 'master' into cli-alert-notifs remove unused imports Defining a new implementation of the RhqFacade that uses the local SLSBs and created a new server/client-api module for it to be used for running the server-side CLI scripts. Some initial code for the alert-cli plugin. dev profile and cobertura support in the new maven modules. Merge branch 'master' into cli-alert-notifs Added the ability to read in the latest version of a package. The "latest" version is based on the ability of the content source to compare versions of the packages it provides. Package types can now exist independently of the resource types. moving OSGiVersionComparator from core-util to core-domain so that GWT compilation has access to its source. CliSender implemented. Not so much the supporting infrastructure around it. exposing slightly more data from the disambiguation report by exposing the full "resource" (i.e. id, name and type) also for the resource representing the "original". Adding support for finalization and validation of the alert parameters and extra parameters by the alert senders. starting to implement the CLI alert plugin controls to support re-enabling of corrupted alerts after user deletion. Merge remote branch 'origin/master' into cli-alert-notifs Specifically ask for full path while asking the disambiguate() method to generate the resource paths. consider cli notifications with no userId property at all invalid (these should never exist, but one never knows). implemented re-assigning of cli alert notifications to different users. Adding support for meaningful SenderResult and configuration preview, adding repoId as the required parameter to the CLI alert script so that it is clear what repo should be used to get the package from. Merge remote branch 'origin/master' into cli-alert-notifs start of the CLI alert def UI, package criteria object. This doesn't even compile and will have to wait until more elaborate privileges are implemented. some CLI Alert sender GUI related work Hardcode the package type used by CLI alert sender and init it on the plugin load. The repos will be uploaded to any repo user will have access to, so no need for the "uploadRepoName" config. The validateAndFinalizeConfiguration() method on the AlertSender now has a Subject argument, so that it has the complete picture of who's requesting the configuration update and what it actually is. Make sure no spaces end up in the names of the form items. SmartGWT doesn't like it. More CLI script alert GUI work. Rewriting the queries for package types with possibly null resource type. ...resourceType.id = ? wouldn't work if the parameter was null. small i18n Merge remote branch 'origin/master' into cli-alert-notifs First round of changes to implement public/private repos. UI and actual tests coming. force the owner of a repo if the creator/updater is not repo manager. dbsetup now correctly sets up the rhqadmin user to have MANAGE_REPOSITORIES, UI work on repo details page. adding the capability to put a ScriptEngine in a security sandbox. adding the binding and client-api modules into the server build. CLI alert sender runs the script in a sandbox with a timeout. adding ability to delete a package version from a repo manually. Running the RHQ server with the security manager turned on, with all permissions. this is to support CLI script sandboxing. UI updates for JSF UI: GWT UI for CLI alert notification editing. Yet to be finished. Correctly reinitializing CreateRepoUIBean so that cancelling works once again. plain views for JSF content UI. Simplify the interfaces in the LocalClient in the same way we do it in the RemoteClient so that serverside and remote CLI scripts have the same APIs bound. lowering the logging level when outputting the package version bits so that the logs don't get spammed during correct behavior. beefing up the exporter a bit so that it can be used from within the scripts more comfortably (the API hasn't changed). BZ 678551 - fixing the authz logic in the hq:authorization JSP tag. Merge branch 'master' into cli-alert-notifs added validation support to the cli alert sender. added configuration support for MANAGE_REPOSITORIES permission in the role editor. adding support for querying packages together with their latest versions. updating the package upload mechanism to: throw an actual exception on notification validation failure. A lot of improvements on the CLI notification editor. Make sure to find the local method on the invocation handler even if it is defined in the super classes. Final touches on the CLI alert sender UI. moving about some tests. Merge remote branch 'origin/master' into cli-alert-notifs Adding some more permissions to StandardScriptPermissions so that we block as little as possible while remaining reasonably safe. CLI alert sender fixes: Merge remote branch 'origin/master' into cli-alert-notifs fail the validation if another user is entered with incorrect credentials. Deleting a user will cause all the repos s/he owned to have no owner and thus become readonly to anyone except repository managers. Deleting a user will therefore not cause disappearance of any packages s/he previously created and that might be used throughout the inventory as backing content for resources or as CLI scripts. Make the CLI alert plugin controls for managing invalid alert definitions actually work and return more useful data. remove unused import small changes in the script engine factory, more useful configuration preview and error messages in the CliSender. Suggesting the package version in the upload form of the CLI notification editor. remove e.printStacktrace(), import classes instead of using full names. Caching custom interfaces for resource proxies obtained from ProxyFactory. This rather huge commit contains the following changes: Updating the CLI notification form to make use of the version formatting info provided by the package type behaviors. Merge remote branch 'origin/master' into cli-alert-notifs forgot to change the cli package type name to the new value in the cli package type plugin itself, d'oh! :) Finish i18n of the CLI notification form + a minor correction in setting the version field. Fixing the ContentManagerLocal.getUploadedPackageVersion() and thus enabling the content upload from the resource content tab again. Creating *-plain.xhtml views for rhq/resource/content pages. These are *NOT* finished as they still contain links to "full" views. fixing db-upgrade to successfully add the "is_private" column on rhq_repo. Merge remote branch 'origin/master' into cli-alert-notifs OSGiVersionComparator works again. Fixing the ResourceFactoryManagerBeanTest and the bundle tests by correctly initializing the server plugin master container. Whenever we create a package, we need a package type plugin container initialized now. ok, now the ResourceFactoryManagerTest *really* works.. ;) execute the DatabaseAndFilePluginDeploymentTest only after all the tests from plugin.metadata group have been executed, so that the rhq_plugin table is cleaned up. do *NOT* reset the bindings of the script engine on issuing a command in the CLI. That would clear any user defined variables... Simeon Pinder (18): initial groupActivity commit: i)measurementData for group changes event query updates for groups i)recent operations summary for groups fix issue with display name in link for group Ops. enable group config query. More work needed here as group config changes not currently supported. fix/enable group metric summary activity region. enable group Activity OOB content. Criteria method seemed non-trivial and not useful beyond this one case. BZ:679200: finish conversion from Http get to Post during login requests. Embedded url no longer displays. enable Pkg History for Group Activity page. Added new InstalledPackageHistoryCriteria class. enable Bundles view for Group Activity page. Include new criteria. enable 'see more...' links for Resource/Group Activity pages where applicable. i)conditionally display recently deployed bundles for groups/resources of platforms. change images for package history items to be different from Bundle images an fix for bundle display region separator. enable refresh for Resource/Group Activity pages. modify group activity display to display with facet availability. modify resource activity regions to enable on facet availability. swapping 'Dashboard' Group ActivityView content with Group ActivityView2 content. copy/paste bug with Group Activity. Using wrong id in query. --- etc/eclipse-tools/RHQ | 42 modules/common/ant-bundle/pom.xml | 34 modules/common/filetemplate-bundle/pom.xml | 32 modules/common/jboss-as/pom.xml | 42 modules/common/pom.xml | 2 modules/core/client-api/pom.xml | 34 modules/core/comm-api/pom.xml | 2 modules/core/dbutils/pom.xml | 32 modules/core/dbutils/src/main/scripts/dbsetup/authz-data.xml | 1 modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 6 modules/core/dbutils/src/main/scripts/dbsetup/dashboard-schema.xml | 5 modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 81 modules/core/domain/pom.xml | 33 modules/core/domain/src/main/java/org/rhq/core/domain/alert/notification/AlertNotification.java | 17 modules/core/domain/src/main/java/org/rhq/core/domain/auth/Subject.java | 27 modules/core/domain/src/main/java/org/rhq/core/domain/authz/Permission.java | 8 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/AbstractConfigurationUpdate.java | 5 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/AbstractResourceConfigurationUpdate.java | 9 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PluginConfigurationUpdate.java | 7 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/PropertyList.java | 8 modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ResourceConfigurationUpdate.java | 7 modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageType.java | 7 modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersion.java | 79 modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersionContentSource.java | 11 modules/core/domain/src/main/java/org/rhq/core/domain/content/PackageVersionFormatDescription.java | 91 + modules/core/domain/src/main/java/org/rhq/core/domain/content/Repo.java | 90 - modules/core/domain/src/main/java/org/rhq/core/domain/content/RepoPackageVersion.java | 14 modules/core/domain/src/main/java/org/rhq/core/domain/content/ValidatablePackageDetailsKey.java | 107 + modules/core/domain/src/main/java/org/rhq/core/domain/content/composite/PackageAndLatestVersionComposite.java | 85 modules/core/domain/src/main/java/org/rhq/core/domain/content/composite/PackageTypeAndVersionFormatComposite.java | 68 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/AlertDefinitionCriteria.java | 21 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/BundleDeploymentCriteria.java | 7 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/DashboardCriteria.java | 126 + modules/core/domain/src/main/java/org/rhq/core/domain/criteria/GroupBundleDeploymentCriteria.java | 55 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/InstalledPackageHistoryCriteria.java | 110 + modules/core/domain/src/main/java/org/rhq/core/domain/criteria/PackageCriteria.java | 92 + modules/core/domain/src/main/java/org/rhq/core/domain/criteria/RepoCriteria.java | 13 modules/core/domain/src/main/java/org/rhq/core/domain/criteria/ResourceBundleDeploymentCriteria.java | 55 modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/Dashboard.java | 66 modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/DashboardCategory.java | 68 modules/core/domain/src/main/java/org/rhq/core/domain/dashboard/DashboardPortlet.java | 6 modules/core/domain/src/main/java/org/rhq/core/domain/event/Event.java | 7 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementOOB.java | 17 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/ui/BaseMetricDisplay.java | 392 ++++ modules/core/domain/src/main/java/org/rhq/core/domain/measurement/ui/MeasurementSummary.java | 133 + modules/core/domain/src/main/java/org/rhq/core/domain/measurement/ui/MetricDisplayConstants.java | 70 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/ui/MetricDisplaySummary.java | 222 ++ modules/core/domain/src/main/java/org/rhq/core/domain/measurement/ui/MetricDisplayValue.java | 81 modules/core/domain/src/main/java/org/rhq/core/domain/resource/Resource.java | 13 modules/core/domain/src/main/java/org/rhq/core/domain/resource/composite/DisambiguationReport.java | 43 modules/core/domain/src/main/java/org/rhq/core/domain/resource/group/ResourceGroup.java | 13 modules/core/domain/src/main/java/org/rhq/core/domain/util/DisambiguationReportRenderer.java | 683 +++++++ modules/core/domain/src/main/java/org/rhq/core/domain/util/OSGiVersion.java | 169 + modules/core/domain/src/main/java/org/rhq/core/domain/util/OSGiVersionComparator.java | 68 modules/core/domain/src/test/java/org/rhq/core/domain/test/QueriesTest.java | 2 modules/core/domain/src/test/java/org/rhq/core/domain/util/DisambiguationReportRendererTest.java | 184 ++ modules/core/domain/src/test/java/org/rhq/core/domain/util/OSGiVersionComparatorTest.java | 82 modules/core/gui/pom.xml | 2 modules/core/native-system/pom.xml | 38 modules/core/plugin-api/pom.xml | 32 modules/core/plugin-container/pom.xml | 48 modules/core/plugin-validator/pom.xml | 2 modules/core/plugindoc/pom.xml | 2 modules/core/pom.xml | 4 modules/core/util/pom.xml | 32 modules/core/util/src/main/java/org/rhq/core/util/OSGiVersionComparator.java | 94 - modules/core/util/src/test/java/org/rhq/core/util/OSGiVersionComparatorTest.java | 80 modules/enterprise/agent/pom.xml | 44 modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/i18n/AgentI18NResourceKeys.java | 2 modules/enterprise/agentupdate/pom.xml | 30 modules/enterprise/binding/pom.xml | 366 ++++ modules/enterprise/binding/src/main/java/org/rhq/bindings/SandboxedScriptEngine.java | 193 ++ modules/enterprise/binding/src/main/java/org/rhq/bindings/ScriptEngineFactory.java | 142 + modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardBindings.java | 178 + modules/enterprise/binding/src/main/java/org/rhq/bindings/StandardScriptPermissions.java | 107 + modules/enterprise/binding/src/main/java/org/rhq/bindings/client/AbstractRhqFacadeProxy.java | 103 + modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientFactory.java | 213 ++ modules/enterprise/binding/src/main/java/org/rhq/bindings/client/ResourceClientProxy.java | 657 +++++++ modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqFacade.java | 132 + modules/enterprise/binding/src/main/java/org/rhq/bindings/client/RhqManagers.java | 116 + modules/enterprise/binding/src/main/java/org/rhq/bindings/engine/JsEngineInitializer.java | 73 modules/enterprise/binding/src/main/java/org/rhq/bindings/engine/ScriptEngineInitializer.java | 60 modules/enterprise/binding/src/main/java/org/rhq/bindings/export/ExportException.java | 43 modules/enterprise/binding/src/main/java/org/rhq/bindings/export/Exporter.java | 121 + modules/enterprise/binding/src/main/java/org/rhq/bindings/output/TabularWriter.java | 708 +++++++ modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ConfigurationClassBuilder.java | 158 + modules/enterprise/binding/src/main/java/org/rhq/bindings/util/InterfaceSimplifier.java | 128 + modules/enterprise/binding/src/main/java/org/rhq/bindings/util/LazyLoadScenario.java | 44 modules/enterprise/binding/src/main/java/org/rhq/bindings/util/PackageFinder.java | 144 + modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ResourceTypeFingerprint.java | 182 ++ modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptAssert.java | 421 ++++ modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptAssertionException.java | 57 modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ScriptUtil.java | 181 ++ modules/enterprise/binding/src/main/java/org/rhq/bindings/util/ShortOutput.java | 27 modules/enterprise/binding/src/main/java/org/rhq/bindings/util/SummaryFilter.java | 127 + modules/enterprise/binding/src/test/java/org/rhq/bindings/FakeRhqFacade.java | 185 ++ modules/enterprise/binding/src/test/java/org/rhq/bindings/ScriptEngineTest.java | 111 + modules/enterprise/binding/src/test/java/org/rhq/bindings/TabularWriterTest.java | 397 ++++ modules/enterprise/binding/src/test/java/org/rhq/bindings/util/ScriptAssertTest.java | 92 + modules/enterprise/binding/src/test/java/org/rhq/bindings/util/ScriptUtilTest.java | 40 modules/enterprise/binding/src/test/java/org/rhq/bindings/util/SummaryFilterTest.java | 103 + modules/enterprise/binding/src/test/resources/allow-all.policy | 3 modules/enterprise/comm/pom.xml | 32 modules/enterprise/gui/base-perspective-jar/pom.xml | 2 modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/AbstractPerspectiveResourceUIBean.java | 2 modules/enterprise/gui/base-perspective-jar/src/main/java/org/rhq/enterprise/server/perspective/PerspectiveClientUIBean.java | 4 modules/enterprise/gui/base-perspective-war/pom.xml | 2 modules/enterprise/gui/content_http-war/pom.xml | 2 modules/enterprise/gui/coregui/pom.xml | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java | 70 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Footer.java | 49 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ImageManager.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 21 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/UserSessionManager.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/PermissionsEditor.java | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/templates/TemplateSchedulesView.java | 26 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UserEditView.java | 45 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersDataSource.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractNotificationSenderForm.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/CliNotificationSenderForm.java | 704 +++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewConditionEditor.java | 21 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/NewNotificationEditor.java | 20 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceOperationNotificationSenderForm.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SimpleNotificationSenderForm.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemRolesNotificationSenderForm.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SystemUsersNotificationSenderForm.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationComparisonView.java | 22 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 519 +++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/GroupConfigurationEditor.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/PropertyMapListGridRecord.java | 75 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/AbstractRecordEditor.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/ColorButtonItem.java | 97 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/DurationItem.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/EnhancedDynamicForm.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/RadioGroupWithComponentsItem.java | 92 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/form/TimeUnit.java | 42 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/measurement/MeasurementRangeEditor.java | 194 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/sorter/ReorderableList.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java | 21 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/Table.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/trigger/JobTriggerEditor.java | 55 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/FileUploadForm.java | 22 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/upload/PackageVersionFileUploadForm.java | 104 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardContainer.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java | 210 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 45 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalColumn.java | 27 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java | 95 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/footer/FavoritesButton.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ConfigurationGWTService.java | 20 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ContentGWTService.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/DashboardGWTService.java | 11 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/EventGWTService.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/GWTServiceLookup.java | 12 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementChartsGWTService.java | 50 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java | 5 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementScheduleGWTService.java | 35 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/OperationGWTService.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/SubjectGWTService.java | 8 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleListView.java | 28 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/UpdateCollectionIntervalWidget.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDataSource.java | 15 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java | 34 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDataSource.java | 42 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 94 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/ExecutionSchedule.java | 311 --- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationCreateWizard.java | 157 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationParametersStep.java | 78 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/OperationSchedulingStep.java | 430 ---- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java | 478 +++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/SingleGroupDefinitionView.java | 170 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupContextMenu.java | 113 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java | 189 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java | 245 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationSettings.java | 150 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationTable.java | 276 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java | 86 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/CurrentGroupPluginConfigurationView.java | 236 -- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java | 249 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java | 96 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationTable.java | 97 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesView.java | 18 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDataSource.java | 24 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleDetailsView.java | 73 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java | 673 +++++++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView2.java | 221 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceDatasource.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 317 ++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 110 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java | 290 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryView.java | 176 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDataSource.java | 143 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryDetailView.java | 18 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java | 158 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java | 92 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java | 25 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDataSource.java | 124 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryDetailView.java | 91 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationHistoryView.java | 103 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceResourceAgentView.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesView.java | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableDataSource.java | 157 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java | 165 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDataSource.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleDetailsView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/Activity2View.java | 203 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java | 377 +--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryPackageStep.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/resource/disambiguation/ReportDecorator.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java | 28 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationFactory.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestConfigurationView.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestGroupConfigurationView.java | 14 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestReadOnlyConfigurationView.java | 41 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/configuration/TestReadOnlyGroupConfigurationView.java | 41 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/i18n/TestRemoteServiceStatisticsView.java | 292 +++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/BrowserUtility.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/MeasurementUtility.java | 28 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/RPCDataSource.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/StringUtility.java | 27 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java | 16 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageCenterView.java | 62 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java | 237 ++ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceChangeListener.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferenceNames.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/UserPreferences.java | 106 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/rpc/RemoteServiceStatistics.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableWindow.java | 10 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ConfigurationGWTServiceImpl.java | 107 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ContentGWTServiceImpl.java | 45 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/DashboardGWTServiceImpl.java | 19 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/EventGWTServiceImpl.java | 9 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementChartsGWTServiceImpl.java | 119 + modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java | 27 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementScheduleGWTServiceImpl.java | 50 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/OperationGWTServiceImpl.java | 58 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/PackageVersionFileUploadServlet.java | 24 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/SubjectGWTServiceImpl.java | 8 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 2 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 282 ++- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 22 modules/enterprise/gui/coregui/src/main/webapp/WEB-INF/web.xml | 16 modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/content/Package_16.png |binary modules/enterprise/gui/coregui/src/main/webapp/images/subsystems/content/Package_24.png |binary modules/enterprise/gui/installer-war/pom.xml | 2 modules/enterprise/gui/pom.xml | 2 modules/enterprise/gui/portal-war/pom.xml | 28 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/agentupdate/AgentUpdateServlet.java | 6 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/client/RemoteClientServlet.java | 6 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/common/tag/FunctionTagLibrary.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateContentSourceUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateNewPackageUIBean.java | 90 - modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/CreateRepoUIBean.java | 65 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoDetailsUIBean.java | 66 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/content/RepoPackageVersionsUIBean.java | 25 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/download/DownloadServlet.java | 6 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/group/ViewGroupConnectionPropertyDetailsUIBean.java | 12 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java | 13 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/CompareMetricsFormPrepareAction.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/IndicatorChartsAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ListChildrenAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/MetricsDisplayForm.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/MetricsDisplayFormPrepareAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ResourceMetricsFormPrepareAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/common/monitor/visibility/ViewChartFormPrepareAction.java | 4 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/action/resource/group/monitor/ListChildrenAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/portlet/recentlyApproved/ViewAction.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/taglib/Authorization.java | 12 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/legacy/util/MonitorUtils.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/graphs/IndicatorChartsUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/tables/MetricsTableUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/measurement/tables/resource/ResourceMetricsTableUIBean.java | 2 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/uibeans/AutoGroupCompositeDisplaySummary.java | 3 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/uibeans/CompGroupCompositeDisplaySummary.java | 3 modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/util/EnterpriseFacesContextUtility.java | 18 modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/web.xml | 62 modules/enterprise/gui/portal-war/src/main/webapp/index.html | 10 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/advisoryInfo-plain.xhtml | 137 + modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-add-map-plain.xhtml | 58 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-edit-map-plain.xhtml | 59 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-plain.xhtml | 512 +++++ modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-view-map-plain.xhtml | 58 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-add-map-plain.xhtml | 57 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-edit-map-plain.xhtml | 58 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createContentProvider-plain.xhtml | 152 + modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createRepo-plain.xhtml | 90 + modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/createRepo.xhtml | 15 modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml | 118 + modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders-plain.xhtml | 171 + modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos-plain.xhtml | 151 + modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/packageVersion-plain.xhtml | 192 ++ modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml | 893 ++++++++++ modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo.xhtml | 118 + modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations-plain.xhtml | 288 +++ modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoSubscriptions-plain.xhtml | 282 +++ modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/audit-trail-item-plain.xhtml | 83 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml | 196 ++ modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-delete-plain.xhtml | 70 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/create-plain.xhtml | 149 + modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-item-plain.xhtml | 131 + modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-plain.xhtml | 189 ++ modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-step-details-plain.xhtml | 57 modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription_packages-plain.xhtml | 114 + modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/update-plain.xhtml | 154 + modules/enterprise/gui/portal-war/src/test/java/org/rhq/enterprise/gui/legacy/util/MonitorUtilsTest.java | 6 modules/enterprise/gui/webdav-war/src/main/java/org/rhq/gui/webdav/MeasurementDataResource.java | 2 modules/enterprise/pom.xml | 8 modules/enterprise/remoting/cli/pom.xml | 64 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/SummaryFilter.java | 127 - modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/TabularWriter.java | 708 ------- modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/HelpCommand.java | 2 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/LoginCommand.java | 8 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/commands/ScriptCommand.java | 163 - modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/export/ExportException.java | 43 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/export/Exporter.java | 86 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ConfigurationEditor.java | 2 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/EditableResourceClientFactory.java | 61 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/EditableResourceClientProxy.java | 71 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientFactory.java | 134 - modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/proxy/ResourceClientProxy.java | 669 ------- modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/utility/ConfigurationClassBuilder.java | 158 - modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/utility/LazyLoadScenario.java | 44 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/utility/PackageFinder.java | 140 - modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/utility/ScriptAssert.java | 413 ---- modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/utility/ScriptAssertionException.java | 57 modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/utility/ScriptUtil.java | 159 - modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/utility/ShortOutput.java | 27 modules/enterprise/remoting/cli/src/main/scripts/rhq-client.build.xml | 3 modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/SummaryFilterTest.java | 101 - modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/TabularWriterTest.java | 396 ---- modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/commands/ScriptCommandTest.java | 34 modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/utility/ScriptAssertTest.java | 90 - modules/enterprise/remoting/cli/src/test/java/org/rhq/enterprise/client/utility/ScriptUtilTest.java | 38 modules/enterprise/remoting/client-api/pom.xml | 98 - modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClient.java | 186 -- modules/enterprise/remoting/client-api/src/main/java/org/rhq/enterprise/client/RemoteClientProxy.java | 186 -- modules/enterprise/remoting/client-deps/pom.xml | 2 modules/enterprise/remoting/pom.xml | 2 modules/enterprise/remoting/webservices/pom.xml | 2 modules/enterprise/server/client-api/pom.xml | 212 ++ modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClient.java | 229 ++ modules/enterprise/server/client-api/src/main/java/org/rhq/enterprise/client/LocalClientProxy.java | 67 modules/enterprise/server/container-lib/pom.xml | 2 modules/enterprise/server/container/pom.xml | 2 modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.security-policy | 10 modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh | 3 modules/enterprise/server/container/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf | 3 modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-postinstaller.war.rej/welcome.jsf | 2 modules/enterprise/server/ear/pom.xml | 29 modules/enterprise/server/jar/pom.xml | 18 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertDefinitionManagerBean.java | 23 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerBean.java | 89 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationManagerLocal.java | 33 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertNotificationValidationException.java | 49 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/alert/AlertTemplateManagerBean.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerBean.java | 45 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/auth/SubjectManagerLocal.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerBean.java | 25 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/AuthorizationManagerLocal.java | 22 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/authz/RoleManagerBean.java | 12 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/configuration/ConfigurationManagerBean.java | 36 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java | 47 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerBean.java | 238 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerHelper.java | 57 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerLocal.java | 86 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentManagerRemote.java | 67 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerBean.java | 114 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentSourceManagerLocal.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentUIManagerBean.java | 40 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/ContentUIManagerLocal.java | 16 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerBean.java | 262 ++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerLocal.java | 22 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/content/RepoManagerRemote.java | 38 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/dashboard/DashboardManagerBean.java | 50 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/dashboard/DashboardManagerLocal.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/dashboard/DashboardManagerRemote.java | 15 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java | 22 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerLocal.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerBean.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementChartsManagerLocal.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerLocal.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerBean.java | 57 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementOOBManagerLocal.java | 9 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementPreferences.java | 3 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/uibean/BaseMetricDisplay.java | 373 ---- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/uibean/MeasurementSummary.java | 133 - modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/uibean/MetricDisplayConstants.java | 70 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/uibean/MetricDisplaySummary.java | 222 -- modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/uibean/MetricDisplayValue.java | 82 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/util/MeasurementUtils.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/MasterServerPluginContainer.java | 2 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSender.java | 20 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/alert/AlertSenderValidationResults.java | 46 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/AbstractPackageTypeBehavior.java | 33 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/ContentProviderPackageDetailsKey.java | 11 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/PackageDetailsValidationException.java | 47 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/PackageSource.java | 1 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/PackageTypeBehavior.java | 67 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/PackageTypePluginManager.java | 155 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/PackageTypeServerPluginContainer.java | 56 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/plugin/pc/content/sync/PackageSourceSynchronizer.java | 6 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 8 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/disambiguation/MutableDisambiguationReport.java | 4 modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/webservices/WebservicesManagerBean.java | 33 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/bundle/TestBundleServerPluginService.java | 4 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/core/plugin/DatabaseAndFilePluginDeploymentTest.java | 4 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/plugin/pc/content/TestContentProvider.java | 4 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java | 8 modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginService.java | 107 + modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/StandardServerPluginServiceMBean.java | 31 modules/enterprise/server/plugins/alert-cli/pom.xml | 221 ++ modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliComponent.java | 360 ++++ modules/enterprise/server/plugins/alert-cli/src/main/java/org/rhq/enterprise/server/plugins/alertCli/CliSender.java | 403 ++++ modules/enterprise/server/plugins/alert-cli/src/main/resources/META-INF/rhq-serverplugin.xml | 73 modules/enterprise/server/plugins/alert-email/pom.xml | 34 modules/enterprise/server/plugins/alert-email/src/main/resources/META-INF/rhq-serverplugin.xml | 8 modules/enterprise/server/plugins/alert-irc/pom.xml | 34 modules/enterprise/server/plugins/alert-log4j/pom.xml | 6 modules/enterprise/server/plugins/alert-microblog/pom.xml | 34 modules/enterprise/server/plugins/alert-mobicents/pom.xml | 34 modules/enterprise/server/plugins/alert-operations/pom.xml | 32 modules/enterprise/server/plugins/alert-roles/pom.xml | 34 modules/enterprise/server/plugins/alert-snmp/pom.xml | 34 modules/enterprise/server/plugins/alert-subject/pom.xml | 32 modules/enterprise/server/plugins/ant-bundle/pom.xml | 30 modules/enterprise/server/plugins/cobbler/pom.xml | 32 modules/enterprise/server/plugins/disk/pom.xml | 30 modules/enterprise/server/plugins/disk/src/main/java/org/rhq/enterprise/server/plugins/disk/DiskSource.java | 2 modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 32 modules/enterprise/server/plugins/groovy-script/pom.xml | 38 modules/enterprise/server/plugins/jboss-software/pom.xml | 30 modules/enterprise/server/plugins/packagetype-cli/pom.xml | 212 ++ modules/enterprise/server/plugins/packagetype-cli/src/main/java/org/rhq/enterprise/server/plugins/packagetypeCli/CliPackageTypeBehavior.java | 132 + modules/enterprise/server/plugins/packagetype-cli/src/main/resources/META-INF/rhq-serverplugin.xml | 24 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 | 4 modules/enterprise/server/plugins/rhnhosted/pom.xml | 34 modules/enterprise/server/plugins/url/pom.xml | 30 modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 modules/enterprise/server/plugins/yum/pom.xml | 32 modules/enterprise/server/pom.xml | 1 modules/enterprise/server/safe-invoker/pom.xml | 30 modules/enterprise/server/sars/agent-sar/pom.xml | 32 modules/enterprise/server/sars/pom.xml | 2 modules/enterprise/server/xml-schemas/pom.xml | 30 modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/ServerPluginDescriptorUtil.java | 3 modules/enterprise/server/xml-schemas/src/main/java/org/rhq/enterprise/server/xmlschema/XmlSchemas.java | 4 modules/enterprise/server/xml-schemas/src/main/resources/rhq-serverplugin-packagetype.xsd | 144 + modules/helpers/bundleGen/pom.xml | 32 modules/helpers/perftest-support/pom.xml | 6 modules/helpers/pom.xml | 4 modules/helpers/rtfilter/pom.xml | 32 modules/plugins/aliases/pom.xml | 58 modules/plugins/ant-bundle/pom.xml | 32 modules/plugins/apache/pom.xml | 54 modules/plugins/augeas/pom.xml | 30 modules/plugins/byteman/pom.xml | 30 modules/plugins/cobbler/pom.xml | 60 modules/plugins/cron/pom.xml | 40 modules/plugins/database/pom.xml | 38 modules/plugins/filetemplate-bundle/pom.xml | 38 modules/plugins/grub/pom.xml | 30 modules/plugins/hadoop/pom.xml | 30 modules/plugins/hibernate/pom.xml | 42 modules/plugins/hosts/pom.xml | 58 modules/plugins/hudson/pom.xml | 38 modules/plugins/iis/pom.xml | 38 modules/plugins/irc/pom.xml | 28 modules/plugins/jboss-as-5/pom.xml | 58 modules/plugins/jboss-as/pom.xml | 56 modules/plugins/jboss-cache-v3/pom.xml | 62 modules/plugins/jboss-cache/pom.xml | 46 modules/plugins/jmx/pom.xml | 40 modules/plugins/kickstart/pom.xml | 32 modules/plugins/mysql/pom.xml | 38 modules/plugins/netservices/pom.xml | 30 modules/plugins/oracle/pom.xml | 60 modules/plugins/perftest/pom.xml | 34 modules/plugins/platform/pom.xml | 36 modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml | 8 modules/plugins/pom.xml | 4 modules/plugins/postfix/pom.xml | 40 modules/plugins/postgres/pom.xml | 38 modules/plugins/rhq-agent/pom.xml | 38 modules/plugins/rhq-server/pom.xml | 40 modules/plugins/samba/pom.xml | 38 modules/plugins/script/pom.xml | 30 modules/plugins/script2/pom.xml | 32 modules/plugins/snmptrapd/pom.xml | 30 modules/plugins/sshd/pom.xml | 30 modules/plugins/sudoers/pom.xml | 38 modules/plugins/tomcat/pom.xml | 42 modules/plugins/twitter/pom.xml | 30 modules/plugins/validate-all-plugins/pom.xml | 2 modules/plugins/virt/pom.xml | 34 modules/pom.xml | 2 modules/test-utils/pom.xml | 40 pom.xml | 79 release.sh | 52 520 files changed, 28776 insertions(+), 10072 deletions(-) ---

13 years, 3 months

1
0
0 / 0

[rhq] modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/pom.xml modules/test-utils pom.xml

by ips

modules/common/ant-bundle/pom.xml | 2 modules/common/filetemplate-bundle/pom.xml | 2 modules/common/jboss-as/pom.xml | 2 modules/common/pom.xml | 2 modules/core/client-api/pom.xml | 2 modules/core/comm-api/pom.xml | 2 modules/core/dbutils/pom.xml | 2 modules/core/domain/pom.xml | 2 modules/core/gui/pom.xml | 2 modules/core/native-system/pom.xml | 2 modules/core/plugin-api/pom.xml | 2 modules/core/plugin-container/pom.xml | 2 modules/core/plugin-validator/pom.xml | 2 modules/core/plugindoc/pom.xml | 2 modules/core/pom.xml | 2 modules/core/util/pom.xml | 2 modules/enterprise/agent/pom.xml | 2 modules/enterprise/agentupdate/pom.xml | 2 modules/enterprise/binding/pom.xml | 60 ++------ 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/pom.xml | 2 modules/enterprise/remoting/cli/pom.xml | 2 modules/enterprise/remoting/client-api/pom.xml | 2 modules/enterprise/remoting/client-deps/pom.xml | 2 modules/enterprise/remoting/pom.xml | 2 modules/enterprise/remoting/webservices/pom.xml | 2 modules/enterprise/server/client-api/pom.xml | 60 ++------ 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-cli/pom.xml | 73 +++------- modules/enterprise/server/plugins/alert-email/pom.xml | 4 modules/enterprise/server/plugins/alert-irc/pom.xml | 4 modules/enterprise/server/plugins/alert-log4j/pom.xml | 4 modules/enterprise/server/plugins/alert-microblog/pom.xml | 4 modules/enterprise/server/plugins/alert-mobicents/pom.xml | 4 modules/enterprise/server/plugins/alert-operations/pom.xml | 4 modules/enterprise/server/plugins/alert-roles/pom.xml | 4 modules/enterprise/server/plugins/alert-snmp/pom.xml | 4 modules/enterprise/server/plugins/alert-subject/pom.xml | 4 modules/enterprise/server/plugins/ant-bundle/pom.xml | 2 modules/enterprise/server/plugins/cobbler/pom.xml | 4 modules/enterprise/server/plugins/disk/pom.xml | 2 modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 modules/enterprise/server/plugins/groovy-script/pom.xml | 4 modules/enterprise/server/plugins/jboss-software/pom.xml | 2 modules/enterprise/server/plugins/packagetype-cli/pom.xml | 15 -- 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/bundleGen/pom.xml | 4 modules/helpers/perftest-support/pom.xml | 4 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/byteman/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/hadoop/pom.xml | 2 modules/plugins/hibernate/pom.xml | 2 modules/plugins/hosts/pom.xml | 2 modules/plugins/hudson/pom.xml | 4 modules/plugins/iis/pom.xml | 2 modules/plugins/irc/pom.xml | 2 modules/plugins/jboss-as-5/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/kickstart/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/script2/pom.xml | 2 modules/plugins/snmptrapd/pom.xml | 2 modules/plugins/sshd/pom.xml | 2 modules/plugins/sudoers/pom.xml | 2 modules/plugins/tomcat/pom.xml | 2 modules/plugins/twitter/pom.xml | 2 modules/plugins/validate-all-plugins/pom.xml | 2 modules/plugins/virt/pom.xml | 2 modules/pom.xml | 2 modules/test-utils/pom.xml | 2 pom.xml | 2 115 files changed, 191 insertions(+), 267 deletions(-) New commits: commit eff8946bdd80e9f860e65c824ded4b6871f45622 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Mar 7 12:01:11 2011 -0500 [maven-release-plugin] prepare release RHQ_4_0_0_Beta1 diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 71f43e7..7a46e4e 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 1c84528..d26a810 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index 110c8a1..c2adf42 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index bb61b03..ffe160e 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index e5ea9a1..55e917c 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index f52e92d..724d965 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index e2b59a9..fe5f14e 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 2b84a8b..5a398b4 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index 884e360..3af1695 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index eb11f1a..7e51726 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 18846ad..672605c 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index ad82fe0..df8b3f1 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 5adfabf..0abe942 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index 2e5c467..73f16d6 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 2bafeac..84bc5dd 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index a080670..7705090 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 76c9071..65435a5 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 2d1ea0b..74eed41 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index 54e2250..f5dd125 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -1,14 +1,13 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-script-bindings</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Script Bindings</name> <description>Abstraction of different facilities and default configurations for script bindings</description> @@ -239,12 +238,10 @@ <configuration> <tasks> <mkdir dir="${rhq.deploymentDir}" /> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> - <jar destfile="${deployment.file}" - basedir="${project.build.outputDirectory}" /> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> </tasks> </configuration> <goals> @@ -257,8 +254,7 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> @@ -304,28 +300,20 @@ <mkdir dir="target/cobertura/backup" />  - <copy toDir="target/cobertura/backup" - verbose="true" overwrite="true"> + <copy toDir="target/cobertura/backup" verbose="true" overwrite="true"> <fileset dir="target/classes"> <include name="**/*.class" /> </fileset> </copy>  - <touch - file="target/classes/cobertura.properties" /> - <echo - file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo> - <taskdef - classpathref="maven.plugin.classpath" - resource="tasks.properties" /> + <touch file="target/classes/cobertura.properties" /> + <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo> + <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  - <cobertura-instrument - datafile="${project.build.directory}/cobertura/cobertura.ser" - todir="${project.build.directory}/classes"> - <fileset - dir="${project.build.directory}/classes"> + <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes"> + <fileset dir="${project.build.directory}/classes"> <include name="**/*.class" /> </fileset> </cobertura-instrument> @@ -340,39 +328,29 @@ <phase>post-integration-test</phase> <configuration> <tasks> - <taskdef - classpathref="maven.plugin.classpath" - resource="tasks.properties" /> + <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> <mkdir dir="target/site/cobertura" />  - <copy toDir="target/classes" - verbose="true" overwrite="true"> - <fileset - dir="target/cobertura/backup"> + <copy toDir="target/classes" verbose="true" overwrite="true"> + <fileset dir="target/cobertura/backup"> <include name="**/*.class" /> </fileset> </copy>  - <delete - dir="target/cobertura/backup" /> + <delete dir="target/cobertura/backup" />  - <cobertura-report - format="html" - datafile="${project.build.directory}/cobertura/cobertura.ser" - destdir="${project.build.directory}/site/cobertura"> - <fileset - dir="${basedir}/src/main/java"> + <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura"> + <fileset dir="${basedir}/src/main/java"> <include name="**/*.java" /> </fileset> </cobertura-report>  - <delete - file="target/classes/cobertura.properties" /> + <delete file="target/classes/cobertura.properties" /> </tasks> </configuration> <goals> diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml index c029f62..0920927 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-jar/pom.xml b/modules/enterprise/gui/base-perspective-jar/pom.xml index 4d79169..926a6de 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/base-perspective-war/pom.xml b/modules/enterprise/gui/base-perspective-war/pom.xml index 877f9f5..ac085d0 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/content_http-war/pom.xml b/modules/enterprise/gui/content_http-war/pom.xml index 57a30b9..29ab8ee 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index 09c58dd..c3da41e 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml index c36a444..f3130ea 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index f81b4c2..9a731ca 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml index 808b267..50c31f8 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index b6461ea..d36a2b4 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 1c5207c..0787238 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-api/pom.xml b/modules/enterprise/remoting/client-api/pom.xml index 872ac37..6c4b1c5 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/client-deps/pom.xml b/modules/enterprise/remoting/client-deps/pom.xml index 1630e51..67659ce 100644 --- a/modules/enterprise/remoting/client-deps/pom.xml +++ b/modules/enterprise/remoting/client-deps/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index b7a9a46..0dcf0dc 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index 097e3c2..ddea860 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index 963feed..0178789 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -1,18 +1,17 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Enterprise Server Client API</name> <description>The implementation of the client API when accessing the server locally</description> @@ -83,12 +82,10 @@ <configuration> <tasks> <mkdir dir="${rhq.deploymentDir}" /> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> - <jar destfile="${deployment.file}" - basedir="${project.build.outputDirectory}" /> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> </tasks> </configuration> <goals> @@ -101,8 +98,7 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> @@ -148,28 +144,20 @@ <mkdir dir="target/cobertura/backup" />  - <copy toDir="target/cobertura/backup" - verbose="true" overwrite="true"> + <copy toDir="target/cobertura/backup" verbose="true" overwrite="true"> <fileset dir="target/classes"> <include name="**/*.class" /> </fileset> </copy>  - <touch - file="target/classes/cobertura.properties" /> - <echo - file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo> - <taskdef - classpathref="maven.plugin.classpath" - resource="tasks.properties" /> + <touch file="target/classes/cobertura.properties" /> + <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo> + <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  - <cobertura-instrument - datafile="${project.build.directory}/cobertura/cobertura.ser" - todir="${project.build.directory}/classes"> - <fileset - dir="${project.build.directory}/classes"> + <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes"> + <fileset dir="${project.build.directory}/classes"> <include name="**/*.class" /> </fileset> </cobertura-instrument> @@ -184,39 +172,29 @@ <phase>post-integration-test</phase> <configuration> <tasks> - <taskdef - classpathref="maven.plugin.classpath" - resource="tasks.properties" /> + <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> <mkdir dir="target/site/cobertura" />  - <copy toDir="target/classes" - verbose="true" overwrite="true"> - <fileset - dir="target/cobertura/backup"> + <copy toDir="target/classes" verbose="true" overwrite="true"> + <fileset dir="target/cobertura/backup"> <include name="**/*.class" /> </fileset> </copy>  - <delete - dir="target/cobertura/backup" /> + <delete dir="target/cobertura/backup" />  - <cobertura-report - format="html" - datafile="${project.build.directory}/cobertura/cobertura.ser" - destdir="${project.build.directory}/site/cobertura"> - <fileset - dir="${basedir}/src/main/java"> + <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura"> + <fileset dir="${basedir}/src/main/java"> <include name="**/*.java" /> </fileset> </cobertura-report>  - <delete - file="target/classes/cobertura.properties" /> + <delete file="target/classes/cobertura.properties" /> </tasks> </configuration> <goals> diff --git a/modules/enterprise/server/container-lib/pom.xml b/modules/enterprise/server/container-lib/pom.xml index 2376311..d07988b 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 1ec4552..27ea269 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index 220eee6..43e7561 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 5b9ff73..66747bd 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/alert-cli/pom.xml b/modules/enterprise/server/plugins/alert-cli/pom.xml index 7b71a2f..871cccb 100644 --- a/modules/enterprise/server/plugins/alert-cli/pom.xml +++ b/modules/enterprise/server/plugins/alert-cli/pom.xml @@ -1,14 +1,13 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Enterprise Server CLI Script Alert Plugin</name> <description>An alert sender able to execute an arbitrary CLI script as a response to an alert</description> @@ -25,7 +24,7 @@ <dependency> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <type>jar</type> <scope>compile</scope> </dependency> @@ -71,12 +70,10 @@ <configuration> <tasks> <mkdir dir="${rhq.deploymentDir}" /> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating ${deployment.file}...</echo> - <jar destfile="${deployment.file}" - basedir="${project.build.outputDirectory}" /> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> </tasks> </configuration> <goals> @@ -89,8 +86,7 @@ <phase>clean</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Deleting ${deployment.file}...</echo> <delete file="${deployment.file}" /> @@ -106,20 +102,15 @@ <phase>package</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> - <unjar - src="${project.build.directory}/${project.build.finalName}.jar" - dest="${project.build.outputDirectory}"> + <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> <patternset> <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" - manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> @@ -163,28 +154,20 @@ <mkdir dir="target/cobertura/backup" />  - <copy toDir="target/cobertura/backup" - verbose="true" overwrite="true"> + <copy toDir="target/cobertura/backup" verbose="true" overwrite="true"> <fileset dir="target/classes"> <include name="**/*.class" /> </fileset> </copy>  - <touch - file="target/classes/cobertura.properties" /> - <echo - file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo> - <taskdef - classpathref="maven.plugin.classpath" - resource="tasks.properties" /> + <touch file="target/classes/cobertura.properties" /> + <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo> + <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  - <cobertura-instrument - datafile="${project.build.directory}/cobertura/cobertura.ser" - todir="${project.build.directory}/classes"> - <fileset - dir="${project.build.directory}/classes"> + <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes"> + <fileset dir="${project.build.directory}/classes"> <include name="**/*.class" /> </fileset> </cobertura-instrument> @@ -199,39 +182,29 @@ <phase>post-integration-test</phase> <configuration> <tasks> - <taskdef - classpathref="maven.plugin.classpath" - resource="tasks.properties" /> + <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />  <mkdir dir="target/cobertura" /> <mkdir dir="target/site/cobertura" />  - <copy toDir="target/classes" - verbose="true" overwrite="true"> - <fileset - dir="target/cobertura/backup"> + <copy toDir="target/classes" verbose="true" overwrite="true"> + <fileset dir="target/cobertura/backup"> <include name="**/*.class" /> </fileset> </copy>  - <delete - dir="target/cobertura/backup" /> + <delete dir="target/cobertura/backup" />  - <cobertura-report - format="html" - datafile="${project.build.directory}/cobertura/cobertura.ser" - destdir="${project.build.directory}/site/cobertura"> - <fileset - dir="${basedir}/src/main/java"> + <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura"> + <fileset dir="${basedir}/src/main/java"> <include name="**/*.java" /> </fileset> </cobertura-report>  - <delete - file="target/classes/cobertura.properties" /> + <delete file="target/classes/cobertura.properties" /> </tasks> </configuration> <goals> diff --git a/modules/enterprise/server/plugins/alert-email/pom.xml b/modules/enterprise/server/plugins/alert-email/pom.xml index 54891ae..fb3d559 100644 --- a/modules/enterprise/server/plugins/alert-email/pom.xml +++ b/modules/enterprise/server/plugins/alert-email/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Enterprise Server Email Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-irc/pom.xml b/modules/enterprise/server/plugins/alert-irc/pom.xml index d9e695c..7ab811c 100644 --- a/modules/enterprise/server/plugins/alert-irc/pom.xml +++ b/modules/enterprise/server/plugins/alert-irc/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Enterprise Server IRC Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-log4j/pom.xml b/modules/enterprise/server/plugins/alert-log4j/pom.xml index a270432..b63ac9f 100644 --- a/modules/enterprise/server/plugins/alert-log4j/pom.xml +++ b/modules/enterprise/server/plugins/alert-log4j/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Enterprise Server Log4J Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-microblog/pom.xml b/modules/enterprise/server/plugins/alert-microblog/pom.xml index 3ebc711..aee9b42 100644 --- a/modules/enterprise/server/plugins/alert-microblog/pom.xml +++ b/modules/enterprise/server/plugins/alert-microblog/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Enterprise Server Microblog Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-mobicents/pom.xml b/modules/enterprise/server/plugins/alert-mobicents/pom.xml index 21a353d..2bcb08a 100644 --- a/modules/enterprise/server/plugins/alert-mobicents/pom.xml +++ b/modules/enterprise/server/plugins/alert-mobicents/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Enterprise Server Mobicents Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml index 8be5518..3d04901 100644 --- a/modules/enterprise/server/plugins/alert-operations/pom.xml +++ b/modules/enterprise/server/plugins/alert-operations/pom.xml @@ -2,14 +2,14 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Enterprise Server Opertions Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-roles/pom.xml b/modules/enterprise/server/plugins/alert-roles/pom.xml index 390b329..3b3cc32 100644 --- a/modules/enterprise/server/plugins/alert-roles/pom.xml +++ b/modules/enterprise/server/plugins/alert-roles/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Enterprise Server Roles Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-snmp/pom.xml b/modules/enterprise/server/plugins/alert-snmp/pom.xml index 7b494d7..c288f5c 100644 --- a/modules/enterprise/server/plugins/alert-snmp/pom.xml +++ b/modules/enterprise/server/plugins/alert-snmp/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Enterprise Server SNMP Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/alert-subject/pom.xml b/modules/enterprise/server/plugins/alert-subject/pom.xml index 635aa9c..5152f39 100644 --- a/modules/enterprise/server/plugins/alert-subject/pom.xml +++ b/modules/enterprise/server/plugins/alert-subject/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Enterprise Server Subject Alert Plugin</name> diff --git a/modules/enterprise/server/plugins/ant-bundle/pom.xml b/modules/enterprise/server/plugins/ant-bundle/pom.xml index 13260a0..fe15ded 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-SNAPSHOT</version> + <version>4.0.0.Beta1</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 b58a7ae..8fc3b0c 100644 --- a/modules/enterprise/server/plugins/cobbler/pom.xml +++ b/modules/enterprise/server/plugins/cobbler/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Enterprise Server Cobbler Plugin</name> diff --git a/modules/enterprise/server/plugins/disk/pom.xml b/modules/enterprise/server/plugins/disk/pom.xml index 34f0e08..1683752 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-SNAPSHOT</version> + <version>4.0.0.Beta1</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 ebf0154..48fe1cb 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml index e3c202b..413ab87 100644 --- a/modules/enterprise/server/plugins/groovy-script/pom.xml +++ b/modules/enterprise/server/plugins/groovy-script/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>groovy-script-server-plugin</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Enterprise Server Groovy Script Plugin</name> diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml index 659622f..9e1ade8 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/packagetype-cli/pom.xml b/modules/enterprise/server/plugins/packagetype-cli/pom.xml index 65c8e71..5651294 100644 --- a/modules/enterprise/server/plugins/packagetype-cli/pom.xml +++ b/modules/enterprise/server/plugins/packagetype-cli/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>RHQ Enterprise Server CLI Package Type Plugin</name> @@ -101,20 +101,15 @@ <phase>package</phase> <configuration> <tasks> - <property name="deployment.file" - location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> <echo>*** Updating META-INF dir in ${deployment.file}...</echo> - <unjar - src="${project.build.directory}/${project.build.finalName}.jar" - dest="${project.build.outputDirectory}"> + <unjar src="${project.build.directory}/${project.build.finalName}.jar" dest="${project.build.outputDirectory}"> <patternset> <include name="META-INF/**" /> </patternset> </unjar> - <jar destfile="${deployment.file}" - manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" - update="true"> + <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true"> </jar> </tasks> </configuration> diff --git a/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml b/modules/enterprise/server/plugins/perspectives/core/perspective/pom.xml index f695982..01e87de 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/perspectives/core/pom.xml b/modules/enterprise/server/plugins/perspectives/core/pom.xml index 287d62e..57a1d3e 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 2ebb23e..e3d93ac 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml index 1c8d17c..ec9557d 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-SNAPSHOT</version> + <version>4.0.0.Beta1</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 56adc17..4c5c608 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-SNAPSHOT</version> + <version>4.0.0.Beta1</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 3ec9918..2f1ff57 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-SNAPSHOT</version> + <version>4.0.0.Beta1</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 f22634e..0850e35 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-SNAPSHOT</version> + <version>4.0.0.Beta1</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 12ea01d..20c536a 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/sars/agent-sar/pom.xml b/modules/enterprise/server/sars/agent-sar/pom.xml index b1c400f..396fe2d 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index 4ed8677..822c82f 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml index 5dfa3a0..d50a64a 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 49b64f7..7e61cb5 100644 --- a/modules/helpers/bundleGen/pom.xml +++ b/modules/helpers/bundleGen/pom.xml @@ -3,13 +3,13 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <build> <plugins> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index b3085a3..c1d68c9 100644 --- a/modules/helpers/perftest-support/pom.xml +++ b/modules/helpers/perftest-support/pom.xml @@ -3,11 +3,11 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <name>Performance Testing Support</name> <description>To support performance testing, this is a basic tool to support extracting and later reimporting of data from/to a database. diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml index 15126b3..3368bb3 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index 612f9cd..557ae38 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index 4e89419..2397c63 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 887eb25..080bec6 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index 0cfa72c..2b87c31 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index 48528ba..7cec1c5 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index d4111a3..6dcb67d 100644 --- a/modules/plugins/byteman/pom.xml +++ b/modules/plugins/byteman/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index bfd354f..93e2785 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index eaf87a7..31a8ae3 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index 4b0ec48..e53bc25 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 32503ea..7c0056e 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 02f0c58..bbeb0d7 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index 4179f3d..6df9776 100644 --- a/modules/plugins/hadoop/pom.xml +++ b/modules/plugins/hadoop/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 1775ae1..f7d68cf 100644 --- a/modules/plugins/hibernate/pom.xml +++ b/modules/plugins/hibernate/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId>  <artifactId>rhq-plugins-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index e9f147d..2a43773 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index 71c974a..2b429ae 100644 --- a/modules/plugins/hudson/pom.xml +++ b/modules/plugins/hudson/pom.xml @@ -6,12 +6,12 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <packaging>jar</packaging> <name>RHQ Hudson Plugin</name> diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml index b58b28c..cf4b03b 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index df8ea6b..b399865 100644 --- a/modules/plugins/irc/pom.xml +++ b/modules/plugins/irc/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>rhq-plugins-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</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 1e9183e..08ee960 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 94e111a..f40c7a4 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-SNAPSHOT</version> + <version>4.0.0.Beta1</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 070ed5e..297c491 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml index 4d15790..c427b55 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 57d44c0..2738a2b 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index dd0035e..ab41a41 100644 --- a/modules/plugins/kickstart/pom.xml +++ b/modules/plugins/kickstart/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index cfbb26e..9a0d0c3 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 1987cfb..26aa524 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index e6d37b9..ff8ff8c 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index a84f95d..a45a2e8 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index ed3f654..6919e28 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index f39e509..774a3b0 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index b4c9c4c..dcee192 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index 0e5b102..d39f06f 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index 37dfc09..537e456 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index 60c4245..f42151f 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index 00be871..a0ab798 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 3627ab7..4b0eb9c 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index d6fa9c4..2f5a6a9 100644 --- a/modules/plugins/script2/pom.xml +++ b/modules/plugins/script2/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index e0750eb..71e39e2 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index f00f113..e0698ed 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index 8a88bb4..d921388 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 37d52a1..5db064a 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 1993f61..441b462 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-SNAPSHOT</version> + <version>4.0.0.Beta1</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 4f1c4c3..c918dc2 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index c16d198..82fe96b 100644 --- a/modules/plugins/virt/pom.xml +++ b/modules/plugins/virt/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index f760f66..f9899a7 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-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index cb02492..2e8d8ae 100644 --- a/modules/test-utils/pom.xml +++ b/modules/test-utils/pom.xml @@ -7,7 +7,7 @@ <parent> <artifactId>rhq-modules-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index ba31907..920c6a5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.Beta1</version> <packaging>pom</packaging> <name>RHQ</name>

13 years, 3 months

1
0
0 / 0

[rhq] release.sh

by ips

release.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit d3dd29be75594288b41ce96f551aded94f19d830 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Mar 7 11:43:53 2011 -0500 temporarily turn off test build and release:prepare dry run diff --git a/release.sh b/release.sh index 1928c1b..316af14 100755 --- a/release.sh +++ b/release.sh @@ -414,12 +414,12 @@ fi # Run a test build before tagging. This will publish the snapshot artifacts to the local repo to "bootstrap" the repo. -echo "Building project to ensure tests pass and to bootstrap local Maven repo (this will take about 15-30 minutes)..." +#echo "Building project to ensure tests pass and to bootstrap local Maven repo (this will take about 15-30 minutes)..." # NOTE: There is no need to do a mvn clean below, since we just did either a clone or clean checkout above. -mvn install $MAVEN_ARGS -Ddbreset -[ "$?" -ne 0 ] && abort "Test build failed. Please see above Maven output for details, fix any issues, then try again." -echo -echo "Test build succeeded!" +#mvn install $MAVEN_ARGS -Ddbreset +#[ "$?" -ne 0 ] && abort "Test build failed. Please see above Maven output for details, fix any issues, then try again." +#echo +#echo "Test build succeeded!" # Clean up the snapshot jars produced by the test build from module target dirs. @@ -432,9 +432,9 @@ mvn clean $MAVEN_ARGS # If this is a production build perform a dry run of tagging the release. Skip this for test builds to reduce the # build time -if [ "$MODE" = "production" ]; then +if [ "$MODE" = "todo" ]; then echo "Doing a dry run of tagging the release..." - mvn release:prepare $MAVEN_ARGS -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$DEVELOPMENT_VERSION -Dresume=false -Dtag=$RELEASE_TAG "-DpreparationGoals=install $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true" -DdryRun=true + mvn release:prepare $MAVEN_ARGS -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$DEVELOPMENT_VERSION -Dresume=false -Dtag=$RELEASE_TAG "-DpreparationGoals=install $MAVEN_ARGS -DskipTests=true -Ddbsetup-do-not-check-schema=true" -DdryRun=true [ "$?" -ne 0 ] && abort "Tagging dry run failed. Please see above Maven output for details, fix any issues, then try again." mvn release:clean $MAVEN_ARGS [ "$?" -ne 0 ] && abort "Failed to cleanup release plugin working files from tagging dry run. Please see above Maven output for details, fix any issues, then try again." @@ -446,7 +446,7 @@ fi # If the dry run was skipped or succeeded, tag it for real. echo "Tagging the release..." -mvn release:prepare $MAVEN_ARGS -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$DEVELOPMENT_VERSION -Dresume=false -Dtag=$RELEASE_TAG "-DpreparationGoals=install $MAVEN_ARGS -Dmaven.test.skip=true -Ddbsetup-do-not-check-schema=true" -DdryRun=false -Dusername=$GIT_USERNAME +mvn release:prepare $MAVEN_ARGS -DreleaseVersion=$RELEASE_VERSION -DdevelopmentVersion=$DEVELOPMENT_VERSION -Dresume=false -Dtag=$RELEASE_TAG "-DpreparationGoals=install $MAVEN_ARGS -DskipTests=true -Ddbsetup-do-not-check-schema=true" -DdryRun=false -Dusername=$GIT_USERNAME [ "$?" -ne 0 ] && abort "Tagging failed. Please see above Maven output for details, fix any issues, then try again." echo echo "Tagging succeeded!"

13 years, 3 months

1
0
0 / 0

[rhq] pom.xml

by ips

pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c11da6d573454229bbc936b0746e1d2cd467f348 Author: Ian Springer <ian.springer(a)redhat.com> Date: Mon Mar 7 10:56:32 2011 -0500 move javadoc/sources jar publishing to 'publish' profile, rather than 'release' profile diff --git a/pom.xml b/pom.xml index 68cab4c..ba31907 100644 --- a/pom.xml +++ b/pom.xml @@ -1132,7 +1132,7 @@ It will ensure that sources and javadoc jars are built and published for each source module. --> <profile> - <id>release</id> + <id>publish</id> <build> <plugins>

13 years, 3 months

1
0
0 / 0

[rhq] modules/enterprise

by ips

modules/enterprise/server/client-api/pom.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) New commits: commit 77ad7aa0f635e3738a81302ba7c3e76a49df2d33 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Mar 4 21:56:53 2011 -0500 fix parent pom diff --git a/modules/enterprise/server/client-api/pom.xml b/modules/enterprise/server/client-api/pom.xml index d605b1c..963feed 100644 --- a/modules/enterprise/server/client-api/pom.xml +++ b/modules/enterprise/server/client-api/pom.xml @@ -1,11 +1,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> - <artifactId>rhq-enterprise-server-parent</artifactId> + <artifactId>rhq-parent</artifactId> <groupId>org.rhq</groupId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../../../../pom.xml</relativePath> </parent> + <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> <version>4.0.0-SNAPSHOT</version> @@ -225,4 +229,6 @@ </build> </profile> </profiles> -</project> \ No newline at end of file + +</project> +

13 years, 3 months

1
0
0 / 0

[rhq] release.sh

by ips

release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 3b070f3e31b38b685b65659e85d12d39e9ba30f4 Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Mar 4 18:30:01 2011 -0500 pass -DskipTests=true, rather than -Dmaven.test.skip=true diff --git a/release.sh b/release.sh index 0de47a0..1928c1b 100755 --- a/release.sh +++ b/release.sh @@ -180,9 +180,9 @@ PROJECT_GIT_URL="ssh://${GIT_USERNAME}@git.fedorahosted.org/git/rhq/rhq.git" MAVEN_ARGS="--settings $MAVEN_SETTINGS_FILE --batch-mode --errors -Penterprise,dist,release" # TODO: We may eventually want to reenable tests for production releases. #if [ "$MODE" = "test" ]; then -# MAVEN_ARGS="$MAVEN_ARGS -Dmaven.test.skip=true" +# MAVEN_ARGS="$MAVEN_ARGS -DskipTests=true" #fi -MAVEN_ARGS="$MAVEN_ARGS -Dmaven.test.skip=true" +MAVEN_ARGS="$MAVEN_ARGS -DskipTests=true" if [ "$RELEASE_TYPE" = "enterprise" ]; then MAVEN_ARGS="$MAVEN_ARGS -Dexclude-webdav -Djava5.home=$JAVA5_HOME/jre" fi

13 years, 3 months

1
0
0 / 0

[rhq] modules/enterprise

by ips

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 2 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/PropertyMapListGridRecord.java | 38 +++++----- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java | 14 +-- 3 files changed, 27 insertions(+), 27 deletions(-) New commits: commit 521613e595bf0c38e93f5c75ecc0cc939c5dbeeb Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Mar 4 18:23:13 2011 -0500 fix layout bug in config editor that was causing op params and results not to be displayed on op history details view (may have also affected other views) (https://bugzilla.redhat.com/show_bug.cgi?id=682341) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java index a986d06..fb1fea4 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java @@ -183,8 +183,6 @@ public class ConfigurationEditor extends LocatableVLayout { private ConfigurationEditor(String locatorId) { super(locatorId); - - setOverflow(Overflow.AUTO); } public ConfigurationEditor(String locatorId, int resourceId, int resourceTypeId, ConfigType configType) { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/PropertyMapListGridRecord.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/PropertyMapListGridRecord.java index 843c15d..5a840c2 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/PropertyMapListGridRecord.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/PropertyMapListGridRecord.java @@ -43,22 +43,28 @@ public class PropertyMapListGridRecord extends ListGridRecord { PropertySimple propertySimple = propertyMap.getSimple(propertyName); if ((propertySimple != null) && (propertySimple.getStringValue() != null)) { - switch (((PropertyDefinitionSimple) subDef).getType()) { - case BOOLEAN: - setAttribute(propertyName, propertySimple.getBooleanValue()); - break; - case INTEGER: - setAttribute(propertyName, propertySimple.getIntegerValue()); - break; - case FLOAT: - setAttribute(propertyName, propertySimple.getFloatValue()); - break; - case DOUBLE: - setAttribute(propertyName, propertySimple.getDoubleValue()); - break; - default: - setAttribute(propertyName, propertySimple.getStringValue()); - break; + try { + switch (((PropertyDefinitionSimple) subDef).getType()) { + case BOOLEAN: + setAttribute(propertyName, propertySimple.getBooleanValue()); + break; + case INTEGER: + setAttribute(propertyName, propertySimple.getIntegerValue()); + break; + case FLOAT: + setAttribute(propertyName, propertySimple.getFloatValue()); + break; + case DOUBLE: + setAttribute(propertyName, propertySimple.getDoubleValue()); + break; + default: + setAttribute(propertyName, propertySimple.getStringValue()); + break; + } + } catch (Exception e) { + // value is not valid according to the type specified by the prop def; validation code in + // ConfigurationEditor should catch this later on - for now, set the value as a string. + setAttribute(propertyName, propertySimple.getStringValue()); } } else { setAttribute(propertyName, (String) null); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java index b74a387..40a826d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryDetailsView.java @@ -41,6 +41,7 @@ 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.util.selenium.LocatableHTMLPane; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVStack; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow; import java.util.ArrayList; @@ -50,7 +51,7 @@ import java.util.List; /** * @author Greg Hinkle */ -public abstract class AbstractOperationHistoryDetailsView<T extends OperationHistory> extends LocatableVLayout +public abstract class AbstractOperationHistoryDetailsView<T extends OperationHistory> extends LocatableVStack implements BookmarkableView { private T operationHistory; @@ -91,8 +92,7 @@ public abstract class AbstractOperationHistoryDetailsView<T extends OperationHis this.operationHistory = operationHistory; - // Information Form - + // History Basic Details form = new DynamicForm(); form.setWidth100(); form.setWrapItemTitles(false); @@ -100,8 +100,7 @@ public abstract class AbstractOperationHistoryDetailsView<T extends OperationHis form.setFields(items.toArray(new FormItem[items.size()])); addMember(form); - // params/results - + // Parameters (if applicable) if (operationHistory.getParameters() != null) { LocatableVLayout parametersSection = new LocatableVLayout(extendLocatorId("ParametersSection")); @@ -127,14 +126,11 @@ public abstract class AbstractOperationHistoryDetailsView<T extends OperationHis addMember(parametersSection); } + // Results (if applicable) Canvas resultsSection = buildResultsSection(operationHistory); if (resultsSection != null) { addMember(resultsSection); } - - VLayout verticalSpacer = new VLayout(); - verticalSpacer.setHeight100(); - addMember(verticalSpacer); } protected List<FormItem> createFields(final T operationHistory) {

13 years, 3 months

1
0
0 / 0

[rhq] modules/enterprise modules/plugins

by ips

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java | 8 ++++++++ modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) New commits: commit 6bed86246029966fdcd63c59ffd00448ee28915b Author: Ian Springer <ian.springer(a)redhat.com> Date: Fri Mar 4 17:10:28 2011 -0500 change some of the prop types in viewProcessList op's results from integer to long; make sure Save button is enabled on op schedule details page when fields not on the main form are changed diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java index 7dc0142..ff577d0 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleDetailsView.java @@ -32,6 +32,8 @@ 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.events.ItemChangedEvent; +import com.smartgwt.client.widgets.form.events.ItemChangedHandler; import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.SelectItem; import com.smartgwt.client.widgets.form.fields.StaticTextItem; @@ -176,6 +178,12 @@ public abstract class AbstractOperationScheduleDetailsView extends AbstractRecor this.notesForm = new EnhancedDynamicForm(extendLocatorId("NotesForm"), isReadOnly(), isNewRecord()); this.notesForm.setColWidths(FIRST_COLUMN_WIDTH, "50%", "140", "50%"); + this.notesForm.addItemChangedHandler(new ItemChangedHandler() { + public void onItemChanged(ItemChangedEvent event) { + AbstractOperationScheduleDetailsView.this.onItemChanged(); + } + }); + List<FormItem> notesFields = new ArrayList<FormItem>(); TreeSet<TimeUnit> supportedUnits = new TreeSet<TimeUnit>(); diff --git a/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml index 5f64398..abe6cc7 100644 --- a/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/platform/src/main/resources/META-INF/rhq-plugin.xml @@ -21,11 +21,11 @@ <results> <c:list-property name="processList"> <c:map-property name="process"> - <c:simple-property name="pid" type="integer" description="Process id"/> + <c:simple-property name="pid" type="long" description="Process id"/> <c:simple-property name="name" description="Name of the process"/> - <c:simple-property name="size" type="integer" units="bytes" description="Memory, in bytes, that this process is using."/> - <c:simple-property name="userTime" type="integer" units="milliseconds" description="User time, in milliseconds, this process has been running."/> - <c:simple-property name="kernelTime" type="integer" units="milliseconds" description="Kernel time, in milliseconds, this process has been running."/> + <c:simple-property name="size" type="long" units="bytes" description="Memory, in bytes, that this process is using."/> + <c:simple-property name="userTime" type="long" units="milliseconds" description="User time, in milliseconds, this process has been running."/> + <c:simple-property name="kernelTime" type="long" units="milliseconds" description="Kernel time, in milliseconds, this process has been running."/> </c:map-property> </c:list-property> </results>

13 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits March 2011