February 2010 - gatein-commits - Jboss List Archives

gatein SVN: r1602 - in components/wsrp/trunk/admin-gui/src/main/webapp/jsf: producer and 1 other directory.

by do-not-reply＠jboss.org

Author: wesleyhales Date: 2010-02-09 21:25:10 -0500 (Tue, 09 Feb 2010) New Revision: 1602 Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml Log: webui wsrp consumer & producer admin skin Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2010-02-10 02:07:58 UTC (rev 1601) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmEraseRegistration.xhtml 2010-02-10 02:25:10 UTC (rev 1602) @@ -26,7 +26,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:jbp="http://www.jboss.org/portal" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns:c="http://java.sun.com/jstl/core" + xmlns:webui="http://jboss.org/gatein"> <ui:param name="title" value=""/> <ui:define name="content"> @@ -51,12 +52,13 @@ <p class="portlet-class">#{i18n.confirm_delete_registration_proceed}</p> <h:form id="confirm-erase-form"> - <h:commandButton id="submit" value="#{i18n.confirm_delete_registration_submit}" - action="#{consumer.eraseLocalRegistration}" - styleClass="portlet-form-button portlet-section-buttonrow"/> - <h:commandButton id="cancel" value="#{i18n.confirm_delete_registration_cancel}" - action="configureConsumer" - styleClass="portlet-form-button portlet-section-buttonrow"/> + + <webui:commandButton id="submit" value="#{i18n.confirm_delete_registration_submit}" + action="eraseLocalRegistration" + backingBean="#{consumer}"/> + + <webui:commandLink id="cancel" value="#{i18n.confirm_delete_registration_cancel}" + actionString="configureConsumer"/> </h:form> </div> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-10 02:07:58 UTC (rev 1601) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-10 02:25:10 UTC (rev 1602) @@ -25,7 +25,8 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns:c="http://java.sun.com/jstl/core" + xmlns:webui="http://jboss.org/gatein"> <ui:param name="title" value="#{i18n.consumers_title}"/> <ui:param name="showAddConsumer" value="true"/> @@ -97,21 +98,11 @@ </h:form> <h:form> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink id="createConsumerButton" action="#{consumersMgr.reload}" - value="#{i18n.consumers_table_reload}"/> - </div> - </div> - </div> - </td> - </tr> - </table> + <webui:commandButton id="createConsumerButton" value="#{i18n.consumers_table_reload}" + action="reload" + backingBean="#{consumersMgr}"/> + </h:form> </ui:define> </ui:decorate> \ No newline at end of file Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2010-02-10 02:07:58 UTC (rev 1601) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/confirmPropDeletion.xhtml 2010-02-10 02:25:10 UTC (rev 1602) @@ -26,7 +26,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:jbp="http://www.jboss.org/portal" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns:c="http://java.sun.com/jstl/core" + xmlns:webui="http://jboss.org/gatein"> <ui:param name="title" value=""/> <ui:define name="content"> @@ -51,11 +52,12 @@ <p class="portlet-class">#{i18n.confirm_delete_reg_property_proceed}</p> <h:form id="confirm-prop-del-form"> - <h:commandButton id="confirm-delete" value="#{i18n.confirm_delete_reg_property_submit}" - action="#{producer.deleteRegistrationProperty}" - styleClass="portlet-form-button portlet-section-buttonrow"/> - <h:commandButton id="cancel-delete" value="#{i18n.confirm_delete_reg_property_cancel}" action="producer" - styleClass="portlet-form-button portlet-section-buttonrow"/> + <webui:commandButton id="confirm-delete" value="#{i18n.confirm_delete_reg_property_submit}" + action="deleteRegistrationProperty" + backingBean="#{producer}"/> + + <webui:commandLink id="cancel-delete" value="#{i18n.confirm_delete_reg_property_cancel}" + actionString="producer"/> </h:form> </div> </div>

14 years, 10 months

1
0
0 / 0

gatein SVN: r1601 - in components/wsrp/trunk/admin-gui/src/main/webapp: jsf/consumers and 2 other directories.

by do-not-reply＠jboss.org

