Author: roy.russo(a)jboss.com Date: 2006-11-21 16:30:34 -0500 (Tue, 21 Nov 2006) New Revision: 5705 Modified: trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp Log: JBPORTAL-993 - added instance listing Modified: trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java 2006-11-21 18:05:04 UTC (rev 5704) +++ trunk/core/src/main/org/jboss/portal/core/portlet/dashboard/Configurator.java 2006-11-21 21:30:34 UTC (rev 5705) @@ -21,6 +21,11 @@ */ package org.jboss.portal.core.portlet.dashboard; +import org.jboss.logging.Logger; +import org.jboss.portal.core.model.instance.Instance; +import org.jboss.portal.core.model.instance.InstanceContainer; +import org.jboss.portal.portlet.Portlet; +import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portlet.JBossActionRequest; import org.jboss.portlet.JBossPortlet; import org.jboss.portlet.JBossRenderRequest; @@ -30,6 +35,10 @@ import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletSecurityException; import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; /** * @author <a href="mailto:roy.russo@jboss.com">Roy Russo</a> @@ -37,10 +46,30 @@ */ public class Configurator extends JBossPortlet { + private Logger log = Logger.getLogger(Configurator.class); + + private InstanceContainer instanceContainer; + + public void init() + throws PortletException + { + super.init(); + + instanceContainer = (InstanceContainer)getPortletContext().getAttribute("InstanceContainer"); + + if (instanceContainer == null) + { + throw new PortletException("No InstanceContainer found"); + } + } + protected void doView(JBossRenderRequest req, JBossRenderResponse resp) throws PortletException, PortletSecurityException, IOException { + List instances = (List)instanceContainer.getInstances(); + resp.setContentType("text/html"); + req.setAttribute("instances", instances); PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/dashboard/editpage.jsp"); rd.include(req, resp); } Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml 2006-11-21 18:05:04 UTC (rev 5704) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml 2006-11-21 21:30:34 UTC (rev 5705) @@ -92,6 +92,12 @@ <trans-attribute>Required</trans-attribute> </transaction> </portlet> + <portlet> + <portlet-name>ConfiguratorPortlet</portlet-name> + <transaction> + <trans-attribute>Required</trans-attribute> + </transaction> + </portlet> <!-- Service injected in the portlet context. --> <service> <service-name>PortalObjectContainer</service-name> Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp 2006-11-21 18:05:04 UTC (rev 5704) +++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/dashboard/editpage.jsp 2006-11-21 21:30:34 UTC (rev 5705) @@ -1,3 +1,6 @@ +<%@ page import="org.jboss.portal.core.model.instance.Instance" %> +<%@ page import="java.util.List" %> +<%@ page import="org.jboss.portal.portlet.Portlet" %> <%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> @@ -4,6 +7,11 @@ <%@ page isELIgnored="false" %> <portlet:defineObjects/> + +<% + List instances = (List)request.getAttribute("instances"); +%> + <script type="text/javascript" language="JavaScript"> function assignPortlet(op, to) { @@ -77,11 +85,16 @@ </td> <td class="portlet-section-body" valign="top"><b>Available Content</b><br/> <select name="available_instances" multiple="true" size="20"> - <option value="1">Instance 1</option> - <option value="2">Instance 2</option> - <option value="3">Instance 3</option> - <option value="4">Instance 4</option> - <option value="5">Instance 5</option> + <% + for (int i = 0; i < instances.size(); i++) + { + Instance instance = (Instance)instances.get(i); + %> + <option value="<%= instance.getId() %>"><%= instance.getId()%> + </option> + <% + } + %> </select> </td> <td>