Author: chris.laprun(a)jboss.com Date: 2009-06-12 11:33:59 -0400 (Fri, 12 Jun 2009) New Revision: 13450 Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/common/template.xhtml Log: JBPORTAL-2410: Use h:message instead of h:messages for error reporting (need to test more that this doesn't have unexpected side-effects since I've seen some already) Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2009-06-11 14:49:17 UTC (rev 13449) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2009-06-12 15:33:59 UTC (rev 13450) @@ -232,7 +232,11 @@ { if (refreshConsumerId() != null) { - internalRefresh(getSelectedConsumer()); + RefreshResult refreshResult = internalRefresh(getSelectedConsumer()); + if (refreshResult == null) + { + return null; + } return configureConsumer(); } Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/common/template.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/common/template.xhtml 2009-06-11 14:49:17 UTC (rev 13449) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/common/template.xhtml 2009-06-12 15:33:59 UTC (rev 13450) @@ -1,3 +1,26 @@ +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2009, 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + <ui:composition xmlns="http://www.w3.org/1999/xhtml" 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:ui="http://java.sun.com/jsf/facelets"> @@ -2,2 +25,3 @@ <f:loadBundle basename="Resource" var="i18n"/> + <div class="wsrp-consumers-ui"> @@ -11,18 +35,18 @@ <ui:insert name="objectpath">Object path if needed</ui:insert> <div class="wsrp-content-container"> - <c:if test="#{!empty title}"> - <h3 class="sectionTitle">${title}</h3> - </c:if> + <c:if test="#{!empty title}"> + <h3 class="sectionTitle">${title}</h3> + </c:if> - <!-- Status message --> - <h:messages id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" - fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> + <!-- Status message --> + <h:message id="status" for="status" infoClass="portlet-msg-success" errorClass="portlet-msg-error" + fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/> - <!-- Content --> - <ui:insert name="content">Content</ui:insert> + <!-- Content --> + <ui:insert name="content">Content</ui:insert> </div> - + </div> </div> </ui:composition> \ No newline at end of file