modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java
| 14 ++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 0e90bc94eb626e05b55fd5f2f1a2eeaac7e25c4e
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Sun Dec 19 18:42:38 2010 -0500
BZ 625198 the bundle deploy wizard needs to show the default values for the config
properties if defaults have been set in the recipe
this code is agnostic to the kind of bundle type it is.
checked in fixes to both filetemplate and ant bundle types (file template now supports
setting default values in configdef command)
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java
index a28845c..5c31961 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/deploy/GetDeploymentConfigStep.java
@@ -23,6 +23,7 @@ import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.core.domain.configuration.definition.ConfigurationTemplate;
import org.rhq.enterprise.gui.coregui.client.components.HeaderLabel;
import
org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
import org.rhq.enterprise.gui.coregui.client.components.wizard.AbstractWizardStep;
@@ -57,8 +58,17 @@ public class GetDeploymentConfigStep extends AbstractWizardStep {
editor.addMember(label);
} else {
// otherwise, pop up the config editor to get the needed config
- Configuration startingConfig = (null == wizard.getLiveDeployment()) ? new
Configuration()
- : getNormalizedLiveConfig(configDef);
+ Configuration startingConfig;
+ if (wizard.getLiveDeployment() == null) {
+ ConfigurationTemplate defaultTemplate =
configDef.getDefaultTemplate();
+ if (defaultTemplate == null) {
+ startingConfig = new Configuration();
+ } else {
+ startingConfig = defaultTemplate.getConfiguration();
+ }
+ } else {
+ startingConfig = getNormalizedLiveConfig(configDef);
+ }
editor = new ConfigurationEditor("BundleDeploymentConfig",
configDef, startingConfig);
}
}
Show replies by date