modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java
| 10 ----------
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
| 1 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
| 1 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
| 1 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
| 1 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
| 1 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
| 1 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
| 1 -
modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
| 1 -
9 files changed, 18 deletions(-)
New commits:
commit 3cee61d26c5151750a727502fd5c95c4bf715a18
Author: Thomas Segismont <tsegismo(a)redhat.com>
Date: Wed Oct 30 15:34:28 2013 +0100
Bug 1011095 - Give created resources the name supplied by the user even if the managed
object has no "name" attribute
Revert "Bug 886119 - JON is using JNDI when referring to child Datasource
resource instead of specified Resource name"
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java
index 0f7c810..b93c400 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/factory/ResourceFactoryInfoStep.java
@@ -18,8 +18,6 @@
*/
package org.rhq.coregui.client.inventory.resource.factory;
-import static java.lang.Boolean.FALSE;
-
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -32,7 +30,6 @@ import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.SelectItem;
-import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.form.fields.TextItem;
import com.smartgwt.client.widgets.form.fields.events.ChangedEvent;
import com.smartgwt.client.widgets.form.fields.events.ChangedHandler;
@@ -102,13 +99,6 @@ public class ResourceFactoryInfoStep extends AbstractWizardStep {
}
});
formItems.add(nameItem);
-
- StaticTextItem commentItem = new
StaticTextItem("resourceNameComment");
- commentItem.setWidth(300);
- commentItem.setTextBoxStyle("InlineInfo");
- commentItem.setShowTitle(FALSE);
- commentItem.setValue(MSG.widget_resourceFactoryWizard_nameComment());
- formItems.add(commentItem);
}
if (null != versionPrompt) {
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
index e773d98..030174c 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties
@@ -2322,7 +2322,6 @@ widget_resourceFactoryWizard_importWizardTitle = Import Resource of
Type [{0}]
widget_resourceFactoryWizard_importWizardWindowTitle = Resource Import Wizard
widget_resourceFactoryWizard_infoStepName = Resource Information
widget_resourceFactoryWizard_infoStep_loadFail = Failed to get available Architectures
-widget_resourceFactoryWizard_nameComment = Not all management plug-ins or their managed
resources allow the agent to set the name for a new resource. This value will only be used
by agent plug-ins that support the capability. For plug-ins that do not support the
capability, the resource may receive a generic or different name when it is discovered.
widget_resourceFactoryWizard_namePrompt = New Resource Name
widget_resourceFactoryWizard_templatePrompt = Connection Settings Template
widget_resourceFactoryWizard_timeoutFailure = Timed out
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
index 7c80bbb..c4e70d6 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties
@@ -2337,7 +2337,6 @@ widget_resourceFactoryWizard_importWizardWindowTitle = Průvodce
importu zdroje
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_nameComment = Not all management plug-ins or their managed
resources allow the agent to set the name for a new resource. This value will only be used
by agent plug-ins that support the capability. For plug-ins that do not support the
capability, the resource may receive a generic or different name when it is discovered.
widget_resourceFactoryWizard_templatePrompt = Šablona pro nastavení připojení
##widget_resourceFactoryWizard_timeoutFailure = Timed out
##widget_resourceFactoryWizard_timeoutHelp = A timeout duration that if specified will
override the default timeout for child resource creation (on the {0} Agent). The default
timeout is set to 60 seconds. A higher value may be useful for particularly long create
actions, like deployment of a large application. Usually used if a previous attempt
suffered a timeout failure. Note that if there is a timeout failure, it is still possible
that the resource deployment succeeded. In the event of a timeout you may want to execute
a discovery scan before attempting to redeploy the resource.
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
index b5e02cc..513c06e 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties
@@ -2172,7 +2172,6 @@ widget_resourceFactoryWizard_importWizardWindowTitle = Wizard zum
Import von Res
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_nameComment = Not all management plug-ins or their managed
resources allow the agent to set the name for a new resource. This value will only be used
by agent plug-ins that support the capability. For plug-ins that do not support the
capability, the resource may receive a generic or different name when it is discovered.
widget_resourceFactoryWizard_templatePrompt = Vorlage für die Verbindungseinstellungen
##widget_resourceFactoryWizard_timeoutHelp = A timeout duration that if specified will
override the default timeout for child resource creation (on the {0} Agent). The default
timeout is set to 60 seconds. A higher value may be useful for particularly long create
actions, like deployment of a large application. Usually used if a previous attempt
suffered a timeout failure. Note that if there is a timeout failure, it is still possible
that the resource deployment succeeded. In the event of a timeout you may want to execute
a discovery scan before attempting to redeploy the resource.
widget_resourceFactoryWizard_uploadFailure = Konnte die Datei nicht hochladen
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
index 6a35cd2..d51d2d3 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties
@@ -2307,7 +2307,6 @@ widget_resourceFactoryWizard_importWizardWindowTitle = リソースインポー
widget_resourceFactoryWizard_infoStepName = リソース情報
widget_resourceFactoryWizard_infoStep_loadFail = アーキテクチャーを利用可能にするのに失敗しました
widget_resourceFactoryWizard_namePrompt = 新規リソース名
-#widget_resourceFactoryWizard_nameComment = Not all management plug-ins or their managed
resources allow the agent to set the name for a new resource. This value will only be used
by agent plug-ins that support the capability. For plug-ins that do not support the
capability, the resource may receive a generic or different name when it is discovered.
widget_resourceFactoryWizard_templatePrompt = コネクション設定テンプレート
###widget_resourceFactoryWizard_timeoutFailure = Timed out
##widget_resourceFactoryWizard_timeoutHelp = A timeout duration that if specified will
override the default timeout for child resource creation (on the {0} Agent). The default
timeout is set to 60 seconds. A higher value may be useful for particularly long create
actions, like deployment of a large application. Usually used if a previous attempt
suffered a timeout failure. Note that if there is a timeout failure, it is still possible
that the resource deployment succeeded. In the event of a timeout you may want to execute
a discovery scan before attempting to redeploy the resource.
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
index 96d4562..cfda9c4 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties
@@ -1940,7 +1940,6 @@ widget_resourceFactoryWizard_importFailure2 = 수동으로 리소스를 가져
widget_resourceFactoryWizard_importWizardWindowTitle = 리소스 가져오기 마법사
widget_resourceFactoryWizard_infoStepName = 리소스 정보
widget_resourceFactoryWizard_namePrompt = 새 리소스 이름
-#widget_resourceFactoryWizard_nameComment = Not all management plug-ins or their managed
resources allow the agent to set the name for a new resource. This value will only be used
by agent plug-ins that support the capability. For plug-ins that do not support the
capability, the resource may receive a generic or different name when it is discovered.
widget_resourceFactoryWizard_timeoutFailure = 타임 아웃
widget_resourceFactoryWizard_versionPrompt = 패키지 버전
widget_resourceSelector_pleaseSelectMultipleResource = 하나 이상의 리소스를 선택하십시오
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
index 6ab2d30..c4f273a 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties
@@ -2424,7 +2424,6 @@ widget_resourceFactoryWizard_importWizardWindowTitle = Assistente
para Importa\u
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_nameComment = Not all management plug-ins or their managed
resources allow the agent to set the name for a new resource. This value will only be used
by agent plug-ins that support the capability. For plug-ins that do not support the
capability, the resource may receive a generic or different name when it is discovered.
widget_resourceFactoryWizard_templatePrompt = Modelo de Propriedades para Conex\u00E3o
##widget_resourceFactoryWizard_timeoutFailure = Timed out
##widget_resourceFactoryWizard_timeoutHelp = A timeout duration that if specified will
override the default timeout for child resource creation (on the {0} Agent). The default
timeout is set to 60 seconds. A higher value may be useful for particularly long create
actions, like deployment of a large application. Usually used if a previous attempt
suffered a timeout failure. Note that if there is a timeout failure, it is still possible
that the resource deployment succeeded. In the event of a timeout you may want to execute
a discovery scan before attempting to redeploy the resource.
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
index 6fb04a0..3ac439d 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties
@@ -2183,7 +2183,6 @@
#widget_resourceFactoryWizard_infoStepName = Resource Information
#widget_resourceFactoryWizard_infoStep_loadFail = Failed to get available Architectures
#widget_resourceFactoryWizard_namePrompt = New Resource Name
-#widget_resourceFactoryWizard_nameComment = Not all management plug-ins or their managed
resources allow the agent to set the name for a new resource. This value will only be used
by agent plug-ins that support the capability. For plug-ins that do not support the
capability, the resource may receive a generic or different name when it is discovered.
#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). 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.
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
index 80614c3..c416115 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties
@@ -2307,7 +2307,6 @@ widget_resourceFactoryWizard_importWizardWindowTitle =
\u5bfc\u5165\u8d44\u6e90\
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_nameComment = Not all management plug-ins or their managed
resources allow the agent to set the name for a new resource. This value will only be used
by agent plug-ins that support the capability. For plug-ins that do not support the
capability, the resource may receive a generic or different name when it is discovered.
#widget_resourceFactoryWizard_templatePrompt = \u8fde\u63a5\u8bbe\u7f6e\u6a21\u677f
#widget_resourceFactoryWizard_timeoutHelp = A timeout duration that if specified will
override the default timeout for child resource creation (on the {0} Agent). The default
timeout is set to 60 seconds. A higher value may be useful for particularly long create
actions, like deployment of a large application. Usually used if a previous attempt
suffered a timeout failure. Note that if there is a timeout failure, it is still possible
that the resource deployment succeeded. In the event of a timeout you may want to execute
a discovery scan before attempting to redeploy the resource.
#widget_resourceFactoryWizard_timeoutFailure = Timed out
Show replies by date