JBoss Portal SVN: r10297 - in modules/web/trunk/web/src/test: resources/config and 1 other directory.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2008-03-17 14:31:09 -0400 (Mon, 17 Mar 2008)
New Revision: 10297
Modified:
modules/web/trunk/web/src/test/build.xml
modules/web/trunk/web/src/test/resources/config/servers.xml
Log:
adding jboss 4.2.2 to the server list
Modified: modules/web/trunk/web/src/test/build.xml
===================================================================
--- modules/web/trunk/web/src/test/build.xml 2008-03-17 16:50:00 UTC (rev 10296)
+++ modules/web/trunk/web/src/test/build.xml 2008-03-17 18:31:09 UTC (rev 10297)
@@ -56,6 +56,14 @@
<property environment="env"/>
<!--If properties are not in command line check if they are set in env-->
+ <condition property="JBOSS_4_2_2_HOME" value="${env.JBOSS_4_2_2_HOME}">
+ <and>
+ <isset property="env.JBOSS_4_2_2_HOME"/>
+ <not>
+ <isset property="JBOSS_4_2_2_HOME"/>
+ </not>
+ </and>
+ </condition>
<condition property="JBOSS_4_2_1_HOME" value="${env.JBOSS_4_2_1_HOME}">
<and>
<isset property="env.JBOSS_4_2_1_HOME"/>
@@ -81,7 +89,7 @@
</and>
</condition>
- <fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_HOME">
+ <fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_HOME or JBOSS_4_2_2_HOME">
<condition>
<and>
<not>
@@ -90,6 +98,9 @@
<not>
<isset property="JBOSS_4_2_1_HOME"/>
</not>
+ <not>
+ <isset property="JBOSS_4_2_2_HOME"/>
+ </not>
</and>
</condition>
</fail>
@@ -470,6 +481,13 @@
<param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_1_HOME"/>
<param name="test.archive.path" value="${test.temp.lib}/jboss-4.2-container-servlet/test-spi-server.war"/>
</antcall>
+ <antcall target="tests.jboss-4.2.container-servlet">
+ <param name="test.id" value="JBoss-4_2_2-spi-container-servlet"/>
+ <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_2"/>
+ <param name="test.jboss-4.2.home" value="${JBOSS_4_2_2_HOME}"/>
+ <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_2_HOME"/>
+ <param name="test.archive.path" value="${test.temp.lib}/jboss-4.2-container-servlet/test-spi-server.war"/>
+ </antcall>
<antcall target="tests.jboss-4.2.generic">
<param name="test.id" value="JBoss-4_2_0-spi-generic"/>
<param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/>
@@ -484,6 +502,14 @@
<param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_1_HOME"/>
<param name="test.archive.path" value="${test.temp.lib}/jboss-4.2-generic/test-spi-server.war"/>
</antcall>
+ <antcall target="tests.jboss-4.2.generic">
+ <param name="test.id" value="JBoss-4_2_2-spi-generic"/>
+ <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_2"/>
+ <param name="test.jboss-4.2.home" value="${JBOSS_4_2_2_HOME}"/>
+ <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_2_HOME"/>
+ <param name="test.archive.path" value="${test.temp.lib}/jboss-4.2-generic/test-spi-server.war"/>
+ </antcall>
+
<antcall target="tests.jboss-4.2.container-servlet">
<param name="test.id" value="JBoss-4_2_0-request-container-servlet"/>
<param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/>
@@ -498,6 +524,14 @@
<param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_1_HOME"/>
<param name="test.archive.path" value="${test.temp.lib}/jboss-4.2-container-servlet/test-request-server.war"/>
</antcall>
+ <antcall target="tests.jboss-4.2.container-servlet">
+ <param name="test.id" value="JBoss-4_2_2-request-container-servlet"/>
+ <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_2"/>
+ <param name="test.jboss-4.2.home" value="${JBOSS_4_2_2_HOME}"/>
+ <param name="test.jboss-4.2.home.variable-name" value="JBOSS_4_2_2_HOME"/>
+ <param name="test.archive.path" value="${test.temp.lib}/jboss-4.2-container-servlet/test-request-server.war"/>
+ </antcall>
+
</target>
@@ -657,4 +691,4 @@
</target>
-</project>
\ No newline at end of file
+</project>
Modified: modules/web/trunk/web/src/test/resources/config/servers.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/config/servers.xml 2008-03-17 16:50:00 UTC (rev 10296)
+++ modules/web/trunk/web/src/test/resources/config/servers.xml 2008-03-17 18:31:09 UTC (rev 10297)
@@ -57,4 +57,22 @@
</deployer>
</node>
</server>
+ <server>
+ <server-name>RemoteJBoss_4_2_2</server-name>
+ <node>
+ <node-id>default</node-id>
+ <service>
+ <service-name>TestDriverServer</service-name>
+ <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface>
+ <uri>socket://localhost:5400</uri>
+ </service>
+ <deployer>
+ <remote>
+ <name>jboss4x</name>
+ <host>localhost</host>
+ <port>8080</port>
+ </remote>
+ </deployer>
+ </node>
+ </server>
</servers>
16 years, 3 months
JBoss Portal SVN: r10296 - modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/basic.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-17 12:50:00 -0400 (Mon, 17 Mar 2008)
New Revision: 10296
Added:
modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/basic/RandomEventPortlet.java
Log:
added missing random portlet
Added: modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/basic/RandomEventPortlet.java
===================================================================
--- modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/basic/RandomEventPortlet.java (rev 0)
+++ modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/basic/RandomEventPortlet.java 2008-03-17 16:50:00 UTC (rev 10296)
@@ -0,0 +1,125 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, 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.portlet.samples.basic;
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletURL;
+import javax.portlet.Event;
+import javax.portlet.StateAwareResponse;
+import javax.xml.namespace.QName;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Random;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class RandomEventPortlet extends GenericPortlet
+{
+
+ /** . */
+ private static final QName[] QNAMES = {
+ new QName("urn:jboss:portal:samples:basic", "Event1"),
+ new QName("urn:jboss:portal:samples:basic", "Event2"),
+ new QName("urn:jboss:portal:samples:basic", "Event3")
+ };
+
+ /** . */
+ private static final Random random = new Random();
+
+ private static QName pickQName()
+ {
+ synchronized (random)
+ {
+ return QNAMES[random.nextInt(QNAMES.length)];
+ }
+ }
+
+ private static boolean shouldFail()
+ {
+ synchronized (random)
+ {
+ return random.nextInt(3) == 0;
+ }
+ }
+
+ public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, IOException
+ {
+ int repeat = Integer.parseInt(req.getParameter("repeat"));
+
+ //
+ publishEvent(resp, repeat);
+ }
+
+ public void processEvent(EventRequest req, EventResponse resp) throws PortletException, IOException
+ {
+ Event event = req.getEvent();
+
+ //
+ int repeat = ((Integer)event.getValue());
+ String name = event.getName();
+ System.out.println("Portlet " + getPortletConfig().getPortletName() + " received the event (" + name + "," + repeat + ")");
+
+ //
+ if (shouldFail())
+ {
+ System.out.println("Portlet " + getPortletConfig().getPortletName() + " decided to fail");
+
+ //
+ throw new PortletException("Don't be scarred, this is expected to happen");
+ }
+
+ //
+ if (repeat > 0)
+ {
+ publishEvent(resp, repeat - 1);
+ }
+ }
+
+ private void publishEvent(StateAwareResponse resp, int repeat)
+ {
+ QName name = pickQName();
+ resp.setEvent(name, repeat);
+ System.out.println("Portlet " + getPortletConfig().getPortletName() + " generated the event (" + name + "," + repeat + ")");
+ }
+
+ public void render(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ {
+ PortletURL actionURL = resp.createActionURL();
+
+ //
+ PrintWriter writer = resp.getWriter();
+ writer.println("<form action=\"" + actionURL + "\" method=\"post\">");
+ writer.println("<input type=\"text\" name=\"repeat\" value=\"2\"/>");
+ writer.println("<input type=\"submit\"/>");
+ writer.println("</form>");
+ }
+}
16 years, 3 months
JBoss Portal SVN: r10295 - in modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal: jsp and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-17 12:22:01 -0400 (Mon, 17 Mar 2008)
New Revision: 10295
Modified:
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java
Log:
updated debugger portlet
Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java 2008-03-17 16:11:26 UTC (rev 10294)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java 2008-03-17 16:22:01 UTC (rev 10295)
@@ -60,10 +60,11 @@
private void printRoute(EventRoute route, PrintWriter writer)
{
- writer.print("<div>Event name: " + route.getSource().getName().getLocalPart() + "</div>\n");
- writer.print("<div>Source: " + route.getSource().getWindowId() + "</div>\n");
- writer.print("<div>Destination: " + route.getDestination().getWindowId() + "</div>\n");
- writer.print("<div>Acknowledgement: " + route.getAcknowledgment() + "</div>\n");
+ writer.print("<div>Event name: " + route.getName().getLocalPart() + "</div>\n");
+ writer.print("<div>Event payload: " + route.getPayload() + "</div>\n");
+ writer.print("<div>Source: " + route.getSource() + "</div>\n");
+ writer.print("<div>Destination: " + route.getDestination() + "</div>\n");
+ writer.print("<div>Acknowledgement: " + route.getAcknowledgement() + "</div>\n");
writer.print("<ul>\n");
for (EventRoute child : route.getChildren())
{
Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java 2008-03-17 16:11:26 UTC (rev 10294)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java 2008-03-17 16:22:01 UTC (rev 10295)
@@ -24,8 +24,10 @@
import org.jboss.portal.portlet.controller.event.Event;
+import javax.xml.namespace.QName;
import java.util.LinkedList;
import java.util.List;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
@@ -38,25 +40,43 @@
private final EventRoute parent;
/** . */
- private final Event source;
+ private final QName name;
/** . */
- private final Event destination;
+ private final Serializable payload;
/** . */
+ private final String source;
+
+ /** . */
+ private final String destination;
+
+ /** . */
final LinkedList<EventRoute> children;
/** . */
EventAcknowledgement acknowledgement;
- public EventRoute(EventRoute parent, Event source, Event destination)
+ public EventRoute(EventRoute parent, QName name, Serializable payload, String source, String destination)
{
this.parent = parent;
+ this.name = name;
+ this.payload = payload;
this.source = source;
this.destination = destination;
this.children = new LinkedList<EventRoute>();
}
+ public String getSource()
+ {
+ return source;
+ }
+
+ public String getDestination()
+ {
+ return destination;
+ }
+
public EventRoute getParent()
{
return parent;
@@ -67,17 +87,17 @@
return children;
}
- public Event getSource()
+ public QName getName()
{
- return source;
+ return name;
}
- public Event getDestination()
+ public Serializable getPayload()
{
- return destination;
+ return payload;
}
- public EventAcknowledgement getAcknowledgment()
+ public EventAcknowledgement getAcknowledgement()
{
return acknowledgement;
}
Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java 2008-03-17 16:11:26 UTC (rev 10294)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java 2008-03-17 16:22:01 UTC (rev 10295)
@@ -94,15 +94,15 @@
Event destinationEvent = new Event(producedEvent.getName(), producedEvent.getPayload(), windowId);
//
- EventRoute eventRoute;
+ EventRoute eventRoute = new EventRoute(relatedRoute, producedEvent.getName(), producedEvent.getPayload(), producedEvent.getWindowId(), destinationEvent.getWindowId());
+
+ //
if (relatedRoute != null)
{
- eventRoute = new EventRoute(relatedRoute, producedEvent, destinationEvent);
relatedRoute.children.add(eventRoute);
}
else
{
- eventRoute = new EventRoute(relatedRoute, producedEvent, destinationEvent);
roots.add(eventRoute);
}
16 years, 3 months
JBoss Portal SVN: r10294 - modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-17 12:11:26 -0400 (Mon, 17 Mar 2008)
New Revision: 10294
Modified:
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java
Log:
updated debugger portlet
Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java 2008-03-17 15:01:00 UTC (rev 10293)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java 2008-03-17 16:11:26 UTC (rev 10294)
@@ -60,8 +60,9 @@
private void printRoute(EventRoute route, PrintWriter writer)
{
- writer.print("<div>Source: " + route.getSource().getName().getLocalPart() + "</div>\n");
- writer.print("<div>Destination: " + route.getDestination().getName().getLocalPart() + "</div>\n");
+ writer.print("<div>Event name: " + route.getSource().getName().getLocalPart() + "</div>\n");
+ writer.print("<div>Source: " + route.getSource().getWindowId() + "</div>\n");
+ writer.print("<div>Destination: " + route.getDestination().getWindowId() + "</div>\n");
writer.print("<div>Acknowledgement: " + route.getAcknowledgment() + "</div>\n");
writer.print("<ul>\n");
for (EventRoute child : route.getChildren())
16 years, 3 months
JBoss Portal SVN: r10293 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-03-17 11:01:00 -0400 (Mon, 17 Mar 2008)
New Revision: 10293
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java
Log:
JBPORTAL-1932: Portlet Session replication failing.
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java 2008-03-17 14:59:17 UTC (rev 10292)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/PortletInvocationFactory.java 2008-03-17 15:01:00 UTC (rev 10293)
@@ -161,7 +161,7 @@
return render;
}
- private static class ControllerPortletInvocationContext extends AbstractPortletInvocationContext
+ public static class ControllerPortletInvocationContext extends AbstractPortletInvocationContext
{
private InvokePortletCommandFactory cmdFactory;
private ControllerContext controllerContext;
16 years, 3 months
JBoss Portal SVN: r10292 - in modules/portlet/trunk/portal/src/main: java/org/jboss/portal/portlet/portal/jsp and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-17 10:59:17 -0400 (Mon, 17 Mar 2008)
New Revision: 10292
Added:
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo4.jsp
Removed:
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventProduction.java
Modified:
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java
Log:
updated debugger portlet
Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java 2008-03-17 14:23:26 UTC (rev 10291)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java 2008-03-17 14:59:17 UTC (rev 10292)
@@ -47,12 +47,30 @@
if (eventCC != null)
{
PrintWriter writer = resp.getWriter();
+ writer.print("<ul>\n");
+ for (EventRoute route : eventCC.getRoots())
+ {
+ writer.println("<li>\n");
+ printRoute(route, writer);
+ writer.println("</li>\n");
+ }
+ writer.println("</ul>\n");
+ }
+ }
-// for (EventRoute route : eventCC.getRoutings())
-// {
-// writer.println("from:" + route.getSource() + " to:" + route.getDestination() + " acknowledgement:" + route.getAcknowledgment());
-// writer.println("<hr/>");
-// }
+ private void printRoute(EventRoute route, PrintWriter writer)
+ {
+ writer.print("<div>Source: " + route.getSource().getName().getLocalPart() + "</div>\n");
+ writer.print("<div>Destination: " + route.getDestination().getName().getLocalPart() + "</div>\n");
+ writer.print("<div>Acknowledgement: " + route.getAcknowledgment() + "</div>\n");
+ writer.print("<ul>\n");
+ for (EventRoute child : route.getChildren())
+ {
+ writer.println("<li>\n");
+ printRoute(child, writer);
+ writer.println("</li>\n");
}
+ writer.println("</ul>\n");
}
+
}
Deleted: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventProduction.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventProduction.java 2008-03-17 14:23:26 UTC (rev 10291)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventProduction.java 2008-03-17 14:59:17 UTC (rev 10292)
@@ -1,60 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, 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.portlet.portal.jsp;
-
-import org.jboss.portal.portlet.controller.event.Event;
-
-import java.util.Map;
-import java.util.LinkedHashMap;
-
-/**
- * The production of an event by a portlet.
- *
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class EventProduction
-{
-
- /** . */
- private final Event event;
-
- /** . */
- final Map<Event, EventRoute> routings;
-
- public EventProduction(Event event)
- {
- this.event = event;
- this.routings = new LinkedHashMap<Event, EventRoute>();
- }
-
- public Event getEvent()
- {
- return event;
- }
-
- public Iterable<EventRoute> getRoutings()
- {
- return routings.values();
- }
-}
Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java 2008-03-17 14:23:26 UTC (rev 10291)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java 2008-03-17 14:59:17 UTC (rev 10292)
@@ -35,34 +35,43 @@
{
/** . */
- private final EventProduction parent;
+ private final EventRoute parent;
/** . */
+ private final Event source;
+
+ /** . */
private final Event destination;
/** . */
- final LinkedList<EventProduction> children;
+ final LinkedList<EventRoute> children;
/** . */
EventAcknowledgement acknowledgement;
- public EventRoute(EventProduction parent, Event destination)
+ public EventRoute(EventRoute parent, Event source, Event destination)
{
this.parent = parent;
+ this.source = source;
this.destination = destination;
- this.children = new LinkedList<EventProduction>();
+ this.children = new LinkedList<EventRoute>();
}
- public EventProduction getParent()
+ public EventRoute getParent()
{
return parent;
}
- public List<EventProduction> getChildren()
+ public List<EventRoute> getChildren()
{
return children;
}
+ public Event getSource()
+ {
+ return source;
+ }
+
public Event getDestination()
{
return destination;
Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java 2008-03-17 14:23:26 UTC (rev 10291)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java 2008-03-17 14:59:17 UTC (rev 10292)
@@ -32,6 +32,8 @@
import java.util.Map;
import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.ArrayList;
/**
* Route events according to the portlets discovered on the page. For now it is pretty trivial.
@@ -52,6 +54,9 @@
/** Used internally. */
private final Map<Event, EventRoute> routings;
+ /** . */
+ private final List<EventRoute> roots;
+
public PageEventControllerContext(
PagePortletControllerContext context,
PortalPrepareResponse prepareResponse)
@@ -59,18 +64,17 @@
this.context = context;
this.prepareResponse = prepareResponse;
this.routings = new LinkedHashMap<Event, EventRoute>();
+ this.roots = new ArrayList<EventRoute>();
}
+ public List<EventRoute> getRoots()
+ {
+ return roots;
+ }
+
public void eventProduced(EventPhaseContext context, Event producedEvent, Event causeEvent)
{
- EventProduction production = new EventProduction(producedEvent);
-
- //
EventRoute relatedRoute = routings.get(causeEvent);
- if (relatedRoute != null)
- {
- relatedRoute.children.add(production);
- }
//
for (String windowId : prepareResponse.getWindowIds())
@@ -90,10 +94,22 @@
Event destinationEvent = new Event(producedEvent.getName(), producedEvent.getPayload(), windowId);
//
- EventRoute eventRoute = new EventRoute(production, destinationEvent);
- production.routings.put(destinationEvent, eventRoute);
+ EventRoute eventRoute;
+ if (relatedRoute != null)
+ {
+ eventRoute = new EventRoute(relatedRoute, producedEvent, destinationEvent);
+ relatedRoute.children.add(eventRoute);
+ }
+ else
+ {
+ eventRoute = new EventRoute(relatedRoute, producedEvent, destinationEvent);
+ roots.add(eventRoute);
+ }
//
+ routings.put(destinationEvent, eventRoute);
+
+ //
context.queueEvent(destinationEvent);
}
}
Added: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo4.jsp
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo4.jsp (rev 0)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo4.jsp 2008-03-17 14:59:17 UTC (rev 10292)
@@ -0,0 +1,23 @@
+<%@ page contentType="text/html" %>
+<%@ page language="java" %>
+<%@ taglib prefix="xportal" tagdir="/WEB-INF/tags/portal" %>
+<%@ taglib uri="/WEB-INF/portal.tld" prefix="portal" %>
+<%@ page isELIgnored="false" %>
+
+<%@ include file="/layouts/header.jsp" %>
+
+<portal:page>
+
+ <xportal:2columns>
+ <jsp:attribute name="leftcol">
+ <xportal:portlet name="RandomEventPortlet1" applicationName="samples-basic-portlet"/>
+ <xportal:portlet name="RandomEventPortlet2" applicationName="samples-basic-portlet"/>
+ <xportal:portlet name="RandomEventPortlet3" applicationName="samples-basic-portlet"/>
+ </jsp:attribute>
+ <jsp:attribute name="rightcol">
+ <xportal:portlet name="DebuggerPortlet" applicationName="simple-portal"/>
+ </jsp:attribute>
+
+ </xportal:2columns>
+</portal:page>
+<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
16 years, 3 months
JBoss Portal SVN: r10291 - in modules/portlet/trunk: portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui and 4 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-17 10:23:26 -0400 (Mon, 17 Mar 2008)
New Revision: 10291
Added:
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventAcknowledgement.java
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventProduction.java
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java
Modified:
modules/portlet/trunk/portal/pom.xml
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java
modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/portlet.xml
modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo1.jsp
modules/portlet/trunk/samples/src/main/artifacts/basic-portlet-war/WEB-INF/portlet.xml
Log:
updated debugger portlet
Modified: modules/portlet/trunk/portal/pom.xml
===================================================================
--- modules/portlet/trunk/portal/pom.xml 2008-03-17 12:49:18 UTC (rev 10290)
+++ modules/portlet/trunk/portal/pom.xml 2008-03-17 14:23:26 UTC (rev 10291)
@@ -17,7 +17,6 @@
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>portlet-portlet</artifactId>
<version>${project.version}</version>
- <type>test-jar</type>
</dependency>
<dependency>
<groupId>org.jboss.portal.portlet</groupId>
@@ -26,11 +25,6 @@
</dependency>
<dependency>
<groupId>org.jboss.portal.portlet</groupId>
- <artifactId>portlet-portlet</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.portal.portlet</groupId>
<artifactId>portlet-mc</artifactId>
<version>${project.version}</version>
</dependency>
Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java (rev 0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/admin/ui/DebuggerPortlet.java 2008-03-17 14:23:26 UTC (rev 10291)
@@ -0,0 +1,58 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, 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.portlet.portal.admin.ui;
+
+import org.jboss.portal.portlet.portal.jsp.PageEventControllerContext;
+import org.jboss.portal.portlet.portal.jsp.EventRoute;
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class DebuggerPortlet extends GenericPortlet
+{
+
+ protected void doView(RenderRequest req, RenderResponse resp) throws PortletException, IOException
+ {
+ PageEventControllerContext eventCC = (PageEventControllerContext)req.getAttribute("bilto");
+
+ //
+ if (eventCC != null)
+ {
+ PrintWriter writer = resp.getWriter();
+
+// for (EventRoute route : eventCC.getRoutings())
+// {
+// writer.println("from:" + route.getSource() + " to:" + route.getDestination() + " acknowledgement:" + route.getAcknowledgment());
+// writer.println("<hr/>");
+// }
+ }
+ }
+}
Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java 2008-03-17 12:49:18 UTC (rev 10290)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/ControllerFilter.java 2008-03-17 14:23:26 UTC (rev 10291)
@@ -71,6 +71,9 @@
/** . */
private FilterConfig config;
+ /** . */
+ private boolean redirectAfterAction = false;
+
private ServletContext getServletContext()
{
return config.getServletContext();
@@ -133,10 +136,15 @@
{
PageUpdateResponse pageUpdate = (PageUpdateResponse)controllerResponse;
+ //
+ pageNavigationalState = pageUpdate.getPageNavigationalState();
+
+ //
+ req.setAttribute("bilto", context.getEventControllerContext());
+
// We perform a send redirect on actions
- if (request instanceof PortletActionRequest)
+ if (request instanceof PortletActionRequest && redirectAfterAction)
{
- //
PortletURLRenderer renderer = new PortletURLRenderer(
pageUpdate.getPageNavigationalState(),
context.getClientRequest(),
@@ -145,17 +153,9 @@
//
String url = renderer.renderURL(new URLFormat(null, null, true, null));
-
- //
resp.sendRedirect(url);
-
- //
return;
}
- else
- {
- pageNavigationalState = pageUpdate.getPageNavigationalState();
- }
}
else if (controllerResponse instanceof ResourceResponse)
{
Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventAcknowledgement.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventAcknowledgement.java (rev 0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventAcknowledgement.java 2008-03-17 14:23:26 UTC (rev 10291)
@@ -0,0 +1,100 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, 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.portlet.portal.jsp;
+
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class EventAcknowledgement
+{
+
+ public static class Consumed extends EventAcknowledgement
+ {
+
+ /** . */
+ private final PortletInvocationResponse response;
+
+ public Consumed(PortletInvocationResponse response)
+ {
+ this.response = response;
+ }
+
+ public PortletInvocationResponse getResponse()
+ {
+ return response;
+ }
+
+ public String toString()
+ {
+ return "Consumed " + response.toString();
+ }
+ }
+
+ public static class Failed extends EventAcknowledgement
+ {
+
+ /** . */
+ private final Throwable throwable;
+
+ public Failed(Throwable throwable)
+ {
+ this.throwable = throwable;
+ }
+
+ public Throwable getThrowable()
+ {
+ return throwable;
+ }
+
+ public String toString()
+ {
+ return "Failed";
+ }
+ }
+
+ public static class Discarded extends EventAcknowledgement
+ {
+
+ /** . */
+ private final int cause;
+
+ public Discarded(int cause)
+ {
+ this.cause = cause;
+ }
+
+ public int getCause()
+ {
+ return cause;
+ }
+
+ public String toString()
+ {
+ return "Discarded";
+ }
+ }
+
+}
Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventProduction.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventProduction.java (rev 0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventProduction.java 2008-03-17 14:23:26 UTC (rev 10291)
@@ -0,0 +1,60 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, 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.portlet.portal.jsp;
+
+import org.jboss.portal.portlet.controller.event.Event;
+
+import java.util.Map;
+import java.util.LinkedHashMap;
+
+/**
+ * The production of an event by a portlet.
+ *
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class EventProduction
+{
+
+ /** . */
+ private final Event event;
+
+ /** . */
+ final Map<Event, EventRoute> routings;
+
+ public EventProduction(Event event)
+ {
+ this.event = event;
+ this.routings = new LinkedHashMap<Event, EventRoute>();
+ }
+
+ public Event getEvent()
+ {
+ return event;
+ }
+
+ public Iterable<EventRoute> getRoutings()
+ {
+ return routings.values();
+ }
+}
Added: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java (rev 0)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/EventRoute.java 2008-03-17 14:23:26 UTC (rev 10291)
@@ -0,0 +1,75 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, 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.portlet.portal.jsp;
+
+import org.jboss.portal.portlet.controller.event.Event;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class EventRoute
+{
+
+ /** . */
+ private final EventProduction parent;
+
+ /** . */
+ private final Event destination;
+
+ /** . */
+ final LinkedList<EventProduction> children;
+
+ /** . */
+ EventAcknowledgement acknowledgement;
+
+ public EventRoute(EventProduction parent, Event destination)
+ {
+ this.parent = parent;
+ this.destination = destination;
+ this.children = new LinkedList<EventProduction>();
+ }
+
+ public EventProduction getParent()
+ {
+ return parent;
+ }
+
+ public List<EventProduction> getChildren()
+ {
+ return children;
+ }
+
+ public Event getDestination()
+ {
+ return destination;
+ }
+
+ public EventAcknowledgement getAcknowledgment()
+ {
+ return acknowledgement;
+ }
+}
Modified: modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java
===================================================================
--- modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java 2008-03-17 12:49:18 UTC (rev 10290)
+++ modules/portlet/trunk/portal/src/main/java/org/jboss/portal/portlet/portal/jsp/PageEventControllerContext.java 2008-03-17 14:23:26 UTC (rev 10291)
@@ -30,6 +30,9 @@
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.info.PortletInfo;
+import java.util.Map;
+import java.util.LinkedHashMap;
+
/**
* Route events according to the portlets discovered on the page. For now it is pretty trivial.
* We could leverage JSP tags to 'wire' portlets on the same page for instance.
@@ -46,16 +49,30 @@
/** . */
private final PagePortletControllerContext context;
+ /** Used internally. */
+ private final Map<Event, EventRoute> routings;
+
public PageEventControllerContext(
PagePortletControllerContext context,
PortalPrepareResponse prepareResponse)
{
this.context = context;
this.prepareResponse = prepareResponse;
+ this.routings = new LinkedHashMap<Event, EventRoute>();
}
- public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent)
+ public void eventProduced(EventPhaseContext context, Event producedEvent, Event causeEvent)
{
+ EventProduction production = new EventProduction(producedEvent);
+
+ //
+ EventRoute relatedRoute = routings.get(causeEvent);
+ if (relatedRoute != null)
+ {
+ relatedRoute.children.add(production);
+ }
+
+ //
for (String windowId : prepareResponse.getWindowIds())
{
try
@@ -70,8 +87,14 @@
//
if (portletInfo.getEventing().getConsumedEvents().containsKey(producedEvent.getName()))
{
- Event distributedEvent = new Event(producedEvent.getName(), producedEvent.getPayload(), windowId);
- context.queueEvent(distributedEvent);
+ Event destinationEvent = new Event(producedEvent.getName(), producedEvent.getPayload(), windowId);
+
+ //
+ EventRoute eventRoute = new EventRoute(production, destinationEvent);
+ production.routings.put(destinationEvent, eventRoute);
+
+ //
+ context.queueEvent(destinationEvent);
}
}
}
@@ -85,13 +108,19 @@
public void eventConsumed(EventPhaseContext context, Event consumedEvent, PortletInvocationResponse consumerResponse)
{
+ EventRoute route = routings.get(consumedEvent);
+ route.acknowledgement = new EventAcknowledgement.Consumed(consumerResponse);
}
public void eventFailed(EventPhaseContext context, Event failedEvent, Throwable throwable)
{
+ EventRoute route = routings.get(failedEvent);
+ route.acknowledgement = new EventAcknowledgement.Failed(throwable);
}
public void eventDiscarded(EventPhaseContext context, Event discardedEvent, int cause)
{
+ EventRoute route = routings.get(discardedEvent);
+ route.acknowledgement = new EventAcknowledgement.Discarded(cause);
}
}
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/portlet.xml
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/portlet.xml 2008-03-17 12:49:18 UTC (rev 10290)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/portlet.xml 2008-03-17 14:23:26 UTC (rev 10291)
@@ -41,5 +41,20 @@
</portlet-info>
</portlet>
+ <portlet>
+ <description>Debugger Portlet</description>
+ <portlet-name>DebuggerPortlet</portlet-name>
+ <display-name>Debugger Portlet</display-name>
+ <portlet-class>org.jboss.portal.portlet.portal.admin.ui.DebuggerPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>Debugger Portlet</title>
+ <keywords>admin</keywords>
+ </portlet-info>
+ </portlet>
+
</portlet-app>
Modified: modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo1.jsp
===================================================================
--- modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo1.jsp 2008-03-17 12:49:18 UTC (rev 10290)
+++ modules/portlet/trunk/portal/src/main/resources/simple-portal-war/demo/demo1.jsp 2008-03-17 14:23:26 UTC (rev 10291)
@@ -16,6 +16,7 @@
<xportal:portlet name="Catalog" applicationName="samples-shoppingcart-portlet"/>
</jsp:attribute>
</xportal:2columns>
+ <xportal:portlet name="DebuggerPortlet" applicationName="simple-portal"/>
</portal:page>
<%@ include file="/layouts/footer.jsp" %>
\ No newline at end of file
Modified: modules/portlet/trunk/samples/src/main/artifacts/basic-portlet-war/WEB-INF/portlet.xml
===================================================================
--- modules/portlet/trunk/samples/src/main/artifacts/basic-portlet-war/WEB-INF/portlet.xml 2008-03-17 12:49:18 UTC (rev 10290)
+++ modules/portlet/trunk/samples/src/main/artifacts/basic-portlet-war/WEB-INF/portlet.xml 2008-03-17 14:23:26 UTC (rev 10291)
@@ -27,6 +27,8 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
version="2.0">
+ <default-namespace>urn:jboss:portal:samples:basic</default-namespace>
+
<portlet>
<portlet-name>ExceptionPortlet</portlet-name>
<portlet-class>org.jboss.portal.portlet.samples.basic.ExceptionPortlet</portlet-class>
@@ -58,14 +60,104 @@
<supports>
<mime-type>text/html</mime-type>
</supports>
+ <portlet-info>
+ <title>Fail during init portlet</title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>RandomEventPortlet1</portlet-name>
+ <portlet-class>org.jboss.portal.portlet.samples.basic.RandomEventPortlet</portlet-class>
<supports>
- <mime-type>text/javascript</mime-type>
+ <mime-type>text/html</mime-type>
</supports>
<portlet-info>
- <title>Fail during init portlet</title>
+ <title>A portlet that generate events randomly</title>
</portlet-info>
+<!--
+ <supported-processing-event>
+ <name>Event1</name>
+ </supported-processing-event>
+-->
+ <supported-processing-event>
+ <name>Event2</name>
+ </supported-processing-event>
+ <supported-processing-event>
+ <name>Event3</name>
+ </supported-processing-event>
+ <supported-publishing-event>
+ <name>Event1</name>
+ </supported-publishing-event>
+ <supported-publishing-event>
+ <name>Event2</name>
+ </supported-publishing-event>
+ <supported-publishing-event>
+ <name>Event3</name>
+ </supported-publishing-event>
</portlet>
+ <portlet>
+ <portlet-name>RandomEventPortlet2</portlet-name>
+ <portlet-class>org.jboss.portal.portlet.samples.basic.RandomEventPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>A portlet that generate events randomly</title>
+ </portlet-info>
+ <supported-processing-event>
+ <name>Event1</name>
+ </supported-processing-event>
+<!--
+ <supported-processing-event>
+ <name>Event2</name>
+ </supported-processing-event>
+-->
+ <supported-processing-event>
+ <name>Event3</name>
+ </supported-processing-event>
+ <supported-publishing-event>
+ <name>Event1</name>
+ </supported-publishing-event>
+ <supported-publishing-event>
+ <name>Event2</name>
+ </supported-publishing-event>
+ <supported-publishing-event>
+ <name>Event3</name>
+ </supported-publishing-event>
+ </portlet>
+
+ <portlet>
+ <portlet-name>RandomEventPortlet3</portlet-name>
+ <portlet-class>org.jboss.portal.portlet.samples.basic.RandomEventPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title>A portlet that generate events randomly</title>
+ </portlet-info>
+ <supported-processing-event>
+ <name>Event1</name>
+ </supported-processing-event>
+ <supported-processing-event>
+ <name>Event2</name>
+ </supported-processing-event>
+<!--
+ <supported-processing-event>
+ <name>Event3</name>
+ </supported-processing-event>
+-->
+ <supported-publishing-event>
+ <name>Event1</name>
+ </supported-publishing-event>
+ <supported-publishing-event>
+ <name>Event2</name>
+ </supported-publishing-event>
+ <supported-publishing-event>
+ <name>Event3</name>
+ </supported-publishing-event>
+ </portlet>
+
<filter>
<filter-name>FilterA</filter-name>
<filter-class>org.jboss.portal.portlet.samples.basic.NullFilter</filter-class>
@@ -94,4 +186,19 @@
<portlet-name>HeaderPortlet</portlet-name>
</filter-mapping>
+ <event-definition>
+ <name>Event1</name>
+ <value-type>java.lang.Integer</value-type>
+ </event-definition>
+
+ <event-definition>
+ <name>Event2</name>
+ <value-type>java.lang.Integer</value-type>
+ </event-definition>
+
+ <event-definition>
+ <name>Event3</name>
+ <value-type>java.lang.Integer</value-type>
+ </event-definition>
+
</portlet-app>
16 years, 3 months
JBoss Portal SVN: r10290 - in branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core: model/portal and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-03-17 08:49:18 -0400 (Mon, 17 Mar 2008)
New Revision: 10290
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java
Log:
Header list can be null.
More generification
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-03-17 12:18:09 UTC (rev 10289)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2008-03-17 12:49:18 UTC (rev 10290)
@@ -184,7 +184,7 @@
}
//
- Map windowProps = new HashMap(window.getProperties());
+ Map<String, String> windowProps = new HashMap<String, String>(window.getProperties());
Mode mode = windowNS.getMode();
WindowState windowState = windowNS.getWindowState();
@@ -303,12 +303,15 @@
// header handling
MultiValuedPropertyMap<Element> headers = properties.getMarkupHeaders();
List<Element> headElements = headers.getValues(MimeResponse.MARKUP_HEAD_ELEMENT);
- StringBuffer buffer = new StringBuffer(124 * headElements.size());
- for (Element element : headElements)
+ if (headElements != null)
{
- buffer.append(element);
+ StringBuffer buffer = new StringBuffer(124 * headElements.size());
+ for (Element element : headElements)
+ {
+ buffer.append(element);
+ }
+ header = buffer.toString();
}
- header = buffer.toString();
// deal with partial refresh
MultiValuedPropertyMap<String> transport = properties.getTransportHeaders();
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2008-03-17 12:18:09 UTC (rev 10289)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObject.java 2008-03-17 12:49:18 UTC (rev 10290)
@@ -120,14 +120,14 @@
*
* @return the children
*/
- Collection getChildren();
+ Collection<PortalObject> getChildren();
/**
* Return all the children of this object filtered with a particular mask.
*
* @return the children
*/
- Collection getChildren(int mask);
+ Collection<PortalObject> getChildren(int mask);
/**
* Return the parent object.
@@ -177,7 +177,7 @@
*
* @return a map of the object properties
*/
- Map getProperties();
+ Map<String, String> getProperties();
/**
* Return a property declared on that object.
@@ -201,7 +201,7 @@
*
* @return a map of the properties declared by the object
*/
- Map getDeclaredProperties();
+ Map<String, String> getDeclaredProperties();
// /**
// * Return true if the portal object is part of a dashboard.
16 years, 3 months
JBoss Portal SVN: r10289 - branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-03-17 08:18:09 -0400 (Mon, 17 Mar 2008)
New Revision: 10289
Modified:
branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java
Log:
JBPORTAL-1952: Portal navigational state replication broken
JBPORTAL-1948: Render Parameters Not Replicated
Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java 2008-03-17 12:13:43 UTC (rev 10288)
+++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/PortalConstants.java 2008-03-17 12:18:09 UTC (rev 10289)
@@ -60,6 +60,6 @@
/** Generic session objects. */
public static final String PORTAL_SESSION_MAP_KEY = "portal.session";
- /** Navigational state objects. */
- public static final String NAVIGATIONAL_STATE_MAP_KEY = "portal.navigationalstate";
+ /** Generic session objects. */
+ public static final String PORTAL_PRINCIPAL_MAP_KEY = "portal.principal";
}
16 years, 3 months
JBoss Portal SVN: r10288 - branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-03-17 08:13:43 -0400 (Mon, 17 Mar 2008)
New Revision: 10288
Modified:
branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/PortalConstants.java
Log:
JBPORTAL-1952: Portal navigational state replication broken
JBPORTAL-1948: Render Parameters Not Replicated
(Still need to check the Portlet parameters serialization)
Modified: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/PortalConstants.java 2008-03-17 12:02:54 UTC (rev 10287)
+++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/PortalConstants.java 2008-03-17 12:13:43 UTC (rev 10288)
@@ -60,6 +60,6 @@
/** Generic session objects. */
public static final String PORTAL_SESSION_MAP_KEY = "portal.session";
- /** Navigational state objects. */
- public static final String NAVIGATIONAL_STATE_MAP_KEY = "portal.navigationalstate";
+ /** Generic session objects. */
+ public static final String PORTAL_PRINCIPAL_MAP_KEY = "portal.principal";
}
16 years, 3 months