Author: wesleyhales Date: 2010-02-09 21:07:58 -0500 (Tue, 09 Feb 2010) New Revision: 1601 Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css Log: webui wsrp consumer & producer admin skin Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml 2010-02-10 01:59:32 UTC (rev 1600) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml 2010-02-10 02:07:58 UTC (rev 1601) @@ -32,9 +32,7 @@ <div class="LeftBar"> <div class="RightBar"> <div class="MiddleBar"> - <ui:insert/> - </div> </div> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml 2010-02-10 01:59:32 UTC (rev 1600) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml 2010-02-10 02:07:58 UTC (rev 1601) @@ -36,7 +36,7 @@ <h:commandLink id="#{id}" action="#{backingBean[action]}" value="#{value}" immediate="#{immediate}"> <ui:insert/> - </h:commandLink> + </h:commandLink> </div> </div> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-10 01:59:32 UTC (rev 1600) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumers.xhtml 2010-02-10 02:07:58 UTC (rev 1601) @@ -27,92 +27,91 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> - <ui:param name="title" value="#{i18n.consumers_title}"/> - <ui:param name="showAddConsumer" value="true"/> + <ui:param name="title" value="#{i18n.consumers_title}"/> + <ui:param name="showAddConsumer" value="true"/> - <ui:define name="content"> + <ui:define name="content"> +  + <h:form id="consumer-list-form"> + <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" + rendered="#{!consumersMgr.consumersEmpty}" + rowClasses="EvenRow,OddRow" + styleClass="UIGrid ConsumerGrid" width="100%"> + <h:column> + <f:facet name="header"> + #{i18n.consumers_table_column_consumer} + <div style="font-size: 90%; display:inline; font-weight: normal;"> + [#{i18n.consumers_table_column_consumer_status} <span + class="active">#{i18n.path_consumers_active}</span>, + <span class="inactive">#{i18n.path_consumers_inactive}</span>, + <span class="needsRefresh">#{i18n.path_consumers_refreshNeeded}</span>] + </div> + </f:facet> -  - <h:form id="consumer-list-form"> - <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" - rendered="#{!consumersMgr.consumersEmpty}" - rowClasses="EvenRow,OddRow" - styleClass="UIGrid ConsumerGrid" width="100%"> - <h:column> - <f:facet name="header"> - #{i18n.consumers_table_column_consumer} - <div style="font-size: 90%; display:inline; font-weight: normal;"> - [#{i18n.consumers_table_column_consumer_status} <span - class="active">#{i18n.path_consumers_active}</span>, - <span class="inactive">#{i18n.path_consumers_inactive}</span>, - <span class="needsRefresh">#{i18n.path_consumers_refreshNeeded}</span>] - </div> - </f:facet> - - <h:outputText style="display:block; width:100%;" - styleClass="#{cons.active ? 'active' : 'inactive'} #{cons.refreshNeeded ? 'needsRefresh' : ''}" - value="#{cons.producerId} (#{cons.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}) + <h:outputText style="display:block; width:100%;" + styleClass="#{cons.active ? 'active' : 'inactive'} #{cons.refreshNeeded ? 'needsRefresh' : ''}" + value="#{cons.producerId} (#{cons.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}) #{cons.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}"/> - </h:column> + </h:column> - <h:column> - <f:facet name="header">#{i18n.consumers_table_column_actions}</f:facet> + <h:column> + <f:facet name="header">#{i18n.consumers_table_column_actions}</f:facet> - <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure" - id="configure"> - <f:param name="id" value="#{cons.producerId}"/> - #{i18n.consumers_table_action_configure} - </h:commandLink> - | - <h:commandLink action="#{consumersMgr.refreshConsumer}" styleClass="actionRefresh" id="refresh"> - <f:param name="id" value="#{cons.producerId}"/> - #{i18n.consumers_table_action_refresh} - </h:commandLink> - | - <h:commandLink action="#{consumersMgr.activateConsumer}" id="activate" - styleClass="#{cons.active ? 'actionDeactivate' : 'actionActivate'}"> - <f:param name="id" value="#{cons.producerId}"/> - <f:param name="activate" value="#{!cons.active}"/> - #{cons.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate} - </h:commandLink> - <h:panelGroup - rendered="#{!cons.refreshNeeded and cons.active and cons.producerInfo.registrationRequired}"> - | - <h:commandLink action="#{consumersMgr.registerConsumer}" id="register" - styleClass="action#{cons.producerInfo.registered ? 'Deregister' : 'Register'}"> - <f:param name="id" value="#{cons.producerId}"/> - <f:param name="register" value="#{!cons.producerInfo.registered}"/> - #{cons.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register} - </h:commandLink> - </h:panelGroup> - | - <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete" id="delete" - actionListener="#{consumersMgr.selectConsumer}"> - <f:param name="id" value="#{cons.producerId}"/> - #{i18n.consumers_table_action_delete} - </h:commandLink> - </h:column> - </h:dataTable> - </h:form> + <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure" + id="configure"> + <f:param name="id" value="#{cons.producerId}"/> + #{i18n.consumers_table_action_configure} + </h:commandLink> + | + <h:commandLink action="#{consumersMgr.refreshConsumer}" styleClass="actionRefresh" id="refresh"> + <f:param name="id" value="#{cons.producerId}"/> + #{i18n.consumers_table_action_refresh} + </h:commandLink> + | + <h:commandLink action="#{consumersMgr.activateConsumer}" id="activate" + styleClass="#{cons.active ? 'actionDeactivate' : 'actionActivate'}"> + <f:param name="id" value="#{cons.producerId}"/> + <f:param name="activate" value="#{!cons.active}"/> + #{cons.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate} + </h:commandLink> + <h:panelGroup + rendered="#{!cons.refreshNeeded and cons.active and cons.producerInfo.registrationRequired}"> + | + <h:commandLink action="#{consumersMgr.registerConsumer}" id="register" + styleClass="action#{cons.producerInfo.registered ? 'Deregister' : 'Register'}"> + <f:param name="id" value="#{cons.producerId}"/> + <f:param name="register" value="#{!cons.producerInfo.registered}"/> + #{cons.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register} + </h:commandLink> + </h:panelGroup> + | + <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete" id="delete" + actionListener="#{consumersMgr.selectConsumer}"> + <f:param name="id" value="#{cons.producerId}"/> + #{i18n.consumers_table_action_delete} + </h:commandLink> + </h:column> + </h:dataTable> + </h:form> - <h:form> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink id="createConsumerButton" action="#{consumersMgr.reload}" - value="#{i18n.consumers_table_reload}"/> - </div> - </div> + <h:form> + <table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="createConsumerButton" action="#{consumersMgr.reload}" + value="#{i18n.consumers_table_reload}"/> </div> - </td> - </tr> - </table> + </div> + </div> + </td> + </tr> + </table> - </h:form> - </ui:define> + </h:form> + </ui:define> </ui:decorate> \ No newline at end of file Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2010-02-10 01:59:32 UTC (rev 1600) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2010-02-10 02:07:58 UTC (rev 1601) @@ -61,73 +61,73 @@ <h:outputText value=" " rendered="#{producer.registrationRequired}"/> <f:subview rendered="#{producer.registrationRequired}"> - <webui:blueHeaderBar> - <div class="full-width float-left bold"> - #{i18n.producer_config_reg_props} - <div style="position:relative;display:inline"> - <div style="position:absolute;top:-5px;left: 10px;font-weight:normal"> - <webui:commandButton id="add-reg-prop" action="addRegistrationProperty" - backingBean="#{producer}" - value="#{i18n.producer_config_add_reg_prop}"/></div> - </div> - </div> + <webui:blueHeaderBar> + <div class="full-width float-left bold"> + #{i18n.producer_config_reg_props} + <div class="add-prop-container"> + <div class="add-prop-button"> + <webui:commandButton id="add-reg-prop" action="addRegistrationProperty" + backingBean="#{producer}" + value="#{i18n.producer_config_add_reg_prop}"/></div> + </div> + </div> - </webui:blueHeaderBar> + </webui:blueHeaderBar> - <f:subview rendered="#{!empty producer.registrationProperties}" id="reg-props"> - <h:dataTable id="reg-properties" value="#{producer.registrationProperties}" var="property" - rendered="#{producer.registrationRequired}" - rowClasses="EvenRow,OddRow" - styleClass="UIGrid ConsumerGrid" width="100%"> - <h:column> - <f:facet name="header">#{i18n.producer_config_reg_prop_name}</f:facet> - <h:inputText id="name" value="#{property.nameAsString}" size="21"/> - </h:column> - <h:column> - <f:facet name="header">#{i18n.producer_config_reg_prop_type}</f:facet> - <h:selectOneListbox id="producer-list" disabled="true"> - <f:selectItems value="#{producer.supportedPropertyTypes}"/> - </h:selectOneListbox> - </h:column> - <h:column> - <f:facet name="header">#{i18n.producer_config_reg_prop_label}</f:facet> - <h:inputText id="label" value="#{property.label}" size="21"/> - </h:column> - <h:column> - <f:facet name="header">#{i18n.producer_config_reg_prop_hint}</f:facet> - <h:inputText id="hint" value="#{property.hint}" size="21"/> - </h:column> - <h:column> - <f:facet name="header">#{i18n.producer_config_reg_prop_action}</f:facet> - <h:commandLink id="confirm-delete" action="confirmPropDeletion" - value="#{i18n.producer_config_reg_prop_remove}" - styleClass="actionDelete" - actionListener="#{producer.selectProperty}"> - <f:param name="propName" value="#{property.nameAsString}"/> - </h:commandLink> - </h:column> - </h:dataTable> - </f:subview> + <f:subview rendered="#{!empty producer.registrationProperties}" id="reg-props"> + <h:dataTable id="reg-properties" value="#{producer.registrationProperties}" var="property" + rendered="#{producer.registrationRequired}" + rowClasses="EvenRow,OddRow" + styleClass="UIGrid ConsumerGrid" width="100%"> + <h:column> + <f:facet name="header">#{i18n.producer_config_reg_prop_name}</f:facet> + <h:inputText id="name" value="#{property.nameAsString}" size="21"/> + </h:column> + <h:column> + <f:facet name="header">#{i18n.producer_config_reg_prop_type}</f:facet> + <h:selectOneListbox id="producer-list" disabled="true"> + <f:selectItems value="#{producer.supportedPropertyTypes}"/> + </h:selectOneListbox> + </h:column> + <h:column> + <f:facet name="header">#{i18n.producer_config_reg_prop_label}</f:facet> + <h:inputText id="label" value="#{property.label}" size="21"/> + </h:column> + <h:column> + <f:facet name="header">#{i18n.producer_config_reg_prop_hint}</f:facet> + <h:inputText id="hint" value="#{property.hint}" size="21"/> + </h:column> + <h:column> + <f:facet name="header">#{i18n.producer_config_reg_prop_action}</f:facet> + <h:commandLink id="confirm-delete" action="confirmPropDeletion" + value="#{i18n.producer_config_reg_prop_remove}" + styleClass="actionDelete" + actionListener="#{producer.selectProperty}"> + <f:param name="propName" value="#{property.nameAsString}"/> + </h:commandLink> + </h:column> + </h:dataTable> + </f:subview> - <f:subview rendered="#{empty producer.registrationProperties}" id="reg-props-none"> - <h:outputText value="#{i18n.producer_config_no_reg_props}"/> - </f:subview> + <f:subview rendered="#{empty producer.registrationProperties}" id="reg-props-none"> + <h:outputText value="#{i18n.producer_config_no_reg_props}"/> + </f:subview> - </f:subview> + </f:subview> <h:outputText value=" "/> <h:panelGroup styleClass="portlet-section-buttonrow"> - <webui:commandButton id="reg-save" action="save" - backingBean="#{producer}" - value="#{i18n.producer_config_save}" /> + <webui:commandButton id="reg-save" action="save" + backingBean="#{producer}" + value="#{i18n.producer_config_save}"/> - <webui:commandButton id="reg-reload" action="reloadConfiguration" - backingBean="#{producer}" - value="#{i18n.producer_config_cancel}"/> + <webui:commandButton id="reg-reload" action="reloadConfiguration" + backingBean="#{producer}" + value="#{i18n.producer_config_cancel}"/> </h:panelGroup> </h:panelGrid> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2010-02-10 01:59:32 UTC (rev 1600) +++ components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2010-02-10 02:07:58 UTC (rev 1601) @@ -1,160 +1,173 @@ .UIWsrpPortlet .UIControlBar { - /*background: url('background/ControlIcon.gif') repeat-x center -222px;*/ - /*border: 1px solid #b7b7b7;*/ - /*height: 23px;*/ - line-height: 28px; - padding: 4px 10px 0 0; - /*margin: 5px 0px;*/ - font-weight: bold; - text-align: right; +/*background: url('background/ControlIcon.gif') repeat-x center -222px;*/ +/*border: 1px solid #b7b7b7;*/ +/*height: 23px;*/ + line-height: 28px; + padding: 4px 10px 0 0; /*margin: 5px 0px;*/ + font-weight: bold; + text-align: right; } /***************************** Consumer Form Style ************************/ .UIWsrpPortlet .cons-temp-form, -.UIWsrpPortlet .producer-temp-form{ - height: 27px; +.UIWsrpPortlet .producer-temp-form { + height: 27px; } .UIWsrpPortlet .UIGrid { - border: 1px solid #B7B7B7; + border: 1px solid #B7B7B7; } .UIWsrpPortlet .ConsumerGrid thead tr th, .UIWsrpPortlet .ConsumerGrid tbody tr td { - border: 1px solid #B7B7B7; + border: 1px solid #B7B7B7; } .UIWsrpPortlet .create-container { - position: relative; + position: relative; } .UIWsrpPortlet .list-cons-link { - text-decoration: underline; - color: darkblue; + text-decoration: underline; + color: darkblue; } .UIWsrpPortlet .create-container .ActionContainer { - position: absolute; - margin: 7px 0 0 0; + position: absolute; + margin: 7px 0 0 0; } +/***************************** Producer Form Style ************************/ + +.UIWsrpPortlet .add-prop-container { + position: relative; + display: inline +} + +.UIWsrpPortlet .add-prop-button { + position: absolute; + top: -5px; + left: 10px; + font-weight: normal +} + /***************************** Messages Style ************************/ .portlet-msg-success { - color: darkgreen; - background: url('background/SelectIcon.gif') no-repeat left top; - list-style: none; - padding: 0 0 0 20px; - font-weight: bold; - height: 19px; + color: darkgreen; + background: url('background/SelectIcon.gif') no-repeat left top; + list-style: none; + padding: 0 0 0 20px; + font-weight: bold; + height: 19px; } .portlet-msg-warn { - color: orange; - background: url('background/Warning.gif') no-repeat left top; - list-style: none; - padding: 0 0 0 20px; - font-weight: bold; - height: 19px; + color: orange; + background: url('background/Warning.gif') no-repeat left top; + list-style: none; + padding: 0 0 0 20px; + font-weight: bold; + height: 19px; } .portlet-msg-error { - color: darkred; - background: url('background/Error.gif') no-repeat left top; - list-style: none; - padding: 0 0 0 20px; - font-weight: bold; - height: 19px; + color: darkred; + background: url('background/Error.gif') no-repeat left top; + list-style: none; + padding: 0 0 0 20px; + font-weight: bold; + height: 19px; } /***************************** ActionButton Style ************************/ .UIWsrpPortlet .ActionContainer { - width: auto; - display: inline; /*margin: auto;*/ + width: auto; + display: inline; /*margin: auto;*/ } .UIWsrpPortlet .ButtonLeft { - background: url('background/LightBlueStyle.gif') no-repeat left top; - padding: 0px 0px 0px 3px; + background: url('background/LightBlueStyle.gif') no-repeat left top; + padding: 0px 0px 0px 3px; } .UIWsrpPortlet .ButtonRight { - background: url('background/LightBlueStyle.gif') no-repeat right top; - padding: 0px 3px 0px 0px; + background: url('background/LightBlueStyle.gif') no-repeat right top; + padding: 0px 3px 0px 0px; } .UIWsrpPortlet .ButtonMiddle { - line-height: 22px; - text-align: center; - background: url('background/LightBlueStyle.gif') repeat-x bottom; - white-space: nowrap; - display: table-cell; - padding: 0px 12px; + line-height: 22px; + text-align: center; + background: url('background/LightBlueStyle.gif') repeat-x bottom; + white-space: nowrap; + display: table-cell; + padding: 0px 12px; } /***************************** GrayTabStyle ************************/ .UIWsrpPortlet .TabsActionContainer { - position: absolute; - bottom: -1px; - width: auto; + position: absolute; + bottom: -1px; + width: auto; } .UIWsrpPortlet .TabsContainer { - height: 29px; - position: relative; + height: 29px; + position: relative; } .UIHorizontalTabs .UITab { - float: left; /* orientation=lt */ - font-weight: bold; - text-align: center; - width: auto; + float: left; /* orientation=lt */ + font-weight: bold; + text-align: center; + width: auto; } .UIWsrpPortlet .GrayTabStyle { - margin-right: 2px; /* orientation=lt */ + margin-right: 2px; /* orientation=lt */ } .UIWsrpPortlet .GrayTabStyle .NormalTab .LeftTab { - background: url(background/TabEditInline.gif) no-repeat left top; - padding-left: 4px; - cursor: pointer; + background: url(background/TabEditInline.gif) no-repeat left top; + padding-left: 4px; + cursor: pointer; } .UIWsrpPortlet .GrayTabStyle .NormalTab .RightTab { - background: url(background/TabEditInline.gif) no-repeat right top; - padding-right: 4px; + background: url(background/TabEditInline.gif) no-repeat right top; + padding-right: 4px; } .UIWsrpPortlet .GrayTabStyle .NormalTab .MiddleTab { - background: url(background/TabEditInline.gif) repeat-x left -25px; - line-height: 25px; - color: #000; - padding: 0px 8px; - font-weight: normal; + background: url(background/TabEditInline.gif) repeat-x left -25px; + line-height: 25px; + color: #000; + padding: 0px 8px; + font-weight: normal; } .UIWsrpPortlet .GrayTabStyle .SelectedTab .LeftTab { - background: url(background/TabEditInline.gif) no-repeat left -50px; - padding-left: 4px; - cursor: pointer; + background: url(background/TabEditInline.gif) no-repeat left -50px; + padding-left: 4px; + cursor: pointer; } .UIWsrpPortlet .GrayTabStyle .SelectedTab .RightTab { - background: url(background/TabEditInline.gif) no-repeat right -50px; - padding-right: 4px; + background: url(background/TabEditInline.gif) no-repeat right -50px; + padding-right: 4px; } .UIWsrpPortlet .GrayTabStyle .SelectedTab .MiddleTab { - background: url(background/TabEditInline.gif) repeat-x left -75px; - line-height: 25px; - color: #000; - padding: 0px 8px; - font-weight: normal; + background: url(background/TabEditInline.gif) repeat-x left -75px; + line-height: 25px; + color: #000; + padding: 0px 8px; + font-weight: normal; } .UIWsrpPortlet .tab-blank { - border-bottom: 1px solid #B7B7B7; + border-bottom: 1px solid #B7B7B7; }

