[portal-commits] JBoss Portal SVN: r11896 - in branches/JBoss_Portal_Branch_2_7: core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers and 3 other directories.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Fri Sep 12 12:23:29 EDT 2008
Author: chris.laprun at jboss.com
Date: 2008-09-12 12:23:29 -0400 (Fri, 12 Sep 2008)
New Revision: 11896
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/consumers/consumerTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java
Log:
- JBPORTAL-2103:
+ Added id on tabs
+ Converted table to h:dataTable to display consumers list
- ConsumerRegister.getConsumers now returns a List
- Some generification
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 2008-09-11 23:50:33 UTC (rev 11895)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2008-09-12 16:23:29 UTC (rev 11896)
@@ -31,8 +31,7 @@
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.util.List;
import java.util.Map;
/**
@@ -83,16 +82,16 @@
return registry.getConsumer(selectedId);
}
- public Collection getConsumers()
+ public List<WSRPConsumer> getConsumers()
{
- return new ArrayList(registry.getConfiguredConsumers());
+ return registry.getConfiguredConsumers();
}
public String activateConsumer()
{
if (refreshConsumerId() != null)
{
- boolean activate = Boolean.valueOf(beanContext.getParameter("activate")).booleanValue();
+ boolean activate = Boolean.valueOf(beanContext.getParameter("activate"));
try
{
if (activate)
@@ -134,7 +133,7 @@
{
if (refreshConsumerId() != null)
{
- boolean register = Boolean.valueOf(beanContext.getParameter("register")).booleanValue();
+ boolean register = Boolean.valueOf(beanContext.getParameter("register"));
try
{
@@ -309,7 +308,7 @@
private void setExpectedRegistrationInfo(RegistrationInfo expected)
{
- Map sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
+ Map<String, Object> sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
sessionMap.put(EXPECTED_REG_INFO_KEY, expected);
}
@@ -335,7 +334,7 @@
private void setConsumerIdInSession(boolean remove)
{
// todo: JSF COMMON extract this behavior into common class
- Map sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
+ Map<String, Object> sessionMap = FacesContext.getCurrentInstance().getExternalContext().getSessionMap();
String consumerBeanName = "consumer"; // must match ConsumerBean name in faces-config.xml
// force recreation of ConsumerBean otherwise switching to the consumer view might not show the proper consumer
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumerTemplate.xhtml 2008-09-11 23:50:33 UTC (rev 11895)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumerTemplate.xhtml 2008-09-12 16:23:29 UTC (rev 11896)
@@ -8,7 +8,7 @@
<h:form>
<ul class="topnav">
<li id="currentTab">#{i18n.nav_tabs_consumers}</li>
- <li><h:commandLink value="#{i18n.nav_tabs_producer_config}" action="producer"/></li>
+ <li><h:commandLink id="producerTab" value="#{i18n.nav_tabs_producer_config}" action="producer"/></li>
<ui:remove>
<li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
</ui:remove>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml 2008-09-11 23:50:33 UTC (rev 11895)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/consumers.xhtml 2008-09-12 16:23:29 UTC (rev 11896)
@@ -9,71 +9,69 @@
<ui:define name="content">
<!-- Consumer creation -->
- <h:form styleClass="createObjectForm">
+ <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"
required="true"/>
- <h:commandButton action="#{consumersMgr.createConsumer}" value="#{i18n.consumers_create_submit}"
- styleClass="portlet-form-button"/>
+ <h:commandButton id="createConsumerButton" action="#{consumersMgr.createConsumer}"
+ value="#{i18n.consumers_create_submit}" styleClass="portlet-form-button"/>
<h:message for="consumerName" errorClass="portlet-msg-error"/>
</h:form>
- <!-- Separation -->
- <hr/>
-
- <table width="100%" class="portlet-table-body" style="margin-bottom: 1em;">
- <thead class="portlet-section-header">
- <tr>
- <th>#{i18n.consumers_table_column_consumer}
+ <!-- Consumers list -->
+ <h:form>
+ <h:dataTable id="consumersList" value="#{consumersMgr.consumers}" var="cons" rendered="#{!empty consumersMgr.consumers}"
+ 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>,
<span class="inactive">#{i18n.path_consumers_inactive}</span>,
<span class="needsRefresh">#{i18n.path_consumers_refreshNeeded}</span>]
</div>
- </th>
- <th>#{i18n.consumers_table_column_actions}</th>
- </tr>
- </thead>
- <tbody>
- <h:form>
- <c:forEach items="#{consumersMgr.consumers}" var="consumer" varStatus="status">
- <tr>
- <td
- class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
- <h:outputText value="#{consumer.producerId} (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
- #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}"/>
- </td>
- <td class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}">
- <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure">
- <f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="#{i18n.consumers_table_action_configure}"/>
- </h:commandLink> | <h:commandLink action="#{consumersMgr.refreshConsumer}"
- styleClass="actionRefresh">
- <f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="#{i18n.consumers_table_action_refresh}"/>
- </h:commandLink> | <h:commandLink action="#{consumersMgr.activateConsumer}"
- styleClass="#{consumer.active ? 'actionDeactivate' : 'actionActivate'}">
- <f:param name="id" value="#{consumer.producerId}"/>
- <f:param name="activate" value="#{!consumer.active}"/>
- <h:outputText value="#{consumer.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate}"/>
- </h:commandLink>
- <c:if
- test="#{!consumer.refreshNeeded and consumer.active and consumer.producerInfo.registrationRequired}">
- | <h:commandLink action="#{consumersMgr.registerConsumer}" styleClass="action#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}">
- <f:param name="id" value="#{consumer.producerId}"/>
- <f:param name="register" value="#{!consumer.producerInfo.registered}"/>
- <h:outputText value="#{consumer.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register}"/>
- </h:commandLink>
- </c:if> | <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete"
- actionListener="#{consumersMgr.selectConsumer}">
- <f:param name="id" value="#{consumer.producerId}"/>
- <h:outputText value="#{i18n.consumers_table_action_delete}"/>
- </h:commandLink>
- </td>
- </tr>
- </c:forEach>
- </h:form>
- </tbody>
- </table>
+ </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})
+ #{cons.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}"/>
+ </h:column>
+
+ <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>
</ui:define>
</ui:decorate>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml 2008-09-11 23:50:33 UTC (rev 11895)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producerTemplate.xhtml 2008-09-12 16:23:29 UTC (rev 11896)
@@ -7,7 +7,7 @@
<ui:define name="topnav">
<h:form>
<ul class="topnav">
- <li><h:commandLink action="consumers" value="#{i18n.nav_tabs_consumers}"/></li>
+ <li><h:commandLink id="consumersTab" action="consumers" value="#{i18n.nav_tabs_consumers}"/></li>
<li id="currentTab">#{i18n.nav_tabs_producer_config}</li>
<ui:remove>
<li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java 2008-09-11 23:50:33 UTC (rev 11895)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java 2008-09-12 16:23:29 UTC (rev 11896)
@@ -31,8 +31,9 @@
import org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo;
import org.jboss.portal.wsrp.consumer.ProducerInfo;
-import java.util.Collection;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -64,9 +65,9 @@
consumers.put(CONSUMER2, consumer);
}
- public Collection getConfiguredConsumers()
+ public List<WSRPConsumer> getConfiguredConsumers()
{
- return consumers.values();
+ return new ArrayList<WSRPConsumer>(consumers.values());
}
public WSRPConsumer getConsumer(String id)
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java 2008-09-11 23:50:33 UTC (rev 11895)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistry.java 2008-09-12 16:23:29 UTC (rev 11896)
@@ -25,7 +25,7 @@
import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.wsrp.WSRPConsumer;
-import java.util.Collection;
+import java.util.List;
/**
* @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
@@ -34,7 +34,7 @@
*/
public interface ConsumerRegistry
{
- Collection getConfiguredConsumers();
+ List<WSRPConsumer> getConfiguredConsumers();
WSRPConsumer getConsumer(String id);
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2008-09-11 23:50:33 UTC (rev 11895)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/ConsumerRegistryService.java 2008-09-12 16:23:29 UTC (rev 11896)
@@ -36,9 +36,9 @@
import org.jboss.portal.wsrp.WSRPConsumer;
import javax.naming.InitialContext;
-import java.util.Collection;
-import java.util.Collections;
+import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.SortedMap;
import java.util.TreeMap;
@@ -325,9 +325,9 @@
consumers = null;
}
- public Collection getConfiguredConsumers()
+ public List<WSRPConsumer> getConfiguredConsumers()
{
- return Collections.unmodifiableCollection(consumers.values());
+ return new ArrayList<WSRPConsumer>(consumers.values());
}
public WSRPConsumer getConsumer(String id)
More information about the portal-commits
mailing list