Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [1640] RHQ-897 - preventing caching of the resource configuration by moving the view.xhtml page into request level;
|
From: <jma...@rh...> - 2008-09-27 00:26:40
|
<!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] [1640] RHQ-897 - preventing caching of the resource configuration by moving the view.xhtml page into request level; </title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1640</dd> <dt>Author</dt> <dd>jmarques</dd> <dt>Date</dt> <dd>2008-09-26 19:26:29 -0500 (Fri, 26 Sep 2008)</dd> </dl> <h3>Log Message</h3> <pre>RHQ-897 - preventing caching of the resource configuration by moving the view.xhtml page into request level; </pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappWEBINFjsfmanagedbeansconfigurationbeansxml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/configuration-beans.xml</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappWEBINFjsfnavigationconfigurationnavigationxml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/configuration-navigation.xml</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqresourceconfigurationviewmapxhtml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view-map.xhtml</a></li> <li><a href="#rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqresourceconfigurationviewxhtml">rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappWEBINFjsfmanagedbeansconfigurationbeansxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/configuration-beans.xml (1639 => 1640)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/configuration-beans.xml 2008-09-26 22:43:19 UTC (rev 1639) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-managed-beans/configuration-beans.xml 2008-09-27 00:26:29 UTC (rev 1640) </span><span class="lines">@@ -3,10 +3,15 @@ </span><span class="cx"> <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> </span><span class="rem">- - <!-- /rhq/resource/configuration/view.xhtml, /rhq/resource/configuration/view-map.xhtml, - /rhq/resource/configuration/history.xhtml, /rhq/resource/configuration/edit.xhtml, and - /rhq/resource/configuration/edit-map.xhtml --> </span><span class="add">+ + <!-- /rhq/resource/configuration/view.xhtml, /rhq/resource/configuration/view-map.xhtml --> + <managed-bean> + <managed-bean-name>ExistingResourceConfigurationViewUIBean</managed-bean-name> + <managed-bean-class>org.rhq.enterprise.gui.configuration.resource.ExistingResourceConfigurationUIBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <!-- /rhq/resource/configuration/history.xhtml, /rhq/resource/configuration/edit.xhtml, and + /rhq/resource/configuration/edit-map.xhtml --> </span><span class="cx"> <managed-bean> <managed-bean-name>ExistingResourceConfigurationUIBean</managed-bean-name> <managed-bean-class>org.rhq.enterprise.gui.configuration.resource.ExistingResourceConfigurationUIBean</managed-bean-class> </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebappWEBINFjsfnavigationconfigurationnavigationxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/configuration-navigation.xml (1639 => 1640)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/configuration-navigation.xml 2008-09-26 22:43:19 UTC (rev 1639) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/WEB-INF/jsf-navigation/configuration-navigation.xml 2008-09-27 00:26:29 UTC (rev 1640) </span><span class="lines">@@ -9,7 +9,7 @@ </span><span class="cx"> <from-view-id>/rhq/resource/configuration/view.xhtml</from-view-id> <navigation-case> </span><span class="rem">- <from-action>#{ExistingResourceConfigurationUIBean.editConfiguration}</from-action> </span><span class="add">+ <from-action>#{ExistingResourceConfigurationViewUIBean.editConfiguration}</from-action> </span><span class="cx"> <to-view-id>/rhq/resource/configuration/edit.xhtml?id=#{param.id}</to-view-id> <redirect/> </navigation-case> </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqresourceconfigurationviewmapxhtml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view-map.xhtml (1639 => 1640)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view-map.xhtml 2008-09-26 22:43:19 UTC (rev 1639) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view-map.xhtml 2008-09-27 00:26:29 UTC (rev 1640) </span><span class="lines">@@ -27,8 +27,8 @@ </span><span class="cx"> <input type="hidden" name="id" value="#{ResourceUIBean.id}"/> </span><span class="rem">- <onc:config configurationDefinition="#{ExistingResourceConfigurationUIBean.configurationDefinition}" - configuration="#{ExistingResourceConfigurationUIBean.configuration}" </span><span class="add">+ <onc:config configurationDefinition="#{ExistingResourceConfigurationViewUIBean.configurationDefinition}" + configuration="#{ExistingResourceConfigurationViewUIBean.configuration}" </span><span class="cx"> listName="#{param.listName}" listIndex="#{param.listIndex}" readOnly="true" </span></pre></div> <a id="rhqtrunkmodulesenterpriseguiportalwarsrcmainwebapprhqresourceconfigurationviewxhtml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml (1639 => 1640)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml 2008-09-26 22:43:19 UTC (rev 1639) +++ rhq/trunk/modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/configuration/view.xhtml 2008-09-27 00:26:29 UTC (rev 1640) </span><span class="lines">@@ -23,7 +23,7 @@ </span><span class="cx"> <ui:define name="content"> </span><span class="rem">- <h:panelGroup layout="block" styleClass="InfoBlock" rendered="#{ExistingResourceConfigurationUIBean.updateInProgress}"> </span><span class="add">+ <h:panelGroup layout="block" styleClass="InfoBlock" rendered="#{ExistingResourceConfigurationViewUIBean.updateInProgress}"> </span><span class="cx"> <b>${msg['note']}</b> ${msg['resource.config.Current.updateInProgress']} </h:panelGroup> </span><span class="lines">@@ -32,30 +32,30 @@ </span><span class="cx"> <input type="hidden" name="id" value="#{ResourceUIBean.id}"/> <h:panelGrid columns="1" styleClass="buttons-table" columnClasses="button-cell" </span><span class="rem">- rendered="#{ExistingResourceConfigurationUIBean.configuration != null and !ExistingResourceConfigurationUIBean.updateInProgress}"> - <h:commandButton value="EDIT" action="#{ExistingResourceConfigurationUIBean.editConfiguration}" </span><span class="add">+ rendered="#{ExistingResourceConfigurationViewUIBean.configuration != null and !ExistingResourceConfigurationViewUIBean.updateInProgress}"> + <h:commandButton value="EDIT" action="#{ExistingResourceConfigurationViewUIBean.editConfiguration}" </span><span class="cx"> title="Edit this Configuration" styleClass="buttonmed" rendered="${ResourceUIBean.permissions.configure}" /> </h:panelGrid> </span><span class="rem">- <onc:config configurationDefinition="#{ExistingResourceConfigurationUIBean.configurationDefinition}" - configuration="#{ExistingResourceConfigurationUIBean.configuration}" - accessMapActionExpression="#{ExistingResourceConfigurationUIBean.accessMap}" </span><span class="add">+ <onc:config configurationDefinition="#{ExistingResourceConfigurationViewUIBean.configurationDefinition}" + configuration="#{ExistingResourceConfigurationViewUIBean.configuration}" + accessMapActionExpression="#{ExistingResourceConfigurationViewUIBean.accessMap}" </span><span class="cx"> readOnly="true" </span><span class="rem">- nullConfigurationDefinitionMessage="#{ExistingResourceConfigurationUIBean.nullConfigurationDefinitionMessage}" - nullConfigurationMessage="#{ExistingResourceConfigurationUIBean.nullConfigurationMessage}" </span><span class="add">+ nullConfigurationDefinitionMessage="#{ExistingResourceConfigurationViewUIBean.nullConfigurationDefinitionMessage}" + nullConfigurationMessage="#{ExistingResourceConfigurationViewUIBean.nullConfigurationMessage}" </span><span class="cx"> prevalidate="true"/> <h:panelGrid columns="1" styleClass="buttons-table" columnClasses="button-cell" </span><span class="rem">- rendered="#{ExistingResourceConfigurationUIBean.configuration != null and !ExistingResourceConfigurationUIBean.updateInProgress}"> - <h:commandButton value="EDIT" action="#{ExistingResourceConfigurationUIBean.editConfiguration}" </span><span class="add">+ rendered="#{ExistingResourceConfigurationViewUIBean.configuration != null and !ExistingResourceConfigurationViewUIBean.updateInProgress}"> + <h:commandButton value="EDIT" action="#{ExistingResourceConfigurationViewUIBean.editConfiguration}" </span><span class="cx"> title="Edit this Configuration" styleClass="buttonmed" rendered="${ResourceUIBean.permissions.configure}" /> </h:panelGrid> </h:form> </span><span class="rem">- <h:panelGroup layout="block" styleClass="InfoBlock" rendered="#{ExistingResourceConfigurationUIBean.updateInProgress}"> </span><span class="add">+ <h:panelGroup layout="block" styleClass="InfoBlock" rendered="#{ExistingResourceConfigurationViewUIBean.updateInProgress}"> </span><span class="cx"> <b>${msg['note']}</b> ${msg['resource.config.Current.updateInProgress']} </h:panelGroup> </span> </pre> </div> </div> </body> </html> |