14 years, 10 months

1
0
0 / 0

gatein SVN: r1600 - in components/wsrp/trunk/admin-gui/src/main/webapp: jsf/producer and 2 other directories.

by do-not-reply＠jboss.org

Author: wesleyhales Date: 2010-02-09 20:59:32 -0500 (Tue, 09 Feb 2010) New Revision: 1600 Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css Log: webui wsrp consumer & producer admin skin Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-09 23:54:32 UTC (rev 1599) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-10 01:59:32 UTC (rev 1600) @@ -72,7 +72,7 @@  <div class="create-container"> <h:form id="createConsumer" styleClass="createObjectForm"> - <span class="portlet-font">#{i18n.consumers_create_title}</span> + <span class="portlet-font bold">#{i18n.consumers_create_title}</span>  <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field" label="Consumer Name" required="true"/>   @@ -109,7 +109,7 @@ </c:if> <span class="#{!empty title ? 'selected' : 'pathItem'} float-right"> - <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" + <h:commandLink id="list-cons-link" class="list-cons-link" action="#{consumersMgr.listConsumers}" value="#{i18n.path_consumers_root}"/> </span> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2010-02-09 23:54:32 UTC (rev 1599) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producer.xhtml 2010-02-10 01:59:32 UTC (rev 1600) @@ -25,7 +25,8 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns:c="http://java.sun.com/jstl/core" + xmlns:webui="http://jboss.org/gatein"> <ui:param name="title" value="#{i18n.producer_config_title}"/> @@ -58,18 +59,31 @@ </h:panelGroup> <h:outputText value=" " rendered="#{producer.registrationRequired}"/> - <h:panelGroup rendered="#{producer.registrationRequired}"> - <h:outputText styleClass="portlet-area-header" value="#{i18n.producer_config_reg_props}"/> - <h:panelGroup styleClass="portlet-area-body"> - <c:choose> - <c:when test="#{!empty producer.registrationProperties}"> - <h:dataTable id="reg-properties" var="property" width="100%" - value="#{producer.registrationProperties}" - rendered="#{producer.registrationRequired}" - headerClass="portlet-section-header"> + <f:subview rendered="#{producer.registrationRequired}"> + + <webui:blueHeaderBar> + <div class="full-width float-left bold"> + #{i18n.producer_config_reg_props} + <div style="position:relative;display:inline"> + <div style="position:absolute;top:-5px;left: 10px;font-weight:normal"> + <webui:commandButton id="add-reg-prop" action="addRegistrationProperty" + backingBean="#{producer}" + value="#{i18n.producer_config_add_reg_prop}"/></div> + </div> + </div> + + + </webui:blueHeaderBar> + + + <f:subview rendered="#{!empty producer.registrationProperties}" id="reg-props"> + <h:dataTable id="reg-properties" value="#{producer.registrationProperties}" var="property" + rendered="#{producer.registrationRequired}" + rowClasses="EvenRow,OddRow" + styleClass="UIGrid ConsumerGrid" width="100%"> <h:column> <f:facet name="header">#{i18n.producer_config_reg_prop_name}</f:facet> - <h:inputText id="name" value="#{property.nameAsString}" size="30"/> + <h:inputText id="name" value="#{property.nameAsString}" size="21"/> </h:column> <h:column> <f:facet name="header">#{i18n.producer_config_reg_prop_type}</f:facet> @@ -79,41 +93,42 @@ </h:column> <h:column> <f:facet name="header">#{i18n.producer_config_reg_prop_label}</f:facet> - <h:inputText id="label" value="#{property.label}" size="50"/> + <h:inputText id="label" value="#{property.label}" size="21"/> </h:column> <h:column> <f:facet name="header">#{i18n.producer_config_reg_prop_hint}</f:facet> - <h:inputText id="hint" value="#{property.hint}" size="50"/> + <h:inputText id="hint" value="#{property.hint}" size="21"/> </h:column> <h:column> <f:facet name="header">#{i18n.producer_config_reg_prop_action}</f:facet> <h:commandLink id="confirm-delete" action="confirmPropDeletion" value="#{i18n.producer_config_reg_prop_remove}" - styleClass="portlet-form-button" + styleClass="actionDelete" actionListener="#{producer.selectProperty}"> <f:param name="propName" value="#{property.nameAsString}"/> </h:commandLink> </h:column> </h:dataTable> - </c:when> - <c:otherwise> + </f:subview> + + <f:subview rendered="#{empty producer.registrationProperties}" id="reg-props-none"> <h:outputText value="#{i18n.producer_config_no_reg_props}"/> - </c:otherwise> - </c:choose> + </f:subview> - <h:commandLink id="add-reg-prop" action="#{producer.addRegistrationProperty}" - value="#{i18n.producer_config_add_reg_prop}" - styleClass="portlet-form-button"/> - </h:panelGroup> - </h:panelGroup> + </f:subview> + + <h:outputText value=" "/> <h:panelGroup styleClass="portlet-section-buttonrow"> - <h:commandButton id="save-producer" action="#{producer.save}" value="#{i18n.producer_config_save}" - styleClass="portlet-form-button"/> - <h:commandButton id="reload-producer" action="#{producer.reloadConfiguration}" - value="#{i18n.producer_config_cancel}" - styleClass="portlet-form-button"/> + <webui:commandButton id="reg-save" action="save" + backingBean="#{producer}" + value="#{i18n.producer_config_save}" /> + + <webui:commandButton id="reg-reload" action="reloadConfiguration" + backingBean="#{producer}" + value="#{i18n.producer_config_cancel}"/> + </h:panelGroup> </h:panelGrid> </h:form> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml 2010-02-09 23:54:32 UTC (rev 1599) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/producer/producerTemplate.xhtml 2010-02-10 01:59:32 UTC (rev 1600) @@ -28,7 +28,7 @@ xmlns:c="http://java.sun.com/jstl/core"> <ui:define name="topnav"> - <h:form id="producer-temp-form"> + <h:form id="producer-temp-form" styleClass="producer-temp-form"> <div class="TabsContainer"> <table class="TabsActionContainer"><tr><td> @@ -49,7 +49,7 @@ <div class="LeftTab"> <div class="RightTab"> <div class="MiddleTab"> - #{i18n.nav_tabs_producer_config}" + #{i18n.nav_tabs_producer_config} </div> </div> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2010-02-09 23:54:32 UTC (rev 1599) +++ components/wsrp/trunk/admin-gui/src/main/webapp/skin/wsrp/DefaultSkin/DefaultStylesheet.css 2010-02-10 01:59:32 UTC (rev 1600) @@ -11,7 +11,8 @@ /***************************** Consumer Form Style ************************/ -.UIWsrpPortlet .cons-temp-form { +.UIWsrpPortlet .cons-temp-form, +.UIWsrpPortlet .producer-temp-form{ height: 27px; } @@ -28,9 +29,14 @@ position: relative; } +.UIWsrpPortlet .list-cons-link { + text-decoration: underline; + color: darkblue; +} + .UIWsrpPortlet .create-container .ActionContainer { position: absolute; - top: 7px; + margin: 7px 0 0 0; } /***************************** Messages Style ************************/ @@ -41,6 +47,7 @@ list-style: none; padding: 0 0 0 20px; font-weight: bold; + height: 19px; } .portlet-msg-warn { @@ -49,6 +56,7 @@ list-style: none; padding: 0 0 0 20px; font-weight: bold; + height: 19px; } .portlet-msg-error { @@ -57,6 +65,7 @@ list-style: none; padding: 0 0 0 20px; font-weight: bold; + height: 19px; } /***************************** ActionButton Style ************************/ @@ -88,12 +97,12 @@ .UIWsrpPortlet .TabsActionContainer { position: absolute; - bottom: -6px; + bottom: -1px; width: auto; } .UIWsrpPortlet .TabsContainer { - height: 24px; + height: 29px; position: relative; } Modified: components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css 2010-02-09 23:54:32 UTC (rev 1599) +++ components/wsrp/trunk/admin-gui/src/main/webapp/styles/basestyles.css 2010-02-10 01:59:32 UTC (rev 1600) @@ -85,6 +85,10 @@ border: 1px solid #B3C0C7; } +.bold { + font-weight: bold; +} + .dotted-blue-border { font-weight: bold; color: #315896;

