rhq-commits May 2012

rhq-commits@lists.fedorahosted.org

12 participants
326 discussions

[rhq] modules/enterprise
by John Sanda 31 May '12

31 May '12

modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java | 28 +++++----- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit 522ff41ba7077e18f43cc053e6ec1eb9cb63fce5 Author: John Sanda <jsanda(a)redhat.com> Date: Thu May 31 19:19:39 2012 -0400 [BZ 824129] Do not treat quotes as ordinary characters I am not sure why but we were treating both single and double quotes as ordinary word character instead of quote or string delimiters. diff --git a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java index 308d6c1..2d0e41a 100644 --- a/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java +++ b/modules/enterprise/remoting/cli/src/main/java/org/rhq/enterprise/client/ClientMain.java @@ -22,9 +22,6 @@ */ package org.rhq.enterprise.client; -import gnu.getopt.Getopt; -import gnu.getopt.LongOpt; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStreamReader; @@ -35,6 +32,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.rhq.core.domain.auth.Subject; +import org.rhq.enterprise.client.commands.ClientCommand; +import org.rhq.enterprise.client.commands.ScriptCommand; +import org.rhq.enterprise.client.script.CommandLineParseException; +import org.rhq.enterprise.clientapi.RemoteClient; + +import gnu.getopt.Getopt; +import gnu.getopt.LongOpt; import jline.ArgumentCompletor; import jline.Completor; import jline.ConsoleReader; @@ -42,12 +47,6 @@ import jline.MultiCompletor; import jline.SimpleCompletor; import mazz.i18n.Msg; -import org.rhq.core.domain.auth.Subject; -import org.rhq.enterprise.client.commands.ClientCommand; -import org.rhq.enterprise.client.commands.ScriptCommand; -import org.rhq.enterprise.client.script.CommandLineParseException; -import org.rhq.enterprise.clientapi.RemoteClient; - /** * @author Greg Hinkle * @author Simeon Pinder @@ -411,13 +410,14 @@ public class ClientMain { List<String> args = new ArrayList<String>(); boolean keep_going = true; - // we don't want to parse numbers and we want ' to be a normal word - // character strtok.ordinaryChars('0', '9'); strtok.ordinaryChar('.'); strtok.ordinaryChar('-'); - strtok.ordinaryChar('\''); - strtok.wordChars(33, 127); + strtok.quoteChar('\''); + strtok.quoteChar('"'); + strtok.wordChars(33, 33); + strtok.wordChars(35, 38); + strtok.wordChars(40, 127); // parse the command line while (keep_going) { @@ -431,7 +431,7 @@ public class ClientMain { if (nextToken == java.io.StreamTokenizer.TT_WORD) { args.add(strtok.sval); - } else if (nextToken == '\"') { + } else if (nextToken == '\"' || nextToken == '\'') { args.add(strtok.sval); } else if ((nextToken == java.io.StreamTokenizer.TT_EOF) || (nextToken == java.io.StreamTokenizer.TT_EOL)) { keep_going = false;

1 0

[rhq] modules/enterprise
by ips 31 May '12

31 May '12

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 46 ++++++---- 1 file changed, 29 insertions(+), 17 deletions(-) New commits: commit a92b7bcace3265964f87fb656b45cf3102ad8708 Author: Ian Springer <ian.springer(a)redhat.com> Date: Thu May 31 17:53:02 2012 -0400 [BZ 827203] prevent infinite auto-switching between auto-group nodes occurs after fast-clicking between two auto-group nodes (https://bugzilla.redhat.com/show_bug.cgi?id=827203) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java index ff99825..694f8b6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java @@ -1,6 +1,6 @@ /* -fcontext * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2012 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -92,7 +92,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGro import org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.ResourceGroupDetailView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.AutoGroupTreeNode; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceTreeDatasource.ResourceTreeNode; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.factory.ResourceFactoryCreateWizard; import org.rhq.enterprise.gui.coregui.client.inventory.resource.factory.ResourceFactoryImportWizard; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.Log; @@ -182,17 +181,30 @@ public class ResourceTreeView extends LocatableVLayout { AutoGroupTreeNode agNode = (AutoGroupTreeNode) selectedRecord; selectedNodeId = agNode.getID(); - getAutoGroupBackingGroup(agNode, new AsyncCallback<ResourceGroup>() { - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_selection(), - caught); - } + // [BZ 827203] Disable this view to prevent fast-click issues. It will get re-enabled when + // the detail resource or group view is done with its async init and calls + // notifyViewRenderedListeners() on itself. + disable(); - public void onSuccess(ResourceGroup result) { - renderAutoGroup(result); - } - }); + try { + getAutoGroupBackingGroup(agNode, new AsyncCallback<ResourceGroup>() { + public void onSuccess(ResourceGroup result) { + renderAutoGroup(result); + } + + public void onFailure(Throwable caught) { + // Make sure to re-enable ourselves. + enable(); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_selection(), + caught); + } + }); + } catch (RuntimeException re) { + // Make sure to re-enable ourselves. + enable(); + CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_selection(), re); + } } else { // TODO: probably clicked on a subcategory, do we need a message? treeGrid.deselectRecord(selectedRecord); @@ -246,7 +258,7 @@ public class ResourceTreeView extends LocatableVLayout { private void getAutoGroupBackingGroup(final AutoGroupTreeNode agNode, final AsyncCallback<ResourceGroup> callback) { final ResourceGroupGWTServiceAsync resourceGroupService = GWTServiceLookup.getResourceGroupService(); - // get the children tree nodes and build a child resourceId array + // get the children tree nodes and build a child resourceId array TreeNode[] children = treeGrid.getTree().getChildren(agNode); final int[] childIds = new int[children.length]; for (int i = 0, size = children.length; (i < size); ++i) { @@ -262,13 +274,13 @@ public class ResourceTreeView extends LocatableVLayout { resourceGroupService.findResourceGroupsByCriteria(criteria, new AsyncCallback<PageList<ResourceGroup>>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_node(), caught); + callback.onFailure(new RuntimeException(MSG.view_tree_common_loadFailed_node(), caught)); } public void onSuccess(PageList<ResourceGroup> result) { if (result.isEmpty()) { // Not found, create new backing group - // the backing group name is a display name using a unique parentResource-resourceType combo + // the backing group name is a display name using a unique parentResource-resourceType combo final String backingGroupName = agNode.getBackingGroupName(); ResourceGroup backingGroup = new ResourceGroup(backingGroupName); backingGroup.setAutoGroupParentResource(agNode.getParentResource()); @@ -277,7 +289,7 @@ public class ResourceTreeView extends LocatableVLayout { resourceGroupService.createPrivateResourceGroup(backingGroup, childIds, new AsyncCallback<ResourceGroup>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_create(), caught); + callback.onFailure(new RuntimeException(MSG.view_tree_common_loadFailed_create(), caught)); } public void onSuccess(ResourceGroup result) { @@ -299,7 +311,7 @@ public class ResourceTreeView extends LocatableVLayout { resourceGroupService.setAssignedResources(backingGroup.getId(), childIds, false, new AsyncCallback<Void>() { public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_tree_common_loadFailed_update(), caught); + callback.onFailure(new RuntimeException(MSG.view_tree_common_loadFailed_update(), caught)); } public void onSuccess(Void result) {

1 0

[rhq] modules/enterprise
by John Sanda 30 May '12

30 May '12

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java | 17 ++++--- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 5 +- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 24 +++++++++- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 3 - modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 3 - modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 3 - modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 3 - modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 3 - 8 files changed, 47 insertions(+), 14 deletions(-) New commits: commit ab45b07b171c171871b4b54679a7eca020e5d951 Author: John Sanda <jsanda(a)redhat.com> Date: Wed May 30 19:59:27 2012 -0400 [BZ 802796] providing more info about the deployment timeout diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java index 0d41906..3307387 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java @@ -19,6 +19,10 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; + import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.data.DSRequest; import com.smartgwt.client.data.DSResponse; @@ -33,7 +37,12 @@ import com.smartgwt.client.widgets.events.DoubleClickEvent; import com.smartgwt.client.widgets.events.DoubleClickHandler; import com.smartgwt.client.widgets.form.fields.FormItem; import com.smartgwt.client.widgets.form.fields.SpinnerItem; -import com.smartgwt.client.widgets.grid.*; +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 org.rhq.core.domain.criteria.Criteria; import org.rhq.core.domain.resource.CreateResourceHistory; import org.rhq.core.domain.resource.CreateResourceStatus; @@ -51,10 +60,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; - /** * @author John Mazzitelli */ @@ -142,7 +147,7 @@ public class ChildHistoryView extends Table<ChildHistoryView.DataSource> { case INVALID_CONFIGURATION: return MSG.view_resource_inventory_childhistory_status_invalidConfig(); case TIMED_OUT: - return MSG.common_status_timedOut(); + return MSG.widget_resourceFactoryWizard_timeoutFailure(); } } else if (DataSource.TYPE_DELETE.equals(type)) { switch (DeleteResourceStatus.valueOf(value.toString())) { 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 4e53d8c..eeeefb0 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,7 +100,7 @@ common_status_inprogress = In Progress common_status_nochange = No Change common_status_partial = Partial common_status_success = Success -common_status_timedOut = Timed Out +common_status_timedOut = Timed Out. common_status_unknown = Unknown common_title_acknowledged = Acknowledged common_title_add_column = Add Column @@ -2016,7 +2016,8 @@ widget_resourceFactoryWizard_infoStepName = Resource Information widget_resourceFactoryWizard_infoStep_loadFail = Failed to get available Architectures widget_resourceFactoryWizard_namePrompt = New Resource Name widget_resourceFactoryWizard_templatePrompt = Connection Settings Template -widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. +widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. +widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that the deployment may still succeed. widget_resourceFactoryWizard_uploadFailure = Failed to upload file widget_resourceFactoryWizard_uploadFileStepName = Upload Resource Content File widget_resourceFactoryWizard_uploadInProgress = The upload is in progress... This can take several minutes to complete for large distribution files. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 9e6d1b4..8797465 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -1,3 +1,24 @@ +# +# /* +# * RHQ Management Platform +# * Copyright (C) 2005-2012 Red Hat, Inc. +# * All rights reserved. +# * +# * This program is free software; you can redistribute it and/or modify +# * it under the terms of the GNU General Public License as published by +# * the Free Software Foundation version 2 of the License. +# * +# * This program is distributed in the hope that it will be useful, +# * but WITHOUT ANY WARRANTY; without even the implied warranty of +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# * GNU General Public License for more details. +# * +# * You should have received a copy of the GNU General Public License +# * along with this program; if not, write to the Free Software +# * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# */ +# + # suppress inspection "UnusedProperty" for whole file # # RHQ GUI i18n Messages - Locale: CS @@ -2014,7 +2035,8 @@ widget_resourceFactoryWizard_infoStepName = Informace o zdroji widget_resourceFactoryWizard_infoStep_loadFail = Nepodařilo se získat dostupné architektury widget_resourceFactoryWizard_namePrompt = Nové jméno zdroje widget_resourceFactoryWizard_templatePrompt = Šablona pro nastavení připojení -##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. +##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. +##widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that the deployment may still succeed. widget_resourceFactoryWizard_uploadFailure = Nepodařilo se nahrát soubor widget_resourceFactoryWizard_uploadFileStepName = Nahrát obsah souboru zdroje widget_resourceFactoryWizard_uploadInProgress = Upload právě probíhá... Může to trvat několik minut. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties index 57e541c..e47bcdb 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties @@ -1777,8 +1777,9 @@ widget_resourceFactoryWizard_infoStepName = Information über die Ressource widget_resourceFactoryWizard_infoStep_loadFail = Konnte die verfügbaren Architekturen nicht ermitteln widget_resourceFactoryWizard_namePrompt = Name der neuen Ressource widget_resourceFactoryWizard_templatePrompt = Vorlage für die Verbindungseinstellungen -##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the RHQ Agent). Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. widget_resourceFactoryWizard_uploadFailure = Konnte die Datei nicht hochladen +##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. +###widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that the deployment may still succeed. ##widget_resourceFactoryWizard_uploadFileStepName = Upload Resource Content File ##widget_resourceFactoryWizard_uploadInProgress = The upload is in progress... This can take several minutes to complete for large distribution files. widget_resourceFactoryWizard_versionPrompt = Paketversion diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index ff17934..ee72bd8 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -2005,7 +2005,8 @@ widget_resourceFactoryWizard_infoStepName = リソース情報 widget_resourceFactoryWizard_infoStep_loadFail = アーキテクチャーを利用可能にするのに失敗しました widget_resourceFactoryWizard_namePrompt = 新規リソース名 widget_resourceFactoryWizard_templatePrompt = コネクション設定テンプレート -widget_resourceFactoryWizard_timeoutHelp = タイムアウト間隔。もし指定されたならば({0}エージェント上での)子のリソース作成のためのデフォルトタイムアウトを上書きします。大きなアプリケーションのデプロイのような長時間かかる作成アクションに特に有用です。通常、前回の試みのときにタイムアウトの失敗だった場合に使われます。 +##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. +###widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that the deployment may still succeed. widget_resourceFactoryWizard_uploadFailure = ファイルアップロードの失敗 widget_resourceFactoryWizard_uploadFileStepName = リソースコンテントファイルのアップロード widget_resourceFactoryWizard_uploadInProgress = アップロードは処理中です... 大きなファイルを配布するには数分かかることもあります。 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 9f5cf82..c8afbd8 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -2118,7 +2118,8 @@ widget_resourceFactoryWizard_infoStepName = Informa\u00E7\u00E3o do Recurso widget_resourceFactoryWizard_infoStep_loadFail = Falha ao recuperar Arquiteturas dispon\u00EDveis. widget_resourceFactoryWizard_namePrompt = Novo Nome do Recurso widget_resourceFactoryWizard_templatePrompt = Modelo de Propriedades para Conex\u00E3o -##widget_resourceFactoryWizard_timeoutHelp = Dura��o do timeout. Se especificado ir� sobrescrever o timeout padr�o para cria��o de recursos filhos (no RHQ Agent). �til principalmente para a��es muito longas, como a implanta��o de uma apli��o muito grande. Geralmente utilizado devido a tentativas que sofreram timeout anteriormente. +##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. +##widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that the deployment may still succeed. widget_resourceFactoryWizard_uploadFailure = Falha ao realizar o upload do arquivo widget_resourceFactoryWizard_uploadFileStepName = Upload do Arquivo do Recurso widget_resourceFactoryWizard_uploadInProgress = Upload em andamento... Esse processo pode demorar alguns minutos para ser finalizado em caso de arquivos muito grandes. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 1fd5f80..2692287 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -2005,7 +2005,8 @@ #widget_resourceFactoryWizard_infoStep_loadFail = Failed to get available Architectures #widget_resourceFactoryWizard_namePrompt = New Resource Name #widget_resourceFactoryWizard_templatePrompt = Connection Settings Template -#widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. +#widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. +#widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that the deployment may still succeed. #widget_resourceFactoryWizard_uploadFailure = Failed to upload file #widget_resourceFactoryWizard_uploadFileStepName = Upload Resource Content File #widget_resourceFactoryWizard_uploadInProgress = The upload is in progress... This can take several minutes to complete for large distribution files. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 1f68830..9453ba2 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -2003,7 +2003,8 @@ widget_resourceFactoryWizard_infoStepName = \u8d44\u6e90\u6d88\u606f widget_resourceFactoryWizard_infoStep_loadFail = \u65e0\u6cd5\u53d6\u5f97\u67b6\u6784 widget_resourceFactoryWizard_namePrompt = \u65b0\u8d44\u6e90\u540d widget_resourceFactoryWizard_templatePrompt = \u8fde\u63a5\u8bbe\u7f6e\u6a21\u677f -##widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the RHQ Agent). Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. +#widget_resourceFactoryWizard_timeoutHelp = A timeout duration. If specified will override the default timeout for child resource creation (on the {0} Agent). The default timeout is set to 60 seconds. Useful for particularly long create actions, like deployment of a large application. Usually used if a previous attempt suffered a timeout failure. +#widget_resourceFactoryWizard_timeoutFailure = Timed out. Note that it is possible that the deployment may still succeed. widget_resourceFactoryWizard_uploadFailure = \u4e0a\u4f20\u6587\u4ef6\u5931\u8d25 widget_resourceFactoryWizard_uploadFileStepName = \u4e0a\u4f20\u8d44\u6e90Content\u6587\u4ef6 widget_resourceFactoryWizard_uploadInProgress = \u6b63\u5728\u4e0a\u4f20\u4e2d... \u5927\u7684\u53d1\u5e03\u6587\u4ef6\u9700\u8981\u6d88\u8017\u6570\u5206\u949f\u5b8c\u6210.

1 0

[rhq] modules/enterprise
by ips 30 May '12

30 May '12

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 11 +++++----- 1 file changed, 6 insertions(+), 5 deletions(-) New commits: commit 953cd5b1f47fbada4ed64824daf4b046365ded9e Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed May 30 19:00:40 2012 -0400 improve logging to help debug NPE occurring in unit test when running in Jenkins diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index a7a6408..49e51f4 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -52,6 +52,7 @@ import org.quartz.SchedulerException; import org.quartz.SimpleTrigger; import org.rhq.core.clientapi.agent.PluginContainerException; +import org.rhq.core.clientapi.agent.discovery.DiscoveryAgentService; import org.rhq.core.clientapi.agent.discovery.InvalidPluginConfigurationClientException; import org.rhq.core.clientapi.agent.upgrade.ResourceUpgradeRequest; import org.rhq.core.clientapi.agent.upgrade.ResourceUpgradeResponse; @@ -452,12 +453,12 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot MergeResourceResponse mergeResourceResponse; try { AgentClient agentClient = this.agentManager.getAgentClient(parentResource.getAgent()); - mergeResourceResponse = agentClient.getDiscoveryAgentService().manuallyAddResource(resourceType, - parentResourceId, pluginConfiguration, user.getId()); + DiscoveryAgentService discoveryAgentService = agentClient.getDiscoveryAgentService(); + mergeResourceResponse = discoveryAgentService.manuallyAddResource(resourceType, + parentResourceId, pluginConfiguration, user.getId()); } catch (RuntimeException e) { - throw new RuntimeException("Error adding " + resourceType.getName() - + " resource to inventory as a child of the resource with id " + parentResourceId + " - cause: " - + e.getLocalizedMessage(), e); + throw new RuntimeException("Error adding [" + resourceType + + "] Resource to inventory as a child of " + parentResource + " - cause: " + e, e); } return mergeResourceResponse;

1 0

[rhq] modules/enterprise
by ips 30 May '12

30 May '12

modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java | 31 + modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java | 56 +++ modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java | 82 ++++ modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java | 165 ++++++++-- modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml | 2 5 files changed, 305 insertions(+), 31 deletions(-) New commits: commit 7de3b23b2a9b65af0733086da19636c50d3a7789 Author: Ian Springer <ian.springer(a)redhat.com> Date: Wed May 30 16:48:32 2012 -0400 [BZ 814305] throw RuntimeExceptions in SLSB methods for manual-add and create-child if 1) the new Resource's type is a singleton and a child Resource with that type already exists or 2) the new Resource's type does not support manual-add or the appropriate flavor of create-child; add new unit tests to verify the RuntimeExceptions are thrown (https://bugzilla.redhat.com/show_bug.cgi?id=814305) diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java index ce4e6a7..a7a6408 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2011 Red Hat, Inc. + * Copyright (C) 2005-2012 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -61,6 +61,7 @@ import org.rhq.core.clientapi.server.discovery.StaleTypeException; import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.discovery.MergeResourceResponse; import org.rhq.core.domain.discovery.ResourceSyncInfo; import org.rhq.core.domain.resource.Agent; @@ -438,9 +439,18 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot + " to manually add child resources."); } + Resource parentResource = this.resourceManager.getResourceById(user, parentResourceId); + + if (!resourceType.isSupportsManualAdd()) { + throw new RuntimeException("Cannot manually add " + resourceType + " child Resource under parent " + + parentResource + ", since the " + resourceType + + " type does not support manual add."); + } + + abortResourceManualAddIfExistingSingleton(parentResource, resourceType); + MergeResourceResponse mergeResourceResponse; try { - Resource parentResource = this.resourceManager.getResourceById(user, parentResourceId); AgentClient agentClient = this.agentManager.getAgentClient(parentResource.getAgent()); mergeResourceResponse = agentClient.getDiscoveryAgentService().manuallyAddResource(resourceType, parentResourceId, pluginConfiguration, user.getId()); @@ -1060,4 +1070,21 @@ public class DiscoveryBossBean implements DiscoveryBossLocal, DiscoveryBossRemot return newValue != null && (oldValue == null || !newValue.equals(oldValue)); } + private void abortResourceManualAddIfExistingSingleton(Resource parentResource, ResourceType resourceType) { + if (resourceType.isSingleton()) { + ResourceCriteria resourceCriteria = new ResourceCriteria(); + resourceCriteria.addFilterParentResourceId(parentResource.getId()); + resourceCriteria.addFilterResourceTypeId(resourceType.getId()); + PageList<Resource> childResourcesOfType = resourceManager.findResourcesByCriteria(subjectManager.getOverlord(), + resourceCriteria); + if (childResourcesOfType.size() >= 1) { + throw new RuntimeException("Cannot manually add " + resourceType + " child Resource under parent " + + parentResource + ", since " + resourceType + + " is a singleton type, and there is already a child Resource of that type. " + + "If the existing child Resource corresponds to a managed Resource which no longer exists, " + + "uninventory it and then try again."); + } + } + } + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java index b612c5e..8a9257f 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/resource/ResourceFactoryManagerBean.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2012 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -51,6 +51,7 @@ import org.rhq.core.domain.content.InstalledPackage; import org.rhq.core.domain.content.PackageType; import org.rhq.core.domain.content.PackageVersion; import org.rhq.core.domain.content.transfer.ResourcePackageDetails; +import org.rhq.core.domain.criteria.ResourceCriteria; import org.rhq.core.domain.resource.Agent; import org.rhq.core.domain.resource.CreateResourceHistory; import org.rhq.core.domain.resource.CreateResourceStatus; @@ -58,6 +59,7 @@ import org.rhq.core.domain.resource.DeleteResourceHistory; import org.rhq.core.domain.resource.DeleteResourceStatus; import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; +import org.rhq.core.domain.resource.ResourceCreationDataType; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.server.PersistenceUtility; import org.rhq.core.domain.util.PageControl; @@ -170,7 +172,7 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal, // There is some inconsistency if we're completing a request that was not in the database if (history == null) { - log.error("Attemping to complete a request that was not found in the database: " + response.getRequestId()); + log.error("Attempting to complete a request that was not found in the database: " + response.getRequestId()); return; } @@ -437,6 +439,14 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal, ResourceType newResourceType = entityManager.find(ResourceType.class, newResourceTypeId); PackageType newPackageType = contentManager.getResourceCreationPackageType(newResourceTypeId); + if (!newResourceType.isCreatable() || (newResourceType.getCreationDataType() != ResourceCreationDataType.CONTENT)) { + throw new RuntimeException("Cannot create " + newResourceType + " child Resource under parent " + + parentResource + ", since the " + newResourceType + + " type does not support content-based Resource creation."); + } + + abortResourceCreationIfExistingSingleton(parentResource, newResourceType); + // unless version is set start versioning the package by timestamp packageVersionNumber = (null == packageVersionNumber) ? Long.toString(System.currentTimeMillis()) : packageVersionNumber; @@ -477,15 +487,23 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal, + " of type: " + resourceTypeId); ResourceType resourceType = entityManager.find(ResourceType.class, resourceTypeId); - Resource resource = entityManager.find(Resource.class, parentResourceId); - Agent agent = resource.getAgent(); + Resource parentResource = entityManager.find(Resource.class, parentResourceId); + Agent agent = parentResource.getAgent(); // Check permissions first - if (!authorizationManager.hasResourcePermission(user, Permission.CREATE_CHILD_RESOURCES, resource.getId())) { + if (!authorizationManager.hasResourcePermission(user, Permission.CREATE_CHILD_RESOURCES, parentResource.getId())) { throw new PermissionException("User [" + user.getName() - + "] does not have permission to create a child resource for resource [" + resource + "]"); + + "] does not have permission to create a child resource for resource [" + parentResource + "]"); + } + + if (!resourceType.isCreatable() || (resourceType.getCreationDataType() != ResourceCreationDataType.CONFIGURATION)) { + throw new RuntimeException("Cannot create " + resourceType + " child Resource under parent " + + parentResource + ", since the " + resourceType + + " type does not support configuration-based Resource creation."); } + abortResourceCreationIfExistingSingleton(parentResource, resourceType); + // Persist in separate transaction so it is committed immediately, before the request is sent to the agent CreateResourceHistory persistedHistory = resourceFactoryManager.persistCreateHistory(user, parentResourceId, resourceTypeId, resourceName, resourceConfiguration); @@ -573,6 +591,14 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal, ResourceType newResourceType = entityManager.find(ResourceType.class, newResourceTypeId); PackageVersion packageVersion = entityManager.find(PackageVersion.class, packageVersionId); + if (!newResourceType.isCreatable() || (newResourceType.getCreationDataType() != ResourceCreationDataType.CONTENT)) { + throw new RuntimeException("Cannot create " + newResourceType + " child Resource under parent " + + parentResource + ", since the " + newResourceType + + " type does not support content-based Resource creation."); + } + + abortResourceCreationIfExistingSingleton(parentResource, newResourceType); + return doCreatePackageBackedResource(subject, parentResource, newResourceType, newResourceName, pluginConfiguration, deploymentTimeConfiguration, packageVersion, timeout); } @@ -672,4 +698,22 @@ public class ResourceFactoryManagerBean implements ResourceFactoryManagerLocal, throw new RuntimeException("Error while sending delete resource request to agent service", e); } } + + private void abortResourceCreationIfExistingSingleton(Resource parentResource, ResourceType resourceType) { + if (resourceType.isSingleton()) { + ResourceCriteria resourceCriteria = new ResourceCriteria(); + resourceCriteria.addFilterParentResourceId(parentResource.getId()); + resourceCriteria.addFilterResourceTypeId(resourceType.getId()); + PageList<Resource> childResourcesOfType = resourceManager.findResourcesByCriteria(subjectManager.getOverlord(), + resourceCriteria); + if (childResourcesOfType.size() >= 1) { + throw new RuntimeException("Cannot create " + resourceType + " child Resource under parent " + + parentResource + ", since " + resourceType + + " is a singleton type, and there is already a child Resource of that type. " + + "If the existing child Resource corresponds to a managed Resource which no longer exists, " + + "uninventory it and then try again."); + } + } + } + } diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java index 0dc28aa..1625480 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2012 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -25,7 +25,9 @@ import java.io.ObjectOutputStream; import java.sql.Connection; import java.util.List; import java.util.Random; +import java.util.UUID; +import javax.ejb.EJBException; import javax.management.MBeanServer; import javax.management.MBeanServerFactory; import javax.persistence.EntityManager; @@ -42,6 +44,9 @@ import org.dbunit.ext.oracle.Oracle10DataTypeFactory; import org.dbunit.ext.oracle.OracleDataTypeFactory; import org.dbunit.ext.postgresql.PostgresqlDataTypeFactory; import org.dbunit.operation.DatabaseOperation; +import org.mockito.Mockito; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; @@ -50,20 +55,38 @@ import org.xml.sax.InputSource; import org.jboss.mx.util.MBeanServerLocator; +import org.rhq.core.clientapi.agent.discovery.DiscoveryAgentService; import org.rhq.core.clientapi.server.discovery.InventoryReport; +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.discovery.MergeResourceResponse; import org.rhq.core.domain.discovery.ResourceSyncInfo; import org.rhq.core.domain.resource.Agent; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceType; +import org.rhq.enterprise.server.auth.SubjectManagerLocal; import org.rhq.enterprise.server.core.comm.ServerCommunicationsService; import org.rhq.enterprise.server.core.comm.ServerCommunicationsServiceMBean; +import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.test.AbstractEJB3Test; +import org.rhq.enterprise.server.test.TestServerCommunicationsService; import org.rhq.enterprise.server.util.LookupUtil; import org.rhq.enterprise.server.util.ResourceTreeHelper; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Mockito.when; + +/** + * A unit test for {@link DiscoveryBossBean}. + */ public class DiscoveryBossBeanTest extends AbstractEJB3Test { + private DiscoveryBossLocal discoveryBoss; + private SubjectManagerLocal subjectManager; + + private ResourceManagerLocal resourceManager; + private MBeanServer dummyJBossMBeanServer; private ResourceType platformType; @@ -76,9 +99,13 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test { private Agent agent; + private TestServerCommunicationsService agentServiceContainer; + @BeforeClass public void beforeClass() throws Exception { discoveryBoss = LookupUtil.getDiscoveryBoss(); + subjectManager = LookupUtil.getSubjectManager(); + resourceManager = LookupUtil.getResourceManager(); } @BeforeMethod @@ -95,6 +122,26 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test { serviceType1 = getEntityManager().find(ResourceType.class, 3); serviceType2 = getEntityManager().find(ResourceType.class, 4); agent = getEntityManager().find(Agent.class, 1); + + agentServiceContainer = prepareForTestAgents(); + agentServiceContainer.discoveryService = Mockito.mock(DiscoveryAgentService.class); + when(agentServiceContainer.discoveryService.manuallyAddResource(any(ResourceType.class), anyInt(), + any(Configuration.class), anyInt())).thenAnswer(new Answer<MergeResourceResponse>() { + public MergeResourceResponse answer(InvocationOnMock invocation) throws Throwable { + Resource resource = new Resource(1000000); + resource.setUuid(UUID.randomUUID().toString()); + ResourceType resourceType = (ResourceType) invocation.getArguments()[0]; + resource.setResourceType(resourceType); + long randomLong = UUID.randomUUID().getLeastSignificantBits(); + resource.setResourceKey(String.valueOf("key-" + randomLong)); + resource.setName("name-" + randomLong); + int parentResourceId = (Integer)invocation.getArguments()[1]; + Resource parentResource = resourceManager.getResource(subjectManager.getOverlord(), parentResourceId); + resource.setParentResource(parentResource); + Integer ownerSubjectId = (Integer) invocation.getArguments()[3]; + return discoveryBoss.addResource(resource, ownerSubjectId); + } + }); } @AfterMethod(alwaysRun = true) @@ -158,6 +205,39 @@ public class DiscoveryBossBeanTest extends AbstractEJB3Test { assert syncInfo != null; } + @Test(groups = "integration.ejb3") + public void testManuallyAddResource() throws Exception { + InventoryReport inventoryReport = new InventoryReport(agent); + + Resource platform = new Resource("alpha", "platform", platformType); + Resource server = new Resource("bravo", "server", serverType); + platform.addChildResource(server); + Resource service2 = new Resource("delta", "service 2", serviceType2); + server.addChildResource(service2); + + platform.setUuid("" + new Random().nextInt()); + server.setUuid("" + new Random().nextInt()); + service2.setUuid("" + new Random().nextInt()); + + inventoryReport.addAddedRoot(platform); + + ResourceSyncInfo syncInfo = discoveryBoss.mergeInventoryReport(serialize(inventoryReport)); + assert syncInfo != null; + + ResourceSyncInfo serverSyncInfo = syncInfo.getChildSyncInfos().iterator().next(); + Resource resource1 = discoveryBoss.manuallyAddResource(subjectManager.getOverlord(), serviceType2.getId(), + serverSyncInfo.getId(), new Configuration()); + + try { + Resource resource2 = discoveryBoss.manuallyAddResource(subjectManager.getOverlord(), serviceType2.getId(), + serverSyncInfo.getId(), new Configuration()); + fail("Manually adding a singleton that already existed succeeded: " + resource2); + } catch (EJBException e) { + assertEquals(String.valueOf(e.getCause()), RuntimeException.class, e.getCause().getClass()); + assertTrue(String.valueOf(e.getCause()), e.getCause().getMessage().contains("singleton")); + } + } + /** * Use this to fake like your remoting objects. Can be used to keep your own copy of objects locally transient. * diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java index fdb6607..cbcf1dc 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/test/ResourceFactoryManagerBeanTest.java @@ -1,6 +1,6 @@ /* * RHQ Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * Copyright (C) 2005-2012 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -23,7 +23,9 @@ import java.net.URL; import java.util.List; import java.util.Random; import java.util.Set; +import java.util.UUID; +import javax.ejb.EJBException; import javax.persistence.EntityManager; import org.testng.annotations.AfterMethod; @@ -42,6 +44,7 @@ import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.domain.content.PackageCategory; import org.rhq.core.domain.content.PackageType; +import org.rhq.core.domain.resource.CreateDeletePolicy; import org.rhq.core.domain.resource.CreateResourceHistory; import org.rhq.core.domain.resource.CreateResourceStatus; import org.rhq.core.domain.resource.DeleteResourceHistory; @@ -49,9 +52,11 @@ import org.rhq.core.domain.resource.DeleteResourceStatus; import org.rhq.core.domain.resource.InventoryStatus; import org.rhq.core.domain.resource.Resource; import org.rhq.core.domain.resource.ResourceCategory; +import org.rhq.core.domain.resource.ResourceCreationDataType; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.domain.util.PageControl; import org.rhq.core.domain.util.PageList; +import org.rhq.enterprise.server.discovery.DiscoveryBossLocal; import org.rhq.enterprise.server.resource.ResourceFactoryManagerLocal; import org.rhq.enterprise.server.resource.ResourceManagerLocal; import org.rhq.enterprise.server.test.AbstractEJB3Test; @@ -60,13 +65,19 @@ import org.rhq.enterprise.server.test.TestServerCommunicationsService; import org.rhq.enterprise.server.util.LookupUtil; /** + * A unit test for {@link org.rhq.enterprise.server.resource.ResourceFactoryManagerBean}. + * * @author Jason Dobies */ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { + + private static final String TEST_PLUGIN_NAME = "TestPlugin"; + // Attributes -------------------------------------------- private ResourceFactoryManagerLocal resourceFactoryManager; private ResourceManagerLocal resourceManager; + private DiscoveryBossLocal discoveryBoss; private Subject overlord; private MockResourceFactoryAgentService mockAgentService = new MockResourceFactoryAgentService(); @@ -74,7 +85,9 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { // Populated during setupResourceEnvironment private Resource parentResource; private ResourceType parentResourceType; - private ResourceType childResourceType; + private ResourceType contentBackedChildResourceType; + private ResourceType configBackedChildResourceType1; + private ResourceType configBackedChildResourceType2; private PackageType packageType; // Setup -------------------------------------------- @@ -83,6 +96,7 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { public void setupBeforeClass() throws Exception { resourceFactoryManager = LookupUtil.getResourceFactoryManager(); resourceManager = LookupUtil.getResourceManager(); + discoveryBoss = LookupUtil.getDiscoveryBoss(); overlord = LookupUtil.getSubjectManager().getOverlord(); } @@ -123,7 +137,7 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { resourceConfiguration.put(new PropertySimple("property1", "value1")); // Test - resourceFactoryManager.createResource(overlord, parentResource.getId(), childResourceType.getId(), + resourceFactoryManager.createResource(overlord, parentResource.getId(), configBackedChildResourceType1.getId(), "newResource", null, resourceConfiguration); // Verify @@ -164,7 +178,7 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { resourceConfiguration.put(new PropertySimple("property1", "value1")); // Test - resourceFactoryManager.createResource(overlord, parentResource.getId(), childResourceType.getId(), + resourceFactoryManager.createResource(overlord, parentResource.getId(), configBackedChildResourceType1.getId(), "newResource", null, resourceConfiguration); // Verify @@ -192,7 +206,70 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { } @Test - public void createResourceViaPackage() throws Exception { + public void createSingletonResourceViaConfiguration() throws Exception { + // Setup + mockAgentService.setCreateReturnStatus(CreateResourceStatus.SUCCESS); + + // Assemble call parameters + Subject overlord = LookupUtil.getSubjectManager().getOverlord(); + + Configuration resourceConfiguration = new Configuration(); + resourceConfiguration.put(new PropertySimple("property1", "value1")); + + // Test + CreateResourceHistory history1 = resourceFactoryManager.createResource(overlord, parentResource.getId(), configBackedChildResourceType2.getId(), + "newResource", null, resourceConfiguration); + + // Verify + EntityManager entityManager = null; + try { + getTransactionManager().begin(); + entityManager = getEntityManager(); + + Resource parent = entityManager.find(Resource.class, parentResource.getId()); + List<CreateResourceHistory> historyList = parent.getCreateChildResourceRequests(); + + assert historyList.size() == 1 : "Incorrect number of children found. Expected: 1, Found: " + + historyList.size(); + + CreateResourceHistory historyItem = historyList.get(0); + + assert historyItem.getStatus() == CreateResourceStatus.SUCCESS : "Incorrect status for history item. Expected: Success, Found: " + + historyItem.getStatus(); + assert historyItem.getNewResourceKey().equals("mockResourceKey") : "Incorrect resource key for history item. Expected: mockResourceKey, Found: " + + historyItem.getNewResourceKey(); + assert historyItem.getErrorMessage() == null : "Error message found for successful call"; + assert historyItem.getConfiguration() != null : "Null configuration found for history item"; + } finally { + getTransactionManager().rollback(); + entityManager.close(); + } + + // Invoke the same callbacks the plugin container would to actually commit the new Resource to inventory. + resourceFactoryManager.completeCreateResource(new CreateResourceResponse(history1.getId(), "newResource", "key", + CreateResourceStatus.SUCCESS, null, new Configuration())); + Resource resource = new Resource(1000000); + resource.setUuid(UUID.randomUUID().toString()); + resource.setResourceType(configBackedChildResourceType2); + long randomLong = UUID.randomUUID().getLeastSignificantBits(); + resource.setResourceKey(String.valueOf("key-" + randomLong)); + resource.setName("name-" + randomLong); + resource.setParentResource(parentResource); + discoveryBoss.addResource(resource, overlord.getId()); + + // Now try to create another Resource of the same singleton type - this should fail. + try { + CreateResourceHistory history2 = resourceFactoryManager.createResource(overlord, parentResource.getId(), + configBackedChildResourceType2.getId(), "newResource2", null, resourceConfiguration); + fail("Creating a singleton that already existed succeeded: " + history2); + } catch (EJBException e) { + assertEquals(String.valueOf(e.getCause()), RuntimeException.class, e.getCause().getClass()); + assertTrue(String.valueOf(e.getCause()), e.getCause().getMessage().contains("singleton")); + } + } + + @Test + public void createSingletonResourceViaPackage() throws Exception { // Setup mockAgentService.setCreateReturnStatus(CreateResourceStatus.SUCCESS); @@ -212,9 +289,9 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { InputStream packageInputStream = contentResource.openStream(); // Test - resourceFactoryManager.createResource(overlord, parentResource.getId(), childResourceType.getId(), - "newResource", null, packageName, packageVersion, architectureId, deploymentTimeConfiguration, - packageInputStream); + CreateResourceHistory history1 = resourceFactoryManager.createResource(overlord, parentResource.getId(), contentBackedChildResourceType.getId(), + "newResource", null, packageName, packageVersion, architectureId, deploymentTimeConfiguration, + packageInputStream); // Verify EntityManager entityManager = null; @@ -239,6 +316,29 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { getTransactionManager().rollback(); entityManager.close(); } + + // Invoke the same callbacks the plugin container would to actually commit the new Resource to inventory. + resourceFactoryManager.completeCreateResource(new CreateResourceResponse(history1.getId(), "newResource", "key", + CreateResourceStatus.SUCCESS, null, new Configuration())); + Resource resource = new Resource(2000000); + resource.setUuid(UUID.randomUUID().toString()); + resource.setResourceType(contentBackedChildResourceType); + long randomLong = UUID.randomUUID().getLeastSignificantBits(); + resource.setResourceKey(String.valueOf("key-" + randomLong)); + resource.setName("name-" + randomLong); + resource.setParentResource(parentResource); + discoveryBoss.addResource(resource, overlord.getId()); + + // Now try to create another Resource of the same singleton type - this should fail. + try { + CreateResourceHistory history2 = resourceFactoryManager.createResource(overlord, parentResource.getId(), + contentBackedChildResourceType.getId(), "newResource2", null, packageName, packageVersion, + architectureId, deploymentTimeConfiguration, packageInputStream); + fail("Creating a singleton that already existed succeeded: " + history2); + } catch (EJBException e) { + assertEquals(String.valueOf(e.getCause()), RuntimeException.class, e.getCause().getClass()); + assertTrue(String.valueOf(e.getCause()), e.getCause().getMessage().contains("singleton")); + } } @Test @@ -323,17 +423,17 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { resourceConfiguration = new Configuration(); resourceConfiguration.getMap(); - resourceFactoryManager.createResource(overlord, parentResource.getId(), childResourceType.getId(), "resource1", + resourceFactoryManager.createResource(overlord, parentResource.getId(), configBackedChildResourceType1.getId(), "resource1", (Configuration) null, resourceConfiguration); resourceConfiguration = new Configuration(); resourceConfiguration.getMap(); - resourceFactoryManager.createResource(overlord, parentResource.getId(), childResourceType.getId(), "resource2", - (Configuration) null, resourceConfiguration); + resourceFactoryManager.createResource(overlord, parentResource.getId(), configBackedChildResourceType1.getId(), "resource2", + (Configuration) null, resourceConfiguration); resourceConfiguration = new Configuration(); resourceConfiguration.getMap(); - resourceFactoryManager.createResource(overlord, parentResource.getId(), childResourceType.getId(), "resource3", + resourceFactoryManager.createResource(overlord, parentResource.getId(), configBackedChildResourceType1.getId(), "resource3", (Configuration) null, resourceConfiguration); // Verify @@ -395,7 +495,7 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { Configuration resourceConfiguration = new Configuration(); resourceConfiguration.getMap(); - resourceFactoryManager.createResource(overlord, parentResource.getId(), childResourceType.getId(), + resourceFactoryManager.createResource(overlord, parentResource.getId(), configBackedChildResourceType1.getId(), "NewResource", null, resourceConfiguration); PageList<CreateResourceHistory> historyList = resourceFactoryManager.findCreateChildResourceHistory(overlord, parentResource.getId(), null, null, new PageControl(0, 1000)); @@ -425,14 +525,17 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { try { try { // Create parent resource type - parentResourceType = new ResourceType("platform-" + System.currentTimeMillis(), "TestPlugin", + parentResourceType = new ResourceType("platform-" + System.currentTimeMillis(), TEST_PLUGIN_NAME, ResourceCategory.PLATFORM, null); em.persist(parentResourceType); // Create child resource type to parent. Artifact type lives under this resource type. - childResourceType = new ResourceType("server-" + System.currentTimeMillis(), "TestPlugin", - ResourceCategory.SERVER, parentResourceType); - em.persist(childResourceType); + contentBackedChildResourceType = new ResourceType("service-" + System.currentTimeMillis(), TEST_PLUGIN_NAME, + ResourceCategory.SERVICE, parentResourceType); + contentBackedChildResourceType.setCreateDeletePolicy(CreateDeletePolicy.BOTH); + contentBackedChildResourceType.setCreationDataType(ResourceCreationDataType.CONTENT); + contentBackedChildResourceType.setSingleton(true); + em.persist(contentBackedChildResourceType); // Create artifact type under child resource type that is marked as the creation artifact type packageType = new PackageType(); @@ -441,11 +544,24 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { packageType.setCategory(PackageCategory.DEPLOYABLE); packageType.setDisplayName("TestResourceArtifact"); packageType.setCreationData(true); - packageType.setResourceType(childResourceType); + packageType.setResourceType(contentBackedChildResourceType); em.persist(packageType); // Link artifact type and child resource type - childResourceType.addPackageType(packageType); + contentBackedChildResourceType.addPackageType(packageType); + + configBackedChildResourceType1 = new ResourceType("service1-" + System.currentTimeMillis(), TEST_PLUGIN_NAME, + ResourceCategory.SERVICE, parentResourceType); + configBackedChildResourceType1.setCreateDeletePolicy(CreateDeletePolicy.BOTH); + configBackedChildResourceType1.setCreationDataType(ResourceCreationDataType.CONFIGURATION); + em.persist(configBackedChildResourceType1); + + configBackedChildResourceType2 = new ResourceType("service2-" + System.currentTimeMillis(), TEST_PLUGIN_NAME, + ResourceCategory.SERVICE, parentResourceType); + configBackedChildResourceType2.setCreateDeletePolicy(CreateDeletePolicy.BOTH); + configBackedChildResourceType2.setCreationDataType(ResourceCreationDataType.CONFIGURATION); + configBackedChildResourceType2.setSingleton(true); + em.persist(configBackedChildResourceType2); // Create parent resource off of which to hang created resources parentResource = new Resource("parent" + System.currentTimeMillis(), "name", parentResourceType); @@ -479,8 +595,14 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { getTransactionManager().begin(); EntityManager em = getEntityManager(); try { - // Remove the child first. - ResourceType deleteMeType = em.find(ResourceType.class, childResourceType.getId()); + // Remove the children first. + ResourceType deleteMeType = em.find(ResourceType.class, contentBackedChildResourceType.getId()); + em.remove(deleteMeType); + + deleteMeType = em.find(ResourceType.class, configBackedChildResourceType1.getId()); + em.remove(deleteMeType); + + deleteMeType = em.find(ResourceType.class, configBackedChildResourceType2.getId()); em.remove(deleteMeType); deleteMeType = em.find(ResourceType.class, parentResourceType.getId()); @@ -617,4 +739,5 @@ public class ResourceFactoryManagerBeanTest extends AbstractEJB3Test { return null; } } + } \ No newline at end of file diff --git a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml index b21cc8d..4891276 100644 --- a/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml +++ b/modules/enterprise/server/jar/src/test/resources/org/rhq/enterprise/server/discovery/DiscoveryBossBeanTest.xml @@ -52,7 +52,7 @@ creation_data_type="CONFIGURATION" create_delete_policy="BOTH" supports_manual_add="1" - singleton="0" + singleton="1" plugin="test" deleted="0"/>

1 0

[rhq] modules/enterprise
by Jay Shaughnessy 30 May '12

30 May '12

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java | 135 ++++++++-- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java | 3 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java | 88 +++++- 3 files changed, 189 insertions(+), 37 deletions(-) New commits: commit f758dd314f3701432e824cc7509fdba21f76d703 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Wed May 30 14:18:57 2012 -0400 [Bug 826673 - RFE: Add ability to maximize a dashboard portlet] - add this ability - also, fix a bug in portlet removal where the portlet window was not being fully removed from the current dashboard. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java index 43a8bc0..ac85aad 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java @@ -18,6 +18,13 @@ */ package org.rhq.enterprise.gui.coregui.client.dashboard; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Set; + import com.google.gwt.user.client.rpc.AsyncCallback; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.widgets.AnimationCallback; @@ -25,7 +32,11 @@ import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.form.DynamicForm; import com.smartgwt.client.widgets.form.events.ColorSelectedEvent; import com.smartgwt.client.widgets.form.events.ColorSelectedHandler; -import com.smartgwt.client.widgets.form.fields.*; +import com.smartgwt.client.widgets.form.fields.ButtonItem; +import com.smartgwt.client.widgets.form.fields.CanvasItem; +import com.smartgwt.client.widgets.form.fields.FormItem; +import com.smartgwt.client.widgets.form.fields.StaticTextItem; +import com.smartgwt.client.widgets.form.fields.TextItem; import com.smartgwt.client.widgets.form.fields.events.BlurEvent; import com.smartgwt.client.widgets.form.fields.events.BlurHandler; import com.smartgwt.client.widgets.layout.LayoutSpacer; @@ -36,6 +47,7 @@ import com.smartgwt.client.widgets.menu.events.ClickHandler; import com.smartgwt.client.widgets.menu.events.ItemClickEvent; import com.smartgwt.client.widgets.menu.events.ItemClickHandler; import com.smartgwt.client.widgets.menu.events.MenuItemClickEvent; + import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.common.EntityContext; @@ -50,13 +62,25 @@ import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.ImageManager; import org.rhq.enterprise.gui.coregui.client.UserSessionManager; import org.rhq.enterprise.gui.coregui.client.components.form.ColorButtonItem; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.*; -import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.*; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupBundleDeploymentsPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupConfigurationUpdatesPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupMetricsPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupOobsPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupOperationsPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.groups.GroupPkgHistoryPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceBundleDeploymentsPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceConfigurationUpdatesPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceEventsPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceMetricsPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourceOperationsPortlet; +import org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.ResourcePkgHistoryPortlet; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.util.message.Message; -import org.rhq.enterprise.gui.coregui.client.util.selenium.*; - -import java.util.*; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableIMenuButton; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableMenu; +import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; +import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility; /** * @author Jay Shaughnessy @@ -68,13 +92,14 @@ public class DashboardView extends LocatableVLayout { private DashboardContainer dashboardContainer; private Dashboard storedDashboard; - boolean editMode = false; + private boolean editMode = false; PortalLayout portalLayout; LocatableDynamicForm editForm; IMenuButton addPortlet; HashSet<PortletWindow> portletWindows = new HashSet<PortletWindow>(); + private static String STOP = MSG.view_dashboards_portlets_refresh_none(); private static String REFRESH1 = MSG.view_dashboards_portlets_refresh_one_min(); private static String REFRESH5 = MSG.view_dashboards_portlets_refresh_multiple_min(String.valueOf(5)); @@ -97,6 +122,8 @@ public class DashboardView extends LocatableVLayout { // the view is set to a Tab's pane. private boolean isInitialized = false; + private PortletWindow maximizedPortlet = null; + /** * Convenience constructor for subsystem context. * @@ -593,20 +620,21 @@ public class DashboardView extends LocatableVLayout { outline.draw(); outline.bringToFront(); - outline.animateRect(newPortletWindow.getPageLeft(), newPortletWindow.getPageTop(), newPortletWindow - .getVisibleWidth(), newPortletWindow.getViewportHeight(), new AnimationCallback() { - public void execute(boolean earlyFinish) { - // callback at end of animation - destroy placeholder and outline; show the new portlet - placeHolder.destroy(); - outline.destroy(); - newPortletWindow.show(); - } - }, 750); + outline.animateRect(newPortletWindow.getPageLeft(), newPortletWindow.getPageTop(), + newPortletWindow.getVisibleWidth(), newPortletWindow.getViewportHeight(), new AnimationCallback() { + public void execute(boolean earlyFinish) { + // callback at end of animation - destroy placeholder and outline; show the new portlet + placeHolder.destroy(); + outline.destroy(); + newPortletWindow.show(); + } + }, 750); save(); } - public void removePortlet(DashboardPortlet portlet) { - storedDashboard.removePortlet(portlet); + public void removePortlet(PortletWindow portletWindow) { + storedDashboard.removePortlet(portletWindow.getStoredPortlet()); + this.portletWindows.remove(portletWindow); // portlet remove means the portlet locations may have changed. The selenium testing locators include // positioning info. So, in this case we have to take the hit and completely refresh the dash. @@ -752,8 +780,8 @@ public class DashboardView extends LocatableVLayout { boolean unpersistedDash = (storedPortlet.getDashboard().getId() == 0 || updatedPortlet.getDashboard().getId() == 0); boolean dashMatchId = (!unpersistedDash && (storedPortlet.getDashboard().getId() == updatedPortlet .getDashboard().getId())); - boolean dashMatchName = (unpersistedDash && storedPortlet.getDashboard().getName().equals( - updatedPortlet.getDashboard().getName())); + boolean dashMatchName = (unpersistedDash && storedPortlet.getDashboard().getName() + .equals(updatedPortlet.getDashboard().getName())); if (!(dashMatchId || dashMatchName)) { return false; } @@ -792,6 +820,12 @@ public class DashboardView extends LocatableVLayout { public void setEditMode(boolean editMode) { this.editMode = editMode; + + // don't allow resizing in min/max in edit mode + for (PortletWindow portletWindow : portletWindows) { + portletWindow.hideSizingHeaderControls(editMode); + } + if (editMode) { this.editForm.show(); // @@ -872,4 +906,65 @@ public class DashboardView extends LocatableVLayout { return resourceComposite; } + public boolean isMaximized() { + return (maximizedPortlet != null); + } + + public PortletWindow getMaximizePortlet() { + return maximizedPortlet; + } + + public void maximizePortlet(PortletWindow portletWindow) { + if (isMaximized()) { + return; + } + + maximizedPortlet = portletWindow; + + int numColumns = storedDashboard.getColumns(); + for (int i = 0; i < numColumns; ++i) { + PortalColumn col = portalLayout.getPortalColumn(i); + Canvas portlet = col.getMember(portletWindow.getID()); + if (null == portlet) { + col.hide(); + } else { + for (Canvas member : col.getMembers()) { + if (!member.equals(portlet)) { + member.hide(); + } else { + ((PortletWindow) member).hideSizingHeaderControls(true); + member.setHeight100(); + } + } + } + } + + portalLayout.markForRedraw(); + } + + public void restorePortlet() { + if (!isMaximized()) { + return; + } + + int numColumns = storedDashboard.getColumns(); + for (int i = 0; i < numColumns; ++i) { + PortalColumn col = portalLayout.getPortalColumn(i); + if (!col.isVisible()) { + col.show(); + } else { + for (Canvas member : col.getMembers()) { + if (!member.isVisible()) { + member.show(); + } else { + ((PortletWindow) member).hideSizingHeaderControls(false); + member.setHeight(maximizedPortlet.getStoredPortlet().getHeight()); + } + } + } + } + + maximizedPortlet = null; + portalLayout.markForRedraw(); + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java index 5cbc4c7..52e3a8f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardsView.java @@ -188,6 +188,9 @@ public class DashboardsView extends LocatableVLayout implements DashboardContain public void onClick(ClickEvent clickEvent) { editMode = !editMode; editButton.setTitle(editMode ? MSG.common_title_view_mode() : MSG.common_title_edit_mode()); + if (selectedDashboardView.isMaximized()) { + selectedDashboardView.restorePortlet(); + } selectedDashboardView.setEditMode(editMode); } }); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java index ff6f522..bb8d568 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java @@ -22,13 +22,28 @@ */ package org.rhq.enterprise.gui.coregui.client.dashboard; +import java.util.ArrayList; +import java.util.Set; + import com.smartgwt.client.types.DragAppearance; import com.smartgwt.client.types.HeaderControls; import com.smartgwt.client.types.Overflow; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.HeaderControl; import com.smartgwt.client.widgets.HeaderControl.HeaderIcon; -import com.smartgwt.client.widgets.events.*; +import com.smartgwt.client.widgets.events.ClickEvent; +import com.smartgwt.client.widgets.events.ClickHandler; +import com.smartgwt.client.widgets.events.CloseClickEvent; +import com.smartgwt.client.widgets.events.CloseClickHandler; +import com.smartgwt.client.widgets.events.DragResizeStopEvent; +import com.smartgwt.client.widgets.events.DragResizeStopHandler; +import com.smartgwt.client.widgets.events.MinimizeClickEvent; +import com.smartgwt.client.widgets.events.MinimizeClickHandler; +import com.smartgwt.client.widgets.events.MouseOverEvent; +import com.smartgwt.client.widgets.events.MouseOverHandler; +import com.smartgwt.client.widgets.events.RestoreClickEvent; +import com.smartgwt.client.widgets.events.RestoreClickHandler; + import org.rhq.core.domain.authz.Permission; import org.rhq.core.domain.common.EntityContext; import org.rhq.core.domain.dashboard.DashboardPortlet; @@ -37,8 +52,6 @@ import org.rhq.enterprise.gui.coregui.client.components.table.Table; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHeaderControl; import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow; -import java.util.Set; - /** * @author Greg Hinkle * @author Jay Shaughnessy @@ -104,6 +117,12 @@ public class PortletWindow extends LocatableWindow { } }; + private HeaderControl maximizeHeaderControl = new HeaderControl(HeaderControl.MAXIMIZE, new ClickHandler() { + public void onClick(ClickEvent event) { + PortletWindow.this.dashboardView.maximizePortlet(PortletWindow.this); + } + }); + public PortletWindow(String locatorId, DashboardView dashboardView, DashboardPortlet dashboardPortlet, EntityContext context) { super(locatorId); @@ -139,18 +158,7 @@ public class PortletWindow extends LocatableWindow { } // customize the appearance and order of the controls in the window header - if (headerIcon != null) { - setHeaderControls(HeaderControls.MINIMIZE_BUTTON, headerIcon, HeaderControls.HEADER_LABEL, - new LocatableHeaderControl(extendLocatorId("Refresh"), HeaderControl.REFRESH, refreshHandler), - new LocatableHeaderControl(extendLocatorId("Settings"), HeaderControl.SETTINGS, settingsHandler), - new LocatableHeaderControl(extendLocatorId("Help"), HeaderControl.HELP, helpHandler), - HeaderControls.CLOSE_BUTTON); - } else { - setHeaderControls(HeaderControls.MINIMIZE_BUTTON, HeaderControls.HEADER_LABEL, new LocatableHeaderControl( - extendLocatorId("Refresh"), HeaderControl.REFRESH, refreshHandler), new LocatableHeaderControl( - extendLocatorId("Settings"), HeaderControl.SETTINGS, settingsHandler), new LocatableHeaderControl( - extendLocatorId("Help"), HeaderControl.HELP, helpHandler), HeaderControls.CLOSE_BUTTON); - } + initHeaderControls(); // enable predefined component animation setAnimateMinimize(true); @@ -189,8 +197,12 @@ public class PortletWindow extends LocatableWindow { addCloseClickHandler(new CloseClickHandler() { public void onCloseClick(CloseClickEvent closeClientEvent) { - PortletWindow.this.dashboardView.removePortlet(PortletWindow.this.storedPortlet); - destroy(); + if (PortletWindow.this.dashboardView.isMaximized()) { + PortletWindow.this.dashboardView.restorePortlet(); + } else { + PortletWindow.this.dashboardView.removePortlet(PortletWindow.this); + destroy(); + } } }); @@ -198,6 +210,48 @@ public class PortletWindow extends LocatableWindow { setHelpClickHandler(helpHandler); } + private void initHeaderControls() { + + ArrayList<Object> headerControls = new ArrayList<Object>(); + + headerControls.add(HeaderControls.MINIMIZE_BUTTON); + addMinimizeClickHandler(new MinimizeClickHandler() { + public void onMinimizeClick(MinimizeClickEvent event) { + maximizeHeaderControl.hide(); + } + }); + addRestoreClickHandler(new RestoreClickHandler() { + public void onRestoreClick(RestoreClickEvent event) { + maximizeHeaderControl.show(); + } + }); + + headerControls.add(maximizeHeaderControl); + + if (headerIcon != null) { + headerControls.add(headerIcon); + } + headerControls.add(HeaderControls.HEADER_LABEL); + headerControls.add(new HeaderControl(HeaderControl.REFRESH, refreshHandler)); + headerControls.add(new HeaderControl(HeaderControl.SETTINGS, settingsHandler)); + headerControls.add(new HeaderControl(HeaderControl.HELP, helpHandler)); + headerControls.add(HeaderControls.CLOSE_BUTTON); + + setHeaderControls(headerControls.toArray(new Object[headerControls.size()])); + } + + void hideSizingHeaderControls(boolean hideControls) { + + if (hideControls) { + setShowMinimizeButton(false); + maximizeHeaderControl.hide(); + + } else { + setShowMinimizeButton(true); + maximizeHeaderControl.show(); + } + } + @Override protected void onInit() { super.onInit();

1 0

[rhq] Branch 'lkrejci/modular-scripting' - modules/enterprise
by lkrejci 30 May '12

30 May '12

modules/enterprise/scripting/python/pom.xml | 187 ++++++++++ modules/enterprise/scripting/python/src/main/java/org/rhq/scripting/python/PythonScriptEngineInitializer.java | 101 +++++ modules/enterprise/scripting/python/src/main/java/org/rhq/scripting/python/PythonScriptEngineProvider.java | 49 ++ modules/enterprise/scripting/python/src/main/resources/META-INF/services/org.rhq.scripting.ScriptEngineProvider | 1 4 files changed, 338 insertions(+) New commits: commit 6bd2fa80f4871209de16e6560b374a24cd308666 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed May 30 20:13:46 2012 +0200 Experimental and unfinished support for python in the CLI. There's no support for custom script sources and code completion. diff --git a/modules/enterprise/scripting/python/pom.xml b/modules/enterprise/scripting/python/pom.xml new file mode 100644 index 0000000..4b48e52 --- /dev/null +++ b/modules/enterprise/scripting/python/pom.xml @@ -0,0 +1,187 @@ +<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-scripting-parent</artifactId> + <groupId>org.rhq</groupId> + <version>4.5.0-SNAPSHOT</version> + </parent> + <artifactId>rhq-scripting-python</artifactId> + <version>4.5.0-SNAPSHOT</version> + <name>RHQ Python support</name> + <description>Provides RHQ scripting in Python using Jython</description> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>rhq-scripting-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.python</groupId> + <artifactId>jython-standalone</artifactId> + <version>2.5.2</version> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludedGroups>${rhq.testng.excludedGroups}</excludedGroups> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + + <profile> + <id>dev</id> + + <properties> + <rhq.rootDir>../../..</rhq.rootDir> + <rhq.containerDir>${rhq.rootDir}/${rhq.defaultDevContainerPath}</rhq.containerDir> + <rhq.deploymentDir>${rhq.containerDir}/jbossas/server/default/deploy/${rhq.earName}/lib</rhq.deploymentDir> + </properties> + + <build> + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + <executions> + + <execution> + <id>deploy</id> + <phase>compile</phase> + <configuration> + <tasks> + <mkdir dir="${rhq.deploymentDir}" /> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <echo>*** Updating + ${deployment.file}...</echo> + <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + <execution> + <id>undeploy</id> + <phase>clean</phase> + <configuration> + <tasks> + <property name="deployment.file" location="${rhq.deploymentDir}/${project.build.finalName}.jar" /> + <echo>*** Deleting + ${deployment.file}...</echo> + <delete file="${deployment.file}" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>cobertura-plugins</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <dependencies> + <dependency> + <groupId>net.sourceforge.cobertura</groupId> + <artifactId>cobertura</artifactId> + <version>1.9.4.1</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>cobertura-instrument</id> + <phase>pre-integration-test</phase> + <configuration> + <tasks> +  + <mkdir dir="target/cobertura" /> + <mkdir dir="target/cobertura/backup" /> +  + <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" /> +  + <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> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>cobertura-report</id> + <phase>post-integration-test</phase> + <configuration> + <tasks> + <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"> + <include name="**/*.class" /> + </fileset> + </copy> +  + <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"> + <include name="**/*.java" /> + </fileset> + </cobertura-report> +  + <delete file="target/classes/cobertura.properties" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> diff --git a/modules/enterprise/scripting/python/src/main/java/org/rhq/scripting/python/PythonScriptEngineInitializer.java b/modules/enterprise/scripting/python/src/main/java/org/rhq/scripting/python/PythonScriptEngineInitializer.java new file mode 100644 index 0000000..9ee50b8 --- /dev/null +++ b/modules/enterprise/scripting/python/src/main/java/org/rhq/scripting/python/PythonScriptEngineInitializer.java @@ -0,0 +1,101 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.scripting.python; + +import java.lang.reflect.Method; +import java.security.PermissionCollection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import javax.script.ScriptEngine; +import javax.script.ScriptEngineManager; +import javax.script.ScriptException; + +import org.rhq.scripting.ScriptEngineInitializer; +import org.rhq.scripting.ScriptSourceProvider; +import org.rhq.scripting.util.SandboxedScriptEngine; + +/** + * + * + * @author Lukas Krejci + */ +public class PythonScriptEngineInitializer implements ScriptEngineInitializer { + + private ScriptEngineManager engineManager = new ScriptEngineManager(); + + @Override + public ScriptEngine instantiate(Set<String> packages, ScriptSourceProvider scriptSourceProvider, + PermissionCollection permissions) throws ScriptException { + + ScriptEngine eng = engineManager.getEngineByName("python"); + + for (String pkg : packages) { + eng.eval("from " + pkg + " import *\n"); + } + + //TODO add support for script source providers... possibly using http://www.python.org/dev/peps/pep-0302/ + + //fingers crossed we can secure jython like this + return new SandboxedScriptEngine(eng, permissions); + } + + @Override + public Set<String> generateIndirectionMethods(String boundObjectName, Set<Method> overloadedMethods) { + if (overloadedMethods == null || overloadedMethods.isEmpty()) { + return Collections.emptySet(); + } + + Set<Integer> argCnts = new HashSet<Integer>(); + for(Method m : overloadedMethods) { + argCnts.add(m.getParameterTypes().length); + } + + String methodName = overloadedMethods.iterator().next().getName(); + StringBuilder functionBody = new StringBuilder(); + + functionBody.append("def ").append(methodName).append("(*args, **kwargs):\n"); + functionBody.append("\t").append("if len(kwargs) > 0:\n"); + functionBody.append("\t\t").append("raise ValueError(\"Named arguments not supported for Java methods\")\n"); + functionBody.append("\t").append("argCnt = len(args)\n"); + + for(Integer argCnt : argCnts) { + functionBody.append("\t").append("if argCnt == ").append(argCnt).append(":\n"); + functionBody.append("\t\treturn ").append(boundObjectName).append(".").append(methodName).append("("); + int last = argCnt - 1; + for(int i = 0; i < argCnt; ++i) { + functionBody.append("args[").append(i).append("]"); + if (i < last) { + functionBody.append(", "); + } + } + functionBody.append(")\n"); + } + + return Collections.singleton(functionBody.toString()); + } + + @Override + public String extractUserFriendlyErrorMessage(ScriptException e) { + return e.getMessage(); + } + +} diff --git a/modules/enterprise/scripting/python/src/main/java/org/rhq/scripting/python/PythonScriptEngineProvider.java b/modules/enterprise/scripting/python/src/main/java/org/rhq/scripting/python/PythonScriptEngineProvider.java new file mode 100644 index 0000000..c0bfcac --- /dev/null +++ b/modules/enterprise/scripting/python/src/main/java/org/rhq/scripting/python/PythonScriptEngineProvider.java @@ -0,0 +1,49 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2012 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.scripting.python; + +import org.rhq.scripting.CodeCompletion; +import org.rhq.scripting.ScriptEngineInitializer; +import org.rhq.scripting.ScriptEngineProvider; + +/** + * + * + * @author Lukas Krejci + */ +public class PythonScriptEngineProvider implements ScriptEngineProvider { + + @Override + public String getSupportedLanguage() { + return "python"; + } + + @Override + public ScriptEngineInitializer getInitializer() { + return new PythonScriptEngineInitializer(); + } + + @Override + public CodeCompletion getCodeCompletion() { + // XXX are we gonna support code completion for multiple langs in the CLI? + return null; + } + +} diff --git a/modules/enterprise/scripting/python/src/main/resources/META-INF/services/org.rhq.scripting.ScriptEngineProvider b/modules/enterprise/scripting/python/src/main/resources/META-INF/services/org.rhq.scripting.ScriptEngineProvider new file mode 100644 index 0000000..3882776 --- /dev/null +++ b/modules/enterprise/scripting/python/src/main/resources/META-INF/services/org.rhq.scripting.ScriptEngineProvider @@ -0,0 +1 @@ +org.rhq.scripting.python.PythonScriptEngineProvider

1 0

[rhq] Changes to 'lkrejci/modular-scripting'
by lkrejci 30 May '12

30 May '12

New branch 'lkrejci/modular-scripting' available with the following commits: commit 6515d4f28dfddde094d20b72bad3b2f038d70b13 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed May 30 20:08:03 2012 +0200 Initial impl of modules in the javascript CLI. All should be hooked up apart from the actual bundling of now standalone javascript support with the CLI. This will going to need some pom.xml love. We now bundle our own ScriptEngine implementation based on the Phobos javascript engine with modifications inspired by the version of the script engine in JDK 1.6.30. commit ff78b1e7cf7b64f78fd155752222fba7ad4261f4 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Fri May 18 13:39:27 2012 +0200 An attempt to use Rhino 1.7R3 as a script engine. This will most probably not work because of the number of changes in behavior between phobos-based ScriptEngine and the JDK-bundled ScriptEngine. commit 13e77125213af769de8f72ff5017458ba81a4cea Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu May 17 10:18:13 2012 +0200 Initial refactoring of the scripting infrastructure to allow language support to be defined in a standalone module (and allow multiple script langs in the future). The ScriptEngineFactory now searches for the supported script langs using META-INF/services. The project probably doesn't compile with this commit but this will get fixed by the future commits.

1 0

[rhq] modules/enterprise
by Jiri Kremser 30 May '12

30 May '12

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 130 ++++++---- 1 file changed, 90 insertions(+), 40 deletions(-) New commits: commit d645f4ec3d9b7c82bc61516cc8f89cc2b7ba4b26 Author: Jirka Kremser <jkremser(a)redhat.com> Date: Wed May 30 17:00:05 2012 +0200 [BZ 814305] Before the context menu is shown the check for singleton resurces is performed (when creating child resources or importing the resources manually) diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java index 74dba33..ff99825 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java @@ -522,54 +522,102 @@ public class ResourceTreeView extends LocatableVLayout { // Create Child Menu Set<ResourceType> creatableChildTypes = getCreatableChildTypes(resourceType); if (!creatableChildTypes.isEmpty()) { - MenuItem createChildMenu = new MenuItem(MSG.common_button_create_child()); + final MenuItem createChildMenu = new MenuItem(MSG.common_button_create_child()); boolean hasCreateChildPermission = resourcePermission.isCreateChildResources(); createChildMenu.setEnabled(hasCreateChildPermission); if (hasCreateChildPermission) { - Menu createChildSubMenu = new Menu(); - Map<String, ResourceType> displayNameMap = getDisplayNames(creatableChildTypes); - Set<String> displayNames = displayNameMap.keySet(); - for (String displayName : displayNames) { - MenuItem createItem = new MenuItem(displayName); - final ResourceType childType = displayNameMap.get(displayName); - createItem.addClickHandler(new ClickHandler() { - public void onClick(MenuItemClickEvent event) { - ResourceFactoryCreateWizard.showCreateWizard(resource, childType); + final Menu createChildSubMenu = new Menu(); + final Map<String, ResourceType> displayNameMap = getDisplayNames(creatableChildTypes); + + ResourceCriteria criteria = new ResourceCriteria(); + criteria.addFilterParentResourceId(resource.getId()); + GWTServiceLookup.getResourceService().findResourcesByCriteria(criteria, + new AsyncCallback<PageList<Resource>>() { + + @Override + public void onSuccess(PageList<Resource> result) { + Menu filteredSubmenu = checkForSingletons(result, resource, displayNameMap, + createChildSubMenu); + createChildMenu.setSubmenu(filteredSubmenu); + resourceContextMenu.addItem(createChildMenu); + } + + @Override + public void onFailure(Throwable caught) { + Log.error("Error resources with parentId:" + resource.getId(), caught); } }); - createChildSubMenu.addItem(createItem); - } - createChildMenu.setSubmenu(createChildSubMenu); - } - resourceContextMenu.addItem(createChildMenu); + } else { + resourceContextMenu.addItem(createChildMenu); + } } // Manual Import Menu Set<ResourceType> importableChildTypes = getImportableChildTypes(resourceType); if (!importableChildTypes.isEmpty()) { - MenuItem importChildMenu = new MenuItem(MSG.common_button_import()); + final MenuItem importChildMenu = new MenuItem(MSG.common_button_import()); boolean hasManualImportPermission = resourcePermission.isCreateChildResources(); importChildMenu.setEnabled(hasManualImportPermission); if (hasManualImportPermission) { - Menu importChildSubMenu = new Menu(); - Map<String, ResourceType> displayNameMap = getDisplayNames(importableChildTypes); - Set<String> displayNames = displayNameMap.keySet(); - for (final String displayName : displayNames) { - MenuItem importItem = new MenuItem(displayName); - final ResourceType childType = displayNameMap.get(displayName); - importItem.addClickHandler(new ClickHandler() { - public void onClick(MenuItemClickEvent event) { - ResourceFactoryImportWizard.showImportWizard(resource, childType); + final Menu importChildSubMenu = new Menu(); + final Map<String, ResourceType> displayNameMap = getDisplayNames(creatableChildTypes); + + ResourceCriteria criteria = new ResourceCriteria(); + criteria.addFilterParentResourceId(resource.getId()); + GWTServiceLookup.getResourceService().findResourcesByCriteria(criteria, + new AsyncCallback<PageList<Resource>>() { + + @Override + public void onSuccess(PageList<Resource> result) { + Menu filteredSubmenu = checkForSingletons(result, resource, displayNameMap, + importChildSubMenu); + importChildMenu.setSubmenu(filteredSubmenu); + resourceContextMenu.addItem(importChildMenu); + } + + @Override + public void onFailure(Throwable caught) { + Log.error("Error resources with parentId:" + resource.getId(), caught); } }); - importChildSubMenu.addItem(importItem); + + } else { + resourceContextMenu.addItem(importChildMenu); + } + } + } + + private Menu checkForSingletons(PageList<Resource> siblings, final Resource resource, + Map<String, ResourceType> displayNameMap, Menu submentuToAdd) { + Set<String> displayNames = displayNameMap.keySet(); + for (final String displayName : displayNames) { + MenuItem itemToAdd = new MenuItem(displayName); + final ResourceType childType = displayNameMap.get(displayName); + boolean disabled = false; + // for each already added child, check if the type is the same. + // If yes, disable the menu item + if (displayNameMap.get(displayName).isSingleton()) { + for (Resource sibling : siblings) { + if (sibling.getResourceType().equals(displayNameMap.get(displayName))) { + disabled = true; + break; + } } - importChildMenu.setSubmenu(importChildSubMenu); } - resourceContextMenu.addItem(importChildMenu); + // if the condition obove is not satisfied, add the menu item + if (!disabled) { + itemToAdd.addClickHandler(new ClickHandler() { + public void onClick(MenuItemClickEvent event) { + ResourceFactoryImportWizard.showImportWizard(resource, childType); + } + }); + submentuToAdd.addItem(itemToAdd); + } + } + return submentuToAdd; } /** @@ -692,7 +740,7 @@ public class ResourceTreeView extends LocatableVLayout { //2 lines could be uncommented and the lines below them refactorized //MeasurementUserPreferences measurementPreferences = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); //String selectedView = measurementPreferences.getSelectedView(String.valueOf(resource.getId())); - + final int sid = UserSessionManager.getSessionSubject().getId(); SubjectCriteria c = new SubjectCriteria(); c.addFilterId(sid); @@ -701,11 +749,15 @@ public class ResourceTreeView extends LocatableVLayout { new AsyncCallback<PageList<Subject>>() { public void onSuccess(PageList<Subject> result) { if (result.size() > 0) { - UserPreferences uPreferences = new UserPreferences(result.get(0)); - MeasurementUserPreferences mPreferences = new MeasurementUserPreferences(uPreferences); - String selectedView = mPreferences.getSelectedView(String.valueOf(resource.getId())); - - addNewMetric(String.valueOf(resource.getId()), selectedView, resourceGraphElements); + UserPreferences uPreferences = new UserPreferences(result + .get(0)); + MeasurementUserPreferences mPreferences = new MeasurementUserPreferences( + uPreferences); + String selectedView = mPreferences.getSelectedView(String + .valueOf(resource.getId())); + + addNewMetric(String.valueOf(resource.getId()), + selectedView, resourceGraphElements); } else { Log.trace("Error obtaining subject with id:" + sid); } @@ -727,9 +779,9 @@ public class ResourceTreeView extends LocatableVLayout { measurements.setSubmenu(measurementsSubMenu); return measurements; } - + private void addNewMetric(String id, String selectedView, String resourceGraphElements) { - //construct portal.war url to access + //construct portal.war url to access String baseUrl = "/resource/common/monitor/visibility/IndicatorCharts.do"; baseUrl += "?id=" + id; baseUrl += "&view=" + selectedView; @@ -740,10 +792,8 @@ public class ResourceTreeView extends LocatableVLayout { try { b.setCallback(new RequestCallback() { - public void onResponseReceived(final Request request, - final Response response) { - Log.trace("Successfully submitted request to add graph to view:" - + url); + public void onResponseReceived(final Request request, final Response response) { + Log.trace("Successfully submitted request to add graph to view:" + url); //kick off a page reload. String currentViewPath = History.getToken();

1 0

[rhq] Branch 'rc/jon3.1.0.CR1' - modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/integration-tests modules/plugins modules/pom.xml modules/test-utils pom.xml
by rhqci 29 May '12

29 May '12

modules/cli-tests/pom.xml | 2 +- modules/common/ant-bundle/pom.xml | 2 +- modules/common/drift/pom.xml | 2 +- modules/common/filetemplate-bundle/pom.xml | 2 +- modules/common/jboss-as/pom.xml | 2 +- modules/common/pom.xml | 2 +- modules/core/arquillian-integration/archive/pom.xml | 2 +- modules/core/arquillian-integration/container/pom.xml | 2 +- modules/core/arquillian-integration/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-itest/pom.xml | 2 +- modules/core/plugin-container/pom.xml | 2 +- modules/core/plugin-test-api/pom.xml | 2 +- modules/core/plugin-test-util/pom.xml | 2 +- modules/core/plugin-validator/pom.xml | 2 +- modules/core/plugindoc/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/util/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/gui/rest-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/itests/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/drift-mongodb/pom.xml | 2 +- modules/enterprise/server/plugins/drift-rhq/pom.xml | 2 +- modules/enterprise/server/plugins/filetemplate-bundle/pom.xml | 2 +- modules/enterprise/server/plugins/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/url/pom.xml | 2 +- modules/enterprise/server/plugins/validate-all-serverplugins/pom.xml | 2 +- modules/enterprise/server/plugins/yum/pom.xml | 2 +- modules/enterprise/server/pom.xml | 2 +- modules/enterprise/server/safe-invoker/pom.xml | 2 +- modules/enterprise/server/sars/agent-sar/pom.xml | 2 +- modules/enterprise/server/sars/pom.xml | 2 +- modules/enterprise/server/xml-schemas/pom.xml | 2 +- modules/helpers/bundleGen/pom.xml | 4 ++-- modules/helpers/jeeGen/pom.xml | 2 +- modules/helpers/perftest-support/pom.xml | 4 ++-- modules/helpers/pom.xml | 2 +- modules/helpers/rtfilter-subsystem/pom.xml | 2 +- modules/helpers/rtfilter/pom.xml | 2 +- modules/integration-tests/apache-plugin-test/pom.xml | 2 +- modules/integration-tests/jndi-access/jndi-access-test/pom.xml | 2 +- modules/integration-tests/jndi-access/pom.xml | 2 +- modules/integration-tests/jndi-access/remote-server/pom.xml | 2 +- modules/integration-tests/pom.xml | 2 +- modules/plugins/aliases/pom.xml | 2 +- modules/plugins/ant-bundle/pom.xml | 2 +- modules/plugins/apache/pom.xml | 2 +- modules/plugins/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-7/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/mod-cluster/pom.xml | 2 +- modules/plugins/mysql/pom.xml | 2 +- modules/plugins/netservices/pom.xml | 2 +- modules/plugins/oracle/pom.xml | 2 +- modules/plugins/pattern-generator/pom.xml | 2 +- modules/plugins/perftest/pom.xml | 2 +- modules/plugins/platform/pom.xml | 2 +- modules/plugins/pom.xml | 2 +- modules/plugins/postfix/pom.xml | 2 +- modules/plugins/postgres/pom.xml | 2 +- modules/plugins/rhq-agent/pom.xml | 2 +- modules/plugins/rhq-server/pom.xml | 2 +- modules/plugins/samba/pom.xml | 2 +- modules/plugins/script/pom.xml | 2 +- modules/plugins/script2/pom.xml | 2 +- modules/plugins/snmptrapd/pom.xml | 2 +- modules/plugins/sshd/pom.xml | 2 +- modules/plugins/sudoers/pom.xml | 2 +- modules/plugins/tomcat/pom.xml | 2 +- modules/plugins/twitter/pom.xml | 2 +- modules/plugins/validate-all-plugins/pom.xml | 2 +- modules/plugins/virt/pom.xml | 2 +- modules/pom.xml | 2 +- modules/test-utils/pom.xml | 2 +- pom.xml | 2 +- 137 files changed, 155 insertions(+), 155 deletions(-) New commits: commit 89e0a8e4ad214f01f5d922532f89d97e283cb373 Author: Hudson <jboss-qa-internal(a)redhat.com> Date: Tue May 29 18:35:46 2012 -0400 development RHQ_4.4.0.JON310-SNAPSHOT diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml index a81daea..3141330 100644 --- a/modules/cli-tests/pom.xml +++ b/modules/cli-tests/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml index 6bb8c62..09bf308 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/common/drift/pom.xml b/modules/common/drift/pom.xml index e2dd1fd..761268e 100644 --- a/modules/common/drift/pom.xml +++ b/modules/common/drift/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-common-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <artifactId>rhq-common-drift</artifactId> diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml index 59f84c1..fceb7bf 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <artifactId>rhq-filetemplate-bundle-common</artifactId> diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml index cb8b115..dc5a309 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <artifactId>rhq-jboss-as-common</artifactId> diff --git a/modules/common/pom.xml b/modules/common/pom.xml index 026b865..4bd55d2 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/arquillian-integration/archive/pom.xml b/modules/core/arquillian-integration/archive/pom.xml index 9fd5174..c971d99 100644 --- a/modules/core/arquillian-integration/archive/pom.xml +++ b/modules/core/arquillian-integration/archive/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent>  diff --git a/modules/core/arquillian-integration/container/pom.xml b/modules/core/arquillian-integration/container/pom.xml index 2146044..fe27670 100644 --- a/modules/core/arquillian-integration/container/pom.xml +++ b/modules/core/arquillian-integration/container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-arquillian-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent>  diff --git a/modules/core/arquillian-integration/pom.xml b/modules/core/arquillian-integration/pom.xml index 02152ca..f7fb600 100644 --- a/modules/core/arquillian-integration/pom.xml +++ b/modules/core/arquillian-integration/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml index 9bd2dc1..53c721f 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/comm-api/pom.xml b/modules/core/comm-api/pom.xml index 69cfce7..8ab2167 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index 3bc17b5..2996c54 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 0f5f960..7006397 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <artifactId>rhq-core-domain</artifactId> diff --git a/modules/core/gui/pom.xml b/modules/core/gui/pom.xml index b6c5f5f..9ff6c78 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml index ff08853..505f77a 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml index 09c20c5..cb2ba9e 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-container-itest/pom.xml b/modules/core/plugin-container-itest/pom.xml index 1d806f7..5239595 100644 --- a/modules/core/plugin-container-itest/pom.xml +++ b/modules/core/plugin-container-itest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container-itest</artifactId> diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml index 14f9a01..b989e5f 100644 --- a/modules/core/plugin-container/pom.xml +++ b/modules/core/plugin-container/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-container</artifactId> diff --git a/modules/core/plugin-test-api/pom.xml b/modules/core/plugin-test-api/pom.xml index 02b1f6f..ccfc1d8 100644 --- a/modules/core/plugin-test-api/pom.xml +++ b/modules/core/plugin-test-api/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <artifactId>rhq-core-plugin-test-api</artifactId> diff --git a/modules/core/plugin-test-util/pom.xml b/modules/core/plugin-test-util/pom.xml index 0e6bf4f..85955f3 100644 --- a/modules/core/plugin-test-util/pom.xml +++ b/modules/core/plugin-test-util/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-core-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugin-validator/pom.xml b/modules/core/plugin-validator/pom.xml index 35c0fcb..d077ff8 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/plugindoc/pom.xml b/modules/core/plugindoc/pom.xml index bea87b1..d0e9cf1 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/core/pom.xml b/modules/core/pom.xml index a68ab57..f350e7c 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml index 70b7d43..9ede572 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <artifactId>rhq-core-util</artifactId> diff --git a/modules/enterprise/agent/pom.xml b/modules/enterprise/agent/pom.xml index 581489a..e25668f 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/agentupdate/pom.xml b/modules/enterprise/agentupdate/pom.xml index 5575911..2d9cf1d 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/binding/pom.xml b/modules/enterprise/binding/pom.xml index c44bdd9..359baa1 100644 --- a/modules/enterprise/binding/pom.xml +++ b/modules/enterprise/binding/pom.xml @@ -3,10 +3,10 @@ <parent> <artifactId>rhq-enterprise-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <artifactId>rhq-script-bindings</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 70a52dd..9af1787 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 e0288b8..c5f6365 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 c311d16..2cb10e4 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 4204bbe..c25bf1b 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml index da68cc2..9c18ed6 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 971ca8a..00d7cb4 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/pom.xml b/modules/enterprise/gui/pom.xml index f6cf5ef..1f9c53b 100644 --- a/modules/enterprise/gui/pom.xml +++ b/modules/enterprise/gui/pom.xml @@ -8,7 +8,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 4ea48ec..680be5c 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/gui/rest-war/pom.xml b/modules/enterprise/gui/rest-war/pom.xml index db14906..c40bef5 100644 --- a/modules/enterprise/gui/rest-war/pom.xml +++ b/modules/enterprise/gui/rest-war/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml index 308870f..a71a20a 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml index 7ad5d72..76fd3e3 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 4171a4d..39a316b 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 95a8420..4bf4133 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/pom.xml b/modules/enterprise/remoting/pom.xml index 606e3e0..5de24ec 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/remoting/webservices/pom.xml b/modules/enterprise/remoting/webservices/pom.xml index 255e644..5d84c7f 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 05afb70..075bab3 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-server-client-api</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 36a4516..5184b49 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index d0693d7..7005e95 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/ear/pom.xml b/modules/enterprise/server/ear/pom.xml index b4ddfee..0119cc5 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/itests/pom.xml b/modules/enterprise/server/itests/pom.xml index df17ba3..f96bf06 100644 --- a/modules/enterprise/server/itests/pom.xml +++ b/modules/enterprise/server/itests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml index 5a696f2..daee116 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 7efef56..c7f5d47 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>alert-cli</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 75c1d4b..cac9abe 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.server</groupId> <artifactId>alert-email</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 cb84aef..b8603ad 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-irc</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 b3f0912..891800d 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-log4j</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 8b100cd..a5b937d 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-microblog</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 f2b813e..dee6820 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-mobicents</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 69be715..5d16801 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-operations</artifactId> <packaging>jar</packaging> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 0e90279..b86357e 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-roles</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 598de47..554c9b0 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-snmp</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 9265f19..0a2eae5 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>alert-subject</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 ae8e00a..3e8714d 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 524e1c5..4dc8e19 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>rhq-serverplugin-cobbler</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 da51c52..f6ea33c 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-mongodb/pom.xml b/modules/enterprise/server/plugins/drift-mongodb/pom.xml index 2d2628a..275d207 100644 --- a/modules/enterprise/server/plugins/drift-mongodb/pom.xml +++ b/modules/enterprise/server/plugins/drift-mongodb/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/plugins/drift-rhq/pom.xml b/modules/enterprise/server/plugins/drift-rhq/pom.xml index 95f06e6..233448f 100644 --- a/modules/enterprise/server/plugins/drift-rhq/pom.xml +++ b/modules/enterprise/server/plugins/drift-rhq/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-enterprise-server-plugins-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 a7e0469..4f33fc6 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 d8e1a9c..159d7ed 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>groovy-script-server-plugin</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 baed328..fa5fbf9 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 7ac74cb..cb44676 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq</groupId> <artifactId>packagetype-cli</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 b4621dd..fa17b74 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 0f74bec..94ca6e4 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/pom.xml b/modules/enterprise/server/plugins/pom.xml index 80e6287..7042f19 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml index 3a96a52..03c1f88 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 5cd8218..b0c6e8b 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 64c0d05..8bf5764 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/pom.xml b/modules/enterprise/server/pom.xml index b3ecbe9..17ff04b 100644 --- a/modules/enterprise/server/pom.xml +++ b/modules/enterprise/server/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> diff --git a/modules/enterprise/server/safe-invoker/pom.xml b/modules/enterprise/server/safe-invoker/pom.xml index 70a8b4e..789d412 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 c528f90..9837d84 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/enterprise/server/sars/pom.xml b/modules/enterprise/server/sars/pom.xml index c33982e..2075405 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 3322457..dc49f7d 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/bundleGen/pom.xml b/modules/helpers/bundleGen/pom.xml index 37e3d38..a496d8c 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.rhq.helpers</groupId> <artifactId>bundleGen</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <build> <plugins> diff --git a/modules/helpers/jeeGen/pom.xml b/modules/helpers/jeeGen/pom.xml index bc3d7cd..6d0f4de 100644 --- a/modules/helpers/jeeGen/pom.xml +++ b/modules/helpers/jeeGen/pom.xml @@ -9,7 +9,7 @@ <parent> <artifactId>rhq-helpers</artifactId> <groupId>org.rhq.helpers</groupId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/perftest-support/pom.xml b/modules/helpers/perftest-support/pom.xml index 669767a..090b9ef 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> <artifactId>perftest-support</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 0ab96f7..561a73b 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/helpers/rtfilter-subsystem/pom.xml b/modules/helpers/rtfilter-subsystem/pom.xml index 6911b31..98a50e9 100644 --- a/modules/helpers/rtfilter-subsystem/pom.xml +++ b/modules/helpers/rtfilter-subsystem/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/helpers/rtfilter/pom.xml b/modules/helpers/rtfilter/pom.xml index cdde6f2..b926687 100644 --- a/modules/helpers/rtfilter/pom.xml +++ b/modules/helpers/rtfilter/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq.helpers</groupId> <artifactId>rhq-helpers</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq.helpers</groupId> diff --git a/modules/integration-tests/apache-plugin-test/pom.xml b/modules/integration-tests/apache-plugin-test/pom.xml index 27336ef..e9082b6 100644 --- a/modules/integration-tests/apache-plugin-test/pom.xml +++ b/modules/integration-tests/apache-plugin-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml index 93a990f..87a8b84 100644 --- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml +++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/pom.xml b/modules/integration-tests/jndi-access/pom.xml index e216940..641efc8 100644 --- a/modules/integration-tests/jndi-access/pom.xml +++ b/modules/integration-tests/jndi-access/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>rhq-integration-tests</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/jndi-access/remote-server/pom.xml b/modules/integration-tests/jndi-access/remote-server/pom.xml index 8fbdf1e..9507dfc 100644 --- a/modules/integration-tests/jndi-access/remote-server/pom.xml +++ b/modules/integration-tests/jndi-access/remote-server/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>jndi-access-test-parent</artifactId> <groupId>org.rhq</groupId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/integration-tests/pom.xml b/modules/integration-tests/pom.xml index bb52074..f7eca34 100644 --- a/modules/integration-tests/pom.xml +++ b/modules/integration-tests/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml index d21a6d0..4879880 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml index 7806bf8..269fd3a 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml index aa03eef..12c16fe 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/augeas/pom.xml b/modules/plugins/augeas/pom.xml index fe940ca..f50e547 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml index 4e4e64e..fdbf5da 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml index 846a4d7..a7fe25e 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml index 299a781..8bb7858 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml index cffb003..0ed2904 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml index 8123b9b..9311066 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml index 3ac82c2..5cf8176 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml index 4237a05..4d0a221 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml index 84fd5f5..954f8df 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml index 99798c5..1f45df3 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml index c5f96b0..34a7d7d 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> <artifactId>rhq-hudson-plugin</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 e5d9396..ac15ed2 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml index 446dcb7..fe43901 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 376eeef..b6b730a 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml index 642efe7..c690ee1 100644 --- a/modules/plugins/jboss-as-7/pom.xml +++ b/modules/plugins/jboss-as-7/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml index 2b7ca0a..b879d7d 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 e0d1c7f..93ba8a6 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 140a0f2..5a6dfa5 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml index 4f01232..a20ec35 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml index 6cc3c2d..b69a6db 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mod-cluster/pom.xml b/modules/plugins/mod-cluster/pom.xml index 4d13749..a17f13e 100644 --- a/modules/plugins/mod-cluster/pom.xml +++ b/modules/plugins/mod-cluster/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml index f461084..467874d 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml index 3a84884..6ce11c5 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 27e3a82..317157e 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pattern-generator/pom.xml b/modules/plugins/pattern-generator/pom.xml index 4c32820..23936a0 100644 --- a/modules/plugins/pattern-generator/pom.xml +++ b/modules/plugins/pattern-generator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml index d9a1eeb..1d22fab 100644 --- a/modules/plugins/perftest/pom.xml +++ b/modules/plugins/perftest/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml index b06049e..13ed138 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml index 6c4aaa7..4184401 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml index bd83c02..13eb05d 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml index b6318fe..d06c792 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml index d69ad51..cb171f4 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml index fa4d0dd..db5a0d6 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml index b3f7b50..e654a70 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml index 3110532..4a8c713 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml index 2cb66d5..4c94705 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml index a2fab64..80a215f 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml index e26f0d7..86ccdf0 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml index c7a4649..e2283a0 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml index 01a084c..abbc476 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.jboss.on</groupId> diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml index 98bebba..bb21eab 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-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 62c0b76..716c544 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml index 08b4629..fa32294 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/pom.xml b/modules/pom.xml index 4dbaf29..9f2f231 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <groupId>org.rhq</groupId> diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml index 125909a..18c2a46 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.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> </parent> <artifactId>test-utils</artifactId> diff --git a/pom.xml b/pom.xml index 6bfbd4c..d3290ce 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>org.rhq</groupId> <artifactId>rhq-parent</artifactId> - <version>4.4.0.JON310CR1</version> + <version>4.4.0.JON310-SNAPSHOT</version> <packaging>pom</packaging> <name>RHQ</name>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits May 2012