[portal-commits] JBoss Portal SVN: r12718 - in tags/Enterprise_Portal_Platform_4_3_GA: core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui and 4 other directories.

Author: thomas.heute(a)jboss.com Date: 2009-01-29 16:18:45 -0500 (Thu, 29 Jan 2009) New Revision: 12718 Modified: tags/Enterprise_Portal_Platform_4_3_GA/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java Log: Synching up with Branch_4_3 Modified: tags/Enterprise_Portal_Platform_4_3_GA/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2009-01-29 21:03:56 UTC (rev 12717) +++ tags/Enterprise_Portal_Platform_4_3_GA/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2009-01-29 21:18:45 UTC (rev 12718) @@ -65,7 +65,7 @@ registrationService = (RegistrationService) portletContext.getAttribute("RegistrationService"); // if (username.length() >= 5 && (Pattern.matches(NICKNAME_VALIDATION, username))) - if (username.contains("<") || username.contains(">")) + if (username.contains("<") || username.contains(">") || username.contains("\"") || username.contains("\'")) { throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR"), Modified: tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2009-01-29 21:03:56 UTC (rev 12717) +++ tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2009-01-29 21:18:45 UTC (rev 12718) @@ -83,11 +83,22 @@ return registry.getConsumer(selectedId); } + public boolean isConsumersEmpty() + { + return registry.getConfiguredConsumers().isEmpty(); + } + public List<WSRPConsumer> getConsumers() { return registry.getConfiguredConsumers(); } + public String reload() + { + registry.reloadConsumers(); + return CONSUMERS; + } + public String activateConsumer() { if (refreshConsumerId() != null) Modified: tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-01-29 21:03:56 UTC (rev 12717) +++ tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-01-29 21:18:45 UTC (rev 12718) @@ -1,6 +1,6 @@ ################################################################################ # JBoss, a division of Red Hat # -# Copyright 2008, Red Hat Middleware, LLC, and individual # +# 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. # @@ -21,7 +21,7 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # ################################################################################ -## WSRP GUI localization +## WSRP GUI localization # JBoss Portal display information org.jboss.portal.object.name.WSRPConfigurationPortlet = WSRP Configuration @@ -74,6 +74,7 @@ consumers_table_action_register = Register consumers_table_action_deregister = Deregister consumers_table_action_delete = Delete +consumers_table_reload = Reload consumers # Consumer editing screen edit_consumer_producer = Producer id: @@ -173,3 +174,5 @@ registration_property_status_unchecked_value = Undetermined status registration_property_status_invalid_value = Invalid value registration_property_status_valid = Valid + +org.jboss.portal.object.name.admin.WSRP=WSRP Modified: tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-01-29 21:03:56 UTC (rev 12717) +++ tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-01-29 21:18:45 UTC (rev 12718) @@ -1,6 +1,6 @@ ################################################################################ # JBoss, a division of Red Hat # -# Copyright 2008, Red Hat Middleware, LLC, and individual # +# 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. # @@ -18,7 +18,7 @@ # 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. # ` +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. # ################################################################################ # JBoss Portal display information org.jboss.portal.object.name.WSRPConfigurationPortlet = Configuration WSRP @@ -142,4 +142,6 @@ registration_property_status_missing=Manquant registration_property_status_missing_value=Valeur manquante registration_property_status_unchecked_value=Status ind\u00e9termin\u00e9 -registration_property_status_valid=Valide \ No newline at end of file +registration_property_status_valid=Valide +org.jboss.portal.object.name.admin.WSRP=WSRP +consumers_table_reload=Recharger consommateurs \ No newline at end of file Modified: tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml 2009-01-29 21:03:56 UTC (rev 12717) +++ tags/Enterprise_Portal_Platform_4_3_GA/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml 2009-01-29 21:18:45 UTC (rev 12718) @@ -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:decorate template="consumerTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -18,16 +41,20 @@ <h:message for="consumerName" errorClass="portlet-msg-error"/> </h:form> + <br/> + <!-- Consumers list --> <h:form id="consumer-list-form"> - <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" rendered="#{!empty consumersMgr.consumers}" + <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" + rendered="#{!consumersMgr.consumersEmpty}" rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header" styleClass="datatable objectList" 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>, + [#{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> @@ -50,13 +77,14 @@ <f:param name="id" value="#{cons.producerId}"/> #{i18n.consumers_table_action_refresh} </h:commandLink> | - <h:commandLink action="#{consumersMgr.activateConsumer}" id="activate" + <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: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'}"> @@ -65,7 +93,7 @@ #{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" + <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete" id="delete" actionListener="#{consumersMgr.selectConsumer}"> <f:param name="id" value="#{cons.producerId}"/> #{i18n.consumers_table_action_delete} @@ -73,5 +101,10 @@ </h:column> </h:dataTable> </h:form> + + <h:form> + <h:commandButton id="createConsumerButton" action="#{consumersMgr.reload}" + value="#{i18n.consumers_table_reload}" styleClass="portlet-form-button"/> + </h:form> </ui:define> </ui:decorate> \ No newline at end of file Modified: tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java 2009-01-29 21:03:56 UTC (rev 12717) +++ tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java 2009-01-29 21:18:45 UTC (rev 12718) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2007, Red Hat Middleware, LLC, and individual * + * 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. * @@ -56,13 +56,7 @@ */ public MockConsumerRegistry() { - consumers.put(CONSUMER1, new MockWSRPConsumer(CONSUMER1)); - MockWSRPConsumer consumer = new MockWSRPConsumer(CONSUMER2); - consumer.getProducerInfo().setActive(true); - EndpointConfigurationInfo info = consumer.getProducerInfo().getEndpointConfigurationInfo(); - info.setServiceDescriptionURL(MOCK_SERVICE_DESCRIPTION); - info.setMarkupURL(MOCK_MARKUP); - consumers.put(CONSUMER2, consumer); + reloadConsumers(); } public List<WSRPConsumer> getConfiguredConsumers() @@ -118,4 +112,16 @@ { // do nothing } + + public void reloadConsumers() + { + consumers.clear(); + consumers.put(CONSUMER1, new MockWSRPConsumer(CONSUMER1)); + MockWSRPConsumer consumer = new MockWSRPConsumer(CONSUMER2); + consumer.getProducerInfo().setActive(true); + EndpointConfigurationInfo info = consumer.getProducerInfo().getEndpointConfigurationInfo(); + info.setServiceDescriptionURL(MOCK_SERVICE_DESCRIPTION); + info.setMarkupURL(MOCK_MARKUP); + consumers.put(CONSUMER2, consumer); + } } Modified: tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java 2009-01-29 21:03:56 UTC (rev 12717) +++ tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java 2009-01-29 21:18:45 UTC (rev 12718) @@ -1,24 +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 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. * + ******************************************************************************/ package org.jboss.portal.wsrp.consumer; @@ -60,4 +61,6 @@ void registerOrDeregisterConsumerWith(String id, boolean register) throws ConsumerException; void destroyConsumer(String id) throws ConsumerException; + + void reloadConsumers(); } \ No newline at end of file Modified: tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2009-01-29 21:03:56 UTC (rev 12717) +++ tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2009-01-29 21:18:45 UTC (rev 12718) @@ -1,6 +1,6 @@ /****************************************************************************** * JBoss, a division of Red Hat * - * Copyright 2006, Red Hat Middleware, LLC, and individual * + * 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. * @@ -262,7 +262,11 @@ { InitialContext initialContext = new InitialContext(); sessionFactory = (SessionFactory)initialContext.lookup(sessionFactoryJNDIName); + reloadConsumers(); + } + public void reloadConsumers() + { // load the configured consumers consumers = new TreeMap<String, WSRPConsumer>(); Modified: tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2009-01-29 21:03:56 UTC (rev 12717) +++ tags/Enterprise_Portal_Platform_4_3_GA/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2009-01-29 21:18:45 UTC (rev 12718) @@ -177,10 +177,7 @@ public RegistrationInfo getRegistrationInfo() { // update parent since it might not be set when unfrozen from Hibernate - if (persistentRegistrationInfo != null) - { - persistentRegistrationInfo.setParent(this); - } + persistentRegistrationInfo.setParent(this); return persistentRegistrationInfo; } @@ -191,35 +188,30 @@ public boolean isRegistered() { - if (persistentRegistrationInfo != null) + Boolean valid = persistentRegistrationInfo.isRegistrationValid(); + if (valid == null) { - Boolean valid = persistentRegistrationInfo.isRegistrationValid(); - if (valid == null) - { - return persistentRegistrationInfo.getRegistrationHandle() != null; - } - else - { - return valid; - } + return persistentRegistrationInfo.getRegistrationHandle() != null; } - - return false; + else + { + return valid; + } } public boolean isRegistrationRequired() { - return persistentRegistrationInfo != null && persistentRegistrationInfo.isRegistrationDeterminedRequired(); + return persistentRegistrationInfo.isRegistrationDeterminedRequired(); } public boolean isRegistrationChecked() { - return persistentRegistrationInfo != null && persistentRegistrationInfo.isRegistrationRequired() != null; + return persistentRegistrationInfo.isRegistrationRequired() != null; } public boolean hasLocalRegistrationInfo() { - return persistentRegistrationInfo != null && persistentRegistrationInfo.hasLocalInfo(); + return persistentRegistrationInfo.hasLocalInfo(); } /** @@ -251,7 +243,7 @@ public boolean isModifyRegistrationRequired() { - return isModifyRegistrationRequired || (persistentRegistrationInfo != null && persistentRegistrationInfo.isModifyRegistrationNeeded()); + return isModifyRegistrationRequired || persistentRegistrationInfo.isModifyRegistrationNeeded(); } // FIX-ME: remove when a better dirty management is in place at property level @@ -346,8 +338,7 @@ try { // if we don't yet have registration information, get an unregistered service description - boolean unmanaged = persistentRegistrationInfo == null || persistentRegistrationInfo.isUndetermined(); - serviceDescription = getUnmanagedServiceDescription(unmanaged); + serviceDescription = getUnmanagedServiceDescription(persistentRegistrationInfo.isUndetermined()); result.setServiceDescription(serviceDescription); } catch (OperationFailedFault operationFailedFault) @@ -789,7 +780,7 @@ public RegistrationContext getRegistrationContext() throws PortletInvokerException { - if (persistentRegistrationInfo == null || persistentRegistrationInfo.isUndetermined()) + if (persistentRegistrationInfo.isUndetermined()) { refresh(false); } @@ -799,10 +790,7 @@ public void resetRegistration() throws PortletInvokerException { - if (persistentRegistrationInfo != null) - { - persistentRegistrationInfo.resetRegistration(); - } + persistentRegistrationInfo.resetRegistration(); invalidateCache(); registry.updateProducerInfo(this); @@ -865,11 +853,6 @@ */ private RefreshResult register(ServiceDescription serviceDescription, boolean forceRefresh) throws PortletInvokerException { - if (persistentRegistrationInfo == null) - { - persistentRegistrationInfo = new RegistrationInfo(this); - } - if (!isRegistered()) { persistentEndpointInfo.refresh(); @@ -957,7 +940,7 @@ public void modifyRegistration() throws PortletInvokerException { - if (persistentRegistrationInfo != null && persistentRegistrationInfo.getRegistrationHandle() != null) + if (persistentRegistrationInfo.getRegistrationHandle() != null) { persistentEndpointInfo.refresh(); @@ -1009,11 +992,6 @@ private RefreshResult internalRefreshRegistration(ServiceDescription serviceDescription, boolean mergeWithLocalInfo, boolean forceRefresh, boolean forceCheckOfExtraProps) throws PortletInvokerException { - if (persistentRegistrationInfo == null) - { - persistentRegistrationInfo = new RegistrationInfo(this); - } - RefreshResult result = persistentRegistrationInfo.refresh(serviceDescription, persistentId, mergeWithLocalInfo, forceRefresh, forceCheckOfExtraProps); @@ -1025,7 +1003,6 @@ public boolean isRefreshNeeded(boolean considerCache) { boolean result = (considerCache && isCacheExpired()) - || persistentRegistrationInfo == null || persistentRegistrationInfo.isRefreshNeeded() || persistentEndpointInfo.isRefreshNeeded(); if (result) @@ -1044,7 +1021,7 @@ public void eraseRegistrationInfo() { - persistentRegistrationInfo = null; + persistentRegistrationInfo = RegistrationInfo.createUndeterminedRegistration(this); registry.updateProducerInfo(this);