14 years, 10 months

1
0
0 / 0

gatein SVN: r1599 - in components/wsrp/trunk/admin-gui/src/main/webapp: WEB-INF/tags/xhtml and 1 other directories.

by do-not-reply＠jboss.org

Author: wesleyhales Date: 2010-02-09 18:54:32 -0500 (Tue, 09 Feb 2010) New Revision: 1599 Added: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml Log: final styles for wsrp consumer admin Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml 2010-02-09 22:46:56 UTC (rev 1598) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/webui.taglib.xml 2010-02-09 23:54:32 UTC (rev 1599) @@ -8,4 +8,14 @@ <tag-name>commandButton</tag-name> <source>xhtml/commandButton.xhtml</source> </tag> + + <tag> + <tag-name>commandLink</tag-name> + <source>xhtml/commandLink.xhtml</source> + </tag> + + <tag> + <tag-name>blueHeaderBar</tag-name> + <source>xhtml/blueHeaderBar.xhtml</source> + </tag> </facelet-taglib> \ No newline at end of file Added: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml (rev 0) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/blueHeaderBar.xhtml 2010-02-09 23:54:32 UTC (rev 1599) @@ -0,0 +1,44 @@ + + +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:c="http://java.sun.com/jstl/core"> + + <div class="UIBarStyle"> + <div class="BarStyle2"> + <div class="LeftBar"> + <div class="RightBar"> + <div class="MiddleBar"> + + <ui:insert/> + + </div> + </div> + </div> + </div> + </div> + +</ui:composition> \ No newline at end of file Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml 2010-02-09 22:46:56 UTC (rev 1598) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml 2010-02-09 23:54:32 UTC (rev 1599) @@ -33,8 +33,10 @@ <div class="ButtonLeft"> <div class="ButtonRight"> <div class="ButtonMiddle"> - <h:commandLink id="#{id}" action="#{action}" - value="#{value}" immediate="#{immediate}"/> + <h:commandLink id="#{id}" action="#{backingBean[action]}" + value="#{value}" immediate="#{immediate}"> + <ui:insert/> + </h:commandLink> </div> </div> </div> Copied: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml (from rev 1591, components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandButton.xhtml) =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml (rev 0) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/tags/xhtml/commandLink.xhtml 2010-02-09 23:54:32 UTC (rev 1599) @@ -0,0 +1,45 @@ + + +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:c="http://java.sun.com/jstl/core"> + +<table class="ActionContainer"> + <tr> + <td> + <div class="ButtonLeft"> + <div class="ButtonRight"> + <div class="ButtonMiddle"> + <h:commandLink id="#{id}" action="#{actionString}" + value="#{value}" immediate="#{immediate}"/> + </div> + </div> + </div> + </td> + </tr> +</table> + +</ui:composition> \ No newline at end of file Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml 2010-02-09 22:46:56 UTC (rev 1598) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/confirmDeleteConsumer.xhtml 2010-02-09 23:54:32 UTC (rev 1599) @@ -26,7 +26,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:jbp="http://www.jboss.org/portal" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns:c="http://java.sun.com/jstl/core" + xmlns:webui="http://jboss.org/gatein"> <ui:param name="title" value=""/> <ui:define name="content"> @@ -51,14 +52,18 @@ <p class="portlet-class">#{i18n.confirm_detete_consumer_proceed}</p> <h:form id="confirm-delete-form"> - <h:commandLink id="destroy-link" value="#{i18n.confirm_delete_consumer_submit}" - action="#{consumersMgr.destroyConsumer}" - styleClass="portlet-form-button portlet-section-buttonrow"> - <f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/> - </h:commandLink> - <h:commandButton id="cancel-link" value="#{i18n.confirm_delete_consumer_cancel}" - action="#{consumersMgr.listConsumers}" - styleClass="portlet-form-button portlet-section-buttonrow"/> + + <webui:commandButton id="destroy-link" + action="destroyConsumer" + backingBean="#{consumersMgr}" + value="#{i18n.confirm_delete_consumer_submit}"> + <f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/> + </webui:commandButton> + + <webui:commandButton id="cancel-link" + action="listConsumers" + backingBean="#{consumersMgr}" + value="#{i18n.confirm_delete_consumer_cancel}"/> </h:form> </div> </div> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-09 22:46:56 UTC (rev 1598) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/consumerTemplate.xhtml 2010-02-09 23:54:32 UTC (rev 1599) @@ -25,7 +25,8 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:c="http://java.sun.com/jstl/core"> + xmlns:c="http://java.sun.com/jstl/core" + xmlns:webui="http://jboss.org/gatein"> <ui:define name="topnav"> <h:form id="cons-temp-form" styleClass="cons-temp-form"> @@ -64,87 +65,61 @@ <ui:define name="objectpath"> + <webui:blueHeaderBar> + <div class="full-width"> + <f:subview id="add-consumer" rendered="#{showAddConsumer eq true}"> + <div class="float-left half-width"> +  + <div class="create-container"> + <h:form id="createConsumer" styleClass="createObjectForm"> + <span class="portlet-font">#{i18n.consumers_create_title}</span> + <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" + styleClass="portlet-form-input-field" + label="Consumer Name" required="true"/>   + <webui:commandButton id="createConsumerButton" + action="createConsumer" + backingBean="#{consumersMgr}" + value="#{i18n.consumers_create_submit}"/> - <div class="UIBarStyle"> - <div class="BarStyle2"> - <div class="LeftBar"> - <div class="RightBar"> - <div class="MiddleBar"> - <div class="full-width"> - <f:subview id="add-consumer" rendered="#{showAddConsumer eq true}"> - <div class="float-left half-width"> + <ui:remove> + <h:message for="consumerName" errorClass="portlet-msg-error"/> + </ui:remove> + </h:form> + </div> + </div> + </f:subview> -  - <div class="create-container"> - <h:form id="createConsumer" styleClass="createObjectForm"> - <span class="portlet-font">#{i18n.consumers_create_title}</span> - <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field" - label="Consumer Name" required="true"/>   + <div class="#{showAddConsumer eq true ? 'float-right half-width' : 'full-width'}"> - <table class="ActionContainer"> - <tr> - <td> - <div class="ButtonLeft"> - <div class="ButtonRight"> - <div class="ButtonMiddle"> - <h:commandLink id="createConsumerButton" action="#{consumersMgr.createConsumer}" - value="#{i18n.consumers_create_submit}"/> - </div> - </div> - </div> - </td> - </tr> - </table> + <h:form id="cons-temp-form1"> + <div class="UIControlBar"> + <c:if test="#{empty title}"> + <span + class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''} float-left"> + <h:outputFormat value="#{i18n.path_consumers_consumer}"> + <f:param value="#{consumer.id}"/> + </h:outputFormat> + (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}) + #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''} + </span> + </c:if> - <ui:remove> - <h:message for="consumerName" errorClass="portlet-msg-error"/> - </ui:remove> - </h:form> - </div> + <span class="#{!empty title ? 'selected' : 'pathItem'} float-right"> + <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" + value="#{i18n.path_consumers_root}"/> + </span> + </div> + </h:form> - </div> - </f:subview> + </div> + </div> + </webui:blueHeaderBar> - <div class="#{showAddConsumer eq true ? 'float-right half-width' : 'full-width'}"> - <h:form id="cons-temp-form1"> - <div class="UIControlBar"> - <c:if test="#{empty title}"> - <span - class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''} float-left"> - <h:outputFormat value="#{i18n.path_consumers_consumer}"> - <f:param value="#{consumer.id}"/> - </h:outputFormat> - (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}) - #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''} - </span> - </c:if> - - <span class="#{!empty title ? 'selected' : 'pathItem'} float-right"> - <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" - value="#{i18n.path_consumers_root}"/> - </span> - - </div> - </h:form> - - </div> - - </div> - - - </div> - </div> - </div> - </div> - </div> - - - </ui:define> </ui:decorate> Modified: components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-09 22:46:56 UTC (rev 1598) +++ components/wsrp/trunk/admin-gui/src/main/webapp/jsf/consumers/editConsumer.xhtml 2010-02-09 23:54:32 UTC (rev 1599) @@ -26,7 +26,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core" - xmlns:webui="http://jboss.org/gatein"> + xmlns:webui="http://jboss.org/gatein"> <ui:param name="title" value=""/> <ui:define name="content"> @@ -93,20 +93,24 @@ converter="faces.convert.RegistrationProperty.Status"/> </h:column> </h:dataTable> - <h:commandLink id="cons-update-link" action="#{consumer.update}" - value="#{i18n.edit_consumer_registration_update_props}" - rendered="#{consumer.registered}" - styleClass="portlet-form-button portlet-section-buttonrow"/> + + + <webui:commandButton action="update" + backingBean="#{consumer}" + id="cons-update-link" + value="#{i18n.edit_consumer_registration_update_props}" + rendered="#{consumer.registered}"/> </c:when> <c:otherwise> #{i18n.edit_consumer_registration_no_props} </c:otherwise> </c:choose> - <h:commandLink id="modify-reg-link" action="#{consumer.modifyRegistration}" - value="#{i18n.edit_consumer_registration_modify}" - rendered="#{consumer.registrationLocallyModified}" - title="#{i18n.edit_consumer_registration_modify_title}" - styleClass="portlet-form-button portlet-section-buttonrow"/> + <webui:commandButton action="modifyRegistration" + backingBean="#{consumer}" + id="modify-reg-link" + rendered="#{consumer.registrationLocallyModified}" + value="#{i18n.edit_consumer_registration_modify}" + title="#{i18n.edit_consumer_registration_modify_title}"/> <br style="clear:both;"/> </h:panelGroup> @@ -145,10 +149,12 @@ #{i18n.edit_consumer_registration_no_props} </c:otherwise> </c:choose> - <h:commandLink id="edit-reg-link" action="#{consumer.modifyRegistration}" - value="#{i18n.edit_consumer_registration_modify}" - title="#{i18n.edit_consumer_registration_modify_title}" - styleClass="portlet-form-button portlet-section-buttonrow"/> + + <webui:commandButton action="modifyRegistration" + backingBean="#{consumer}" + id="edit-reg-link" + value="#{i18n.edit_consumer_registration_modify}" + title="#{i18n.edit_consumer_registration_modify_title}"/> <br style="clear:both;"/> </h:panelGroup> </c:if> @@ -166,10 +172,11 @@ #{i18n.edit_consumer_registration_context_handle} <h:outputText value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/> - <h:commandLink id="erase-cons-link" action="confirmEraseRegistration" - value="#{i18n.edit_consumer_registration_context_erase}" - title="#{i18n.edit_consumer_registration_context_erase_title}" - styleClass="portlet-form-button"/> + <webui:commandLink actionString="confirmEraseRegistration" + id="erase-cons-link" + value="#{i18n.edit_consumer_registration_context_erase}" + title="#{i18n.edit_consumer_registration_context_erase_title}"/> + </td> </tr> </c:if> @@ -177,12 +184,14 @@ <tr> <th/> <td class="portlet-section-buttonrow"> - <webui:commandButton action="#{consumer.refreshConsumer}" + <webui:commandButton action="refreshConsumer" + backingBean="#{consumer}" id="refresh-cons-link" value="#{i18n.edit_consumer_refresh}" title="#{i18n.edit_consumer_refresh_title}"/> - <webui:commandButton action="#{consumersMgr.listConsumers}" + <webui:commandButton action="listConsumers" + backingBean="#{consumersMgr}" id="list-cons-link" value="#{i18n.edit_consumer_cancel}" immediate="true"/>

