JBoss Portal SVN: r10083 - in modules/test/trunk: build and 16 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-22 08:20:01 -0500 (Fri, 22 Feb 2008)
New Revision: 10083
Modified:
modules/test/trunk/build/pom.xml
modules/test/trunk/docs/pom.xml
modules/test/trunk/mc/pom.xml
modules/test/trunk/mc/src/test/java/org/jboss/test/unit/mc/SomeTest.java
modules/test/trunk/pom.xml
modules/test/trunk/remote/pom.xml
modules/test/trunk/remote/src/main/java/org/jboss/unit/remote/driver/RemoteTestDriverClient.java
modules/test/trunk/test/agent/pom.xml
modules/test/trunk/test/core/pom.xml
modules/test/trunk/test/generic/pom.xml
modules/test/trunk/test/jboss/pom.xml
modules/test/trunk/test/opends/pom.xml
modules/test/trunk/tooling/ant/pom.xml
modules/test/trunk/tooling/core/pom.xml
modules/test/trunk/tooling/examples/maven2/pom.xml
modules/test/trunk/tooling/maven2/pom.xml
modules/test/trunk/tooling/pom.xml
modules/test/trunk/unit/pom.xml
Log:
JBUNIT-9 : migration to MC 2 beta 9
Modified: modules/test/trunk/build/pom.xml
===================================================================
--- modules/test/trunk/build/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/build/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss Portal Test Module</name>
<url>http://www.jboss.com/products/jbossmc</url>
@@ -26,7 +26,7 @@
<properties>
<version.portal.common>1.2.0-SNAPSHOT</version.portal.common>
- <version.jboss.microcontainer>2.0.0.Beta4</version.jboss.microcontainer>
+ <version.jboss.microcontainer>2.0.0.Beta9</version.jboss.microcontainer>
<version.apache.httpclient>3.0.1</version.apache.httpclient>
<version.cargo>0.9-portal</version.cargo>
<version.sun.opends>legacy</version.sun.opends>
Modified: modules/test/trunk/docs/pom.xml
===================================================================
--- modules/test/trunk/docs/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/docs/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -4,13 +4,13 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Docs Aggregator</name>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
<modules>
Modified: modules/test/trunk/mc/pom.xml
===================================================================
--- modules/test/trunk/mc/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/mc/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/mc/src/test/java/org/jboss/test/unit/mc/SomeTest.java
===================================================================
--- modules/test/trunk/mc/src/test/java/org/jboss/test/unit/mc/SomeTest.java 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/mc/src/test/java/org/jboss/test/unit/mc/SomeTest.java 2008-02-22 13:20:01 UTC (rev 10083)
@@ -24,7 +24,7 @@
import org.jboss.unit.api.pojo.annotations.Test;
import org.jboss.unit.mc.api.annotations.Bootstrap;
-import org.jboss.beans.metadata.plugins.annotations.Inject;
+import org.jboss.beans.metadata.api.annotations.Inject;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
Modified: modules/test/trunk/pom.xml
===================================================================
--- modules/test/trunk/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Test</name>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
Modified: modules/test/trunk/remote/pom.xml
===================================================================
--- modules/test/trunk/remote/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/remote/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/remote/src/main/java/org/jboss/unit/remote/driver/RemoteTestDriverClient.java
===================================================================
--- modules/test/trunk/remote/src/main/java/org/jboss/unit/remote/driver/RemoteTestDriverClient.java 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/remote/src/main/java/org/jboss/unit/remote/driver/RemoteTestDriverClient.java 2008-02-22 13:20:01 UTC (rev 10083)
@@ -25,7 +25,7 @@
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
-import org.jboss.beans.metadata.plugins.annotations.Inject;
+import org.jboss.beans.metadata.api.annotations.Inject;
import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
import org.jboss.kernel.spi.deployment.KernelDeployment;
Modified: modules/test/trunk/test/agent/pom.xml
===================================================================
--- modules/test/trunk/test/agent/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/test/agent/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/test/core/pom.xml
===================================================================
--- modules/test/trunk/test/core/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/test/core/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/test/generic/pom.xml
===================================================================
--- modules/test/trunk/test/generic/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/test/generic/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/test/jboss/pom.xml
===================================================================
--- modules/test/trunk/test/jboss/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/test/jboss/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/test/opends/pom.xml
===================================================================
--- modules/test/trunk/test/opends/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/test/opends/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/tooling/ant/pom.xml
===================================================================
--- modules/test/trunk/tooling/ant/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/tooling/ant/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/tooling/core/pom.xml
===================================================================
--- modules/test/trunk/tooling/core/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/tooling/core/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/tooling/examples/maven2/pom.xml
===================================================================
--- modules/test/trunk/tooling/examples/maven2/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/tooling/examples/maven2/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -11,7 +11,7 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -39,7 +39,7 @@
<plugin>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-maven2</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<executions>
<execution>
<phase>test</phase>
Modified: modules/test/trunk/tooling/maven2/pom.xml
===================================================================
--- modules/test/trunk/tooling/maven2/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/tooling/maven2/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/tooling/pom.xml
===================================================================
--- modules/test/trunk/tooling/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/tooling/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -11,7 +11,7 @@
<artifactId>jboss-unit-tooling-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Unit Tooling (aggregator)</name>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<modules>
<module>core</module>
<module>ant</module>
Modified: modules/test/trunk/unit/pom.xml
===================================================================
--- modules/test/trunk/unit/pom.xml 2008-02-22 11:34:17 UTC (rev 10082)
+++ modules/test/trunk/unit/pom.xml 2008-02-22 13:20:01 UTC (rev 10083)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-Beta1</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
16 years, 7 months
JBoss Portal SVN: r10082 - in modules/portlet/trunk: test/src/main/java/org/jboss/portal/portlet/portal/admin/ui and 2 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-22 06:34:17 -0500 (Fri, 22 Feb 2008)
New Revision: 10082
Added:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/NullFilter.java
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletFilterImpl.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/admin/ui/AdminPortlet.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/FailDuringInitPortlet.java
modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/WEB-INF/portlet.xml
Log:
- fix a bug with wrong filter name
- add filters in basic sample to test the filter -> container dependencies
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletFilterImpl.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletFilterImpl.java 2008-02-22 10:31:17 UTC (rev 10081)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletFilterImpl.java 2008-02-22 11:34:17 UTC (rev 10082)
@@ -101,7 +101,7 @@
public String getId()
{
- return null;
+ return info.getName();
}
public void setPortletApplication(PortletApplication application)
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/admin/ui/AdminPortlet.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/admin/ui/AdminPortlet.java 2008-02-22 10:31:17 UTC (rev 10081)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/admin/ui/AdminPortlet.java 2008-02-22 11:34:17 UTC (rev 10082)
@@ -25,6 +25,8 @@
import org.jboss.portal.portlet.container.managed.PortletApplicationRegistry;
import org.jboss.portal.portlet.container.managed.ManagedPortletApplication;
import org.jboss.portal.portlet.container.managed.ManagedPortletContainer;
+import org.jboss.portal.portlet.container.managed.ManagedPortletFilter;
+import org.jboss.portal.portlet.container.managed.ManagedObject;
import javax.portlet.GenericPortlet;
import javax.portlet.RenderRequest;
@@ -59,26 +61,30 @@
//
ManagedPortletApplication application = registry.getManagedPortletApplication(applicationId);
+ ManagedObject managedObject = application;
//
String containerId = req.getParameter("container");
+ if (containerId != null)
+ {
+ managedObject = application.getManagedPortletContainer(containerId);
+ }
+ else
+ {
+ String filterId = req.getParameter("filter");
+ if (filterId != null)
+ {
+ managedObject = application.getManagedPortletFilter(filterId);
+ }
+ }
//
- if (containerId != null)
+ final ManagedObject tmp = managedObject;
+ if (tmp != null)
{
- final ManagedPortletContainer container = application.getManagedPortletContainer(containerId);
-
- //
if ("start".equals(lifeCycle))
{
- try
- {
- container.managedStart();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
+ tmp.managedStart();
}
else if ("stop".equals(lifeCycle))
{
@@ -87,7 +93,7 @@
{
public void run()
{
- container.managedStop();
+ tmp.managedStop();
}
}.start();
}
@@ -97,40 +103,69 @@
protected void doView(RenderRequest req, RenderResponse resp) throws PortletException, IOException
{
-
resp.setContentType("text/html");
-
PrintWriter writer = resp.getWriter();
// Use an alias
PortletApplicationRegistry registry = (PortletApplicationRegistry)getPortletContext().getAttribute("PortletApplicationDeployer");
+ //
for (ManagedPortletApplication application : registry.getManagedPortletApplications())
{
PortletURL url = resp.createActionURL();
url.setParameter("application", application.getId());
//
- writer.print("<ul><li>Application " + application.getId() + " " + application.getStatus() + "</li><ul>");
+ url.setParameter("lifecycle", "stop");
+ String stopURL = url.toString();
//
+ url.setParameter("lifecycle", "start");
+ String startURL = url.toString();
+
+ //
+ writer.print("<ul><li>Application " + application.getId() + " " + application.getStatus() +
+ " <a href=\"" + startURL + "\">Start</a> <a href=\"" + stopURL + "\">Stop</a></li><ul>");
+
+ //
+ for (ManagedPortletFilter filter : application.getManagedPortletFilters())
+ {
+ url.setParameter("filter", filter.getId());
+
+ //
+ url.setParameter("lifecycle", "stop");
+ stopURL = url.toString();
+
+ //
+ url.setParameter("lifecycle", "start");
+ startURL = url.toString();
+
+ //
+ writer.print("<li>Filter " + filter.getId() + " " + filter.getStatus() + " <a href=\"" +
+ startURL + "\">Start</a> <a href=\"" + stopURL + "\">Stop</a></li>");
+ }
+
+ //
for (ManagedPortletContainer container : application.getManagedPortletContainers())
{
-
url.setParameter("container", container.getId());
+ //
url.setParameter("lifecycle", "stop");
- String stopURL = url.toString();
+ stopURL = url.toString();
+ //
url.setParameter("lifecycle", "start");
- String startURL = url.toString();
+ startURL = url.toString();
- writer.print("<li>Container " + container.getId() + " " + container.getStatus() + "<a href=\"" +
- startURL + "\">Start</a> <a href=\"" + stopURL + "\">Stop</a>" + "</li>");
+ //
+ writer.print("<li>Container " + container.getId() + " " + container.getStatus() + " <a href=\"" +
+ startURL + "\">Start</a> <a href=\"" + stopURL + "\">Stop</a></li>");
}
writer.print("</ul></ul>");
}
+ //
writer.close();
}
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/FailDuringInitPortlet.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/FailDuringInitPortlet.java 2008-02-22 10:31:17 UTC (rev 10081)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/FailDuringInitPortlet.java 2008-02-22 11:34:17 UTC (rev 10082)
@@ -24,6 +24,10 @@
import javax.portlet.GenericPortlet;
import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
/**
* A portlet that will fail only one time during startup (so it is possible to restart it).
@@ -50,4 +54,12 @@
// Nothing
}
}
+
+ protected void doView(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException
+ {
+ renderResponse.setContentType("text/html");
+ PrintWriter writer = renderResponse.getWriter();
+ writer.print("A portlet that may fail during init");
+ writer.close();
+ }
}
Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/NullFilter.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/NullFilter.java (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/portal/samples/basic/NullFilter.java 2008-02-22 11:34:17 UTC (rev 10082)
@@ -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.samples.basic;
+
+import javax.portlet.filter.RenderFilter;
+import javax.portlet.filter.ActionFilter;
+import javax.portlet.filter.EventFilter;
+import javax.portlet.filter.ResourceFilter;
+import javax.portlet.filter.FilterChain;
+import javax.portlet.filter.FilterConfig;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class NullFilter implements RenderFilter, ActionFilter, EventFilter, ResourceFilter
+{
+ public void init(FilterConfig config) throws PortletException
+ {
+ }
+
+ public void doFilter(RenderRequest req, RenderResponse resp, FilterChain chain) throws IOException, PortletException
+ {
+ chain.doFilter(req, resp);
+ }
+
+ public void doFilter(ActionRequest req, ActionResponse resp, FilterChain chain) throws IOException, PortletException
+ {
+ chain.doFilter(req, resp);
+ }
+
+ public void doFilter(EventRequest req, EventResponse resp, FilterChain chain) throws IOException, PortletException
+ {
+ chain.doFilter(req, resp);
+ }
+
+ public void doFilter(ResourceRequest req, ResourceResponse resp, FilterChain chain) throws IOException, PortletException
+ {
+ chain.doFilter(req, resp);
+ }
+
+ public void destroy()
+ {
+ }
+}
Modified: modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/WEB-INF/portlet.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/WEB-INF/portlet.xml 2008-02-22 10:31:17 UTC (rev 10081)
+++ modules/portlet/trunk/test/src/test/resources/portal/samples/basic-war/WEB-INF/portlet.xml 2008-02-22 11:34:17 UTC (rev 10082)
@@ -66,4 +66,32 @@
</portlet-info>
</portlet>
+ <filter>
+ <filter-name>FilterA</filter-name>
+ <filter-class>org.jboss.portal.portlet.portal.samples.basic.NullFilter</filter-class>
+ <lifecycle>ACTION_PHASE</lifecycle>
+ <lifecycle>EVENT_PHASE</lifecycle>
+ <lifecycle>RENDER_PHASE</lifecycle>
+ <lifecycle>RESOURCE_PHASE</lifecycle>
+ </filter>
+
+ <filter>
+ <filter-name>FilterB</filter-name>
+ <filter-class>org.jboss.portal.portlet.portal.samples.basic.NullFilter</filter-class>
+ <lifecycle>ACTION_PHASE</lifecycle>
+ <lifecycle>EVENT_PHASE</lifecycle>
+ <lifecycle>RENDER_PHASE</lifecycle>
+ <lifecycle>RESOURCE_PHASE</lifecycle>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>FilterA</filter-name>
+ <portlet-name>*</portlet-name>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>FilterB</filter-name>
+ <portlet-name>HeaderPortlet</portlet-name>
+ </filter-mapping>
+
</portlet-app>
16 years, 7 months
JBoss Portal SVN: r10080 - modules/test/trunk.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-02-22 05:18:36 -0500 (Fri, 22 Feb 2008)
New Revision: 10080
Modified:
modules/test/trunk/pom.xml
Log:
move docs build to separate profile
Modified: modules/test/trunk/pom.xml
===================================================================
--- modules/test/trunk/pom.xml 2008-02-22 10:14:25 UTC (rev 10079)
+++ modules/test/trunk/pom.xml 2008-02-22 10:18:36 UTC (rev 10080)
@@ -25,6 +25,15 @@
</snapshotRepository>
</distributionManagement>
+ <profiles>
+ <profile>
+ <id>docs</id>
+ <modules>
+ <module>docs</module>
+ </modules>
+ </profile>
+ </profiles>
+
<modules>
<module>build</module>
<module>unit</module>
@@ -35,8 +44,7 @@
<module>test/opends</module>
<module>test/generic</module>
<module>test/jboss</module>
- <module>test/agent</module>
- <module>docs</module>
+ <module>test/agent</module>
</modules>
</project>
16 years, 7 months
JBoss Portal SVN: r10079 - modules/portlet/trunk.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-02-22 05:14:25 -0500 (Fri, 22 Feb 2008)
New Revision: 10079
Modified:
modules/portlet/trunk/pom.xml
Log:
Move docs generation to separate profile
Modified: modules/portlet/trunk/pom.xml
===================================================================
--- modules/portlet/trunk/pom.xml 2008-02-22 05:58:14 UTC (rev 10078)
+++ modules/portlet/trunk/pom.xml 2008-02-22 10:14:25 UTC (rev 10079)
@@ -25,6 +25,15 @@
</snapshotRepository>
</distributionManagement>
+ <profiles>
+ <profile>
+ <id>docs</id>
+ <modules>
+ <module>docs</module>
+ </modules>
+ </profile>
+ </profiles>
+
<modules>
<module>build</module>
<module>jsr168api</module>
@@ -34,7 +43,6 @@
<module>federation</module>
<module>management</module>
<module>test</module>
- <module>docs</module>
</modules>
</project>
16 years, 7 months
JBoss Portal SVN: r10078 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-02-22 00:58:14 -0500 (Fri, 22 Feb 2008)
New Revision: 10078
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.1.1. The JBoss Portlet DTD
minor revisions and corrections
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-02-22 03:57:05 UTC (rev 10077)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-02-22 05:58:14 UTC (rev 10078)
@@ -184,10 +184,10 @@
</screen></term>
<listitem>
<para>
- Define how the portlet behaves with the transactional context. The <computeroutput><trans-attribute></computeroutput> element specifies the behavior of the portlet when it is invoked at runtime, with respect to the transactional context. Depending on how the portlet is invoked, a transaction may or may not exist before the portlet is invoked. The portal transaction is usually present in the local context.
+ The <computeroutput><transaction></computeroutput> element defines how the portlet behaves with regards to the transactional context. The <computeroutput><trans-attribute></computeroutput> element specifies the behavior of the portlet when it is invoked at runtime, with respect to the transactional context. Depending on how the portlet is invoked, a transaction may or may not exist before the portlet is invoked. The portal transaction is usually present in the local context.
</para>
<para>
- The following is an example of the <computeroutput><trans-attribute></computeroutput> element:
+ The following is an example of the <computeroutput><transaction></computeroutput> and <computeroutput><trans-attribute></computeroutput> elements:
</para>
<para>
<screen><![CDATA[
@@ -202,7 +202,7 @@
</screen>
</para>
<para>
- The default value is <computeroutput>NotSupported</computeroutput>, which means that the portal transaction will be suspended for the duration of the portlet invocation. Accepted values are <computeroutput>Required</computeroutput>, <computeroutput>Mandatory</computeroutput>, <computeroutput>Never</computeroutput>, <computeroutput>Supports</computeroutput>, <computeroutput>NotSupported</computeroutput>, and <computeroutput>RequiresNew</computeroutput>.
+ The default value is <computeroutput>NotSupported</computeroutput>, which means that the portal transaction will be suspended for the duration of the session. Accepted values are <computeroutput>Required</computeroutput>, <computeroutput>Mandatory</computeroutput>, <computeroutput>Never</computeroutput>, <computeroutput>Supports</computeroutput>, <computeroutput>NotSupported</computeroutput>, and <computeroutput>RequiresNew</computeroutput>.
</para>
</listitem>
</varlistentry>
16 years, 7 months
JBoss Portal SVN: r10077 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-02-21 22:57:05 -0500 (Thu, 21 Feb 2008)
New Revision: 10077
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.1.1. The JBoss Portlet DTD
minor, changed two words...
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-02-22 01:14:40 UTC (rev 10076)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-02-22 03:57:05 UTC (rev 10077)
@@ -148,7 +148,7 @@
</screen>
</para>
<para>
- If a portlet uses the <computeroutput>true</computeroutput> value for the <computeroutput><partial-refresh></computeroutput> element, the portal uses partial-page refreshing and only renders the portlet. If the <computeroutput><partial-refresh></computeroutput> element uses a <computeroutput>false</computeroutput> value, the portal uses a full-page refresh when the portlet is refreshed.
+ If a portlet uses the <computeroutput>true</computeroutput> value for the <computeroutput><partial-refresh></computeroutput> element, the portal uses partial-page refreshing and only renders that portlet. If the <computeroutput><partial-refresh></computeroutput> element uses a <computeroutput>false</computeroutput> value, the portal uses a full-page refresh when the portlet is refreshed.
</para>
</listitem>
</varlistentry>
@@ -157,7 +157,7 @@
</screen></term>
<listitem>
<para>
- The <computeroutput><session-config></computeroutput> element configures the portlet session of the portlet. The <computeroutput><distributed></computeroutput> element instructs the container to distribute the session attributes using portal session replication. This only applies to local portlets, not remote portlets.
+ The <computeroutput><session-config></computeroutput> element configures the portlet session for the portlet. The <computeroutput><distributed></computeroutput> element instructs the container to distribute the session attributes using portal session replication. This only applies to local portlets, not remote portlets.
</para>
<para>
The following is an example of the <computeroutput><session-config></computeroutput> and <computeroutput><distributed></computeroutput> elements:
16 years, 7 months
JBoss Portal SVN: r10075 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-21 20:13:49 -0500 (Thu, 21 Feb 2008)
New Revision: 10075
Removed:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/JBossApplicationMetaData.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/JBossPortletMetaData.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/PolicyPermissionMetaData.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/SecurityConstraintMetaData.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/SessionConfigMetaData.java
Log:
remove legacy classes
Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/JBossApplicationMetaData.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/JBossApplicationMetaData.java 2008-02-22 01:12:15 UTC (rev 10074)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/JBossApplicationMetaData.java 2008-02-22 01:13:49 UTC (rev 10075)
@@ -1,60 +0,0 @@
-/******************************************************************************
- * 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. *
- ******************************************************************************/
-package org.jboss.portal.portlet.metadata;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5448 $
- */
-public class JBossApplicationMetaData
-{
-
- /** . */
- protected Boolean remotable;
-
- /** . */
- protected Map portlets;
-
- public JBossApplicationMetaData()
- {
- portlets = new LinkedHashMap();
- }
-
- public Map getPortlets()
- {
- return portlets;
- }
-
- public Boolean getRemotable()
- {
- return remotable;
- }
-
- public void setRemotable(Boolean remotable)
- {
- this.remotable = remotable;
- }
-}
Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/JBossPortletMetaData.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/JBossPortletMetaData.java 2008-02-22 01:12:15 UTC (rev 10074)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/JBossPortletMetaData.java 2008-02-22 01:13:49 UTC (rev 10075)
@@ -1,163 +0,0 @@
-/******************************************************************************
- * 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. *
- ******************************************************************************/
-package org.jboss.portal.portlet.metadata;
-
-import org.jboss.portal.common.transaction.Transactions;
-
-/**
- * Specific metadata specified to jboss portlet container.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 7226 $
- */
-public class JBossPortletMetaData implements Cloneable
-{
-
- /** . */
- private String name;
-
- /** . */
- private Boolean remotable;
-
- /** . */
- private SecurityConstraintMetaData securityConstraint;
-
- /** . */
- private Integer cacheRefType;
-
- /** . */
- private Transactions.Type txType;
-
- /** . */
- private Boolean distributed;
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public Boolean getRemotable()
- {
- return remotable;
- }
-
- public void setRemotable(Boolean remotable)
- {
- this.remotable = remotable;
- }
-
- public Boolean getDistributed()
- {
- return distributed;
- }
-
- public void setDistributed(Boolean distributed)
- {
- this.distributed = distributed;
- }
-
- public SecurityConstraintMetaData getSecurityConstraint()
- {
- return securityConstraint;
- }
-
- public void setSecurityConstraint(SecurityConstraintMetaData securityConstraint)
- {
- this.securityConstraint = securityConstraint;
- }
-
- public Integer getCacheRefType()
- {
- return cacheRefType;
- }
-
- public void setCacheRefType(Integer cacheRefType)
- {
- this.cacheRefType = cacheRefType;
- }
-
- public Transactions.Type getTxType()
- {
- return txType;
- }
-
- public void setTxType(Transactions.Type txType)
- {
- this.txType = txType;
- }
-
- /**
- * Merge the current meta data with portlet application.
- */
- public void merge(JBossApplicationMetaData application)
- {
- if (remotable == null)
- {
- remotable = application.getRemotable();
- }
- }
-
- /**
- * Merge the current meta data with a specified one.
- */
- public void merge(JBossPortletMetaData portlet)
- {
- if (remotable == null)
- {
- remotable = portlet.getRemotable();
- }
- if (txType == null)
- {
- txType = portlet.getTxType();
- }
- if (cacheRefType == null)
- {
- cacheRefType = portlet.getCacheRefType();
- }
- if (securityConstraint == null)
- {
- securityConstraint = portlet.getSecurityConstraint();
- }
- if (distributed == null)
- {
- distributed = portlet.getDistributed();
- }
- }
-
- public Object clone()
- {
- try
- {
- return super.clone();
- }
- catch (CloneNotSupportedException e)
- {
- throw new Error(e);
- }
- }
-}
Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/PolicyPermissionMetaData.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/PolicyPermissionMetaData.java 2008-02-22 01:12:15 UTC (rev 10074)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/PolicyPermissionMetaData.java 2008-02-22 01:13:49 UTC (rev 10075)
@@ -1,62 +0,0 @@
-/******************************************************************************
- * 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. *
- ******************************************************************************/
-package org.jboss.portal.portlet.metadata;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5448 $
- */
-public class PolicyPermissionMetaData
-{
-
- private String roleName;
- private Set actions;
-
- public PolicyPermissionMetaData()
- {
- actions = new HashSet();
- }
-
- public String getRoleName()
- {
- return roleName;
- }
-
- public void setRoleName(String roleName)
- {
- this.roleName = roleName;
- }
-
- public Set getActions()
- {
- return actions;
- }
-
- public void setActions(Set actions)
- {
- this.actions = actions;
- }
-}
Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/SecurityConstraintMetaData.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/SecurityConstraintMetaData.java 2008-02-22 01:12:15 UTC (rev 10074)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/SecurityConstraintMetaData.java 2008-02-22 01:13:49 UTC (rev 10075)
@@ -1,51 +0,0 @@
-/******************************************************************************
- * 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. *
- ******************************************************************************/
-package org.jboss.portal.portlet.metadata;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5448 $
- */
-public class SecurityConstraintMetaData
-{
-
- private Map policyPermissions;
-
- public SecurityConstraintMetaData()
- {
- policyPermissions = new LinkedHashMap();
- }
-
- public Map getPolicyPermissions()
- {
- return policyPermissions;
- }
-
- public void setPolicyPermissions(Map policyPermissions)
- {
- this.policyPermissions = policyPermissions;
- }
-}
Deleted: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/SessionConfigMetaData.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/SessionConfigMetaData.java 2008-02-22 01:12:15 UTC (rev 10074)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/metadata/SessionConfigMetaData.java 2008-02-22 01:13:49 UTC (rev 10075)
@@ -1,47 +0,0 @@
-/******************************************************************************
- * 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. *
- ******************************************************************************/
-package org.jboss.portal.portlet.metadata;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5448 $
- */
-public class SessionConfigMetaData
-{
-
- private boolean distributed;
-
- public SessionConfigMetaData()
- {
- }
-
- public boolean isDistributed()
- {
- return distributed;
- }
-
- public void setDistributed(boolean distributed)
- {
- this.distributed = distributed;
- }
-}
16 years, 7 months
JBoss Portal SVN: r10074 - in modules/portlet/trunk: portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168 and 2 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-21 20:12:15 -0500 (Thu, 21 Feb 2008)
New Revision: 10074
Added:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerUserInfo.java
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletApplicationInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/spi/PortletInfoFactory.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java
Log:
cleanup in metadata usage in container impl, now it does not use anymore the meta data build from the xml descriptors
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-02-22 00:12:06 UTC (rev 10073)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2008-02-22 01:12:15 UTC (rev 10074)
@@ -40,6 +40,7 @@
import org.jboss.portal.portlet.impl.metadata.PortletApplication20MetaData;
import org.jboss.portal.portlet.impl.metadata.PublicRenderParameterMetaData;
import org.jboss.portal.portlet.impl.metadata.ListenerMetaData;
+import org.jboss.portal.portlet.impl.metadata.UserAttributeMetaData;
import org.jboss.portal.portlet.impl.metadata.filter.FilterMetaData;
import org.jboss.portal.portlet.impl.metadata.filter.FilterMappingMetaData;
import org.jboss.portal.portlet.info.MetaInfo;
@@ -67,6 +68,7 @@
import java.util.LinkedHashMap;
import java.util.Collections;
import java.util.HashSet;
+import java.util.Set;
import java.net.URI;
import java.net.URISyntaxException;
@@ -150,6 +152,9 @@
private ContainerPortletApplicationInfo portletApplication;
/** . */
+ private final String portletApplicationId;
+
+ /** . */
private final Map<String, ContainerPortletInfo> portlets;
/** . */
@@ -159,9 +164,11 @@
private Map<String, ContainerOptionInfo> applicationOptions;
public ContainerInfoBuilder(
+ String portletApplicationId,
PortletApplication10MetaData portletApplicationMD,
ContainerInfoBuilderContext context)
{
+ this.portletApplicationId = portletApplicationId;
this.portletApplicationMD = portletApplicationMD;
this.context = context;
this.events = new LinkedHashMap<QName, ContainerEventInfo>();
@@ -409,7 +416,25 @@
}
//
- return new ContainerPortletApplicationInfo(defaultNamespace, allFilters.values(), listeners);
+ Map<String, UserAttributeMetaData> userAttributesMD = portletApplicationMD.getUserAttributes();
+ Set<String> supportedUserAttributes;
+ if (userAttributesMD != null)
+ {
+ supportedUserAttributes = Collections.unmodifiableSet(userAttributesMD.keySet());
+ }
+ else
+ {
+ supportedUserAttributes = Collections.emptySet();
+ }
+ ContainerUserInfo user = new ContainerUserInfo(supportedUserAttributes);
+
+ //
+ return new ContainerPortletApplicationInfo(
+ portletApplicationId,
+ defaultNamespace,
+ allFilters.values(),
+ listeners,
+ user);
}
private ContainerListenerInfo build(ListenerMetaData listenerMD)
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletApplicationInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletApplicationInfo.java 2008-02-22 00:12:06 UTC (rev 10073)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletApplicationInfo.java 2008-02-22 01:12:15 UTC (rev 10074)
@@ -36,18 +36,26 @@
{
/** . */
+ private final String id;
+
+ /** . */
private final String defaultNamespace;
/** . */
private final List<ContainerListenerInfo> listeners;
/** . */
+ private final ContainerUserInfo user;
+
+ /** . */
private final Map<String, ContainerFilterInfo> filters;
public ContainerPortletApplicationInfo(
+ String id,
String defaultNamespace,
Collection<ContainerFilterInfo> filters,
- List<ContainerListenerInfo> listeners)
+ List<ContainerListenerInfo> listeners,
+ ContainerUserInfo user)
{
LinkedHashMap<String, ContainerFilterInfo> tmp = new LinkedHashMap<String, ContainerFilterInfo>();
for (ContainerFilterInfo filter : filters)
@@ -56,11 +64,18 @@
}
//
+ this.id = id;
this.defaultNamespace = defaultNamespace;
this.listeners = listeners;
this.filters = Collections.unmodifiableMap(tmp);
+ this.user = user;
}
+ public String getId()
+ {
+ return id;
+ }
+
public String getDefaultNamespace()
{
return defaultNamespace;
@@ -75,4 +90,9 @@
{
return filters;
}
+
+ public ContainerUserInfo getUser()
+ {
+ return user;
+ }
}
Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerUserInfo.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerUserInfo.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerUserInfo.java 2008-02-22 01:12:15 UTC (rev 10074)
@@ -0,0 +1,46 @@
+/******************************************************************************
+ * 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.impl.info;
+
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class ContainerUserInfo
+{
+
+ /** . */
+ private Set<String> supportedUserAttributes;
+
+ public ContainerUserInfo(Set<String> supportedUserAttributes)
+ {
+ this.supportedUserAttributes = supportedUserAttributes;
+ }
+
+ public Set<String> getSupportedUserAttributes()
+ {
+ return supportedUserAttributes;
+ }
+}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java 2008-02-22 00:12:06 UTC (rev 10073)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java 2008-02-22 01:12:15 UTC (rev 10074)
@@ -25,11 +25,9 @@
import org.jboss.portal.portlet.impl.jsr168.api.PortletContextImpl;
import org.jboss.portal.portlet.impl.jsr168.api.PortletURLGenerationListenerChain;
import org.jboss.portal.portlet.impl.jsr168.api.FilterConfigImpl;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo;
import org.jboss.portal.portlet.impl.info.ContainerListenerInfo;
import org.jboss.portal.portlet.impl.info.ContainerFilterInfo;
-import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
import org.jboss.portal.portlet.container.PortletApplication;
import org.jboss.portal.portlet.container.PortletApplicationContext;
import org.jboss.portal.portlet.container.PortletContainer;
@@ -57,18 +55,12 @@
/** . */
protected final ContainerPortletApplicationInfo info;
- /** . */
- protected final PortletApplication10MetaData metaData;
+ /** Logger. */
+ protected final Logger log;
/** . */
- protected final JBossApplicationMetaData jbossMetaData;
-
- /** . */
protected PortletApplicationContext context;
- /** Logger. */
- protected Logger log;
-
/** . */
protected LinkedHashMap<String, PortletContainer> portlets;
@@ -76,24 +68,16 @@
protected PortletContextImpl portletContext;
/** . */
- protected String version;
-
- /** . */
protected PortletURLGenerationListener urlListener;
/**
- * Todo remove meta data reference and use info instead.
+ * @param info the portlet application info
*/
- public PortletApplicationImpl(
- ContainerPortletApplicationInfo info,
- PortletApplication10MetaData metaData,
- JBossApplicationMetaData jbossMetaData)
+ public PortletApplicationImpl(ContainerPortletApplicationInfo info)
{
this.info = info;
- this.metaData = metaData;
- this.jbossMetaData = jbossMetaData;
this.portlets = new LinkedHashMap<String, PortletContainer>();
- this.log = Logger.getLogger(PortletApplication.class);
+ this.log = Logger.getLogger(PortletApplication.class.getName() + "." + info.getId().replace('.', '_'));
}
public void setContext(PortletApplicationContext context)
@@ -103,17 +87,17 @@
public String getId()
{
- return metaData.getId();
+ return info.getId();
}
public void addPortletFilter(org.jboss.portal.portlet.container.PortletFilter filter)
{
-
+ //
}
public void removePortletFilter(org.jboss.portal.portlet.container.PortletFilter filter)
{
-
+ //
}
public ContainerPortletApplicationInfo getInfo()
@@ -121,16 +105,6 @@
return info;
}
- public PortletApplication10MetaData getMetaData()
- {
- return metaData;
- }
-
- public JBossApplicationMetaData getJBossMetaData()
- {
- return jbossMetaData;
- }
-
public void addPortletContainer(PortletContainer container)
{
portlets.put(container.getId(), container);
@@ -145,8 +119,6 @@
public void start() throws Exception
{
-// this.log = Logger.getLogger(PortletApplication.class.getName() + "." + context.getContextPath().replace('.', '_'));
-
PortletContextImpl portletContext = new PortletContextImpl(context.getServletContext());
//
@@ -184,23 +156,16 @@
}
//
- this.version = metaData.getVersion();
this.portletContext = portletContext;
this.urlListener = listeners.size() == 0 ? null : new PortletURLGenerationListenerChain(Collections.unmodifiableList(listeners));
}
public void stop()
{
- this.version = null;
this.portletContext = null;
this.urlListener = null;
}
- public String getVersion()
- {
- return version;
- }
-
public PortletContext getPortletContext()
{
return portletContext;
@@ -254,44 +219,9 @@
public String toString()
{
- return "PortletWebApp[" + metaData.getId() + "]";
+ return "PortletApplication[" + getId() + "]";
}
- private static class FilterKey
- {
-
- /** . */
- private final String name;
-
- /** . */
- private final Class<? extends PortletFilter> phase;
-
- private FilterKey(String name, Class<? extends PortletFilter> phase)
- {
- this.name = name;
- this.phase = phase;
- }
-
- public int hashCode()
- {
- return name.hashCode() + name.hashCode();
- }
-
- public boolean equals(Object obj)
- {
- if (obj == this)
- {
- return true;
- }
- if (obj instanceof FilterKey)
- {
- FilterKey that = (FilterKey)obj;
- return name.equals(that.name) && phase == that.phase;
- }
- return false;
- }
- }
-
static class FilterLifecycle extends ClassInstanceLifeCycle<PortletFilter>
{
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java 2008-02-22 00:12:06 UTC (rev 10073)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletRequestAttributes.java 2008-02-22 01:12:15 UTC (rev 10074)
@@ -22,8 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.impl.jsr168;
-import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
-import org.jboss.portal.portlet.impl.metadata.UserAttributeMetaData;
+import org.jboss.portal.portlet.impl.info.ContainerUserInfo;
import org.jboss.portal.portlet.spi.UserContext;
import org.jboss.portal.portlet.container.PortletContainer;
@@ -106,14 +105,13 @@
{
// Get portlet application metadata
PortletApplicationImpl portletApp = (PortletApplicationImpl)container.getPortletApplication();
- PortletApplication10MetaData pamd = portletApp.getMetaData();
- Map<String, UserAttributeMetaData> uaMD = pamd.getUserAttributes();
+ ContainerUserInfo userInfo = portletApp.getInfo().getUser();
// Clone the map
infos = new HashMap<String, String>(infos);
// Keep only what is of interest with respect to what the portlet app defines
- infos.keySet().retainAll(uaMD.keySet());
+ infos.keySet().retainAll(userInfo.getSupportedUserAttributes());
// Make it immutable
infos = Collections.unmodifiableMap(infos);
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/spi/PortletInfoFactory.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/spi/PortletInfoFactory.java 2008-02-22 00:12:06 UTC (rev 10073)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/spi/PortletInfoFactory.java 2008-02-22 01:12:15 UTC (rev 10074)
@@ -22,11 +22,8 @@
******************************************************************************/
package org.jboss.portal.portlet.impl.jsr168.spi;
-import org.jboss.portal.portlet.container.PortletApplicationContext;
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.impl.metadata.portlet.PortletMetaData;
-import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
-import org.jboss.portal.common.i18n.ResourceBundleManager;
/**
* Enables the creation of custom portlet info implementations.
@@ -40,13 +37,7 @@
* Create a new portlet info from the provided meta data.
*
* @param portletMD the portlet meta data
- * @param jbossPortletMD
- * @param resourceBundleManager the resource bundle manager
* @return the runtime portlet meta data
*/
- PortletInfo createPortletInfo(
- PortletApplicationContext portletApplicationContext,
- PortletMetaData portletMD,
- JBossPortletMetaData jbossPortletMD,
- ResourceBundleManager resourceBundleManager);
+ PortletInfo createPortletInfo(PortletMetaData portletMD);
}
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java 2008-02-22 00:12:06 UTC (rev 10073)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java 2008-02-22 01:12:15 UTC (rev 10074)
@@ -29,7 +29,6 @@
import org.jboss.portal.portlet.container.managed.ManagedObjectRegistryEventBroadcaster;
import org.jboss.portal.portlet.container.managed.ManagedObjectRegistryEventListener;
import org.jboss.portal.portlet.container.managed.ManagedObjectRegistryEvent;
-import org.jboss.portal.portlet.container.managed.ManagedObjectAddedEvent;
import org.jboss.portal.portlet.container.managed.ManagedObjectEvent;
import org.jboss.portal.portlet.container.managed.ManagedObject;
import org.jboss.portal.portlet.container.managed.ManagedObjectLifeCycleEvent;
@@ -263,7 +262,6 @@
// Unmarshal
PortletApplication10MetaData portletApplicationMD = (PortletApplication10MetaData)unmarshaller.unmarshal(in, new ValueTrimmingFilter(factory), null);
- portletApplicationMD.setId(webApp.getContextPath());
//
return portletApplicationMD;
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-22 00:12:06 UTC (rev 10073)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-22 01:12:15 UTC (rev 10074)
@@ -42,7 +42,6 @@
import org.jboss.portal.portlet.container.PortletContainerContext;
import org.jboss.portal.portlet.container.PortletFilterContext;
import org.jboss.portal.portlet.container.managed.ManagedObjectRegistryEventListener;
-import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
import org.jboss.portal.web.WebApp;
/**
@@ -90,14 +89,11 @@
//
ContainerInfoBuilderContext builderContext = new ContainerInfoBuilderContextImpl(metaData, webApp);
- ContainerInfoBuilder builder = new ContainerInfoBuilder(metaData, builderContext);
+ ContainerInfoBuilder builder = new ContainerInfoBuilder(webApp.getContextPath(), metaData, builderContext);
builder.build();
//
- PortletApplicationObject portletApplicationObject = new PortletApplicationImpl(
- builder.getApplication(),
- metaData,
- new JBossApplicationMetaData());
+ PortletApplicationObject portletApplicationObject = new PortletApplicationImpl(builder.getApplication());
PortletApplicationContext portletApplicationContext = new PortletApplicationContextImpl(webApp);
@@ -129,7 +125,7 @@
// Now create deps
for (String filterRef : containerInfo.getFilterRefs())
{
- PortletFilterLifeCycle portletFilterLifeCycle = (PortletFilterLifeCycle)portletApplicationLifeCycle.getManagedPortletFilter(filterRef);
+ PortletFilterLifeCycle portletFilterLifeCycle = portletApplicationLifeCycle.getManagedPortletFilter(filterRef);
//
if (portletFilterLifeCycle != null)
16 years, 7 months