Author: julien(a)jboss.com Date: 2007-02-27 19:07:19 -0500 (Tue, 27 Feb 2007) New Revision: 6443 Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml Log: minor tweaks Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java 2007-02-27 23:58:43 UTC (rev 6442) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/InstanceManagerBean.java 2007-02-28 00:07:19 UTC (rev 6443) @@ -216,21 +216,7 @@ for (Iterator i = instanceContainer.getDefinitions().iterator(); i.hasNext();) { Instance instance = (Instance)i.next(); - try - { - Portlet portlet = instance.getPortlet(); - Object[] line = new Object[] - { - instance, - portlet, - }; - instances.add(line); - } - catch (PortletInvokerException e) - { - log.warn("Couldn't access portlet invoker associated to instance " + instance.getId() - + ". This instance won't be listed.\nReason:\n\t" + e.getLocalizedMessage()); - } + instances.add(instance); } try Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml 2007-02-27 23:58:43 UTC (rev 6442) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/instances.xhtml 2007-02-28 00:07:19 UTC (rev 6443) @@ -15,8 +15,8 @@ <h:column> <f:facet name="header">Id</f:facet> <h:commandLink action="#{instancemgr.selectInstance}"> - <h:outputText value="#{instance[0].id}"/> - <f:param name="id" value="#{instance[0].id}"/> + <h:outputText value="#{instance.id}"/> + <f:param name="id" value="#{instance.id}"/> <f:param name="plugin" value="info"/> </h:commandLink> </h:column> @@ -24,17 +24,17 @@ <f:facet name="header">Actions</f:facet> <h:commandLink action="#{instancemgr.selectInstance}"> <h:outputText value="Preferences"/> - <f:param name="id" value="#{instance[0].id}"/> + <f:param name="id" value="#{instance.id}"/> <f:param name="plugin" value="preferences"/> </h:commandLink> | <h:commandLink action="#{instancemgr.selectInstance}"> <h:outputText value="Security"/> - <f:param name="id" value="#{instance[0].id}"/> + <f:param name="id" value="#{instance.id}"/> <f:param name="plugin" value="security"/> </h:commandLink> | <h:commandLink action="#{instancemgr.deleteInstance}"> <h:outputText value="Destroy"/> - <f:param name="id" value="#{instance[0].id}"/> + <f:param name="id" value="#{instance.id}"/> </h:commandLink> </h:column> </h:dataTable> @@ -50,7 +50,7 @@ </c:if> <c:if test="#{instancemgr.selectedPlugin == 'preferences'}"> - <h3>Editing preferences of : </h3> + <h3>Editing preferences of #{instancemgr.selectedInstance.id}: </h3> <ui:include src="/WEB-INF/jsp/management/common/editPreferences.xhtml"> <ui:param name="preferences" value="#{instancemgr.selectedPreferences}"/> <ui:param name="action" value="#{preferenceAction}"/> @@ -58,7 +58,7 @@ </c:if> <c:if test="#{instancemgr.selectedPlugin == 'security'}"> - <h3>Editing security of : </h3> + <h3>Editing security of #{instancemgr.selectedInstance.id}: </h3> <ui:include src="/WEB-INF/jsp/management/common/editSecurity.xhtml"> <ui:param name="auth" value="#{instancemgr.auth}"/> </ui:include>