14 years, 10 months

1
0
0 / 0

gatein SVN: r1598 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/conf/wsrp and 1 other directory.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-02-09 17:46:56 -0500 (Tue, 09 Feb 2010) New Revision: 1598 Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml Log: - Added residual properties on wsrp:registrationproperties so that we can add arbitrary registration properties and retrieve them in a Map. We do however need (until @Properties supports scoping) to filter properties when building them back from JCR as we will also retrieve JCR-internal properties that way. Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java 2010-02-09 22:38:46 UTC (rev 1597) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java 2010-02-09 22:46:56 UTC (rev 1598) @@ -1,34 +1,37 @@ /* -* JBoss, a division of Red Hat -* Copyright 2008, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software 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 -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, a division of Red Hat + * Copyright 2010, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.gatein.portal.wsrp.state.producer.registrations.mapping; import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Properties; +import org.exoplatform.commons.utils.Tools; import javax.xml.namespace.QName; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.Set; /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> @@ -39,6 +42,9 @@ { public static final String NODE_NAME = "wsrp:registrationproperties"; + /** Need to ignore JCR properties for now until scoping mechanism exists on @Properties� */ + private static final Set<String> propertiesBlackList = Tools.set("jcr:uuid", "jcr:primaryType"); + @Properties public abstract Map<String, String> getProperties(); @@ -51,7 +57,12 @@ properties = new HashMap<QName, Object>(propMap.size()); for (Map.Entry<String, String> entry : propMap.entrySet()) { - properties.put(QName.valueOf(entry.getKey()), entry.getValue()); + String key = entry.getKey(); + // ignore JCR-specific properties + if (!propertiesBlackList.contains(key)) + { + properties.put(QName.valueOf(key), entry.getValue()); + } } } @@ -60,7 +71,7 @@ public void initFrom(Map<QName, Object> properties) { - if(properties != null) + if (properties != null) { Map<String, String> map = getProperties(); Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2010-02-09 22:38:46 UTC (rev 1597) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-registrations-nodetypes.xml 2010-02-09 22:46:56 UTC (rev 1598) @@ -2,7 +2,7 @@  + <propertyDefinitions> + <propertyDefinition name="*" requiredType="undefined" autoCreated="false" mandatory="false" + onParentVersion="COPY" protected="false" multiple="false"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> </nodeType> <nodeType name="wsrp:consumergroup" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">

14 years, 10 months

1
0
0 / 0

gatein SVN: r1597 - components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-02-09 17:38:46 -0500 (Tue, 09 Feb 2010) New Revision: 1597 Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java Log: - Minor optimization: if we're using the default validator class, instantiate it directly instead of doing it via reflection. Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2010-02-09 22:37:06 UTC (rev 1596) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2010-02-09 22:38:46 UTC (rev 1597) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2009, Red Hat Middleware, LLC, and individual + * Copyright 2010, Red Hat Middleware, LLC, and individual * contributors as indicated by the @authors tag. See the * copyright.txt in the distribution for a full listing of * individual contributors. @@ -316,7 +316,7 @@ { log.debug("Using default registration policy: " + DEFAULT_POLICY_CLASS_NAME); RegistrationPropertyValidator validator; - if (validatorClassName != null) + if (validatorClassName != null && !DEFAULT_VALIDATOR_CLASS_NAME.equals(validatorClassName)) { log.debug("Using registration property validator: " + validatorClassName); ClassLoader loader = Thread.currentThread().getContextClassLoader();

14 years, 10 months

1
0
0 / 0

gatein SVN: r1596 - components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-02-09 17:37:06 -0500 (Tue, 09 Feb 2010) New Revision: 1596 Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerSessionInformationTestCase.java Log: - Increased thread sleep time slightly as it could happen that it'd be too short to properly simulate session expiration. Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerSessionInformationTestCase.java =================================================================== --- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerSessionInformationTestCase.java 2010-02-09 22:28:15 UTC (rev 1595) +++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerSessionInformationTestCase.java 2010-02-09 22:37:06 UTC (rev 1596) @@ -1,25 +1,25 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software 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 * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ +/* + * JBoss, a division of Red Hat + * Copyright 2010, Red Hat Middleware, LLC, and individual + * contributors as indicated by the @authors tag. See the + * copyright.txt in the distribution for a full listing of + * individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.gatein.wsrp.consumer; @@ -37,6 +37,7 @@ public class ProducerSessionInformationTestCase extends TestCase { ProducerSessionInformation info; + private static final int SLEEP_TIME = 1500; protected void setUp() throws Exception { @@ -53,14 +54,14 @@ assertEquals("name=value", info.getUserCookie()); // wait for cookie expiration - Thread.sleep(1000); + Thread.sleep(SLEEP_TIME); assertNull(info.getUserCookie()); // we shouldn't have a cookie now cookies = new Cookie[]{createCookie("name1", "value1", 1), createCookie("name2", "value2", 3)}; info.setUserCookie(cookies); assertEquals("name1=value1,name2=value2", info.getUserCookie()); - Thread.sleep(1000); + Thread.sleep(SLEEP_TIME); assertEquals("name2=value2", info.getUserCookie()); try @@ -94,7 +95,7 @@ assertEquals("name1=value1,name2=value2", info.getGroupCookieFor(groupId)); - Thread.sleep(1000); + Thread.sleep(SLEEP_TIME); assertEquals("name2=value2", info.getGroupCookieFor(groupId)); info.clearGroupCookies(); @@ -119,7 +120,7 @@ assertEquals(sid, info.getSessionIdForPortlet(handle)); assertEquals(2, info.getNumberOfSessions()); - Thread.sleep(1000); + Thread.sleep(SLEEP_TIME); assertNull(info.getSessionIdForPortlet(handle)); assertEquals(sid2, info.getSessionIdForPortlet(handle2)); assertEquals(1, info.getNumberOfSessions()); @@ -144,7 +145,7 @@ info.replaceUserCookiesWith(other); assertEquals("name2=value2", info.getUserCookie()); - Thread.sleep(1000); + Thread.sleep(SLEEP_TIME); info.replaceUserCookiesWith(other); assertNull(info.getUserCookie()); }

