From: <jsh...@rh...> - 2008-09-29 21:58:38
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [1648] RHQ-221/222 Add support for fully editable configurations.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1648</dd> <dt>Author</dt> <dd>jshaughn</dd> <dt>Date</dt> <dd>2008-09-29 16:31:50 -0500 (Mon, 29 Sep 2008)</dd> </dl> <h3>Log Message</h3> <pre>RHQ-221/222 Add support for fully editable configurations. Prior we could support the ability to edit existing values for readonly properties. But this is necessary when still performing a resource create after a failed submit.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulescoreguisrcmainjavaorgrhqcoreguiconfigurationAbstractPropertyBagUIComponentTreeFactoryjava">rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/AbstractPropertyBagUIComponentTreeFactory.java</a></li> <li><a href="#rhqtrunkmodulescoreguisrcmainjavaorgrhqcoreguiconfigurationConfigRendererjava">rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigRenderer.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiconfigurationresourceAbstractResourceConfigurationUIBeanjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/AbstractResourceConfigurationUIBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiinventoryresourceCreateNewConfigurationChildResourceUIBeanjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewConfigurationChildResourceUIBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiinventoryresourceCreateNewPackageChildResourceUIBeanjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiinventoryresourceDetermineChildResourceCreationTypeUIBeanjava">rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/DetermineChildResourceCreationTypeUIBean.java</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqresourceinventorycreateconfig2xhtml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-config-2.xhtml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulescoreguisrcmainjavaorgrhqcoreguiconfigurationAbstractPropertyBagUIComponentTreeFactoryjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/AbstractPropertyBagUIComponentTreeFactory.java (1647 => 1648)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/AbstractPropertyBagUIComponentTreeFactory.java 2008-09-29 21:02:03 UTC (rev 1647) +++ rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/AbstractPropertyBagUIComponentTreeFactory.java 2008-09-29 21:31:50 UTC (rev 1648) </span><span class="lines">@@ -171,7 +171,8 @@ </span><span class="cx"> FacesComponentUtility.NO_STYLE_CLASS); if (!this.propertyDefinitions.isEmpty() || (this.propertyMap instanceof PropertyMap)) { if (!this.propertyDefinitions.isEmpty()) { </span><span class="rem">- String tableStyleClass = this.topLevel ? PROPERTIES_TABLE_STYLE_CLASS : NESTED_PROPERTIES_TABLE_STYLE_CLASS; </span><span class="add">+ String tableStyleClass = this.topLevel ? PROPERTIES_TABLE_STYLE_CLASS + : NESTED_PROPERTIES_TABLE_STYLE_CLASS; </span><span class="cx"> FacesComponentUtility.addVerbatimText(rootPanel, "\n\n<table class='" + tableStyleClass + "'>"); int rowCount = 0; boolean alternateRowStyles = (rowStyleClass == null); </span><span class="lines">@@ -191,7 +192,8 @@ </span><span class="cx"> // members. We refer to such a map as an "open map." PropertyDefinitionMap propertyDefinitionMap = this.config.getConfigurationDefinition() .getPropertyDefinitionMap(((PropertyMap) this.propertyMap).getName()); </span><span class="rem">- FacesComponentUtility.addVerbatimText(rootPanel, "\n\n<table class='" + OPENMAP_PROPERTIES_TABLE_STYLE_CLASS + "'>"); </span><span class="add">+ FacesComponentUtility.addVerbatimText(rootPanel, "\n\n<table class='" + + OPENMAP_PROPERTIES_TABLE_STYLE_CLASS + "'>"); </span><span class="cx"> addOpenMapMemberPropertiesTableHeaders(rootPanel, propertyDefinitionMap); for (Property property : this.propertyMap.getMap().values()) { if (!(property instanceof PropertySimple)) { </span><span class="lines">@@ -269,7 +271,7 @@ </span><span class="cx"> private void addOpenMapMemberPropertiesTableHeaders(UIComponent parent, PropertyDefinitionMap propertyDefinitionMap) { String headerCellStyleClass = this.topLevel ? PROPERTIES_TABLE_HEADER_CELL_STYLE_CLASS : NESTED_PROPERTIES_TABLE_HEADER_CELL_STYLE_CLASS; </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> FacesComponentUtility.addVerbatimText(parent, "\n\n<tr>"); FacesComponentUtility.addVerbatimText(parent, "<th class='" + headerCellStyleClass + "'>"); </span><span class="lines">@@ -1071,8 +1073,7 @@ </span><span class="cx"> } private boolean isReadOnly(PropertyDefinition propertyDefinition) { </span><span class="rem">- return this.config.isReadOnly() - || (propertyDefinition.isReadOnly() && !isUndefinedRequiredProperty(propertyDefinition)); </span><span class="add">+ return (!this.config.isFullyEditable() && (this.config.isReadOnly() || (propertyDefinition.isReadOnly() && !isUndefinedRequiredProperty(propertyDefinition)))); </span><span class="cx"> } private boolean isUndefinedRequiredProperty(PropertyDefinition propertyDefinition) { </span></pre></div> <a id="rhqtrunkmodulescoreguisrcmainjavaorgrhqcoreguiconfigurationConfigRendererjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigRenderer.java (1647 => 1648)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigRenderer.java 2008-09-29 21:02:03 UTC (rev 1647) +++ rhq/trunk/modules/core/gui/src/main/java/org/rhq/core/gui/configuration/ConfigRenderer.java 2008-09-29 21:31:50 UTC (rev 1648) </span><span class="lines">@@ -33,9 +33,12 @@ </span><span class="cx"> import javax.faces.component.html.HtmlSelectOneRadio; import javax.faces.context.FacesContext; import javax.faces.render.Renderer; </span><span class="add">+ </span><span class="cx"> import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.richfaces.component.html.HtmlSimpleTogglePanel; </span><span class="add">+ +import org.rhq.core.clientapi.agent.configuration.ConfigurationUtility; </span><span class="cx"> import org.rhq.core.domain.configuration.Property; import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; </span><span class="lines">@@ -48,7 +51,6 @@ </span><span class="cx"> import org.rhq.core.gui.util.FacesComponentUtility; import org.rhq.core.gui.util.FacesContextUtility; import org.rhq.core.gui.util.PropertyIdGeneratorUtility; </span><span class="rem">-import org.rhq.core.clientapi.agent.configuration.ConfigurationUtility; </span><span class="cx"> /** * A renderer that renders a {@link ConfigUIComponent} component as XHTML. </span><span class="lines">@@ -62,7 +64,7 @@ </span><span class="cx"> protected static final String UNGROUPED_PROPERTIES_STYLE_CLASS = "BlockContent"; protected static final String REQUIRED_MARKER_TEXT_STYLE_CLASS = "required-marker-text"; protected static final String GROUP_DESCRIPTION_PANEL_STYLE_CLASS = "group-description-panel"; </span><span class="rem">- protected static final String GROUP_DESCRIPTION_TEXT_PANEL_STYLE_CLASS = "group-description-text-panel"; </span><span class="add">+ protected static final String GROUP_DESCRIPTION_TEXT_PANEL_STYLE_CLASS = "group-description-text-panel"; </span><span class="cx"> private static final String JAVASCRIPT_INCLUDES = "\n<script type='text/javascript' src='/js/rhq.js'></script>\n\n"; </span><span class="lines">@@ -324,7 +326,7 @@ </span><span class="cx"> unsetInputs.add(input); } </span><span class="rem">- if (FacesComponentUtility.isReadonly(input)) { </span><span class="add">+ if (!config.isFullyEditable() && FacesComponentUtility.isReadonly(input)) { </span><span class="cx"> readOnlyInputs.add(input); } } </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiconfigurationresourceAbstractResourceConfigurationUIBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/AbstractResourceConfigurationUIBean.java (1647 => 1648)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/AbstractResourceConfigurationUIBean.java 2008-09-29 21:02:03 UTC (rev 1647) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/configuration/resource/AbstractResourceConfigurationUIBean.java 2008-09-29 21:31:50 UTC (rev 1648) </span><span class="lines">@@ -19,11 +19,8 @@ </span><span class="cx"> package org.rhq.enterprise.gui.configuration.resource; import org.rhq.core.domain.auth.Subject; </span><span class="rem">-import org.rhq.core.domain.resource.Resource; </span><span class="cx"> import org.rhq.enterprise.gui.configuration.AbstractConfigurationUIBean; import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; </span><span class="rem">-import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; -import org.rhq.enterprise.server.util.LookupUtil; </span><span class="cx"> /** * This is a JSF managed bean for the Resource Configuration view and edit pages. The contents of the page are </span><span class="lines">@@ -33,7 +30,6 @@ </span><span class="cx"> * @author Ian Springer */ public abstract class AbstractResourceConfigurationUIBean extends AbstractConfigurationUIBean { </span><span class="rem">- protected ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); </span><span class="cx"> public boolean isUpdateInProgress() { Subject subject = EnterpriseFacesContextUtility.getSubject(); </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiinventoryresourceCreateNewConfigurationChildResourceUIBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewConfigurationChildResourceUIBean.java (1647 => 1648)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewConfigurationChildResourceUIBean.java 2008-09-29 21:02:03 UTC (rev 1647) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewConfigurationChildResourceUIBean.java 2008-09-29 21:31:50 UTC (rev 1648) </span><span class="lines">@@ -42,7 +42,6 @@ </span><span class="cx"> import org.rhq.enterprise.gui.configuration.resource.AbstractResourceConfigurationUIBean; import org.rhq.enterprise.gui.legacy.ParamConstants; import org.rhq.enterprise.gui.util.EnterpriseFacesContextUtility; </span><span class="rem">-import org.rhq.enterprise.server.configuration.ConfigurationManagerLocal; </span><span class="cx"> import org.rhq.enterprise.server.resource.ResourceFactoryManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeManagerLocal; import org.rhq.enterprise.server.resource.ResourceTypeNotFoundException; </span><span class="lines">@@ -60,7 +59,6 @@ </span><span class="cx"> public static final String MANAGED_BEAN_NAME = "CreateNewConfigurationChildResourceUIBean"; private static final String OUTCOME_SUCCESS_OR_FAILURE = "successOrFailure"; </span><span class="rem">- private static final String OUTCOME_SUCCESS = "success"; </span><span class="cx"> // Attributes -------------------------------------------- </span><span class="lines">@@ -120,15 +118,15 @@ </span><span class="cx"> } public String selectTemplate() { </span><span class="rem">- return OUTCOME_SUCCESS; </span><span class="add">+ return SUCCESS_OUTCOME; </span><span class="cx"> } public String cancel() { </span><span class="rem">- return OUTCOME_SUCCESS; </span><span class="add">+ return SUCCESS_OUTCOME; </span><span class="cx"> } public String finish() { </span><span class="rem">- return OUTCOME_SUCCESS; </span><span class="add">+ return SUCCESS_OUTCOME; </span><span class="cx"> } // Other Methods -------------------------------------------- </span><span class="lines">@@ -162,14 +160,15 @@ </span><span class="cx"> return resourceType; } </span><span class="add">+ @Override </span><span class="cx"> protected ConfigurationDefinition lookupConfigurationDefinition() { Subject user = EnterpriseFacesContextUtility.getSubject(); </span><span class="rem">- ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); - ConfigurationDefinition configurationDefinition = configurationManager </span><span class="add">+ ConfigurationDefinition configurationDefinition = this.configurationManager </span><span class="cx"> .getResourceConfigurationDefinitionWithTemplatesForResourceType(user, getResourceTypeId()); return configurationDefinition; } </span><span class="add">+ @Override </span><span class="cx"> @NotNull protected Configuration lookupConfiguration() { ConfigurationTemplate resourceConfigTemplate; </span><span class="lines">@@ -263,18 +262,22 @@ </span><span class="cx"> super.clearConfiguration(); } </span><span class="add">+ @Override </span><span class="cx"> public String getNullConfigurationDefinitionMessage() { return "This resource does not expose a configuration."; } </span><span class="add">+ @Override </span><span class="cx"> public String getNullConfigurationMessage() { return "Unable to create an initial configuration for resource being added."; } </span><span class="add">+ @Override </span><span class="cx"> protected int getConfigurationDefinitionKey() { return getResourceTypeId(); } </span><span class="add">+ @Override </span><span class="cx"> protected int getConfigurationKey() { return getResourceTypeId(); } </span><span class="lines">@@ -289,8 +292,7 @@ </span><span class="cx"> } private Configuration createPluginConfiguration(Subject user) { </span><span class="rem">- ConfigurationManagerLocal configurationManager = LookupUtil.getConfigurationManager(); - ConfigurationDefinition pluginConfigDefinition = configurationManager </span><span class="add">+ ConfigurationDefinition pluginConfigDefinition = this.configurationManager </span><span class="cx"> .getPluginConfigurationDefinitionForResourceType(user, getResourceTypeId()); Configuration pluginConfig = null; if (pluginConfigDefinition != null) { </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiinventoryresourceCreateNewPackageChildResourceUIBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java (1647 => 1648)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java 2008-09-29 21:02:03 UTC (rev 1647) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/CreateNewPackageChildResourceUIBean.java 2008-09-29 21:31:50 UTC (rev 1648) </span><span class="lines">@@ -22,17 +22,18 @@ </span><span class="cx"> import java.io.InputStream; import java.util.ArrayList; import java.util.List; </span><span class="add">+ </span><span class="cx"> import javax.faces.application.FacesMessage; import javax.faces.model.SelectItem; </span><span class="add">+ </span><span class="cx"> import org.apache.commons.fileupload.FileItem; </span><span class="rem">-import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; </span><span class="add">+ </span><span class="cx"> import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.Configuration; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.configuration.definition.ConfigurationTemplate; </span><span class="rem">-import org.rhq.core.domain.content.PackageType; </span><span class="cx"> import org.rhq.core.domain.content.Architecture; </span><span class="add">+import org.rhq.core.domain.content.PackageType; </span><span class="cx"> import org.rhq.core.domain.resource.CreateResourceHistory; import org.rhq.core.domain.resource.CreateResourceStatus; import org.rhq.core.domain.resource.Resource; </span><span class="lines">@@ -64,22 +65,19 @@ </span><span class="cx"> private static final String OUTCOME_SUCCESS_OR_FAILURE = "successOrFailure"; private static final String OUTCOME_SUCCESS = "success"; </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> // Attributes -------------------------------------------- private ResourceType resourceType; private PackageType packageType; </span><span class="rem">- </span><span class="cx"> private String packageVersion; private int selectedArchitectureId; </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> private CreateResourceHistory retryCreateItem; private ConfigurationDefinition configurationDefinition; private Configuration configuration; </span><span class="rem">- private final Log log = LogFactory.getLog(this.getClass()); - </span><span class="cx"> public CreateNewPackageChildResourceUIBean() { this.resourceType = lookupResourceType(); this.packageType = lookupPackageType(); </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainjavaorgrhqenterpriseguiinventoryresourceDetermineChildResourceCreationTypeUIBeanjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/DetermineChildResourceCreationTypeUIBean.java (1647 => 1648)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/DetermineChildResourceCreationTypeUIBean.java 2008-09-29 21:02:03 UTC (rev 1647) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/java/org/rhq/enterprise/gui/inventory/resource/DetermineChildResourceCreationTypeUIBean.java 2008-09-29 21:31:50 UTC (rev 1648) </span><span class="lines">@@ -20,9 +20,11 @@ </span><span class="cx"> import java.util.ArrayList; import java.util.List; </span><span class="add">+ </span><span class="cx"> import javax.faces.application.FacesMessage; import javax.faces.model.SelectItem; import javax.servlet.http.HttpServletRequest; </span><span class="add">+ </span><span class="cx"> import org.rhq.core.domain.auth.Subject; import org.rhq.core.domain.configuration.definition.ConfigurationDefinition; import org.rhq.core.domain.resource.CreateResourceHistory; </span><span class="lines">@@ -79,14 +81,15 @@ </span><span class="cx"> // call failed because of an invalid configuration, the new page in the workflow should show the previous // configuration, with any plugin-side validation errors that occurred. resourceType = this.retryCreateItem.getResourceType(); </span><span class="add">+ </span><span class="cx"> FacesContextUtility.getFacesContext().getExternalContext().getRequestMap().put( ParamConstants.RESOURCE_TYPE_ID_PARAM, resourceType.getId()); </span><span class="add">+ </span><span class="cx"> switch (resourceType.getCreationDataType()) { case CONTENT: { CreateNewPackageChildResourceUIBean createPackageBean = FacesContextUtility .getManagedBean(CreateNewPackageChildResourceUIBean.class); createPackageBean.setResourceType(this.retryCreateItem.getResourceType()); </span><span class="rem">- // createPackageBean.setPackageName(this.retryCreateItem.getPackageName()); </span><span class="cx"> createPackageBean.setConfiguration(this.retryCreateItem.getConfiguration()); break; } </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqresourceinventorycreateconfig2xhtml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-config-2.xhtml (1647 => 1648)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-config-2.xhtml 2008-09-29 21:02:03 UTC (rev 1647) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/inventory/create-config-2.xhtml 2008-09-29 21:31:50 UTC (rev 1648) </span><span class="lines">@@ -44,7 +44,8 @@ </span><span class="cx"> <onc:config configurationDefinition="#{CreateNewConfigurationChildResourceUIBean.configurationDefinition}" configuration="#{CreateNewConfigurationChildResourceUIBean.configuration}" nullConfigurationDefinitionMessage="#{CreateNewConfigurationChildResourceUIBean.nullConfigurationDefinitionMessage}" </span><span class="rem">- nullConfigurationMessage="#{CreateNewConfigurationChildResourceUIBean.nullConfigurationMessage}"/> </span><span class="add">+ nullConfigurationMessage="#{CreateNewConfigurationChildResourceUIBean.nullConfigurationMessage}" + fullyEditable="true"/> </span><span class="cx"> <h:panelGrid columns="2" styleClass="buttons-table" columnClasses="button-cell"> </span> </pre> </div> </div> </body> </html> |