14 years, 10 months

1
0
0 / 0

gatein SVN: r1595 - in components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp: services and 1 other directory.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-02-09 17:28:15 -0500 (Tue, 09 Feb 2010) New Revision: 1595 Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java Log: - Use isDebugEnabled to prevent unnecessary creation of Strings. Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java 2010-02-09 22:25:16 UTC (rev 1594) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java 2010-02-09 22:28:15 UTC (rev 1595) @@ -147,7 +147,7 @@ public boolean isRefreshNeeded() { boolean result = !isAvailable(); - if (result) + if (result && log.isDebugEnabled()) { log.debug("Refresh needed"); } Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java =================================================================== --- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-02-09 22:25:16 UTC (rev 1594) +++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-02-09 22:28:15 UTC (rev 1595) @@ -63,7 +63,10 @@ public <T> T getService(Class<T> clazz) throws Exception { - log.debug("Getting service for class " + clazz); + if (log.isDebugEnabled()) + { + log.debug("Getting service for class " + clazz); + } // if we need a refresh, reload information from WSDL if (!isAvailable() && !isFailed()) @@ -101,7 +104,10 @@ { if (portAddress != null) { - log.debug("Setting the end point to: " + portAddress); + if (log.isDebugEnabled()) + { + log.debug("Setting the end point to: " + portAddress); + } Map<String, Object> requestContext = ((BindingProvider)service).getRequestContext(); requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, portAddress);

14 years, 10 months

1
0
0 / 0

gatein SVN: r1594 - components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-02-09 17:25:16 -0500 (Tue, 09 Feb 2010) New Revision: 1594 Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/portlet.xml Log: - Switched to Portlet 2.0. - Fixed resource bundle name. - Updated keywords so that they fit better in GateIn. Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/portlet.xml 2010-02-09 22:23:45 UTC (rev 1593) +++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/portlet.xml 2010-02-09 22:25:16 UTC (rev 1594) @@ -1,6 +1,6 @@  <portlet-app - xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" + xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" - version="1.0"> + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="2.0"> <portlet> <description>Configuration portlet for WSRP.</description> <portlet-name>WSRPConfigurationPortlet</portlet-name> @@ -45,10 +45,10 @@ <supported-locale>en</supported-locale> <supported-locale>fr</supported-locale> <supported-locale>pt_BR</supported-locale> - <resource-bundle>WSRPConfigurationResource</resource-bundle> + <resource-bundle>Resource</resource-bundle> <portlet-info> <title>WSRP Configuration</title> - <keywords>management,admin,wsrp</keywords> + <keywords>Administration,WSRP</keywords> </portlet-info> </portlet> </portlet-app> \ No newline at end of file

14 years, 10 months

1
0
0 / 0

gatein SVN: r1593 - components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2010-02-09 17:23:45 -0500 (Tue, 09 Feb 2010) New Revision: 1593 Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java Log: - Remove consumer id from session if we want to display the list of consumers. Modified: components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java =================================================================== --- components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java 2010-02-09 21:31:51 UTC (rev 1592) +++ components/wsrp/trunk/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/RedirectOnNoConsumerNavigationHandler.java 2010-02-09 22:23:45 UTC (rev 1593) @@ -61,6 +61,11 @@ } } } + else if (CONSUMERS.equals(outcome)) + { + // remove any remaining consumer id from session as we only want to list them + JSFBeanContext.getSessionMap(facesContext).remove(ConsumerManagerBean.SESSION_CONSUMER_ID); + } base.handleNavigation(facesContext, fromAction, outcome); }

14 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits February 2010