JBoss Portal SVN: r10023 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-02-18 23:56:52 -0500 (Mon, 18 Feb 2008)
New Revision: 10023
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
Log:
5.2.4. An example Apache MyFaces JSF Portlet
minor corrections/spelling
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-19 04:30:47 UTC (rev 10022)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-19 04:56:52 UTC (rev 10023)
@@ -1468,7 +1468,7 @@
Without the <filename>faces-config.xml</filename> file, the application would work the same outside of the portlet as it would inside a portlet container. In this example, a basic user bean, <computeroutput><managed-bean-name>user</managed-bean-name></computeroutput>, and a navigation rule are defined, which handle the submission of the original form in the <filename>HelloWorldJSFMyFaces42Portlet/WEB-INF/jsp/index.jsp</filename> file.
</para>
<para>
- The following is an example of the <computeroutput><context-parm></computeroutput> section from the <filename>HelloWorldJSFMyFaces42Portlet/WEB-INF/web.xml</filename> file:
+ The following is an example of the <computeroutput><context-parm></computeroutput> element from the <filename>HelloWorldJSFMyFaces42Portlet/WEB-INF/web.xml</filename> file:
</para>
<para>
<screen><![CDATA[
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r10022 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-02-18 23:30:47 -0500 (Mon, 18 Feb 2008)
New Revision: 10022
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
Log:
5.2.4. An example Apache MyFaces JSF Portlet
minor spelling corrections
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-19 00:32:26 UTC (rev 10021)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-19 04:30:47 UTC (rev 10022)
@@ -316,8 +316,8 @@
</supports>]]></screen></term>
<listitem>
<para>
- The <computeroutput><supports></computeroutput> element allows you to declare all the markup types your portlet supports in the <literal>render</literal> method. This is accomplished via the
- <computeroutput><mime-type></computeroutput> element, which is required for every portlet. The declared MIME types must match the capability of the portlet. As well, it allows you to pair which modes and window states are supported for each markup type. All portlets must support the VIEW portlet mode, so this does not have to be declared. Use <computeroutput><mime-type></computeroutput> to define which markup type your portlet supports, which in this example, is <computeroutput>text/html</computeroutput>. This section tells the portal that it will only output text and HTML, and that it only supports the <computeroutput>VIEW</computeroutput> mode.
+ The <computeroutput><supports></computeroutput> element allows you to declare all of the markup types your portlet supports in the <literal>render</literal> method. This is accomplished via the
+ <computeroutput><mime-type></computeroutput> element, which is required for every portlet. The declared MIME types must match the capability of the portlet. As well, it allows you to pair which modes and window states are supported for each markup type. All portlets must support the VIEW portlet mode, so this does not have to be declared. Use the <computeroutput><mime-type></computeroutput> element to define which markup type your portlet supports, which in this example, is <computeroutput>text/html</computeroutput>. This section tells the portal that it will only output text and HTML, and that it only supports the <computeroutput>VIEW</computeroutput> mode.
</para>
</listitem>
</varlistentry>
@@ -1030,7 +1030,7 @@
<sect3>
<title>Application Descriptors</title>
<para>
- For brevity, only the <filename>portlet.xml</filename>, <filename>faces-config.xml</filename>, and <filename>web.xml</filename> descriptors are described here. For more information about application descriptors, refer to <xref linkend="first_portlet_descriptors"/> and <xref linkend="descriptors_portlet"/>.
+ Only the <filename>portlet.xml</filename>, <filename>faces-config.xml</filename>, and <filename>web.xml</filename> descriptors are described here. For more information about application descriptors, refer to <xref linkend="first_portlet_descriptors"/> and <xref linkend="descriptors_portlet"/>.
</para>
<para>
The following is an example of the <filename>HelloWorldJSFSunRIPortlet/WEB-INF/portlet.xml</filename> file. This file must adhere to its definition in the JSR-168 Portlet Specification. You may define more than one portlet application in this file:
@@ -1091,8 +1091,8 @@
</supports>]]></screen></term>
<listitem>
<para>
- The <computeroutput><supports></computeroutput> element allows you to declare all the markup types your portlet supports in the <literal>render</literal> method. This is accomplished via the
- <computeroutput><mime-type></computeroutput> element, which is required for every portlet. The declared MIME types must match the capability of the portlet. As well, it allows you to pair which modes and window states are supported for each markup type. All portlets must support the VIEW portlet mode, so this does not have to be declared. Use <computeroutput><mime-type></computeroutput> to define which markup type your portlet supports, which in this example, is <computeroutput>text/html</computeroutput>. This section tells the portal that it will only output text and HTML, and that it only supports the <computeroutput>VIEW</computeroutput> mode.
+ The <computeroutput><supports></computeroutput> element allows you to declare all of the markup types your portlet supports in the <literal>render</literal> method. This is accomplished via the
+ <computeroutput><mime-type></computeroutput> element, which is required for every portlet. The declared MIME types must match the capability of the portlet. As well, it allows you to pair which modes and window states are supported for each markup type. All portlets must support the VIEW portlet mode, so this does not have to be declared. Use the <computeroutput><mime-type></computeroutput> element to define which markup type your portlet supports, which in this example, is <computeroutput>text/html</computeroutput>. This section tells the portal that it will only output text and HTML, and that it only supports the <computeroutput>VIEW</computeroutput> mode.
</para>
</listitem>
</varlistentry>
@@ -1114,6 +1114,7 @@
<managed-bean-class>org.jboss.portlet.hello.bean.User</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+
<navigation-rule>
<navigation-case>
<from-outcome>done</from-outcome>
@@ -1361,7 +1362,7 @@
<sect3>
<title>Application Descriptors</title>
<para>
- For brevity, only the <filename>portlet.xml</filename>, <filename>faces-config.xml</filename>, and <filename>web.xml</filename> descriptors are described here. For more information about application descriptors, refer to <xref linkend="first_portlet_descriptors"/> and <xref linkend="descriptors_portlet"/>.
+ Only the <filename>portlet.xml</filename>, <filename>faces-config.xml</filename>, and <filename>web.xml</filename> descriptors are described here. For more information about application descriptors, refer to <xref linkend="first_portlet_descriptors"/> and <xref linkend="descriptors_portlet"/>.
</para>
<para>
The following is an example of the <filename>HelloWorldJSFMyFaces42Portlet/WEB-INF/portlet.xml</filename> file. This file must adhere to its definition in the JSR-168 Portlet Specification. You may define more than one portlet application in this file:
@@ -1422,8 +1423,8 @@
</supports>]]></screen></term>
<listitem>
<para>
- The <computeroutput><supports></computeroutput> element allows you to declare all the markup types your portlet supports in the <literal>render</literal> method. This is accomplished via the
- <computeroutput><mime-type></computeroutput> element, which is required for every portlet. The declared MIME types must match the capability of the portlet. As well, it allows you to pair which modes and window states are supported for each markup type. All portlets must support the VIEW portlet mode, so this does not have to be declared. Use <computeroutput><mime-type></computeroutput> to define which markup type your portlet supports, which in this example, is <computeroutput>text/html</computeroutput>. This section tells the portal that it will only output text and HTML, and that it only supports the <computeroutput>VIEW</computeroutput> mode.
+ The <computeroutput><supports></computeroutput> element allows you to declare all of the markup types your portlet supports in the <literal>render</literal> method. This is accomplished via the
+ <computeroutput><mime-type></computeroutput> element, which is required for every portlet. The declared MIME types must match the capability of the portlet. As well, it allows you to pair which modes and window states are supported for each markup type. All portlets must support the VIEW portlet mode, so this does not have to be declared. Use the <computeroutput><mime-type></computeroutput> element to define which markup type your portlet supports, which in this example, is <computeroutput>text/html</computeroutput>. This section tells the portal that it will only output text and HTML, and that it only supports the <computeroutput>VIEW</computeroutput> mode.
</para>
</listitem>
</varlistentry>
@@ -1453,6 +1454,7 @@
<managed-bean-class>org.jboss.portlet.hello.bean.User</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+
<navigation-rule>
<navigation-case>
<from-outcome>done</from-outcome>
@@ -1477,7 +1479,7 @@
</screen>
</para>
<para>
- These extra parameters let the application server know that the portlet embeds its own libraries. This avoids collision with the Sun JSF RI libraries bundled with JBoss AS And JBoss EAP. For more information, refer to the <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossFaces">Apache MyFaces page on the JBoss Wiki</ulink>.
+ These extra parameters let the application server know that the portlet embeds its own libraries. This avoids collision with the Sun JSF RI libraries bundled with JBoss AS and JBoss EAP. For more information, refer to the <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossFaces">Apache MyFaces page on the JBoss Wiki</ulink>.
</para>
</sect3>
<sect3>
@@ -1552,8 +1554,7 @@
</para>
<para>
Performing this step on a running instance of JBoss AS or JBoss EAP, and JBoss Portal, will trigger a hot-deploy of the portlet.
- </para>
- <para>
+ </para><para>
To see the HelloWorldJSFMyFaces42Portlet, navigate to <ulink url="http://localhost:8080/portal/"></ulink>, or, if the default JBoss Portal page is already open, refresh the page. HelloWorldJSFMyFaces42Portlet is added to the bottom of the default JBoss Portal page:
</para>
<para>
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r10021 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-02-18 19:32:26 -0500 (Mon, 18 Feb 2008)
New Revision: 10021
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
Log:
minor spelling corrections, eg porlet/portlet
5.2.4. An example Apache MyFaces JSF Portlet
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-19 00:12:35 UTC (rev 10020)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-19 00:32:26 UTC (rev 10021)
@@ -1431,9 +1431,9 @@
</para>
<para>
<note>
- <title>Adding Functionality to an Apache MyFaces JSF Porlet</title>
+ <title>Adding Functionality to an Apache MyFaces JSF Portlet</title>
<para>
- To add functionality to an Apache MyFaces JSF Porlet, sub-class it and create your own class.
+ To add functionality to an Apache MyFaces JSF Portlet, sub-class it and create your own class.
</para>
</note>
</para>
@@ -1481,7 +1481,7 @@
</para>
</sect3>
<sect3>
- <title>Building your Apache MyFaces JSF Porlet</title>
+ <title>Building your Apache MyFaces JSF Portlet</title>
<para>
The <filename>HelloWorldJSFMyFaces42Portlet.zip</filename> file contains a pre-compiled <filename>helloworldjsfmyfacesportlet.war</filename> file; however, to manually build the <filename>helloworldjsfmyfacesportlet.war</filename> file:
</para>
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r10020 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-02-18 19:12:35 -0500 (Mon, 18 Feb 2008)
New Revision: 10020
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
Log:
revising and adding content to make consistent:
5.2.4.4. Building your Apache MyFaces JSF Porlet
5.2.4.5. Deploying your Apache MyFaces JSF Portlet
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-18 23:41:34 UTC (rev 10019)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-02-19 00:12:35 UTC (rev 10020)
@@ -1547,16 +1547,30 @@
</sect3>
<sect3>
<title>Deploying your Apache MyFaces JSF Portlet</title>
- <para>
- Deploying the portlet is as easy as copying/moving the <literal>helloworldjsfmyfacesportlet.war</literal> file
- to the server <literal>deploy</literal> directory. We can then see our portlet on the Portal default
- page (<ulink url="http://localhost:8080/portal/">http://localhost:8080/portal/</ulink>):
- <mediaobject>
- <imageobject>
- <imagedata align="center" fileref="images/tutorials/jsf_portlet/output.png" valign="middle"/>
- </imageobject>
- </mediaobject>
- </para>
+ <para>
+ If you did not expand the <filename>helloworldjsfmyfacesportlet.war</filename> file, copy the <filename>HelloWorldJSFMyFaces42Portlet/helloworldjsfmyfacesportlet.war</filename> file into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. If you expanded the <filename>helloworldjsfmyfacesportlet.war</filename> file, copy the <filename>HelloWorldJSFMyFaces42Portlet/output/lib/exploded/helloworldjsfmyfacesportlet.war/</filename> directory into the correct JBoss AS or JBoss EAP <filename>deploy/</filename> directory. For example, if you are using JBoss AS, copy the WAR file or the expanded directory into the <filename>$JBOSS_HOME/server/default/deploy/</filename> directory.
+ </para>
+ <para>
+ Performing this step on a running instance of JBoss AS or JBoss EAP, and JBoss Portal, will trigger a hot-deploy of the portlet.
+ </para>
+ <para>
+ To see the HelloWorldJSFMyFaces42Portlet, navigate to <ulink url="http://localhost:8080/portal/"></ulink>, or, if the default JBoss Portal page is already open, refresh the page. HelloWorldJSFMyFaces42Portlet is added to the bottom of the default JBoss Portal page:
+ </para>
+ <para>
+ <mediaobject>
+ <imageobject>
+ <imagedata align="center" fileref="images/tutorials/jsf_portlet/output.png" valign="middle"/>
+ </imageobject>
+ </mediaobject>
+ </para>
+ <para>
+ To re-deploy the portlet, for example, if you have made changes to any of the application descriptors, touch the <filename>$JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldjsfmyfacesportlet.war/WEB-INF/web.xml</filename> file. This will only work if you copied the <filename>HelloWorldJSFMyFaces42Portlet/output/lib/exploded/helloworldjsfmyfacesportlet.war/</filename> directory into the JBoss AS or JBoss EAP <filename>deploy/</filename> directory. On Linux, run the following command to re-deploy the HelloWorldJSFMyFaces42Portlet:
+ </para>
+ <para>
+<screen>
+touch $JBOSS_HOME/server/<replaceable>configuration</replaceable>/deploy/helloworldjsfmyfacesportlet.war/WEB-INF/web.xml
+</screen>
+ </para>
</sect3>
</sect2>
<!-- sect2>
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r10019 - in modules/portlet/trunk: portlet/src/main/java/org/jboss/portal/portlet/container and 5 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-18 18:41:34 -0500 (Mon, 18 Feb 2008)
New Revision: 10019
Added:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainerContext.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletApplication.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletContainer.java
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletApplication.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletApplicationContext.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainer.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.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/PortletContainerImpl.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
modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml
modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml
Log:
preliminary work on the "Rewrite Portlet Container component lifecycle SPI" task, did some cleanup for now
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 2008-02-18 13:08:46 UTC (rev 10018)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 2008-02-18 23:41:34 UTC (rev 10019)
@@ -47,6 +47,7 @@
{
protected Object invoke(PortletInvocation invocation) throws Exception, InvocationException
{
+/*
PortletContainer container = (PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PortletContainerInvoker.PORTLET_CONTAINER);
Valve valve = container.getValve();
@@ -83,5 +84,8 @@
{
return new UnavailableResponse();
}
+*/
+
+ return invocation.invokeNext();
}
}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletApplication.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletApplication.java 2008-02-18 13:08:46 UTC (rev 10018)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletApplication.java 2008-02-18 23:41:34 UTC (rev 10019)
@@ -22,10 +22,10 @@
******************************************************************************/
package org.jboss.portal.portlet.container;
-import java.util.Set;
+import java.util.Collection;
/**
- * A portlet application.
+ * A portlet application exposed for management.
*
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 6733 $
@@ -40,31 +40,49 @@
String getId();
/**
- * Return the set of components part of this web application.
+ * Set the context required by that application.
*
- * @return the set of portlet containers
+ * @param context the context
*/
- Set<PortletContainer> getPortletContainers();
+ void setContext(PortletApplicationContext context);
/**
- * Return a specific portlet container.
+ * Returns the context related to this application.
*
- * @return a portlet container
+ * @return the context
*/
- PortletContainer getPortletContainer(String id);
+ PortletApplicationContext getContext();
/**
- * Return the porlet application context.
+ * Wire a container.
*
- * @return the context
+ * @param container the container
*/
- PortletApplicationContext getContext();
-
void addContainer(PortletContainer container);
+ /**
+ * Unwire a container.
+ *
+ * @param container the container
+ */
void removeContainer(PortletContainer container);
/**
+ * Returns the set of related portlet containers.
+ *
+ * @return the portlet containers
+ */
+ Collection<PortletContainer> getPortletContainers();
+
+ /**
+ * Returns a specific container or null if it does not exist
+ *
+ * @param containerId the container id
+ * @return the portlet container
+ */
+ PortletContainer getPortletContainer(String containerId);
+
+ /**
* Starts the application only. It does not take care of starting its components.
*
* @throws Exception any exception preventing the start
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletApplicationContext.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletApplicationContext.java 2008-02-18 13:08:46 UTC (rev 10018)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletApplicationContext.java 2008-02-18 23:41:34 UTC (rev 10019)
@@ -25,7 +25,7 @@
import javax.servlet.ServletContext;
/**
- * The context provided to a portlet application. For now it manages the application external resources
+ * The context provided to a portlet application by its envronment. For now it manages the application external resources
* such as the servlet context and the application classloader. It manages also the life cycle of the
* application and its components.
*
@@ -57,25 +57,13 @@
/**
* Start the portlet application and its components.
+ *
+ * @throws Exception any exception
*/
- void startPortletApplication() throws Exception;
+ void invokeStart() throws Exception;
/**
* Stop the portlet application and its components.
*/
- void stopPortletApplication();
-
- /**
- * Start a portlet container.
- *
- * @param portletName the container name
- */
- void startPortletContainer(String portletName) throws Exception;
-
- /**
- * Stop a portlet container.
- *
- * @param portletName the container name
- */
- void stopPortletContainer(String portletName);
+ void invokeStop();
}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainer.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainer.java 2008-02-18 13:08:46 UTC (rev 10018)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainer.java 2008-02-18 23:41:34 UTC (rev 10019)
@@ -51,21 +51,33 @@
PortletInfo getInfo();
/**
- * Return the portlet application of this container.
+ * Wire the application.
*
+ * @param application the related application
+ */
+ void setApplication(PortletApplication application);
+
+ /**
+ * Returns the wired application.
+ *
* @return the application
*/
PortletApplication getApplication();
- void setApplication(PortletApplication application);
-
/**
+ * Wire the portlet container context.
*
+ * @param context the context
*/
- Valve getValve();
+ void setContext(PortletContainerContext context);
/**
+ * Invoke the portlet container.
*
+ * @param invocation the portlet invocation
+ * @return the portlet invocation response
+ * @throws PortletInvokerException a portlet invoker exception
+ * @throws InvocationException an invocation exception
*/
PortletInvocationResponse dispatch(PortletInvocation invocation) throws PortletInvokerException, InvocationException;
Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainerContext.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainerContext.java (rev 0)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/container/PortletContainerContext.java 2008-02-18 23:41:34 UTC (rev 10019)
@@ -0,0 +1,44 @@
+/******************************************************************************
+ * 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.container;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public interface PortletContainerContext
+{
+
+ /**
+ * Start the portlet container.
+ *
+ * @throws Exception any exception
+ */
+ void invokeStart() throws Exception;
+
+ /**
+ * Stop the portlet container.
+ */
+ void invokeStop();
+
+}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java 2008-02-18 13:08:46 UTC (rev 10018)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/container/PortletApplicationContextImpl.java 2008-02-18 23:41:34 UTC (rev 10019)
@@ -95,7 +95,7 @@
// PortletApplicationContext implementation *************************************************************************
- public void startPortletApplication() throws Exception
+ public void invokeStart() throws Exception
{
throw new FixMe("Not used anymore for now, check or reimplement in 2.6");
/*
@@ -141,7 +141,7 @@
*/
}
- public void stopPortletApplication()
+ public void invokeStop()
{
// if the portlet application wasn't properly started, we shouldn't be trying to stop it
if (portletApp != null)
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-18 13:08:46 UTC (rev 10018)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java 2008-02-18 23:41:34 UTC (rev 10019)
@@ -73,9 +73,6 @@
phaseToType.put(LifeCyclePhase.RESOURCE, ResourceFilter.class);
}
- /** Logger. */
- protected final Logger log;
-
/** . */
protected final ContainerPortletApplicationInfo info;
@@ -86,11 +83,14 @@
protected final JBossApplicationMetaData jbossMetaData;
/** . */
- protected final PortletApplicationContext context;
+ protected final PortletAPIFactory portletAPIFactory;
/** . */
- protected final PortletAPIFactory portletAPIFactory;
+ protected PortletApplicationContext context;
+ /** Logger. */
+ protected Logger log;
+
/** . */
protected LinkedHashMap<String, PortletContainer> portlets;
@@ -113,7 +113,6 @@
ContainerPortletApplicationInfo info,
PortletApplication10MetaData metaData,
JBossApplicationMetaData jbossMetaData,
- PortletApplicationContext context,
PortletAPIFactory portletAPIFactory)
{
this.info = info;
@@ -121,8 +120,12 @@
this.jbossMetaData = jbossMetaData;
this.portletAPIFactory = portletAPIFactory;
this.portlets = new LinkedHashMap<String, PortletContainer>();
+ this.log = Logger.getLogger(PortletApplication.class);
+ }
+
+ public void setContext(PortletApplicationContext context)
+ {
this.context = context;
- this.log = Logger.getLogger("org.jboss.portal.portlet.application." + context.getContextPath().replace('.', '_'));
}
public String getId()
@@ -164,10 +167,11 @@
public void start() throws Exception
{
+// this.log = Logger.getLogger(PortletApplication.class.getName() + "." + context.getContextPath().replace('.', '_'));
+
PortletContextImpl portletContext = new PortletContextImpl(context.getServletContext());
//
- //
List<PortletURLGenerationListener> listeners = Collections.emptyList();
for (ContainerListenerInfo listenerInfo : info.getListeners())
{
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2008-02-18 13:08:46 UTC (rev 10018)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java 2008-02-18 23:41:34 UTC (rev 10019)
@@ -30,6 +30,7 @@
import org.jboss.portal.portlet.container.PortletApplication;
import org.jboss.portal.portlet.container.PortletContainer;
import org.jboss.portal.portlet.container.PortletInitializationException;
+import org.jboss.portal.portlet.container.PortletContainerContext;
import org.jboss.portal.portlet.impl.jsr168.api.ActionRequestImpl;
import org.jboss.portal.portlet.impl.jsr168.api.ActionResponseImpl;
import org.jboss.portal.portlet.impl.jsr168.api.PortletConfigImpl;
@@ -135,6 +136,9 @@
/** . */
private List<ResourceFilter> resourceFilterList;
+ /** . */
+ private PortletContainerContext context;
+
/**
* The preference validator, this is not exposed as runtime meta data as it is only used by the JSR 168 portlet
* container implementation.
@@ -155,6 +159,11 @@
this.started = false;
}
+ public void setContext(PortletContainerContext context)
+ {
+ this.context = context;
+ }
+
public ContainerPortletInfo getInfo()
{
if (started)
Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletApplication.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletApplication.java (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletApplication.java 2008-02-18 23:41:34 UTC (rev 10019)
@@ -0,0 +1,120 @@
+/******************************************************************************
+ * 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.test;
+
+import org.jboss.portal.portlet.container.PortletApplicationContext;
+import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl;
+import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory;
+import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo;
+import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
+import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
+import org.jboss.portal.web.WebApp;
+import org.jboss.portal.common.NotYetImplemented;
+
+import javax.servlet.ServletContext;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class ManagedPortletApplication implements PortletApplicationContext
+{
+
+ /** . */
+ private final WebApp webApp;
+
+ /** . */
+ final PortletApplicationImpl portletApplication;
+
+ /** . */
+ private final Map<String, ManagedPortletContainer> managedPortletContainers;
+
+ public ManagedPortletApplication(
+ ContainerPortletApplicationInfo portletApplicationInfo,
+ PortletApplication10MetaData portletApplicationMetaData,
+ JBossApplicationMetaData jbossApplicationMetaData,
+ PortletAPIFactory portletAPIFactory,
+ WebApp webApp)
+ {
+ this.webApp = webApp;
+ this.portletApplication = new PortletApplicationImpl(
+ portletApplicationInfo,
+ portletApplicationMetaData,
+ jbossApplicationMetaData,
+ portletAPIFactory);
+ this.managedPortletContainers = new HashMap<String, ManagedPortletContainer>();
+ }
+
+ public void addManagedPortletContainer(ManagedPortletContainer managedPortletContainer)
+ {
+ managedPortletContainers.put(managedPortletContainer.portletContainer.getId(), managedPortletContainer);
+ portletApplication.addContainer(managedPortletContainer.portletContainer);
+ }
+
+ public void removeManagedPortletContainer(ManagedPortletContainer managedPortletContainer)
+ {
+ portletApplication.removeContainer(managedPortletContainer.portletContainer);
+ managedPortletContainers.remove(managedPortletContainer.portletContainer.getId());
+ }
+
+ public void start() throws Exception
+ {
+ portletApplication.setContext(this);
+ portletApplication.start();
+ }
+
+ public void stop()
+ {
+ portletApplication.stop();
+ portletApplication.setContext(null);
+ }
+
+ // PortletApplicationContext ****************************************************************************************
+
+ public ServletContext getServletContext()
+ {
+ return webApp.getServletContext();
+ }
+
+ public String getContextPath()
+ {
+ return webApp.getContextPath();
+ }
+
+ public ClassLoader getClassLoader()
+ {
+ return webApp.getClassLoader();
+ }
+
+ public void invokeStart() throws Exception
+ {
+ throw new NotYetImplemented();
+ }
+
+ public void invokeStop()
+ {
+ throw new NotYetImplemented();
+ }
+}
Added: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletContainer.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletContainer.java (rev 0)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/ManagedPortletContainer.java 2008-02-18 23:41:34 UTC (rev 10019)
@@ -0,0 +1,91 @@
+/******************************************************************************
+ * 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.test;
+
+import org.jboss.portal.portlet.container.PortletContainerContext;
+import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl;
+import org.jboss.portal.portlet.impl.info.ContainerPortletInfo;
+import org.jboss.portal.common.NotYetImplemented;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class ManagedPortletContainer implements PortletContainerContext
+{
+
+ /** . */
+ final PortletContainerImpl portletContainer;
+
+ /** . */
+ private ManagedPortletApplication managedPortletApplication;
+
+ public ManagedPortletContainer(ContainerPortletInfo portletInfo)
+ {
+ portletContainer = new PortletContainerImpl(portletInfo);
+ }
+
+ public ManagedPortletApplication getManagedPortletApplication()
+ {
+ return managedPortletApplication;
+ }
+
+ public void setManagedPortletApplication(ManagedPortletApplication managedPortletApplication)
+ {
+ if (managedPortletApplication != null)
+ {
+ portletContainer.setApplication(managedPortletApplication.portletApplication);
+ }
+ else
+ {
+ portletContainer.setApplication(null);
+ }
+
+ //
+ this.managedPortletApplication = managedPortletApplication;
+ }
+
+ public void start() throws Exception
+ {
+ portletContainer.setContext(this);
+ portletContainer.start();
+ }
+
+ public void stop()
+ {
+ portletContainer.stop();
+ portletContainer.setContext(null);
+ }
+
+ //
+
+ public void invokeStart() throws Exception
+ {
+ throw new NotYetImplemented();
+ }
+
+ public void invokeStop()
+ {
+ throw new NotYetImplemented();
+ }
+}
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-18 13:08:46 UTC (rev 10018)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployer.java 2008-02-18 23:41:34 UTC (rev 10019)
@@ -100,8 +100,8 @@
private ClassLoader classLoader;
/** . */
- private final Map<PortletApplication, PortletApplicationRegistrationContext> registrationContextMap =
- new HashMap<PortletApplication, PortletApplicationRegistrationContext>();
+ private final Map<ManagedPortletApplication, PortletApplicationRegistrationContext> registrationContextMap =
+ new HashMap<ManagedPortletApplication, PortletApplicationRegistrationContext>();
public PortletApplicationRegistry getRegistry()
{
@@ -165,7 +165,7 @@
Kernel kernel = controllerContext.getKernel();
PortletApplicationDeployment deployment = new PortletApplicationDeployment(kernel, webApp, metaData);
deploymentMap.put(webApp.getContextPath(), deployment);
- deployment.start();
+ deployment.install();
}
finally
{
@@ -183,7 +183,7 @@
try
{
Thread.currentThread().setContextClassLoader(classLoader);
- deployment.stop();
+ deployment.uninstall();
}
finally
{
@@ -270,29 +270,36 @@
}
/** Called by MC to install application. */
- public void installPortletApplication(PortletApplication application)
+ public void addManagedPortletApplication(ManagedPortletApplication managedPortletApplication)
{
- PortletApplicationRegistrationContext context = registry.registerPortletApplication(application);
- registrationContextMap.put(application, context);
+ PortletApplication portletApplication = managedPortletApplication.portletApplication;
+ PortletApplicationRegistrationContext context = registry.registerPortletApplication(portletApplication);
+ registrationContextMap.put(managedPortletApplication, context);
+
}
/** Called by MC to install container. */
- public void installPortletContainer(PortletContainer container)
+ public void addManagedPortletContainer(ManagedPortletContainer managedPortletContainer)
{
- PortletApplicationRegistrationContext context = registrationContextMap.get(container.getApplication());
- context.registerPortlet(container);
+ ManagedPortletApplication managedPortletApplication = managedPortletContainer.getManagedPortletApplication();
+ PortletApplicationRegistrationContext context = registrationContextMap.get(managedPortletApplication);
+ PortletContainer portletContainer = managedPortletContainer.portletContainer;
+ context.registerPortlet(portletContainer);
}
/** Called by MC to uninstall application. */
- public void uninstallPortletApplication(PortletApplication application)
+ public void removeManagedPortletApplication(ManagedPortletApplication managedPortletApplication)
{
- registry.unregisterPortletApplication(application);
+ PortletApplication portletApplication = managedPortletApplication.portletApplication;
+ registry.unregisterPortletApplication(portletApplication);
}
/** Called by MC to uninstall container. */
- public void uninstallPortletContainer(PortletContainer container)
+ public void removeManagedPortletContainer(ManagedPortletContainer managedPortletContainer)
{
- PortletApplicationRegistrationContext context = registrationContextMap.get(container.getApplication());
- context.unregisterPortlet(container);
+ ManagedPortletApplication managedPortletApplication = managedPortletContainer.getManagedPortletApplication();
+ PortletApplicationRegistrationContext context = registrationContextMap.get(managedPortletApplication);
+ PortletContainer portletContainer = managedPortletContainer.portletContainer;
+ context.unregisterPortlet(portletContainer);
}
}
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-18 13:08:46 UTC (rev 10018)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2008-02-18 23:41:34 UTC (rev 10019)
@@ -26,34 +26,29 @@
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
-import org.jboss.beans.metadata.plugins.AbstractInstallMetaData;
import org.jboss.beans.metadata.plugins.AbstractLifecycleMetaData;
import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
+import org.jboss.beans.metadata.plugins.AbstractInstallMetaData;
import org.jboss.beans.metadata.plugins.ThisValueMetaData;
-import org.jboss.beans.metadata.spi.InstallMetaData;
import org.jboss.beans.metadata.spi.ParameterMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
+import org.jboss.beans.metadata.spi.InstallMetaData;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.portal.common.NotYetImplemented;
import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.portlet.container.PortletApplicationContext;
import org.jboss.portal.portlet.impl.info.ContainerInfoBuilder;
import org.jboss.portal.portlet.impl.info.ContainerInfoBuilderContext;
import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo;
import org.jboss.portal.portlet.impl.info.ContainerPortletInfo;
import org.jboss.portal.portlet.impl.jsr168.ContainerInfoBuilderContextImpl;
-import org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl;
-import org.jboss.portal.portlet.impl.jsr168.PortletContainerImpl;
import org.jboss.portal.portlet.impl.jsr168.spi.PortletAPIFactory;
import org.jboss.portal.portlet.impl.metadata.PortletApplication10MetaData;
import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
import org.jboss.portal.web.WebApp;
-import javax.servlet.ServletContext;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
@@ -63,7 +58,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public class PortletApplicationDeployment implements PortletApplicationContext
+public class PortletApplicationDeployment
{
/** . */
@@ -81,14 +76,14 @@
/** . */
private final LinkedHashMap<String, KernelControllerContext> installed;
- /** . */
-// private KernelControllerContext portletApplicationControllerContext;
+// /** . */
+//// private KernelControllerContext portletApplicationControllerContext;
+//
+// /** . */
+//// private List<KernelControllerContext> portletContainerControllerContexts = new ArrayList<KernelControllerContext>();
+//
+// /** . */
- /** . */
-// private List<KernelControllerContext> portletContainerControllerContexts = new ArrayList<KernelControllerContext>();
-
- /** . */
-
public PortletApplicationDeployment(Kernel kernel, WebApp webApp, PortletApplication10MetaData metaData)
{
this.kernel = kernel;
@@ -98,9 +93,48 @@
this.installed = new LinkedHashMap<String, KernelControllerContext>();
}
- void start()
+ public AbstractBeanMetaData createManagedPortletContainerMetaData(String managedPortletContainerId, ContainerPortletInfo portletInfo)
{
+ AbstractBeanMetaData beanMD = new AbstractBeanMetaData(managedPortletContainerId, ManagedPortletContainer.class.getName());
+ //
+ AbstractConstructorMetaData ctorMD = new AbstractConstructorMetaData();
+ ctorMD.setParameters(Tools.toList((ParameterMetaData)new AbstractParameterMetaData(ContainerPortletInfo.class.getName(), portletInfo)));
+ beanMD.setConstructor(ctorMD);
+
+ //
+ beanMD.setStart(new AbstractLifecycleMetaData("start"));
+ beanMD.setStop(new AbstractLifecycleMetaData("stop"));
+
+ //
+ return beanMD;
+ }
+
+ public AbstractBeanMetaData createManagedPortletApplicationMetaData(ContainerPortletApplicationInfo portletApplicationInfo, String managedPortletApplicationId)
+ {
+ AbstractBeanMetaData beanMD = new AbstractBeanMetaData(managedPortletApplicationId, ManagedPortletApplication.class.getName());
+
+ //
+ AbstractConstructorMetaData ctorMD = new AbstractConstructorMetaData();
+ ctorMD.setParameters(Tools.toList(
+ (ParameterMetaData)new AbstractParameterMetaData(ContainerPortletApplicationInfo.class.getName(), portletApplicationInfo),
+ new AbstractParameterMetaData(PortletApplication10MetaData.class.getName(), metaData),
+ new AbstractParameterMetaData(JBossApplicationMetaData.class.getName(), (Object)null),
+ new AbstractParameterMetaData(PortletAPIFactory.class.getName(), new AbstractDependencyValueMetaData("PortletAPIFactory")),
+ new AbstractParameterMetaData(WebApp.class.getName(), webApp)));
+ beanMD.setConstructor(ctorMD);
+
+ //
+ beanMD.setStart(new AbstractLifecycleMetaData("start"));
+ beanMD.setStop(new AbstractLifecycleMetaData("stop"));
+
+ //
+ return beanMD;
+ }
+
+ void install()
+ {
+
log.debug("Starting installation");
//
@@ -110,6 +144,9 @@
String portletApplicationId = "PortletApplication[" + webApp.getContextPath() + "]";
//
+ String managedPortletApplicationId = "ManagedPortletApplication[" + webApp.getContextPath() + "]";
+
+ //
ContainerInfoBuilderContext builderContext = new ContainerInfoBuilderContextImpl(metaData, webApp);
ContainerInfoBuilder builder = new ContainerInfoBuilder(metaData, builderContext);
builder.build();
@@ -121,71 +158,127 @@
for (ContainerPortletInfo containerInfo : builder.getPortlets())
{
//
- String portletContainerId = "PortletContainer[" + webApp.getContextPath() + "," + containerInfo.getName() + "]";
+ String managedPortletContainerId = "ManagedPortletContainer[" + webApp.getContextPath() + "," + containerInfo.getName() + "]";
//
- AbstractBeanMetaData portletBMD = new AbstractBeanMetaData(portletContainerId, PortletContainerImpl.class.getName());
- AbstractConstructorMetaData ctormd = new AbstractConstructorMetaData();
- ctormd.setParameters(Tools.toList((ParameterMetaData)new AbstractParameterMetaData(ContainerPortletInfo.class.getName(), containerInfo)));
- portletBMD.setConstructor(ctormd);
- portletBMD.setStart(new AbstractLifecycleMetaData("start"));
- portletBMD.setStop(new AbstractLifecycleMetaData("stop"));
- portletBMD.setProperties(Collections.singleton((PropertyMetaData)new AbstractPropertyMetaData("application", new AbstractDependencyValueMetaData(portletApplicationId))));
- AbstractInstallMetaData deployerinstallmd = new AbstractInstallMetaData();
- deployerinstallmd.setBean("PortletApplicationDeployer");
- deployerinstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
- deployerinstallmd.setMethodName("installPortletContainer");
- AbstractInstallMetaData applicationinstallmd = new AbstractInstallMetaData();
- applicationinstallmd.setBean(portletApplicationId);
- applicationinstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
- applicationinstallmd.setMethodName("addContainer");
- portletBMD.setInstalls(Tools.toList((InstallMetaData)deployerinstallmd, applicationinstallmd));
- AbstractInstallMetaData deployeruninstallmd = new AbstractInstallMetaData();
- deployeruninstallmd.setBean("PortletApplicationDeployer");
- deployeruninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
- deployeruninstallmd.setMethodName("uninstallPortletContainer");
- AbstractInstallMetaData applicationuninstallmd = new AbstractInstallMetaData();
- applicationuninstallmd.setBean(portletApplicationId);
- applicationuninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
- applicationuninstallmd.setMethodName("removeContainer");
- portletBMD.setUninstalls(Tools.toList((InstallMetaData)deployeruninstallmd, applicationuninstallmd));
- toInstall.add(portletBMD);
+ AbstractBeanMetaData managedPortletContainerMD = createManagedPortletContainerMetaData(managedPortletContainerId, containerInfo);
+
+/*
+ // Inject the managed portlet container and the portlet application in the portlet container
+ AbstractDependencyValueMetaData portletContainerContextDependencyMD = new AbstractDependencyValueMetaData(managedPortletContainerId);
+ portletContainerContextDependencyMD.setDependentState(ControllerState.INSTANTIATED);
+ AbstractDependencyValueMetaData portletApplicationDependencyMD = new AbstractDependencyValueMetaData(portletApplicationId);
+ portletApplicationDependencyMD.setDependentState(ControllerState.INSTALLED);
+ portletContainerMD.setProperties(Tools.toSet(
+ (PropertyMetaData)new AbstractPropertyMetaData("context", portletContainerContextDependencyMD),
+ new AbstractPropertyMetaData("application", portletApplicationDependencyMD)));
+
+ // Inject the portlet container in the managed portlet container
+ AbstractDependencyValueMetaData portletContainerDependencyMD = new AbstractDependencyValueMetaData(portletContainerId);
+ portletContainerDependencyMD.setDependentState(ControllerState.INSTALLED);
+ managedPortletContainerMD.setProperties(Tools.toSet((PropertyMetaData)new AbstractPropertyMetaData("peer", portletContainerDependencyMD)));
+
+ // Install the portlet container on the managed portlet container and on the portlet application
+ AbstractInstallMetaData installPortletContainerMD = new AbstractInstallMetaData();
+ installPortletContainerMD.setBean(portletApplicationId);
+ installPortletContainerMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
+ installPortletContainerMD.setMethodName("addContainer");
+ portletContainerMD.setInstalls(Tools.toList((InstallMetaData)installPortletContainerMD));
+
+ // Uninstall the portlet container from the managed portlet container and from the portlet application
+ AbstractInstallMetaData uninstallPortletContainerMD = new AbstractInstallMetaData();
+ uninstallPortletContainerMD.setBean(portletApplicationId);
+ uninstallPortletContainerMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
+ uninstallPortletContainerMD.setMethodName("removeContainer");
+ portletContainerMD.setUninstalls(Tools.toList((InstallMetaData)uninstallPortletContainerMD));
+
+ // Install the managed portlet container on the portlet application deployer
+ AbstractInstallMetaData installManagedPortletContainerMD = new AbstractInstallMetaData();
+ installManagedPortletContainerMD.setBean("PortletApplicationDeployer");
+ installManagedPortletContainerMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
+ installManagedPortletContainerMD.setMethodName("installManagedPortletContainer");
+ managedPortletContainerMD.setInstalls(Collections.singletonList((InstallMetaData)installManagedPortletContainerMD));
+
+ // Uninstall the managed portlet container from the portlet application deployer
+ AbstractInstallMetaData uninstallManagedPortletCotainerMD = new AbstractInstallMetaData();
+ uninstallManagedPortletCotainerMD.setBean("PortletApplicationDeployer");
+ uninstallManagedPortletCotainerMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
+ uninstallManagedPortletCotainerMD.setMethodName("uninstallManagedPortletContainer");
+ managedPortletContainerMD.setUninstalls(Collections.singletonList((InstallMetaData)uninstallManagedPortletCotainerMD));
+*/
+
+ // Inject the managed portlet application in the managed portlet container
+ AbstractDependencyValueMetaData managedPortletApplicationDependencyMD = new AbstractDependencyValueMetaData(managedPortletApplicationId);
+ managedPortletContainerMD.setProperties(Tools.toSet((PropertyMetaData)new AbstractPropertyMetaData("managedPortletApplication", managedPortletApplicationDependencyMD)));
+
+ // Install the managed portlet container on the managed portlet application
+ AbstractInstallMetaData installManagedPortletContainerMD = new AbstractInstallMetaData();
+ installManagedPortletContainerMD.setBean(managedPortletApplicationId);
+ installManagedPortletContainerMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
+ installManagedPortletContainerMD.setMethodName("addManagedPortletContainer");
+ managedPortletContainerMD.setInstalls(Collections.singletonList((InstallMetaData)installManagedPortletContainerMD));
+
+ // Uninstall the managed portlet container from the managed portlet application
+ AbstractInstallMetaData uninstallManagedPortletContainerMD = new AbstractInstallMetaData();
+ uninstallManagedPortletContainerMD.setBean(managedPortletApplicationId);
+ uninstallManagedPortletContainerMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
+ uninstallManagedPortletContainerMD.setMethodName("removeManagedPortletContainer");
+ managedPortletContainerMD.setUninstalls(Collections.singletonList((InstallMetaData)uninstallManagedPortletContainerMD));
+
+ //
+ toInstall.add(managedPortletContainerMD);
}
//
- AbstractBeanMetaData applicationBMD = new AbstractBeanMetaData(portletApplicationId, PortletApplicationImpl.class.getName());
- AbstractConstructorMetaData ctormd = new AbstractConstructorMetaData();
- ctormd.setParameters(Tools.toList(
- (ParameterMetaData)new AbstractParameterMetaData(ContainerPortletApplicationInfo.class.getName(), builder.getApplication()),
- new AbstractParameterMetaData(PortletApplication10MetaData.class.getName(), metaData),
- new AbstractParameterMetaData(JBossApplicationMetaData.class.getName(), (Object)null),
- new AbstractParameterMetaData(PortletApplicationContext.class.getName(), this),
- new AbstractParameterMetaData(PortletAPIFactory.class.getName(), new AbstractDependencyValueMetaData("PortletAPIFactory"))));
- applicationBMD.setConstructor(ctormd);
- applicationBMD.setStart(new AbstractLifecycleMetaData("start"));
- applicationBMD.setStop(new AbstractLifecycleMetaData("stop"));
- AbstractInstallMetaData installmd = new AbstractInstallMetaData();
- installmd.setBean("PortletApplicationDeployer");
- installmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
- installmd.setMethodName("installPortletApplication");
- applicationBMD.setInstalls(Collections.singletonList((InstallMetaData)installmd));
- AbstractInstallMetaData uninstallmd = new AbstractInstallMetaData();
- uninstallmd.setBean("PortletApplicationDeployer");
- uninstallmd.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
- uninstallmd.setMethodName("uninstallPortletApplication");
- applicationBMD.setUninstalls(Collections.singletonList((InstallMetaData)uninstallmd));
- toInstall.add(applicationBMD);
+ AbstractBeanMetaData managedPortletApplicationMD = createManagedPortletApplicationMetaData(builder.getApplication(), managedPortletApplicationId);
+/*
+ // Inject the managed portlet application in the portlet application
+ AbstractDependencyValueMetaData portletApplicationContextDependencyMD = new AbstractDependencyValueMetaData(managedPortletApplicationId);
+ portletApplicationContextDependencyMD.setDependentState(ControllerState.INSTANTIATED);
+ portletApplicationMD.setProperties(Collections.singleton((PropertyMetaData)new AbstractPropertyMetaData("context", portletApplicationContextDependencyMD)));
+
+ // Inject the portlet application managed portlet application
+ AbstractDependencyValueMetaData portletApplicationDependencyMD = new AbstractDependencyValueMetaData(portletApplicationId);
+ portletApplicationDependencyMD.setDependentState(ControllerState.INSTALLED);
+ managedPortletApplicationMD.setProperties(Tools.toSet((PropertyMetaData)new AbstractPropertyMetaData("peer", portletApplicationDependencyMD)));
+
+ // Install the managed portlet application on the portlet application deployer
+ AbstractInstallMetaData installManagedPortletApplicationMD = new AbstractInstallMetaData();
+ installManagedPortletApplicationMD.setBean("PortletApplicationDeployer");
+ installManagedPortletApplicationMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
+ installManagedPortletApplicationMD.setMethodName("installManagedPortletApplication");
+ managedPortletApplicationMD.setInstalls(Collections.singletonList((InstallMetaData)installManagedPortletApplicationMD));
+
+ // Uninstall the managed portlet application from the portlet application deployer
+ AbstractInstallMetaData uninstallManagedPortletApplicationMD = new AbstractInstallMetaData();
+ uninstallManagedPortletApplicationMD.setBean("PortletApplicationDeployer");
+ uninstallManagedPortletApplicationMD.setParameters(Collections.singletonList((ParameterMetaData)new AbstractParameterMetaData(new ThisValueMetaData())));
+ uninstallManagedPortletApplicationMD.setMethodName("uninstallManagedPortletApplication");
+ managedPortletApplicationMD.setUninstalls(Collections.singletonList((InstallMetaData)uninstallManagedPortletApplicationMD));
+*/
+
//
+ toInstall.add(managedPortletApplicationMD);
+// toInstall.add(portletApplicationMD);
+
+ // Install beans
for (AbstractBeanMetaData beanMetaData : toInstall)
{
String beanName = beanMetaData.getName();
try
{
+// beanMetaData.setMode(ControllerMode.MANUAL);
+
+ //
log.debug("Installing bean " + beanName);
KernelControllerContext kcc = controller.install(beanMetaData);
+
+ //
installed.put(beanName, kcc);
log.debug("Installed bean " + beanName);
+
+ //
logBeanFailure(kcc);
}
catch (Throwable throwable)
@@ -209,17 +302,8 @@
}
}
- private void logBeanFailure(KernelControllerContext context)
+ void uninstall()
{
- Throwable t = context.getError();
- if (t != null)
- {
- log.debug("Installation of bean " + context.getName() + " produced an error", t);
- }
- }
-
- void stop()
- {
log.debug("Uninstalling");
//
@@ -252,53 +336,12 @@
// portletContainerControllerContexts = null;
}
- public ServletContext getServletContext()
+ private void logBeanFailure(KernelControllerContext context)
{
- return webApp.getServletContext();
+ Throwable t = context.getError();
+ if (t != null)
+ {
+ log.debug("Installation of bean " + context.getName() + " produced an error", t);
+ }
}
-
- public ClassLoader getClassLoader()
- {
- return webApp.getClassLoader();
- }
-
- public void startPortletApplication() throws Exception
- {
- throw new NotYetImplemented();
-// try
-// {
-// kernel.getController().change(portletApplicationControllerContext, ControllerState.INSTALLED);
-// }
-// catch (Throwable throwable)
-// {
-// }
- }
-
- public void stopPortletApplication()
- {
- throw new NotYetImplemented();
-// try
-// {
-// kernel.getController().change(portletApplicationControllerContext, ControllerState.CREATE);
-// }
-// catch (Throwable throwable)
-// {
-// throwable.printStackTrace();
-// }
- }
-
- public void startPortletContainer(String portletName) throws Exception
- {
- throw new NotYetImplemented();
- }
-
- public void stopPortletContainer(String portletName)
- {
- throw new NotYetImplemented();
- }
-
- public String getContextPath()
- {
- return webApp.getContextPath();
- }
}
Modified: modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-02-18 13:08:46 UTC (rev 10018)
+++ modules/portlet/trunk/test/src/test/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2008-02-18 23:41:34 UTC (rev 10019)
@@ -42,6 +42,10 @@
<property name="registry"><inject bean="PortletApplicationRegistry"/></property>
<property name="servletContainer"><inject bean="ServletContainer"/></property>
<property name="driver"><inject bean="TestDriverServer"/></property>
+ <incallback method="addManagedPortletApplication"/>
+ <uncallback method="removeManagedPortletApplication"/>
+ <incallback method="addManagedPortletContainer"/>
+ <uncallback method="removeManagedPortletContainer"/>
</bean>
<bean name="PortletAPIFactory" class="org.jboss.portal.portlet.impl.jsr168.PortletAPIFactoryImpl"/>
Modified: modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml
===================================================================
--- modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-02-18 13:08:46 UTC (rev 10018)
+++ modules/portlet/trunk/test/src/test/resources/simple-portal-war/WEB-INF/jboss-beans.xml 2008-02-18 23:41:34 UTC (rev 10019)
@@ -30,6 +30,10 @@
<bean name="PortletApplicationDeployer" class="org.jboss.portal.portlet.test.PortletApplicationDeployer">
<property name="registry"><inject bean="PortletApplicationRegistry"/></property>
<property name="servletContainer"><inject bean="ServletContainer"/></property>
+ <incallback method="addManagedPortletApplication"/>
+ <uncallback method="removeManagedPortletApplication"/>
+ <incallback method="addManagedPortletContainer"/>
+ <uncallback method="removeManagedPortletContainer"/>
</bean>
<bean name="PortletAPIFactory" class="org.jboss.portal.portlet.impl.jsr168.PortletAPIFactoryImpl"/>
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r10018 - in modules/portlet/trunk/controller/src: test/java/org/jboss/portal/portlet/controller and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-18 08:08:46 -0500 (Mon, 18 Feb 2008)
New Revision: 10018
Modified:
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java
Log:
- correctly implement the new controller event dispatching options.
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-18 12:32:40 UTC (rev 10017)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-18 13:08:46 UTC (rev 10018)
@@ -107,46 +107,39 @@
UpdateNavigationalStateResponse stateResponse = (UpdateNavigationalStateResponse)response;
// Create event list and feed it with the events that may have been produced
- LinkedList<Event> eventQueue = new LinkedList<Event>();
+ LinkedList<Event> srcEventQueue = new LinkedList<Event>();
for (UpdateNavigationalStateResponse.Event portletEvent : stateResponse.getEvents())
{
Event producedEvent = new Event(portletEvent.getName(), portletEvent.getPayload(), portletRequest.getWindowId());
- List<Event> consumedEvents = eventCC.getConsumedEvents(producedEvent);
- eventQueue.addAll(consumedEvents);
+ srcEventQueue.add(producedEvent);
}
// Deliver events
- while (eventQueue.size() > 0)
+ while (srcEventQueue.size() > 0)
{
- Event event = eventQueue.removeFirst();
+ Event srcEvent = srcEventQueue.removeFirst();
//
- String targetId = event.getWindowId();
+ String srcId = srcEvent.getWindowId();
//
- PortletInfo targetPortletInfo = context.getPortletInfo(targetId);
+ PortletInfo srcPortletInfo = context.getPortletInfo(srcId);
//
- if (targetPortletInfo == null)
+ if (srcPortletInfo == null)
{
- if (log.isTraceEnabled())
- {
- log.trace("Cannot deliver event " + event +" because the target of the event does not have a portlet info");
- }
+ log.trace("Cannot deliver event " + srcEvent +" because the source does not have portlet info");
//
continue;
}
//
- if (!controller.getDistributeNonConsumableEvents())
+ if (!controller.getDistributeNonProduceableEvents())
{
- if (!targetPortletInfo.getEventing().getConsumedEvents().containsKey(event.getName()))
+ if (!srcPortletInfo.getEventing().getProducedEvents().containsKey(srcEvent.getName()))
{
- if (log.isTraceEnabled())
- {
- log.trace("Cannot deliver event " + event +" because the target of the event does not accept the event name");
- }
+ log.trace("Cannot deliver event " + srcEvent +" because the source of the event does not produce the event name");
//
continue;
@@ -154,39 +147,77 @@
}
//
- PortletInvocationResponse eventResponse = deliverEvent(context, event, pageState, requestProperties.getCookies());
+ List<Event> dstEvents = eventCC.getConsumedEvents(srcEvent);
//
- if (eventResponse instanceof UpdateNavigationalStateResponse)
+ for (Event dstEvent : dstEvents)
{
- UpdateNavigationalStateResponse eventStateResponse = (UpdateNavigationalStateResponse)eventResponse;
+ String dstId = dstEvent.getWindowId();
- // Update ns
- updateNavigationalState(context, event.getWindowId(), eventStateResponse, pageState);
+ //
+ PortletInfo dstPortletInfo = context.getPortletInfo(dstId);
- // Add events if any
- for (UpdateNavigationalStateResponse.Event portletEvent : eventStateResponse.getEvents())
+
+ //
+ if (dstPortletInfo == null)
{
- Event producedEvent = new Event(portletEvent.getName(), portletEvent.getPayload(), event.getWindowId());
- List<Event> consumedEvents = eventCC.getConsumedEvents(producedEvent);
- eventQueue.addAll(consumedEvents);
+ if (log.isTraceEnabled())
+ {
+ log.trace("Cannot deliver event " + srcEvent +" because the target of the event does not have a portlet info");
+ }
+
+ //
+ continue;
}
//
- ResponseProperties updateProperties = eventStateResponse.getProperties();
- if (updateProperties != null)
+ if (!controller.getDistributeNonConsumableEvents())
{
- requestProperties.append(updateProperties);
+ if (!dstPortletInfo.getEventing().getConsumedEvents().containsKey(dstEvent.getName()))
+ {
+ if (log.isTraceEnabled())
+ {
+ log.trace("Cannot deliver event " + srcEvent +" because the target of the event does not accept the event name");
+ }
+
+ //
+ continue;
+ }
}
+
+ //
+ PortletInvocationResponse eventResponse = deliverEvent(context, dstEvent, pageState, requestProperties.getCookies());
+
+ //
+ if (eventResponse instanceof UpdateNavigationalStateResponse)
+ {
+ UpdateNavigationalStateResponse eventStateResponse = (UpdateNavigationalStateResponse)eventResponse;
+
+ // Update ns
+ updateNavigationalState(context, dstEvent.getWindowId(), eventStateResponse, pageState);
+
+ // Add events to source event queue
+ for (UpdateNavigationalStateResponse.Event portletEvent : eventStateResponse.getEvents())
+ {
+ srcEventQueue.add(new Event(portletEvent.getName(), portletEvent.getPayload(), dstEvent.getWindowId()));
+ }
+
+ //
+ ResponseProperties updateProperties = eventStateResponse.getProperties();
+ if (updateProperties != null)
+ {
+ requestProperties.append(updateProperties);
+ }
+ }
+ else if (eventResponse instanceof ErrorResponse)
+ {
+ // Do something here !!!!
+ }
+ else
+ {
+ // Do something here !!!!
+ }
}
- else if (eventResponse instanceof ErrorResponse)
- {
- // Do something here !!!!
- }
- else
- {
- // Do something here !!!!
- }
}
//
Modified: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java
===================================================================
--- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2008-02-18 12:32:40 UTC (rev 10017)
+++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2008-02-18 13:08:46 UTC (rev 10018)
@@ -139,8 +139,8 @@
PortletSupport barPortlet = invoker.addPortlet("bar");
//
- EventProducerAction fooEventProducer = new EventProducerAction(srcName);
- NoOpEventProcessor fooEventConsumer = new NoOpEventProcessor();
+ EventProducerAction eventProducer = new EventProducerAction(srcName);
+ NoOpEventProcessor eventConsumer = new NoOpEventProcessor();
// Create wire
context.getEventControllerContext().createWire(srcName, "foo", dstName, "bar");
@@ -155,16 +155,18 @@
);
//
+ controller.setDistributeNonProduceableEvents(true);
controller.setDistributeNonConsumableEvents(true);
- fooPortlet.addHandler(fooEventProducer);
- barPortlet.addHandler(fooEventConsumer);
+ fooPortlet.addHandler(eventProducer);
+ barPortlet.addHandler(eventConsumer);
controller.process(context, request);
fooPortlet.assertInvocationCountIs(1);
barPortlet.assertInvocationCountIs(1);
//
+ controller.setDistributeNonProduceableEvents(true);
controller.setDistributeNonConsumableEvents(false);
- fooPortlet.addHandler(fooEventProducer);
+ fooPortlet.addHandler(eventProducer);
controller.process(context, request);
fooPortlet.assertInvocationCountIs(2);
barPortlet.assertInvocationCountIs(1);
@@ -173,20 +175,59 @@
barPortlet.getInfo().getEventing().addConsumedEvent(new EventInfoSupport(dstName));
//
+ controller.setDistributeNonProduceableEvents(true);
controller.setDistributeNonConsumableEvents(true);
- fooPortlet.addHandler(fooEventProducer);
- barPortlet.addHandler(fooEventConsumer);
+ fooPortlet.addHandler(eventProducer);
+ barPortlet.addHandler(eventConsumer);
controller.process(context, request);
fooPortlet.assertInvocationCountIs(3);
barPortlet.assertInvocationCountIs(2);
//
+ controller.setDistributeNonProduceableEvents(true);
controller.setDistributeNonConsumableEvents(false);
- fooPortlet.addHandler(fooEventProducer);
- barPortlet.addHandler(fooEventConsumer);
+ fooPortlet.addHandler(eventProducer);
+ barPortlet.addHandler(eventConsumer);
controller.process(context, request);
fooPortlet.assertInvocationCountIs(4);
barPortlet.assertInvocationCountIs(3);
+
+ //
+ controller.setDistributeNonProduceableEvents(false);
+ controller.setDistributeNonConsumableEvents(true);
+ fooPortlet.addHandler(eventProducer);
+ controller.process(context, request);
+ fooPortlet.assertInvocationCountIs(5);
+ barPortlet.assertInvocationCountIs(3);
+
+ //
+ controller.setDistributeNonProduceableEvents(false);
+ controller.setDistributeNonConsumableEvents(false);
+ fooPortlet.addHandler(eventProducer);
+ controller.process(context, request);
+ fooPortlet.assertInvocationCountIs(6);
+ barPortlet.assertInvocationCountIs(3);
+
+ //
+ fooPortlet.getInfo().getEventing().addProducedEvent(new EventInfoSupport(srcName));
+
+ //
+ controller.setDistributeNonProduceableEvents(false);
+ controller.setDistributeNonConsumableEvents(true);
+ fooPortlet.addHandler(eventProducer);
+ barPortlet.addHandler(eventConsumer);
+ controller.process(context, request);
+ fooPortlet.assertInvocationCountIs(7);
+ barPortlet.assertInvocationCountIs(4);
+
+ //
+ controller.setDistributeNonProduceableEvents(false);
+ controller.setDistributeNonConsumableEvents(false);
+ fooPortlet.addHandler(eventProducer);
+ barPortlet.addHandler(eventConsumer);
+ controller.process(context, request);
+ fooPortlet.assertInvocationCountIs(8);
+ barPortlet.assertInvocationCountIs(5);
}
private static class EventProducerAction extends PortletSupport.ActionHandler
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r10016 - modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-18 06:35:05 -0500 (Mon, 18 Feb 2008)
New Revision: 10016
Removed:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/
Log:
remove empty dir
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r10015 - in modules/portlet/trunk/portlet/src: test/java/org/jboss/portal/portlet/support and 2 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-18 06:31:11 -0500 (Mon, 18 Feb 2008)
New Revision: 10015
Added:
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CacheInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/MetaInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ModeInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ParameterInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferenceInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SessionInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/TypeInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/WindowStateInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/ClientContextSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/RequestContextSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java
Removed:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CacheInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/MetaInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ModeInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ParameterInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferenceInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SessionInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/TypeInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/WindowStateInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/ClientContextSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/RequestContextSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java
Log:
move org.jboss.portal.portlet.support classes to test jar as they are targetted for writing test cases and should not be used as basis for real implementations
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info (from rev 10000, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info)
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CacheInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/CacheInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CacheInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,56 +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.support.info;
-
-import org.jboss.portal.portlet.info.CacheInfo;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5448 $
- */
-public class CacheInfoSupport implements CacheInfo
-{
-
- /** . */
- private int expirationTimeMillis;
-
- public CacheInfoSupport(int expirationTimeMillis)
- {
- this.expirationTimeMillis = expirationTimeMillis;
- }
-
- public CacheInfoSupport()
- {
- this(0);
- }
-
- public int getExpirationSecs()
- {
- return expirationTimeMillis;
- }
-
- public void setExpirationTimeMillis(int expirationTimeMillis)
- {
- this.expirationTimeMillis = expirationTimeMillis;
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CacheInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/CacheInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CacheInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CacheInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,56 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.portlet.info.CacheInfo;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5448 $
+ */
+public class CacheInfoSupport implements CacheInfo
+{
+
+ /** . */
+ private int expirationTimeMillis;
+
+ public CacheInfoSupport(int expirationTimeMillis)
+ {
+ this.expirationTimeMillis = expirationTimeMillis;
+ }
+
+ public CacheInfoSupport()
+ {
+ this(0);
+ }
+
+ public int getExpirationSecs()
+ {
+ return expirationTimeMillis;
+ }
+
+ public void setExpirationTimeMillis(int expirationTimeMillis)
+ {
+ this.expirationTimeMillis = expirationTimeMillis;
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,123 +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.support.info;
-
-import org.jboss.portal.portlet.info.CapabilitiesInfo;
-import org.jboss.portal.portlet.info.ModeInfo;
-import org.jboss.portal.portlet.info.WindowStateInfo;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Collections;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class CapabilitiesInfoSupport implements CapabilitiesInfo
-{
-
- /** . */
- private Set<String> mimeTypes;
-
- /** . */
- private Set<ModeInfo> modes;
-
- /** . */
- private Set<WindowStateInfo> windowStates;
-
- /** . */
- private Set<Locale> locales;
-
- public CapabilitiesInfoSupport()
- {
- mimeTypes = new HashSet<String>();
- mimeTypes.add("text/html");
-
- //
- this.modes = new HashSet<ModeInfo>();
- modes.add(new ModeInfoSupport(Mode.VIEW));
- modes.add(new ModeInfoSupport(Mode.EDIT));
- modes.add(new ModeInfoSupport(Mode.HELP));
-
- //
- this.windowStates = new HashSet<WindowStateInfo>();
- windowStates.add(new WindowStateInfoSupport(WindowState.NORMAL));
- windowStates.add(new WindowStateInfoSupport(WindowState.MAXIMIZED));
- windowStates.add(new WindowStateInfoSupport(WindowState.MINIMIZED));
-
- //
- locales = new HashSet<Locale>();
- locales.add(Locale.ENGLISH);
- }
-
- public Set<String> getMimeTypes()
- {
- return mimeTypes;
- }
-
- public Set<ModeInfo> getAllModes()
- {
- return modes;
- }
-
- public Set<ModeInfo> getModes(String mimeType)
- {
- if (mimeTypes.contains(mimeType))
- {
- return modes;
- }
- return Collections.emptySet();
- }
-
- public Set<WindowStateInfo> getAllWindowStates()
- {
- return windowStates;
- }
-
- public Set<WindowStateInfo> getWindowStates(String mimeType)
- {
- if (mimeTypes.contains(mimeType))
- {
- return windowStates;
- }
- return Collections.emptySet();
- }
-
- public Set<Locale> getAllLocales()
- {
- return locales;
- }
-
- public Set<Locale> getLocales(String mimeType)
- {
- if (mimeTypes.contains(mimeType))
- {
- return locales;
- }
- return Collections.emptySet();
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/CapabilitiesInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,123 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.portlet.info.CapabilitiesInfo;
+import org.jboss.portal.portlet.info.ModeInfo;
+import org.jboss.portal.portlet.info.WindowStateInfo;
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Collections;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class CapabilitiesInfoSupport implements CapabilitiesInfo
+{
+
+ /** . */
+ private Set<String> mimeTypes;
+
+ /** . */
+ private Set<ModeInfo> modes;
+
+ /** . */
+ private Set<WindowStateInfo> windowStates;
+
+ /** . */
+ private Set<Locale> locales;
+
+ public CapabilitiesInfoSupport()
+ {
+ mimeTypes = new HashSet<String>();
+ mimeTypes.add("text/html");
+
+ //
+ this.modes = new HashSet<ModeInfo>();
+ modes.add(new ModeInfoSupport(Mode.VIEW));
+ modes.add(new ModeInfoSupport(Mode.EDIT));
+ modes.add(new ModeInfoSupport(Mode.HELP));
+
+ //
+ this.windowStates = new HashSet<WindowStateInfo>();
+ windowStates.add(new WindowStateInfoSupport(WindowState.NORMAL));
+ windowStates.add(new WindowStateInfoSupport(WindowState.MAXIMIZED));
+ windowStates.add(new WindowStateInfoSupport(WindowState.MINIMIZED));
+
+ //
+ locales = new HashSet<Locale>();
+ locales.add(Locale.ENGLISH);
+ }
+
+ public Set<String> getMimeTypes()
+ {
+ return mimeTypes;
+ }
+
+ public Set<ModeInfo> getAllModes()
+ {
+ return modes;
+ }
+
+ public Set<ModeInfo> getModes(String mimeType)
+ {
+ if (mimeTypes.contains(mimeType))
+ {
+ return modes;
+ }
+ return Collections.emptySet();
+ }
+
+ public Set<WindowStateInfo> getAllWindowStates()
+ {
+ return windowStates;
+ }
+
+ public Set<WindowStateInfo> getWindowStates(String mimeType)
+ {
+ if (mimeTypes.contains(mimeType))
+ {
+ return windowStates;
+ }
+ return Collections.emptySet();
+ }
+
+ public Set<Locale> getAllLocales()
+ {
+ return locales;
+ }
+
+ public Set<Locale> getLocales(String mimeType)
+ {
+ if (mimeTypes.contains(mimeType))
+ {
+ return locales;
+ }
+ return Collections.emptySet();
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,111 +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.support.info;
-
-import org.jboss.portal.portlet.info.EventInfo;
-import org.jboss.portal.portlet.info.TypeInfo;
-import org.jboss.portal.common.i18n.LocalizedString;
-
-import javax.xml.namespace.QName;
-import java.util.Collection;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class EventInfoSupport implements EventInfo
-{
-
- /** . */
- private QName name;
-
- /** . */
- private TypeInfoSupport type;
-
- /** . */
- private LocalizedString displayName;
-
- /** . */
- private LocalizedString description;
-
- /** . */
- private List<QName> aliases;
-
- public EventInfoSupport(QName name, TypeInfoSupport type)
- {
- this.name = name;
- this.type = type;
- this.aliases = new ArrayList<QName>();
- this.displayName = new LocalizedString("Event " + name);
- this.description = new LocalizedString("Description of event " + name);
- }
-
- public EventInfoSupport(QName name, String type)
- {
- this.name = name;
- this.type = new TypeInfoSupport(type);
- this.aliases = new ArrayList<QName>();
- }
-
- public QName getName()
- {
- return name;
- }
-
- public TypeInfo getType()
- {
- return type;
- }
-
- public LocalizedString getDisplayName()
- {
- return displayName;
- }
-
- public LocalizedString getDescription()
- {
- return description;
- }
-
- public Collection<QName> getAliases()
- {
- return aliases;
- }
-
- public void setDisplayName(LocalizedString displayName)
- {
- this.displayName = displayName;
- }
-
- public void setDescription(LocalizedString description)
- {
- this.description = description;
- }
-
- public void addAlias(QName alias)
- {
- aliases.add(alias);
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,120 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.portlet.info.EventInfo;
+import org.jboss.portal.portlet.info.TypeInfo;
+import org.jboss.portal.common.i18n.LocalizedString;
+
+import javax.xml.namespace.QName;
+import java.util.Collection;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class EventInfoSupport implements EventInfo
+{
+
+ /** . */
+ private QName name;
+
+ /** . */
+ private TypeInfoSupport type;
+
+ /** . */
+ private LocalizedString displayName;
+
+ /** . */
+ private LocalizedString description;
+
+ /** . */
+ private List<QName> aliases;
+
+ public EventInfoSupport(QName name)
+ {
+ this.name = name;
+ this.type = null;
+ this.aliases = new ArrayList<QName>();
+ this.displayName = new LocalizedString("Event " + name);
+ this.description = new LocalizedString("Description of event " + name);
+ }
+
+ public EventInfoSupport(QName name, TypeInfoSupport type)
+ {
+ this.name = name;
+ this.type = type;
+ this.aliases = new ArrayList<QName>();
+ this.displayName = new LocalizedString("Event " + name);
+ this.description = new LocalizedString("Description of event " + name);
+ }
+
+ public EventInfoSupport(QName name, String type)
+ {
+ this.name = name;
+ this.type = new TypeInfoSupport(type);
+ this.aliases = new ArrayList<QName>();
+ }
+
+ public QName getName()
+ {
+ return name;
+ }
+
+ public TypeInfo getType()
+ {
+ return type;
+ }
+
+ public LocalizedString getDisplayName()
+ {
+ return displayName;
+ }
+
+ public LocalizedString getDescription()
+ {
+ return description;
+ }
+
+ public Collection<QName> getAliases()
+ {
+ return aliases;
+ }
+
+ public void setDisplayName(LocalizedString displayName)
+ {
+ this.displayName = displayName;
+ }
+
+ public void setDescription(LocalizedString description)
+ {
+ this.description = description;
+ }
+
+ public void addAlias(QName alias)
+ {
+ aliases.add(alias);
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,70 +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.support.info;
-
-import org.jboss.portal.portlet.info.EventingInfo;
-
-import javax.xml.namespace.QName;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class EventingInfoSupport implements EventingInfo
-{
-
- /** . */
- private Map<QName, EventInfoSupport> producedEvents;
-
- /** . */
- private Map<QName, EventInfoSupport> consumedEvents;
-
- public EventingInfoSupport()
- {
- producedEvents = new HashMap<QName, EventInfoSupport>();
- consumedEvents = new HashMap<QName, EventInfoSupport>();
- }
-
- public void addProducedEvent(EventInfoSupport event)
- {
- producedEvents.put(event.getName(), event);
- }
-
- public void addConsumedEvent(EventInfoSupport event)
- {
- producedEvents.put(event.getName(), event);
- }
-
- public Map<QName, EventInfoSupport> getProducedEvents()
- {
- return Collections.unmodifiableMap(producedEvents);
- }
-
- public Map<QName, EventInfoSupport> getConsumedEvents()
- {
- return Collections.unmodifiableMap(consumedEvents);
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,70 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.portlet.info.EventingInfo;
+
+import javax.xml.namespace.QName;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class EventingInfoSupport implements EventingInfo
+{
+
+ /** . */
+ private Map<QName, EventInfoSupport> producedEvents;
+
+ /** . */
+ private Map<QName, EventInfoSupport> consumedEvents;
+
+ public EventingInfoSupport()
+ {
+ producedEvents = new HashMap<QName, EventInfoSupport>();
+ consumedEvents = new HashMap<QName, EventInfoSupport>();
+ }
+
+ public void addProducedEvent(EventInfoSupport event)
+ {
+ producedEvents.put(event.getName(), event);
+ }
+
+ public void addConsumedEvent(EventInfoSupport event)
+ {
+ consumedEvents.put(event.getName(), event);
+ }
+
+ public Map<QName, EventInfoSupport> getProducedEvents()
+ {
+ return Collections.unmodifiableMap(producedEvents);
+ }
+
+ public Map<QName, EventInfoSupport> getConsumedEvents()
+ {
+ return Collections.unmodifiableMap(consumedEvents);
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/MetaInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/MetaInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/MetaInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,98 +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.support.info;
-
-import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.portlet.info.MetaInfo;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class MetaInfoSupport implements MetaInfo
-{
-
- /** . */
- private Map values = new HashMap();
-
- public LocalizedString getMetaValue(String key)
- {
- if (key == null)
- {
- throw new IllegalArgumentException();
- }
- return (LocalizedString)values.get(key);
- }
-
- public void addValue(String key, Locale locale, String value)
- {
- if (key == null)
- {
- throw new IllegalArgumentException();
- }
- LocalizedString string = new LocalizedString(value, locale);
- if (values.put(key, string) != null)
- {
- throw new IllegalStateException("Already existing");
- }
- }
-
- public void setTitle(String name)
- {
- addValue(MetaInfo.TITLE, Locale.ENGLISH, name);
- }
-
- public void setShortTitle(String name)
- {
- addValue(MetaInfo.SHORT_TITLE, Locale.ENGLISH, name);
- }
-
- public void setKeywords(String name)
- {
- addValue(MetaInfo.KEYWORDS, Locale.ENGLISH, name);
- }
-
- public void setDisplayName(String name)
- {
- addValue(MetaInfo.DISPLAY_NAME, Locale.ENGLISH, name);
- }
-
- public void setDescription(String name)
- {
- addValue(MetaInfo.DESCRIPTION, Locale.ENGLISH, name);
- }
-
- public String getDisplayName()
- {
- LocalizedString string = getMetaValue(MetaInfo.DISPLAY_NAME);
- if (string == null)
- {
- throw new IllegalStateException();
- }
- return string.getString(Locale.ENGLISH, true);
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/MetaInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/MetaInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/MetaInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/MetaInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,98 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.portlet.info.MetaInfo;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class MetaInfoSupport implements MetaInfo
+{
+
+ /** . */
+ private Map values = new HashMap();
+
+ public LocalizedString getMetaValue(String key)
+ {
+ if (key == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ return (LocalizedString)values.get(key);
+ }
+
+ public void addValue(String key, Locale locale, String value)
+ {
+ if (key == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ LocalizedString string = new LocalizedString(value, locale);
+ if (values.put(key, string) != null)
+ {
+ throw new IllegalStateException("Already existing");
+ }
+ }
+
+ public void setTitle(String name)
+ {
+ addValue(MetaInfo.TITLE, Locale.ENGLISH, name);
+ }
+
+ public void setShortTitle(String name)
+ {
+ addValue(MetaInfo.SHORT_TITLE, Locale.ENGLISH, name);
+ }
+
+ public void setKeywords(String name)
+ {
+ addValue(MetaInfo.KEYWORDS, Locale.ENGLISH, name);
+ }
+
+ public void setDisplayName(String name)
+ {
+ addValue(MetaInfo.DISPLAY_NAME, Locale.ENGLISH, name);
+ }
+
+ public void setDescription(String name)
+ {
+ addValue(MetaInfo.DESCRIPTION, Locale.ENGLISH, name);
+ }
+
+ public String getDisplayName()
+ {
+ LocalizedString string = getMetaValue(MetaInfo.DISPLAY_NAME);
+ if (string == null)
+ {
+ throw new IllegalStateException();
+ }
+ return string.getString(Locale.ENGLISH, true);
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ModeInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/ModeInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ModeInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,64 +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.support.info;
-
-import org.jboss.portal.Mode;
-import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.portlet.info.ModeInfo;
-
-import java.util.Locale;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5448 $
- */
-public class ModeInfoSupport implements ModeInfo
-{
-
- /** . */
- private final LocalizedString description;
-
- /** . */
- private final Mode mode;
-
- public ModeInfoSupport(Mode mode)
- {
- this.description = new LocalizedString(mode + " mode", Locale.ENGLISH);
- this.mode = mode;
- }
-
- public LocalizedString getDescription()
- {
- return description;
- }
-
- public Mode getMode()
- {
- return mode;
- }
-
- public String getModeName()
- {
- return mode.toString();
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ModeInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/ModeInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ModeInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ModeInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,64 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.Mode;
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.portlet.info.ModeInfo;
+
+import java.util.Locale;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5448 $
+ */
+public class ModeInfoSupport implements ModeInfo
+{
+
+ /** . */
+ private final LocalizedString description;
+
+ /** . */
+ private final Mode mode;
+
+ public ModeInfoSupport(Mode mode)
+ {
+ this.description = new LocalizedString(mode + " mode", Locale.ENGLISH);
+ this.mode = mode;
+ }
+
+ public LocalizedString getDescription()
+ {
+ return description;
+ }
+
+ public Mode getMode()
+ {
+ return mode;
+ }
+
+ public String getModeName()
+ {
+ return mode.toString();
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,61 +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.support.info;
-
-import org.jboss.portal.portlet.info.NavigationInfo;
-import org.jboss.portal.portlet.info.ParameterInfo;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.LinkedHashMap;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class NavigationInfoSupport implements NavigationInfo
-{
-
- /** . */
- private final Map<String, ParameterInfoSupport> publicParameters;
-
- public NavigationInfoSupport()
- {
- publicParameters = new LinkedHashMap<String, ParameterInfoSupport>();
- }
-
- public void addPublicParameter(ParameterInfoSupport parameter)
- {
- publicParameters.put(parameter.getId(), parameter);
- }
-
- public ParameterInfo getPublicParameter(String id)
- {
- return publicParameters.get(id);
- }
-
- public Collection<? extends ParameterInfo> getPublicParameters()
- {
- return publicParameters.values();
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/NavigationInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,61 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.portlet.info.NavigationInfo;
+import org.jboss.portal.portlet.info.ParameterInfo;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.LinkedHashMap;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class NavigationInfoSupport implements NavigationInfo
+{
+
+ /** . */
+ private final Map<String, ParameterInfoSupport> publicParameters;
+
+ public NavigationInfoSupport()
+ {
+ publicParameters = new LinkedHashMap<String, ParameterInfoSupport>();
+ }
+
+ public void addPublicParameter(ParameterInfoSupport parameter)
+ {
+ publicParameters.put(parameter.getId(), parameter);
+ }
+
+ public ParameterInfo getPublicParameter(String id)
+ {
+ return publicParameters.get(id);
+ }
+
+ public Collection<? extends ParameterInfo> getPublicParameters()
+ {
+ return publicParameters.values();
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ParameterInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/ParameterInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ParameterInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,89 +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.support.info;
-
-import org.jboss.portal.portlet.info.ParameterInfo;
-import org.jboss.portal.common.i18n.LocalizedString;
-
-import javax.xml.namespace.QName;
-import java.util.Collection;
-import java.util.List;
-import java.util.ArrayList;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class ParameterInfoSupport implements ParameterInfo
-{
-
- /** . */
- private final String id;
-
- /** . */
- private final QName name;
-
- /** . */
- private LocalizedString description;
-
- /** . */
- private List<QName> aliases;
-
- public ParameterInfoSupport(String id, QName name)
- {
- this.id = id;
- this.name = name;
- this.aliases = new ArrayList<QName>();
- this.description = new LocalizedString("Description of event " + name);
- }
-
- public String getId()
- {
- return id;
- }
-
- public QName getName()
- {
- return name;
- }
-
- public LocalizedString getDescription()
- {
- return description;
- }
-
- public Collection<QName> getAliases()
- {
- return aliases;
- }
-
- public void setDescription(LocalizedString description)
- {
- this.description = description;
- }
-
- public void addAlias(QName alias)
- {
- aliases.add(alias);
- }
-}
\ No newline at end of file
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ParameterInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/ParameterInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ParameterInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/ParameterInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,89 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.portlet.info.ParameterInfo;
+import org.jboss.portal.common.i18n.LocalizedString;
+
+import javax.xml.namespace.QName;
+import java.util.Collection;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class ParameterInfoSupport implements ParameterInfo
+{
+
+ /** . */
+ private final String id;
+
+ /** . */
+ private final QName name;
+
+ /** . */
+ private LocalizedString description;
+
+ /** . */
+ private List<QName> aliases;
+
+ public ParameterInfoSupport(String id, QName name)
+ {
+ this.id = id;
+ this.name = name;
+ this.aliases = new ArrayList<QName>();
+ this.description = new LocalizedString("Description of event " + name);
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public QName getName()
+ {
+ return name;
+ }
+
+ public LocalizedString getDescription()
+ {
+ return description;
+ }
+
+ public Collection<QName> getAliases()
+ {
+ return aliases;
+ }
+
+ public void setDescription(LocalizedString description)
+ {
+ this.description = description;
+ }
+
+ public void addAlias(QName alias)
+ {
+ aliases.add(alias);
+ }
+}
\ No newline at end of file
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,115 +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.support.info;
-
-import org.jboss.portal.portlet.info.CapabilitiesInfo;
-import org.jboss.portal.portlet.info.PortletInfo;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5448 $
- */
-public class PortletInfoSupport implements PortletInfo
-{
-
- private String name;
- private String applicationName;
- private Boolean remotable;
- private PreferencesInfoSupport preferencesSupport = new PreferencesInfoSupport();
- private SecurityInfoSupport securitySupport = new SecurityInfoSupport();
- private CacheInfoSupport cacheSupport = new CacheInfoSupport();
- private SessionInfoSupport sessionSupport = new SessionInfoSupport();
- private MetaInfoSupport metaSupport = new MetaInfoSupport();
- private EventingInfoSupport eventsSupport = new EventingInfoSupport();
- private NavigationInfoSupport navigationSupport = new NavigationInfoSupport();
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public String getApplicationName()
- {
- return applicationName;
- }
-
- public void setApplicationName(String applicationName)
- {
- this.applicationName = applicationName;
- }
-
- public CapabilitiesInfo getCapabilities()
- {
- throw new UnsupportedOperationException("Implement me");
- }
-
- public PreferencesInfoSupport getPreferences()
- {
- return preferencesSupport;
- }
-
- public MetaInfoSupport getMeta()
- {
- return metaSupport;
- }
-
- public SecurityInfoSupport getSecurity()
- {
- return securitySupport;
- }
-
- public CacheInfoSupport getCache()
- {
- return cacheSupport;
- }
-
- public SessionInfoSupport getSession()
- {
- return sessionSupport;
- }
-
- public Boolean isRemotable()
- {
- return remotable;
- }
-
- public void setRemotable(Boolean remotable)
- {
- this.remotable = remotable;
- }
-
- public EventingInfoSupport getEventing()
- {
- return eventsSupport;
- }
-
- public NavigationInfoSupport getNavigation()
- {
- return navigationSupport;
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,115 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.portlet.info.CapabilitiesInfo;
+import org.jboss.portal.portlet.info.PortletInfo;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5448 $
+ */
+public class PortletInfoSupport implements PortletInfo
+{
+
+ private String name;
+ private String applicationName;
+ private Boolean remotable;
+ private PreferencesInfoSupport preferencesSupport = new PreferencesInfoSupport();
+ private SecurityInfoSupport securitySupport = new SecurityInfoSupport();
+ private CacheInfoSupport cacheSupport = new CacheInfoSupport();
+ private SessionInfoSupport sessionSupport = new SessionInfoSupport();
+ private MetaInfoSupport metaSupport = new MetaInfoSupport();
+ private EventingInfoSupport eventsSupport = new EventingInfoSupport();
+ private NavigationInfoSupport navigationSupport = new NavigationInfoSupport();
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public String getApplicationName()
+ {
+ return applicationName;
+ }
+
+ public void setApplicationName(String applicationName)
+ {
+ this.applicationName = applicationName;
+ }
+
+ public CapabilitiesInfo getCapabilities()
+ {
+ throw new UnsupportedOperationException("Implement me");
+ }
+
+ public PreferencesInfoSupport getPreferences()
+ {
+ return preferencesSupport;
+ }
+
+ public MetaInfoSupport getMeta()
+ {
+ return metaSupport;
+ }
+
+ public SecurityInfoSupport getSecurity()
+ {
+ return securitySupport;
+ }
+
+ public CacheInfoSupport getCache()
+ {
+ return cacheSupport;
+ }
+
+ public SessionInfoSupport getSession()
+ {
+ return sessionSupport;
+ }
+
+ public Boolean isRemotable()
+ {
+ return remotable;
+ }
+
+ public void setRemotable(Boolean remotable)
+ {
+ this.remotable = remotable;
+ }
+
+ public EventingInfoSupport getEventing()
+ {
+ return eventsSupport;
+ }
+
+ public NavigationInfoSupport getNavigation()
+ {
+ return navigationSupport;
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferenceInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/PreferenceInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferenceInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,99 +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.support.info;
-
-import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.portlet.info.PreferenceInfo;
-
-import java.util.Locale;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5448 $
- */
-public class PreferenceInfoSupport implements PreferenceInfo
-{
-
- /** . */
- private final String key;
-
- /** . */
- private LocalizedString displayName;
-
- /** . */
- private LocalizedString description;
-
- /** . */
- private Boolean readOnly;
-
- public PreferenceInfoSupport(String key)
- {
- this.key = key;
- this.displayName = new LocalizedString("Display name of " + key, Locale.ENGLISH);
- this.description = new LocalizedString("Description of " + key, Locale.ENGLISH);
- this.readOnly = null;
- }
-
- public PreferenceInfoSupport(String key, Boolean readOnly)
- {
- this.key = key;
- this.displayName = new LocalizedString("Display name of " + key, Locale.ENGLISH);
- this.description = new LocalizedString("Description of " + key, Locale.ENGLISH);
- this.readOnly = readOnly;
- }
-
- public String getKey()
- {
- return key;
- }
-
- public LocalizedString getDisplayName()
- {
- return displayName;
- }
-
- public LocalizedString getDescription()
- {
- return description;
- }
-
- public Boolean isReadOnly()
- {
- return readOnly;
- }
-
- public void setReadOnly(Boolean readOnly)
- {
- this.readOnly = readOnly;
- }
-
- public void setDisplayName(LocalizedString displayName)
- {
- this.displayName = displayName;
- }
-
- public void setDescription(LocalizedString description)
- {
- this.description = description;
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferenceInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/PreferenceInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferenceInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferenceInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,99 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.portlet.info.PreferenceInfo;
+
+import java.util.Locale;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5448 $
+ */
+public class PreferenceInfoSupport implements PreferenceInfo
+{
+
+ /** . */
+ private final String key;
+
+ /** . */
+ private LocalizedString displayName;
+
+ /** . */
+ private LocalizedString description;
+
+ /** . */
+ private Boolean readOnly;
+
+ public PreferenceInfoSupport(String key)
+ {
+ this.key = key;
+ this.displayName = new LocalizedString("Display name of " + key, Locale.ENGLISH);
+ this.description = new LocalizedString("Description of " + key, Locale.ENGLISH);
+ this.readOnly = null;
+ }
+
+ public PreferenceInfoSupport(String key, Boolean readOnly)
+ {
+ this.key = key;
+ this.displayName = new LocalizedString("Display name of " + key, Locale.ENGLISH);
+ this.description = new LocalizedString("Description of " + key, Locale.ENGLISH);
+ this.readOnly = readOnly;
+ }
+
+ public String getKey()
+ {
+ return key;
+ }
+
+ public LocalizedString getDisplayName()
+ {
+ return displayName;
+ }
+
+ public LocalizedString getDescription()
+ {
+ return description;
+ }
+
+ public Boolean isReadOnly()
+ {
+ return readOnly;
+ }
+
+ public void setReadOnly(Boolean readOnly)
+ {
+ this.readOnly = readOnly;
+ }
+
+ public void setDisplayName(LocalizedString displayName)
+ {
+ this.displayName = displayName;
+ }
+
+ public void setDescription(LocalizedString description)
+ {
+ this.description = description;
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,76 +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.support.info;
-
-import org.jboss.portal.common.value.Value;
-import org.jboss.portal.portlet.info.PreferenceInfo;
-import org.jboss.portal.portlet.info.PreferencesInfo;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5448 $
- */
-public class PreferencesInfoSupport implements PreferencesInfo
-{
-
- private final Map preferences;
-
- public PreferencesInfoSupport(Map preferences)
- {
- this.preferences = preferences;
- }
-
- public PreferencesInfoSupport()
- {
- this(new HashMap());
- }
-
- public Set getKeys()
- {
- return preferences.keySet();
- }
-
- public PreferenceInfo getPreference(String key) throws IllegalArgumentException
- {
- return (PreferenceInfo)preferences.get(key);
- }
-
- public void addPreference(PreferenceInfoSupport preference)
- {
- preferences.put(preference.getKey(), preference);
- }
-
- public void addPreference(String key)
- {
- preferences.put(key, new PreferenceInfoSupport(key));
- }
-
- public void addPreference(String key, Boolean readOnly)
- {
- preferences.put(key, new PreferenceInfoSupport(key, readOnly));
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,76 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.common.value.Value;
+import org.jboss.portal.portlet.info.PreferenceInfo;
+import org.jboss.portal.portlet.info.PreferencesInfo;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5448 $
+ */
+public class PreferencesInfoSupport implements PreferencesInfo
+{
+
+ private final Map preferences;
+
+ public PreferencesInfoSupport(Map preferences)
+ {
+ this.preferences = preferences;
+ }
+
+ public PreferencesInfoSupport()
+ {
+ this(new HashMap());
+ }
+
+ public Set getKeys()
+ {
+ return preferences.keySet();
+ }
+
+ public PreferenceInfo getPreference(String key) throws IllegalArgumentException
+ {
+ return (PreferenceInfo)preferences.get(key);
+ }
+
+ public void addPreference(PreferenceInfoSupport preference)
+ {
+ preferences.put(preference.getKey(), preference);
+ }
+
+ public void addPreference(String key)
+ {
+ preferences.put(key, new PreferenceInfoSupport(key));
+ }
+
+ public void addPreference(String key, Boolean readOnly)
+ {
+ preferences.put(key, new PreferenceInfoSupport(key, readOnly));
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -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.support.info;
-
-import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.portlet.TransportGuarantee;
-import org.jboss.portal.portlet.info.SecurityInfo;
-
-import java.util.Set;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5448 $
- */
-public class SecurityInfoSupport implements SecurityInfo
-{
-
- /** . */
- private final Set<TransportGuarantee> transportGuarantees;
-
- public SecurityInfoSupport(Set<TransportGuarantee> transportGuarantees)
- {
- this.transportGuarantees = transportGuarantees;
- }
-
- public SecurityInfoSupport()
- {
- this(Tools.toSet(TransportGuarantee.NONE));
- }
-
- public boolean containsTransportGuarantee(TransportGuarantee transportGuarantee)
- {
- return transportGuarantees.contains(transportGuarantee);
- }
-
- public Set<TransportGuarantee> getTransportGuarantees()
- {
- return transportGuarantees;
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,60 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.common.util.Tools;
+import org.jboss.portal.portlet.TransportGuarantee;
+import org.jboss.portal.portlet.info.SecurityInfo;
+
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5448 $
+ */
+public class SecurityInfoSupport implements SecurityInfo
+{
+
+ /** . */
+ private final Set<TransportGuarantee> transportGuarantees;
+
+ public SecurityInfoSupport(Set<TransportGuarantee> transportGuarantees)
+ {
+ this.transportGuarantees = transportGuarantees;
+ }
+
+ public SecurityInfoSupport()
+ {
+ this(Tools.toSet(TransportGuarantee.NONE));
+ }
+
+ public boolean containsTransportGuarantee(TransportGuarantee transportGuarantee)
+ {
+ return transportGuarantees.contains(transportGuarantee);
+ }
+
+ public Set<TransportGuarantee> getTransportGuarantees()
+ {
+ return transportGuarantees;
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SessionInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/SessionInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SessionInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,56 +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.support.info;
-
-import org.jboss.portal.portlet.info.SessionInfo;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5448 $
- */
-public class SessionInfoSupport implements SessionInfo
-{
-
- /** . */
- private Boolean distributed;
-
- public SessionInfoSupport(Boolean distributed)
- {
- this.distributed = distributed;
- }
-
- public SessionInfoSupport()
- {
- this(null);
- }
-
- public Boolean getDistributed()
- {
- return distributed;
- }
-
- public void setDistributed(Boolean distributed)
- {
- this.distributed = distributed;
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SessionInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/SessionInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SessionInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/SessionInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,56 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.portlet.info.SessionInfo;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5448 $
+ */
+public class SessionInfoSupport implements SessionInfo
+{
+
+ /** . */
+ private Boolean distributed;
+
+ public SessionInfoSupport(Boolean distributed)
+ {
+ this.distributed = distributed;
+ }
+
+ public SessionInfoSupport()
+ {
+ this(null);
+ }
+
+ public Boolean getDistributed()
+ {
+ return distributed;
+ }
+
+ public void setDistributed(Boolean distributed)
+ {
+ this.distributed = distributed;
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/TypeInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/TypeInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/TypeInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,53 +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.support.info;
-
-import org.jboss.portal.portlet.info.TypeInfo;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class TypeInfoSupport implements TypeInfo
-{
-
- /** . */
- private final String name;
-
- public TypeInfoSupport(String name)
- {
- this.name = name;
- }
-
- public String getName()
- {
- return name;
- }
-
- public XmlRootElement getXMLBinding()
- {
- return null;
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/TypeInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/TypeInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/TypeInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/TypeInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,53 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.portlet.info.TypeInfo;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class TypeInfoSupport implements TypeInfo
+{
+
+ /** . */
+ private final String name;
+
+ public TypeInfoSupport(String name)
+ {
+ this.name = name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public XmlRootElement getXMLBinding()
+ {
+ return null;
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/WindowStateInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/WindowStateInfoSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/WindowStateInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,64 +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.support.info;
-
-import org.jboss.portal.WindowState;
-import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.portlet.info.WindowStateInfo;
-
-import java.util.Locale;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5448 $
- */
-public class WindowStateInfoSupport implements WindowStateInfo
-{
-
- /** . */
- private final LocalizedString description;
-
- /** . */
- private final WindowState windowState;
-
- public WindowStateInfoSupport(WindowState mode)
- {
- this.description = new LocalizedString(mode + " window state", Locale.ENGLISH);
- this.windowState = mode;
- }
-
- public LocalizedString getDescription()
- {
- return description;
- }
-
- public WindowState getWindowState()
- {
- return windowState;
- }
-
- public String getWindowStateName()
- {
- return windowState.toString();
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/WindowStateInfoSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/WindowStateInfoSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/WindowStateInfoSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/WindowStateInfoSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,64 @@
+/******************************************************************************
+ * 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.support.info;
+
+import org.jboss.portal.WindowState;
+import org.jboss.portal.common.i18n.LocalizedString;
+import org.jboss.portal.portlet.info.WindowStateInfo;
+
+import java.util.Locale;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5448 $
+ */
+public class WindowStateInfoSupport implements WindowStateInfo
+{
+
+ /** . */
+ private final LocalizedString description;
+
+ /** . */
+ private final WindowState windowState;
+
+ public WindowStateInfoSupport(WindowState mode)
+ {
+ this.description = new LocalizedString(mode + " window state", Locale.ENGLISH);
+ this.windowState = mode;
+ }
+
+ public LocalizedString getDescription()
+ {
+ return description;
+ }
+
+ public WindowState getWindowState()
+ {
+ return windowState;
+ }
+
+ public String getWindowStateName()
+ {
+ return windowState.toString();
+ }
+}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi (from rev 10000, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi)
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/ClientContextSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/ClientContextSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/ClientContextSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,52 +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.support.spi;
-
-import org.jboss.portal.portlet.spi.ClientContext;
-import org.jboss.portal.common.util.MultiValuedPropertyMap;
-
-import javax.servlet.http.Cookie;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class ClientContextSupport implements ClientContext
-{
- public String getMethod()
- {
- throw new UnsupportedOperationException();
- }
-
- public MultiValuedPropertyMap<String> getProperties()
- {
- throw new UnsupportedOperationException();
- }
-
- public List<Cookie> getCookies()
- {
- throw new UnsupportedOperationException();
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/ClientContextSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/ClientContextSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/ClientContextSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/ClientContextSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,52 @@
+/******************************************************************************
+ * 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.support.spi;
+
+import org.jboss.portal.portlet.spi.ClientContext;
+import org.jboss.portal.common.util.MultiValuedPropertyMap;
+
+import javax.servlet.http.Cookie;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class ClientContextSupport implements ClientContext
+{
+ public String getMethod()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public MultiValuedPropertyMap<String> getProperties()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public List<Cookie> getCookies()
+ {
+ throw new UnsupportedOperationException();
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,49 +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.support.spi;
-
-import org.jboss.portal.portlet.StateEvent;
-import org.jboss.portal.portlet.spi.InstanceContext;
-import org.jboss.portal.portlet.state.AccessMode;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5448 $
- */
-public class InstanceContextSupport implements InstanceContext
-{
- public String getId()
- {
- throw new UnsupportedOperationException();
- }
-
- public AccessMode getAccessMode()
- {
- throw new UnsupportedOperationException();
- }
-
- public void onStateEvent(StateEvent event)
- {
- throw new UnsupportedOperationException();
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/InstanceContextSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,49 @@
+/******************************************************************************
+ * 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.support.spi;
+
+import org.jboss.portal.portlet.StateEvent;
+import org.jboss.portal.portlet.spi.InstanceContext;
+import org.jboss.portal.portlet.state.AccessMode;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5448 $
+ */
+public class InstanceContextSupport implements InstanceContext
+{
+ public String getId()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public AccessMode getAccessMode()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public void onStateEvent(StateEvent event)
+ {
+ throw new UnsupportedOperationException();
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,55 +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.support.spi;
-
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.common.invocation.AbstractInvocationContext;
-import org.jboss.portal.common.util.MarkupInfo;
-import org.jboss.portal.common.util.ParameterMap;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.ContainerURL;
-import org.jboss.portal.portlet.spi.PortletInvocationContext;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5064 $
- */
-public class PortletInvocationContextSupport extends AbstractInvocationContext implements PortletInvocationContext
-{
-
- public MarkupInfo getMarkupInfo()
- {
- throw new UnsupportedOperationException();
- }
-
- public String encodeResourceURL(String url) throws IllegalArgumentException
- {
- throw new UnsupportedOperationException();
- }
-
- public String renderURL(ContainerURL containerURL, Boolean wantSecure, Boolean wantAuthenticated, boolean relative)
- {
- throw new UnsupportedOperationException();
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/PortletInvocationContextSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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.support.spi;
+
+import org.jboss.portal.Mode;
+import org.jboss.portal.WindowState;
+import org.jboss.portal.common.invocation.AbstractInvocationContext;
+import org.jboss.portal.common.util.MarkupInfo;
+import org.jboss.portal.common.util.ParameterMap;
+import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.ContainerURL;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5064 $
+ */
+public class PortletInvocationContextSupport extends AbstractInvocationContext implements PortletInvocationContext
+{
+
+ public MarkupInfo getMarkupInfo()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String encodeResourceURL(String url) throws IllegalArgumentException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String renderURL(ContainerURL containerURL, Boolean wantSecure, Boolean wantAuthenticated, boolean relative)
+ {
+ throw new UnsupportedOperationException();
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/RequestContextSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/RequestContextSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/RequestContextSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,61 +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.support.spi;
-
-import org.jboss.portal.portlet.spi.RequestContext;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class RequestContextSupport implements RequestContext
-{
- public String getCharacterEncoding()
- {
- throw new UnsupportedOperationException();
- }
-
- public int getContentLength()
- {
- throw new UnsupportedOperationException();
- }
-
- public String getContentType()
- {
- throw new UnsupportedOperationException();
- }
-
- public BufferedReader getReader() throws IOException
- {
- throw new UnsupportedOperationException();
- }
-
- public InputStream getInputStream() throws IOException, IllegalStateException
- {
- throw new UnsupportedOperationException();
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/RequestContextSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/RequestContextSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/RequestContextSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/RequestContextSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,61 @@
+/******************************************************************************
+ * 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.support.spi;
+
+import org.jboss.portal.portlet.spi.RequestContext;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class RequestContextSupport implements RequestContext
+{
+ public String getCharacterEncoding()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public int getContentLength()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getContentType()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public BufferedReader getReader() throws IOException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public InputStream getInputStream() throws IOException, IllegalStateException
+ {
+ throw new UnsupportedOperationException();
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,67 +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.support.spi;
-
-import org.jboss.portal.portlet.spi.SecurityContext;
-
-import java.security.Principal;
-
-/**
- * @author <a href="mailto:chris.laprun@jboss.com?subject=org.jboss.portal.portlet.support.spi.SecurityContextSupport">Chris
- * Laprun</a>
- * @version $Revision: 5448 $
- * @since 2.4
- */
-public class SecurityContextSupport implements SecurityContext
-{
- public boolean isSecure()
- {
- throw new UnsupportedOperationException();
- }
-
- public String getAuthType()
- {
- throw new UnsupportedOperationException();
- }
-
- public String getRemoteUser()
- {
- throw new UnsupportedOperationException();
- }
-
- public Principal getUserPrincipal()
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean isUserInRole(String roleName)
- {
- throw new UnsupportedOperationException();
- }
-
- public boolean isAuthenticated()
- {
- throw new UnsupportedOperationException();
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/SecurityContextSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,67 @@
+/******************************************************************************
+ * 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.support.spi;
+
+import org.jboss.portal.portlet.spi.SecurityContext;
+
+import java.security.Principal;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com?subject=org.jboss.portal.portlet.support.spi.SecurityContextSupport">Chris
+ * Laprun</a>
+ * @version $Revision: 5448 $
+ * @since 2.4
+ */
+public class SecurityContextSupport implements SecurityContext
+{
+ public boolean isSecure()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getAuthType()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public String getRemoteUser()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Principal getUserPrincipal()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isUserInRole(String roleName)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isAuthenticated()
+ {
+ throw new UnsupportedOperationException();
+ }
+}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java 2008-02-16 06:20:27 UTC (rev 10000)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -1,58 +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.support.spi;
-
-import org.jboss.portal.portlet.spi.UserContext;
-
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Collections;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 6195 $
- */
-public class UserContextSupport implements UserContext
-{
-
- public String getId()
- {
- throw new UnsupportedOperationException();
- }
-
- public Map<String, String> getInformations()
- {
- throw new UnsupportedOperationException();
- }
-
- public Locale getLocale()
- {
- throw new UnsupportedOperationException();
- }
-
- public List<Locale> getLocales()
- {
- throw new UnsupportedOperationException();
- }
-}
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java (from rev 10014, modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/spi/UserContextSupport.java 2008-02-18 11:31:11 UTC (rev 10015)
@@ -0,0 +1,58 @@
+/******************************************************************************
+ * 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.support.spi;
+
+import org.jboss.portal.portlet.spi.UserContext;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Collections;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 6195 $
+ */
+public class UserContextSupport implements UserContext
+{
+
+ public String getId()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Map<String, String> getInformations()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public Locale getLocale()
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public List<Locale> getLocales()
+ {
+ throw new UnsupportedOperationException();
+ }
+}
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r10014 - in modules/portlet/trunk: controller/src/main/java/org/jboss/portal/portlet/controller and 13 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-02-18 06:21:08 -0500 (Mon, 18 Feb 2008)
New Revision: 10014
Added:
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextSupport.java
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java
modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletInvocationContextSupport.java
modules/portlet/trunk/controller/src/test/resources/local-jboss-unit.xml
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java
Removed:
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/PortletSupport.java
Modified:
modules/portlet/trunk/controller/pom.xml
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletController.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/RequestHandler.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/Event.java
modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ContainerRequest.java
modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java
modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortlet.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortlet.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java
Log:
started to add test case for portlet controller + refactor some stuff to be reused in portlet controller test cases
Modified: modules/portlet/trunk/controller/pom.xml
===================================================================
--- modules/portlet/trunk/controller/pom.xml 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/controller/pom.xml 2008-02-18 11:21:08 UTC (rev 10014)
@@ -20,6 +20,22 @@
<type>jar</type>
</dependency>
+ <!-- Dependencies for tests -->
+
+ <dependency>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit-remote</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.portal.portlet</groupId>
+ <artifactId>portlet-portlet</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<!--TEST SCOPE-->
<!--dependency>
<groupId>org.jboss.portal.portlet</groupId>
@@ -192,4 +208,32 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-unit-tooling-maven2</artifactId>
+ <executions>
+ <execution>
+ <phase>test</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <testsuites>
+ <testsuite>
+ <config>local-jboss-unit.xml</config>
+ </testsuite>
+ </testsuites>
+ <reports>
+ <xml>target/tests/reports/xml</xml>
+ <html>target/tests/reports/html</html>
+ </reports>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletController.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletController.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletController.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -29,8 +29,6 @@
import org.jboss.portal.portlet.controller.request.PortletResourceRequest;
import org.jboss.portal.portlet.controller.response.ControllerResponse;
-import java.io.IOException;
-
/**
* The portlet controller which handles the page state management and the interactions between the action phase and the
* event phase. It really only does that and not more.
@@ -46,10 +44,66 @@
*/
public class PortletController
{
- public ControllerResponse process(PortletControllerContext controllerContext, ControllerRequest controllerRequest) throws IOException, PortletInvokerException
+
+ /** . */
+ private boolean distributeNonConsumableEvents;
+
+ /** . */
+ private boolean distributeNonProduceableEvents;
+
+ public PortletController()
{
+ distributeNonConsumableEvents = true;
+ distributeNonProduceableEvents = true;
+ }
+
+ /**
+ * This option configures the behavior of the controller when an event returned by the
+ * event controller is not declared by the target receiving portlet. If the value is true, then the event
+ * will be fired whatsoever otherwise it will be discarded.
+ *
+ * @return true if the controller distribute a non declared event
+ */
+ public boolean getDistributeNonConsumableEvents()
+ {
+ return distributeNonConsumableEvents;
+ }
+
+ public void setDistributeNonConsumableEvents(boolean distributeNonConsumableEvents)
+ {
+ this.distributeNonConsumableEvents = distributeNonConsumableEvents;
+ }
+
+ /**
+ * This option configures the behavior of the controller when a portlet produces an event it does
+ * not declare. If the value is true then the event will be managed by the event controller for
+ * further redistribution, otherwise it will be discarded.
+ *
+ * @return true if the controller distribute a non declared event
+ */
+ public boolean getDistributeNonProduceableEvents()
+ {
+ return distributeNonProduceableEvents;
+ }
+
+ public void setDistributeNonProduceableEvents(boolean distributeNonProduceableEvents)
+ {
+ this.distributeNonProduceableEvents = distributeNonProduceableEvents;
+ }
+
+ public ControllerResponse process(PortletControllerContext controllerContext, ControllerRequest controllerRequest) throws PortletInvokerException
+ {
+ if (controllerContext == null)
+ {
+ throw new IllegalArgumentException("Null context");
+ }
+ if (controllerRequest == null)
+ {
+ throw new IllegalArgumentException("Null request");
+ }
+
+ //
RequestHandler handler;
-
if (controllerRequest instanceof PortletRequest)
{
handler = new PortletRequestHandler(this);
@@ -60,9 +114,10 @@
}
else
{
- throw new PortletInvokerException("Unknown request type: " + controllerRequest.getClass().getName());
+ throw new IllegalArgumentException("Unknown request type: " + controllerRequest.getClass().getName());
}
+ //
return handler.handle(controllerContext, controllerRequest);
}
}
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletRequestHandler.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -28,6 +28,7 @@
import org.jboss.portal.common.util.ParameterMap;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.controller.event.Event;
import org.jboss.portal.portlet.controller.event.EventControllerContext;
import org.jboss.portal.portlet.controller.request.PortletActionRequest;
@@ -48,7 +49,6 @@
import org.jboss.portal.portlet.spi.PortletInvocationContext;
import javax.servlet.http.Cookie;
-import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -65,7 +65,10 @@
super(PortletRequest.class, controller);
}
- ControllerResponse processResponse(PortletControllerContext context, PortletRequest portletRequest, PortletInvocationResponse response) throws IOException, PortletInvokerException
+ ControllerResponse processResponse(
+ PortletControllerContext context,
+ PortletRequest portletRequest,
+ PortletInvocationResponse response) throws PortletInvokerException
{
StateControllerContext stateContext = context.getStateControllerContext();
@@ -118,6 +121,39 @@
Event event = eventQueue.removeFirst();
//
+ String targetId = event.getWindowId();
+
+ //
+ PortletInfo targetPortletInfo = context.getPortletInfo(targetId);
+
+ //
+ if (targetPortletInfo == null)
+ {
+ if (log.isTraceEnabled())
+ {
+ log.trace("Cannot deliver event " + event +" because the target of the event does not have a portlet info");
+ }
+
+ //
+ continue;
+ }
+
+ //
+ if (!controller.getDistributeNonConsumableEvents())
+ {
+ if (!targetPortletInfo.getEventing().getConsumedEvents().containsKey(event.getName()))
+ {
+ if (log.isTraceEnabled())
+ {
+ log.trace("Cannot deliver event " + event +" because the target of the event does not accept the event name");
+ }
+
+ //
+ continue;
+ }
+ }
+
+ //
PortletInvocationResponse eventResponse = deliverEvent(context, event, pageState, requestProperties.getCookies());
//
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/PortletResourceRequestHandler.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -39,8 +39,6 @@
import org.jboss.portal.portlet.controller.response.ResourceResponse;
import org.jboss.portal.portlet.controller.state.PageNavigationalState;
-import java.io.IOException;
-
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
@@ -53,7 +51,7 @@
super(PortletResourceRequest.class, controller);
}
- ControllerResponse processResponse(PortletControllerContext controllerContext, PortletResourceRequest request, PortletInvocationResponse response) throws IOException, PortletInvokerException
+ ControllerResponse processResponse(PortletControllerContext controllerContext, PortletResourceRequest request, PortletInvocationResponse response) throws PortletInvokerException
{
return new ResourceResponse(response);
}
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/RequestHandler.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/RequestHandler.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/RequestHandler.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -52,7 +52,7 @@
this.controller = controller;
}
- public ControllerResponse handle(PortletControllerContext controllerContext, ControllerRequest request) throws PortletInvokerException, IOException
+ public ControllerResponse handle(PortletControllerContext controllerContext, ControllerRequest request) throws PortletInvokerException
{
if (!t.isInstance(request))
{
@@ -66,7 +66,7 @@
return processResponse(controllerContext, req, response);
}
- abstract ControllerResponse processResponse(PortletControllerContext controllerContext, T request, PortletInvocationResponse response) throws IOException, PortletInvokerException;
+ abstract ControllerResponse processResponse(PortletControllerContext controllerContext, T request, PortletInvocationResponse response) throws PortletInvokerException;
abstract PortletInvocationResponse invoke(PortletControllerContext controllerContext, T controllerRequest) throws PortletInvokerException;
}
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/Event.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/Event.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/event/Event.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -72,4 +72,9 @@
{
return windowId;
}
+
+ public String toString()
+ {
+ return "Event[name=" + name + ",windowId=" + windowId + ",payload=" + payload + "]";
+ }
}
Modified: modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ContainerRequest.java
===================================================================
--- modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ContainerRequest.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/controller/src/main/java/org/jboss/portal/portlet/controller/request/ContainerRequest.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -26,7 +26,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-public class ContainerRequest extends ControllerRequest
+public abstract class ContainerRequest extends ControllerRequest
{
/** . */
Added: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextSupport.java
===================================================================
--- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextSupport.java (rev 0)
+++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/EventControllerContextSupport.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -0,0 +1,131 @@
+/******************************************************************************
+ * 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.controller;
+
+import org.jboss.portal.portlet.controller.event.EventControllerContext;
+import org.jboss.portal.portlet.controller.event.Event;
+
+import javax.xml.namespace.QName;
+import java.util.List;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class EventControllerContextSupport implements EventControllerContext
+{
+
+ /** . */
+ private final Map<Point, List<Point>> wires = new HashMap<Point, List<Point>>();
+
+ public List<Event> getConsumedEvents(Event producedEvent)
+ {
+ List<Point> dsts = wires.get(new Point(producedEvent.getName(), producedEvent.getWindowId()));
+
+ //
+ List<Event> consumedEvents = new ArrayList<Event>();
+ if (dsts != null)
+ {
+ for (Point dst : dsts)
+ {
+ consumedEvents.add(new Event(dst.name, producedEvent.getPayload(), dst.windowId));
+ }
+ }
+
+ //
+ return Collections.unmodifiableList(consumedEvents);
+ }
+
+ public void createWire(QName srcName, String srcWindowId, QName dstName, String dstWindowId)
+ {
+ Point src = new Point(srcName, srcWindowId);
+
+ //
+ List<Point> dsts = wires.get(src);
+
+ //
+ if (dsts == null)
+ {
+ dsts = new ArrayList<Point>();
+ wires.put(src, dsts);
+ }
+
+ //
+ Point dst = new Point(dstName, dstWindowId);
+
+ if (dsts.contains(dst))
+ {
+ throw new IllegalStateException("Such a wire already exists");
+ }
+
+ //
+ dsts.add(dst);
+ }
+
+ private static class Point
+ {
+
+ final QName name;
+
+ final String windowId;
+
+ private Point(QName name, String windowId)
+ {
+ if (name == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ if (windowId == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ this.name = name;
+ this.windowId = windowId;
+ }
+
+ public boolean equals(Object obj)
+ {
+ if (obj == this)
+ {
+ return true;
+ }
+ if (obj instanceof Point)
+ {
+ Point that = (Point)obj;
+ return name.equals(that.name) && windowId.equals(that.windowId);
+ }
+ return false;
+ }
+
+ public int hashCode()
+ {
+ return name.hashCode() + windowId.hashCode();
+ }
+ }
+}
Added: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java
===================================================================
--- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java (rev 0)
+++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerContextSupport.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -0,0 +1,132 @@
+/******************************************************************************
+ * 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.controller;
+
+import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.spi.PortletInvocationContext;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.controller.state.StateControllerContext;
+import org.jboss.portal.portlet.controller.impl.state.StateControllerContextImpl;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.portlet.invocation.EventInvocation;
+import org.jboss.portal.portlet.invocation.ResourceInvocation;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.NoSuchPortletException;
+import org.jboss.portal.portlet.PortletContext;
+import org.jboss.portal.portlet.support.info.PortletInfoSupport;
+import org.jboss.portal.portlet.support.PortletInvokerSupport;
+import org.jboss.portal.portlet.support.PortletSupport;
+
+import javax.servlet.http.Cookie;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public final class PortletControllerContextSupport implements PortletControllerContext
+{
+
+ /** . */
+ private final StateControllerContext stateControllerContext = new StateControllerContextImpl(this);
+
+ /** . */
+ private final EventControllerContextSupport eventControllerContext = new EventControllerContextSupport();
+
+ /** . */
+ private final PortletInvokerSupport invoker = new PortletInvokerSupport();
+
+ public PortletInvokerSupport getInvoker()
+ {
+ return invoker;
+ }
+
+ public PortletInfo getPortletInfo(String windowId)
+ {
+ if (windowId == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ PortletSupport portlet = invoker.getPortlet(windowId);
+
+ //
+ return portlet != null ? portlet.getInfo() : null;
+ }
+
+ //
+ public PortletInvocationContext createPortletInvocationContext(String windowId, PageNavigationalState pageState)
+ {
+ if (windowId == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ return new PortletInvocationContextSupport(windowId, pageState);
+ }
+
+ private PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException
+ {
+ PortletInvocationContextSupport context = (PortletInvocationContextSupport)invocation.getContext();
+
+ //
+ PortletContext target = PortletContext.createPortletContext(context.getWindowId());
+
+ //
+ invocation.setTarget(target);
+
+ //
+ return invoker.invoke(invocation);
+ }
+
+ public PortletInvocationResponse invoke(ActionInvocation actionInvocation) throws PortletInvokerException
+ {
+ return invoke((PortletInvocation)actionInvocation);
+ }
+
+ public PortletInvocationResponse invoke(List<Cookie> requestCookies, EventInvocation eventInvocation) throws PortletInvokerException
+ {
+ return invoke(eventInvocation);
+ }
+
+ public PortletInvocationResponse invoke(ResourceInvocation resourceInvocation) throws PortletInvokerException
+ {
+ return invoke((PortletInvocation)resourceInvocation);
+ }
+
+ public EventControllerContextSupport getEventControllerContext()
+ {
+ return eventControllerContext;
+ }
+
+ public StateControllerContext getStateControllerContext()
+ {
+ return stateControllerContext;
+ }
+}
Added: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java
===================================================================
--- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java (rev 0)
+++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletControllerTestCase.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -0,0 +1,229 @@
+/******************************************************************************
+ * 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.controller;
+
+import org.jboss.portal.portlet.controller.request.ControllerRequest;
+import org.jboss.portal.portlet.controller.request.PortletActionRequest;
+import org.jboss.portal.portlet.controller.state.WindowNavigationalState;
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+import org.jboss.portal.portlet.controller.response.ControllerResponse;
+import org.jboss.portal.portlet.controller.response.PageUpdateResponse;
+import org.jboss.portal.portlet.OpaqueStateString;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.support.PortletSupport;
+import org.jboss.portal.portlet.support.PortletInvokerSupport;
+import org.jboss.portal.portlet.support.info.EventInfoSupport;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.portlet.invocation.EventInvocation;
+import org.jboss.portal.common.util.ParameterMap;
+import org.jboss.portal.common.util.Tools;
+import org.jboss.unit.api.pojo.annotations.Test;
+import static org.jboss.unit.api.Assert.*;
+
+import javax.xml.namespace.QName;
+import java.io.Serializable;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+@Test
+public class PortletControllerTestCase
+{
+
+ /** . */
+ PortletController controller = new PortletController();
+
+ /** . */
+ PortletControllerContextSupport context = new PortletControllerContextSupport();
+
+ /** . */
+ PortletInvokerSupport invoker = context.getInvoker();
+
+ @Test
+ public void testActionReturnsUpdateNavigationalState() throws PortletInvokerException
+ {
+ PortletSupport fooPortlet = invoker.addPortlet("foo");
+ fooPortlet.addHandler(new PortletSupport.ActionHandler()
+ {
+ protected PortletInvocationResponse invoke(ActionInvocation action) throws PortletInvokerException
+ {
+ return new UpdateNavigationalStateResponse();
+ }
+ });
+
+ ControllerRequest request = new PortletActionRequest(
+ "foo",
+ new OpaqueStateString(""),
+ new ParameterMap(),
+ new WindowNavigationalState(),
+ context.getStateControllerContext().createPageState(false)
+ );
+
+ ControllerResponse response = controller.process(context, request);
+
+ PageUpdateResponse pageUpdate = assertInstanceOf(response, PageUpdateResponse.class);
+
+ PageNavigationalState pageNS = assertNotNull(pageUpdate.getPageState());
+
+ assertEquals(Tools.toSet("foo"), pageNS.getWindowIds());
+
+ }
+
+ @Test
+ public void testActionThrowsPortletInvokerException() throws PortletInvokerException
+ {
+
+ final PortletInvokerException e = new PortletInvokerException();
+
+ PortletSupport fooPortlet = invoker.addPortlet("foo");
+ fooPortlet.addHandler(new PortletSupport.ActionHandler()
+ {
+ protected PortletInvocationResponse invoke(ActionInvocation action) throws PortletInvokerException
+ {
+ throw e;
+ }
+ });
+
+ //
+ ControllerRequest request = new PortletActionRequest(
+ "foo",
+ new OpaqueStateString(""),
+ new ParameterMap(),
+ new WindowNavigationalState(),
+ context.getStateControllerContext().createPageState(false)
+ );
+
+ try
+ {
+ controller.process(context, request);
+ fail();
+ }
+ catch (PortletInvokerException ex)
+ {
+ assertSame(e, ex);
+ }
+
+ }
+
+ @Test
+ public void testProcessActionProducedEventIsDistributed() throws PortletInvokerException
+ {
+ QName srcName = new QName("juu", "foo");
+ QName dstName = new QName("juu", "bar");
+
+ //
+ PortletSupport fooPortlet = invoker.addPortlet("foo");
+ PortletSupport barPortlet = invoker.addPortlet("bar");
+
+ //
+ EventProducerAction fooEventProducer = new EventProducerAction(srcName);
+ NoOpEventProcessor fooEventConsumer = new NoOpEventProcessor();
+
+ // Create wire
+ context.getEventControllerContext().createWire(srcName, "foo", dstName, "bar");
+
+ //
+ ControllerRequest request = new PortletActionRequest(
+ "foo",
+ new OpaqueStateString(""),
+ new ParameterMap(),
+ new WindowNavigationalState(),
+ context.getStateControllerContext().createPageState(false)
+ );
+
+ //
+ controller.setDistributeNonConsumableEvents(true);
+ fooPortlet.addHandler(fooEventProducer);
+ barPortlet.addHandler(fooEventConsumer);
+ controller.process(context, request);
+ fooPortlet.assertInvocationCountIs(1);
+ barPortlet.assertInvocationCountIs(1);
+
+ //
+ controller.setDistributeNonConsumableEvents(false);
+ fooPortlet.addHandler(fooEventProducer);
+ controller.process(context, request);
+ fooPortlet.assertInvocationCountIs(2);
+ barPortlet.assertInvocationCountIs(1);
+
+ //
+ barPortlet.getInfo().getEventing().addConsumedEvent(new EventInfoSupport(dstName));
+
+ //
+ controller.setDistributeNonConsumableEvents(true);
+ fooPortlet.addHandler(fooEventProducer);
+ barPortlet.addHandler(fooEventConsumer);
+ controller.process(context, request);
+ fooPortlet.assertInvocationCountIs(3);
+ barPortlet.assertInvocationCountIs(2);
+
+ //
+ controller.setDistributeNonConsumableEvents(false);
+ fooPortlet.addHandler(fooEventProducer);
+ barPortlet.addHandler(fooEventConsumer);
+ controller.process(context, request);
+ fooPortlet.assertInvocationCountIs(4);
+ barPortlet.assertInvocationCountIs(3);
+ }
+
+ private static class EventProducerAction extends PortletSupport.ActionHandler
+ {
+
+ /** . */
+ private final QName name;
+
+ private EventProducerAction(QName name)
+ {
+ this.name = name;
+ }
+
+ protected PortletInvocationResponse invoke(ActionInvocation action) throws PortletInvokerException
+ {
+ UpdateNavigationalStateResponse update = new UpdateNavigationalStateResponse();
+ update.queueEvent(new UpdateNavigationalStateResponse.Event(name, null));
+ return update;
+ }
+ }
+
+ private static class NoOpEventProcessor extends PortletSupport.EventHandler
+ {
+
+ /** . */
+ private QName name;
+
+ /** . */
+ private Serializable payload;
+
+ protected PortletInvocationResponse invoke(EventInvocation action) throws PortletInvokerException
+ {
+ name = action.getName();
+ payload = action.getPayload();
+
+ //
+ return new UpdateNavigationalStateResponse();
+ }
+ }
+}
Added: modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletInvocationContextSupport.java
===================================================================
--- modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletInvocationContextSupport.java (rev 0)
+++ modules/portlet/trunk/controller/src/test/java/org/jboss/portal/portlet/controller/PortletInvocationContextSupport.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -0,0 +1,55 @@
+/******************************************************************************
+ * 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.controller;
+
+import org.jboss.portal.portlet.controller.state.PageNavigationalState;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class PortletInvocationContextSupport extends org.jboss.portal.portlet.support.spi.PortletInvocationContextSupport
+{
+
+ /** . */
+ private final String windowId;
+
+ /** . */
+ private final PageNavigationalState pageNavigationalState;
+
+ public PortletInvocationContextSupport(String windowId, PageNavigationalState pageNavigationalState)
+ {
+ this.windowId = windowId;
+ this.pageNavigationalState = pageNavigationalState;
+ }
+
+ public String getWindowId()
+ {
+ return windowId;
+ }
+
+ public PageNavigationalState getPageNavigationalState()
+ {
+ return pageNavigationalState;
+ }
+}
Added: modules/portlet/trunk/controller/src/test/resources/local-jboss-unit.xml
===================================================================
--- modules/portlet/trunk/controller/src/test/resources/local-jboss-unit.xml (rev 0)
+++ modules/portlet/trunk/controller/src/test/resources/local-jboss-unit.xml 2008-02-18 11:21:08 UTC (rev 10014)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-unit
+ xmlns="urn:jboss:jboss-unit:1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd">
+ <pojo>
+ <test>
+ <class name="org.jboss.portal.portlet.controller.PortletControllerTestCase"/>
+ </test>
+ </pojo>
+</jboss-unit>
Modified: modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java
===================================================================
--- modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/FederatingPortletInvokerTestCase.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -25,8 +25,8 @@
import org.jboss.portal.portlet.federation.FederatedPortletInvoker;
import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService;
-import org.jboss.portal.test.portlet.state.PortletInvokerSupport;
-import org.jboss.portal.test.portlet.state.PortletSupport;
+import org.jboss.portal.portlet.support.PortletInvokerSupport;
+import org.jboss.portal.portlet.support.PortletSupport;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletContext;
@@ -71,14 +71,13 @@
{
federatingInvoker = new FederatingPortletInvokerService();
federatedInvoker = new PortletInvokerSupport();
- federatedPortlet = new PortletSupport();
// Configure
- PortletInfoSupport fooInfo = federatedPortlet.getInfoSupport();
+ PortletInfoSupport fooInfo = new PortletInfoSupport();
fooInfo.getMeta().setDisplayName("FooPortlet");
// Wire
- federatedInvoker.addInternalPortlet("MyPortlet", federatedPortlet);
+ federatedPortlet = federatedInvoker.addPortlet("MyPortlet", fooInfo);
federatingInvoker.registerInvoker("foo", federatedInvoker);
// Basic setup
Modified: modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java
===================================================================
--- modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/federation/src/test/java/org/jboss/portal/test/portlet/federation/OneInvokerNoPortletsTestCase.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.portlet.federation;
import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.test.portlet.state.PortletInvokerSupport;
+import org.jboss.portal.portlet.support.PortletInvokerSupport;
import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.portlet.federation.FederatedPortletInvoker;
import org.jboss.portal.portlet.federation.impl.FederatingPortletInvokerService;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortlet.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortlet.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -37,12 +37,12 @@
private final PortletContext context;
/** . */
- private final Portlet delegate;
+ private final Portlet next;
- public ConsumerPortlet(PortletContext context, Portlet delegate)
+ public ConsumerPortlet(PortletContext context, Portlet next)
{
this.context = context;
- this.delegate = delegate;
+ this.next = next;
}
public PortletContext getContext()
@@ -52,11 +52,16 @@
public PortletInfo getInfo()
{
- return delegate.getInfo();
+ return next.getInfo();
}
public boolean isRemote()
{
- return delegate.isRemote();
+ return next.isRemote();
}
+
+ public Portlet getNext()
+ {
+ return next;
+ }
}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -23,6 +23,7 @@
package org.jboss.portal.portlet.state.consumer;
import org.jboss.portal.common.NotYetImplemented;
+import org.jboss.portal.common.FixMe;
import org.jboss.portal.portlet.InvalidPortletIdException;
import org.jboss.portal.portlet.NoSuchPortletException;
import org.jboss.portal.portlet.Portlet;
@@ -38,6 +39,7 @@
import org.jboss.portal.portlet.state.NoSuchStateException;
import org.jboss.portal.portlet.state.PropertyChange;
import org.jboss.portal.portlet.state.PropertyMap;
+import org.jboss.portal.portlet.state.DestroyCloneFailure;
import java.util.ArrayList;
import java.util.List;
@@ -103,11 +105,21 @@
return popCtx.getId();
}
+ /**
+ * Returns the producer.
+ *
+ * @return the producer
+ */
public PortletInvoker getProducer()
{
return producer;
}
+ /**
+ * Sets the producer.
+ *
+ * @param producer the producer
+ */
public void setProducer(PortletInvoker producer)
{
this.producer = producer;
@@ -118,16 +130,16 @@
this.persistenceManager = persistenceManager;
}
- public Set getPortlets() throws PortletInvokerException
+
+ public Set<Portlet> getPortlets() throws PortletInvokerException
{
+ // We don't need proxies here because we return the list of offered portlets
return producer.getPortlets();
}
public Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
{
- ConsumerContext cpc = getConsumerContext(portletContext);
- Portlet delegate = producer.getPortlet(cpc.portletContext);
- return new ConsumerPortlet(portletContext, delegate);
+ return getConsumerContext(portletContext).getPortlet();
}
public PortletInvocationResponse invoke(PortletInvocation invocation) throws IllegalArgumentException, PortletInvokerException
@@ -147,7 +159,7 @@
try
{
- invocation.setTarget(consumerContext.portletContext);
+ invocation.setTarget(consumerContext.producerPortletContext);
invocation.setInstanceContext(pictx);
//
@@ -214,7 +226,7 @@
ConsumerContext consumerContext = getConsumerContext(portletContext);
//
- PortletContext clonedContext = producer.createClone(consumerContext.portletContext);
+ PortletContext clonedContext = producer.createClone(consumerContext.producerPortletContext);
byte[] state = clonedContext.getState();
if (state != null)
@@ -229,18 +241,18 @@
}
}
- public List destroyClones(List portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ public List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
{
if (portletContexts == null)
{
throw new IllegalArgumentException();
}
- portletContexts = new ArrayList(portletContexts);
+ portletContexts = new ArrayList<PortletContext>(portletContexts);
for (int i = 0; i < portletContexts.size(); i++)
{
- PortletContext portletContext = (PortletContext)portletContexts.get(i);
+ PortletContext portletContext = portletContexts.get(i);
ConsumerContext consumerContext = getConsumerContext(portletContext);
- portletContexts.set(i, consumerContext.portletContext);
+ portletContexts.set(i, consumerContext.producerPortletContext);
if (consumerContext.stateId != null)
{
try
@@ -259,8 +271,9 @@
}
//
- List failures = producer.destroyClones(portletContexts);
+ List<DestroyCloneFailure> failures = producer.destroyClones(portletContexts);
+ // Probably should wrap the portlet context here ????
// for (Iterator i = failures.iterator(); i.hasNext();)
// {
// DestroyCloneFailure failure = (DestroyCloneFailure)i.next();
@@ -274,13 +287,13 @@
public PropertyMap getProperties(PortletContext portletContext, Set keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
{
ConsumerContext consumerContext = getConsumerContext(portletContext);
- return producer.getProperties(consumerContext.portletContext, keys);
+ return producer.getProperties(consumerContext.producerPortletContext, keys);
}
public PropertyMap getProperties(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
{
ConsumerContext consumerContext = getConsumerContext(portletContext);
- return producer.getProperties(consumerContext.portletContext);
+ return producer.getProperties(consumerContext.producerPortletContext);
}
public PortletContext setProperties(PortletContext portletContext, PropertyChange[] changes) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
@@ -288,7 +301,7 @@
ConsumerContext consumerContext = getConsumerContext(portletContext);
//
- PortletContext updatedPortletContext = producer.setProperties(consumerContext.portletContext, changes);
+ PortletContext updatedPortletContext = producer.setProperties(consumerContext.producerPortletContext, changes);
byte[] state = updatedPortletContext.getState();
if (state != null)
@@ -366,7 +379,7 @@
}
}
- private ConsumerContext getConsumerContext(PortletContext portletContext) throws IllegalArgumentException, NoSuchPortletException, InvalidPortletIdException
+ private ConsumerContext getConsumerContext(PortletContext portletContext) throws IllegalArgumentException, InvalidPortletIdException
{
if (portletContext == null)
{
@@ -383,7 +396,7 @@
try
{
ConsumerStateContext stateCtx = persistenceManager.loadState(stateId);
- return new ConsumerContext(stateId, stateCtx.getPortletId(), stateCtx.getBytes());
+ return new ConsumerContext(portletContext, PortletContext.createStatefulPortletContext(stateCtx.getPortletId(), stateCtx.getBytes()), stateId);
}
catch (NoSuchStateException e)
{
@@ -396,27 +409,58 @@
}
else
{
- return new ConsumerContext(portletContext, null);
+ return new ConsumerContext(portletContext, portletContext, null);
}
}
+ /**
+ * A context which defines how the consumer see the producer portlet.
+ */
private class ConsumerContext
{
- private final PortletContext portletContext;
+ /** . */
+ private final PortletContext consumerPortletContext;
- /** . */
+ /** The target portlet context. */
+ private final PortletContext producerPortletContext;
+
+ /** The id in the store. */
private final String stateId;
- public ConsumerContext(PortletContext portletContext, String stateId)
+ /** The lazy created portlet. */
+ private Portlet portlet;
+
+ public ConsumerContext(
+ PortletContext consumerPortletContext,
+ PortletContext producerPortletContext,
+ String stateId)
{
- this.portletContext = portletContext;
+ this.consumerPortletContext = consumerPortletContext;
+ this.producerPortletContext = producerPortletContext;
this.stateId = stateId;
}
- public ConsumerContext(String stateId, String id, byte[] state)
+ public Portlet getPortlet() throws PortletInvokerException
{
- this(PortletContext.createStatefulPortletContext(id, state), stateId);
+ if (portlet == null)
+ {
+ Portlet producerPortlet = producer.getPortlet(producerPortletContext);
+
+ //
+ if (stateId == null)
+ {
+ portlet = producerPortlet;
+ }
+ else
+ {
+ portlet = new ConsumerPortlet(consumerPortletContext, producerPortlet);
+ }
+ }
+
+ //
+ return portlet;
}
+
}
}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortlet.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortlet.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -37,12 +37,12 @@
private final PortletContext context;
/** . */
- private final Portlet delegate;
+ private final Portlet next;
- public ProducerPortlet(PortletContext context, Portlet delegate)
+ public ProducerPortlet(PortletContext context, Portlet next)
{
this.context = context;
- this.delegate = delegate;
+ this.next = next;
}
public PortletContext getContext()
@@ -52,16 +52,21 @@
public PortletInfo getInfo()
{
- return delegate.getInfo();
+ return next.getInfo();
}
public boolean isRemote()
{
- return delegate.isRemote();
+ return next.isRemote();
}
public String toString()
{
- return "ProducerPortlet[" + context + ",delegate=" + delegate + "]";
+ return "ProducerPortlet[" + context + ",delegate=" + next + "]";
}
+
+ public Portlet getNext()
+ {
+ return next;
+ }
}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -55,7 +55,6 @@
import org.apache.log4j.Logger;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.HashSet;
@@ -129,7 +128,7 @@
this.stateConverter = stateConverter;
}
- public Set getPortlets() throws PortletInvokerException
+ public Set<Portlet> getPortlets() throws PortletInvokerException
{
return portletInvoker.getPortlets();
}
@@ -140,10 +139,16 @@
{
throw new IllegalArgumentException("No null portlet id accepted");
}
+
+ //
String portletId = portletContext.getId();
+
+ //
if (CONSUMER_CLONE_ID.equals(portletId))
{
byte[] state = portletContext.getState();
+
+ //
if (state != null)
{
try
@@ -405,7 +410,7 @@
}
}
- public List destroyClones(List portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ public List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
{
if (portletContexts == null)
{
@@ -413,11 +418,9 @@
}
//
- List result = new ArrayList();
- for (Iterator i = portletContexts.iterator(); i.hasNext();)
+ List<DestroyCloneFailure> result = new ArrayList<DestroyCloneFailure>();
+ for (PortletContext portletContext : portletContexts)
{
- PortletContext portletContext = (PortletContext)i.next();
-
// We only take care of producer hosted state
if (!(portletContext instanceof StatefulPortletContext))
{
@@ -519,9 +522,8 @@
{
throw new IllegalArgumentException("No null changes accepted");
}
- for (int i = 0; i < changes.length; i++)
+ for (PropertyChange change : changes)
{
- PropertyChange change = changes[i];
if (change == null)
{
throw new IllegalArgumentException("No null change accepted");
@@ -558,9 +560,8 @@
PropertyMap properties = new SimplePropertyMap(statefulContext.getProperties());
// Clone argument
- for (int i = 0; i < changes.length; i++)
+ for (PropertyChange change : changes)
{
- PropertyChange change = changes[i];
String key = change.getKey();
int type = change.getType();
@@ -640,10 +641,9 @@
PreferencesInfo prefs = portlet.getInfo().getPreferences();
// Collect missing or read only properties from the referenced portlet
- Set keys = new HashSet();
- for (Iterator i = prefs.getKeys().iterator(); i.hasNext();)
+ Set<String> keys = new HashSet<String>();
+ for (String key : prefs.getKeys())
{
- String key = (String)i.next();
PreferenceInfo pref = prefs.getPreference(key);
if (Boolean.TRUE.equals(pref.isReadOnly()) || !props.keySet().contains(pref.getKey()))
{
@@ -654,12 +654,11 @@
// Get the missing or read only properties from the referenced portlet properties
// and add them to the actual state
PropertyMap refPreferencesInfo = portletInvoker.getProperties(portletContext, keys);
- for (Iterator i = refPreferencesInfo.entrySet().iterator();i.hasNext();)
+ for (Map.Entry<String, Value> entry : refPreferencesInfo.entrySet())
{
- Map.Entry entry = (Map.Entry)i.next();
- String key = (String)entry.getKey();
- Value value = (Value)entry.getValue();
- props.setProperty(key, (Value)value.clone());
+ String key = entry.getKey();
+ Value value = entry.getValue();
+ props.setProperty(key, value.clone());
}
}
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/EventInfoSupport.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -53,6 +53,15 @@
/** . */
private List<QName> aliases;
+ public EventInfoSupport(QName name)
+ {
+ this.name = name;
+ this.type = null;
+ this.aliases = new ArrayList<QName>();
+ this.displayName = new LocalizedString("Event " + name);
+ this.description = new LocalizedString("Description of event " + name);
+ }
+
public EventInfoSupport(QName name, TypeInfoSupport type)
{
this.name = name;
Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/support/info/EventingInfoSupport.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -55,7 +55,7 @@
public void addConsumedEvent(EventInfoSupport event)
{
- producedEvents.put(event.getName(), event);
+ consumedEvents.put(event.getName(), event);
}
public Map<QName, EventInfoSupport> getProducedEvents()
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java (from rev 10000, modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -0,0 +1,214 @@
+/******************************************************************************
+ * 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.support;
+
+import org.jboss.portal.portlet.InvalidPortletIdException;
+import org.jboss.portal.portlet.NoSuchPortletException;
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.PortletContext;
+import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.support.info.PortletInfoSupport;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.state.PropertyMap;
+import org.jboss.portal.portlet.state.SimplePropertyMap;
+import org.jboss.portal.portlet.state.DestroyCloneFailure;
+import org.jboss.portal.common.value.Value;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 6712 $
+ */
+public class PortletInvokerSupport implements PortletInvoker
+{
+
+ /** . */
+ private Map<String, PortletSupport> portlets;
+
+ public PortletInvokerSupport()
+ {
+ this.portlets = new HashMap<String, PortletSupport>();
+ }
+
+ public void setValid(String portletId, boolean valid)
+ {
+ getPortlet(portletId).valid = valid;
+ }
+
+ public PortletSupport addPortlet(String portletId)
+ {
+ return addPortlet(portletId, new PortletInfoSupport());
+ }
+
+ public PortletSupport addPortlet(String portletId, PortletInfoSupport info)
+ {
+ if (portletId == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ if (info == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ PortletSupport portlet = new PortletSupport(portletId, info);
+
+ //
+ if (portlets.put(portletId, portlet) != null)
+ {
+ throw new IllegalStateException();
+ }
+
+ //
+ return portlet;
+ }
+
+ public PortletInvokerSupport removePortlet(String portletId)
+ {
+ if (portlets.remove(portletId) == null)
+ {
+ throw new IllegalStateException();
+ }
+ return this;
+ }
+
+ /**
+ * Returns a portlet or null if it is not found. The portlet is returned whether it is tagged as valid or not.
+ * This method is not equivalent to the <code>getPortlet(PortletContext)</code> method which returns a portlet
+ * only if that one is valid. It should be used for configuration purposes.
+ *
+ * @param portletId the portlet id
+ * @return the portlet
+ * @throws IllegalArgumentException if the portlet id is null
+ */
+ public PortletSupport getPortlet(String portletId) throws IllegalArgumentException
+ {
+ if (portletId == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ return portlets.get(portletId);
+ }
+
+ public Set<Portlet> getPortlets()
+ {
+ return new HashSet<Portlet>(portlets.values());
+ }
+
+ public Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ {
+ return internalGetPortlet(portletContext);
+ }
+
+ public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException
+ {
+ PortletContext portletContext = invocation.getTarget();
+ PortletSupport portlet = internalGetPortlet(portletContext);
+ return portlet.invoke(invocation);
+ }
+
+ private PortletSupport internalGetPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
+ {
+ if (portletContext == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ String portletId = portletContext.getId();
+
+ //
+ PortletSupport portlet = portlets.get(portletId);
+
+ //
+ if (portlet == null)
+ {
+ throw new NoSuchPortletException(portletId);
+ }
+
+ //
+ if (!portlet.valid)
+ {
+ throw new InvalidPortletIdException(portletId);
+ }
+
+ //
+ return portlet;
+ }
+
+ public PropertyMap getProperties(PortletContext portletContext, Set<String> keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ PortletSupport internalPortlet = internalGetPortlet(portletContext);
+ PropertyMap props = new SimplePropertyMap();
+ for (String key : keys)
+ {
+ Value value = internalPortlet.state.get(key);
+ if (value != null)
+ {
+ props.put(key, value.clone());
+ }
+ }
+ return props;
+ }
+
+ public PropertyMap getProperties(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ PortletSupport internalPortlet = internalGetPortlet(portletContext);
+ PropertyMap props = new SimplePropertyMap();
+ for (String key: internalPortlet.state.keySet())
+ {
+ Value value = internalPortlet.state.get(key);
+ if (value != null)
+ {
+ props.put(key, value.clone());
+ }
+ }
+ return props;
+ }
+
+ public PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public PortletContext setProperties(PortletContext portletContext, PropertyChange[] changes) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
+ {
+ throw new UnsupportedOperationException();
+ }
+}
Property changes on: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletInvokerSupport.java
___________________________________________________________________
Name: svn:executable
+
Copied: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java (from rev 10000, modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/PortletSupport.java)
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java (rev 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -0,0 +1,204 @@
+/******************************************************************************
+ * 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.support;
+
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.PortletContext;
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.support.info.PortletInfoSupport;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.portlet.invocation.EventInvocation;
+import org.jboss.portal.portlet.invocation.RenderInvocation;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.common.value.Value;
+import static org.jboss.unit.api.Assert.*;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 6116 $
+ */
+public final class PortletSupport implements Portlet
+{
+
+ /** . */
+ private final PortletContext portletContext;
+
+ /** . */
+ boolean valid;
+
+ /** . */
+ final Map<String, Value> state;
+
+ /** . */
+ private int invocationCount;
+
+ /** . */
+ private final ArrayList<InvocationHandler> handlers = new ArrayList<InvocationHandler>();
+
+ /** . */
+ private final PortletInfoSupport info;
+
+ public PortletSupport(String portletId, PortletInfoSupport info)
+ {
+ if (portletId == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ if (info == null)
+ {
+ throw new IllegalArgumentException();
+ }
+
+ //
+ this.portletContext = PortletContext.createPortletContext(portletId);
+ this.valid = true;
+ this.state = new HashMap<String, Value>();
+ this.info = info;
+ }
+
+ public void addPreference(String key, Value value)
+ {
+ info.getPreferences().addPreference(key);
+ state.put(key, value);
+ }
+
+ public void addPreference(String key, Value value, Boolean readOnly)
+ {
+ info.getPreferences().addPreference(key, readOnly);
+ state.put(key, value);
+ }
+
+ public int getInvocationCount()
+ {
+ return invocationCount;
+ }
+
+ public void addHandler(InvocationHandler handler)
+ {
+ handlers.add(handler);
+ }
+
+ public void assertInvocationCountIs(int expectedInvocationCount)
+ {
+ assertEquals(expectedInvocationCount, invocationCount);
+ }
+
+ public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException
+ {
+ assertNotNull(invocation);
+
+ //
+ if (invocationCount == handlers.size())
+ {
+ throw new AssertionError();
+ }
+
+ //
+ InvocationHandler handler = handlers.get(invocationCount++);
+
+ //
+ return handler.invoke(invocation);
+ }
+
+ public PortletContext getContext()
+ {
+ return portletContext;
+ }
+
+ public PortletInfoSupport getInfo()
+ {
+ return info;
+ }
+
+ public boolean isRemote()
+ {
+ return false;
+ }
+
+ public boolean isValid()
+ {
+ return valid;
+ }
+
+ public static class InvocationHandler
+ {
+ protected PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException
+ {
+ throw new PortletInvokerException("No implementations");
+ }
+ }
+
+ public static abstract class ActionHandler extends InvocationHandler
+ {
+ protected final PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException
+ {
+ if (invocation instanceof ActionInvocation)
+ {
+ return invoke((ActionInvocation)invocation);
+ }
+
+ //
+ throw new AssertionError();
+ }
+
+ protected abstract PortletInvocationResponse invoke(ActionInvocation action) throws PortletInvokerException;
+ }
+
+ public static abstract class EventHandler extends InvocationHandler
+ {
+ protected final PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException
+ {
+ if (invocation instanceof EventInvocation)
+ {
+ return invoke((EventInvocation)invocation);
+ }
+
+ //
+ throw new AssertionError();
+ }
+
+ protected abstract PortletInvocationResponse invoke(EventInvocation action) throws PortletInvokerException;
+ }
+
+ public static abstract class RenderHandler extends InvocationHandler
+ {
+ protected final PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException
+ {
+ if (invocation instanceof RenderInvocation)
+ {
+ return invoke((RenderInvocation)invocation);
+ }
+
+ //
+ throw new AssertionError();
+ }
+
+ protected abstract PortletInvocationResponse invoke(RenderInvocation action) throws PortletInvokerException;
+ }
+}
Property changes on: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/PortletSupport.java
___________________________________________________________________
Name: svn:executable
+
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -32,6 +32,7 @@
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.support.info.PortletInfoSupport;
+import org.jboss.portal.portlet.support.PortletSupport;
import org.jboss.portal.portlet.info.MetaInfo;
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.PortletInvocation;
@@ -72,6 +73,11 @@
/**
*
*/
+ protected abstract PortletSupport getPortletSupport(PortletContext portletRef) throws PortletInvokerException;
+
+ /**
+ *
+ */
protected abstract Portlet getPortlet(PortletContext portletRef) throws PortletInvokerException;
/**
@@ -82,7 +88,7 @@
/**
*
*/
- protected abstract PortletContext createPOPRef(PortletSupport portletSupport) throws PortletInvokerException;
+ protected abstract PortletContext createPOPRef(PortletInfoSupport portletInfo) throws PortletInvokerException;
/**
*
@@ -202,15 +208,6 @@
/**
*
*/
- protected final PortletContext createPOPRef(PortletInfoSupport portletInfo) throws PortletInvokerException
- {
- PortletSupport portletSupport = new PortletSupport(portletInfo);
- return createPOPRef(portletSupport);
- }
-
- /**
- *
- */
protected final PortletContext createLocalCCPRef() throws Exception
{
PortletContext popCtx = createPOPRef();
@@ -796,7 +793,8 @@
public void invokeCloneBeforeWriteWithUpdate(boolean pop) throws Exception
{
PortletInfoSupport info = new PortletInfoSupport();
- PortletSupport portletSupport = new PortletSupport(info)
+
+ PortletSupport.InvocationHandler handler = new PortletSupport.InvocationHandler()
{
public PortletInvocationResponse invoke(PortletInvocation invocation)
{
@@ -809,13 +807,17 @@
PortletContext ctx;
if (pop)
{
- PortletContext popCtx = createPOPRef(portletSupport);
+ PortletContext popCtx = createPOPRef(info);
+ PortletSupport portletSupport = getPortletSupport(popCtx);
+ portletSupport.addHandler(handler);
addPreference(popCtx, "abc", new StringValue("def"));
ctx = popCtx;
}
else
{
- PortletContext popCtx = createPOPRef(portletSupport);
+ PortletContext popCtx = createPOPRef(info);
+ PortletSupport portletSupport = getPortletSupport(popCtx);
+ portletSupport.addHandler(handler);
addPreference(popCtx, "abc", new StringValue("def"));
PortletContext ccpCtx = createClone(popCtx);
ctx = ccpCtx;
@@ -848,7 +850,8 @@
final Boolean[] ise = {Boolean.FALSE};
PortletInfoSupport info = new PortletInfoSupport();
- PortletSupport portletSupport = new PortletSupport(info)
+
+ PortletSupport.InvocationHandler handler = new PortletSupport.InvocationHandler()
{
public PortletInvocationResponse invoke(PortletInvocation invocation)
{
@@ -865,7 +868,11 @@
}
}
};
- PortletContext popCtx = createPOPRef(portletSupport);
+
+ //
+ PortletContext popCtx = createPOPRef(info);
+ PortletSupport portletSupport = getPortletSupport(popCtx);
+ portletSupport.addHandler(handler);
addPreference(popCtx, "abc", new StringValue("def"));
//
@@ -882,7 +889,7 @@
public void testInvokeReadWriteWithUpdate() throws Exception
{
PortletInfoSupport info = new PortletInfoSupport();
- PortletSupport portletSupport = new PortletSupport(info)
+ PortletSupport.InvocationHandler handler = new PortletSupport.InvocationHandler()
{
public PortletInvocationResponse invoke(PortletInvocation invocation)
{
@@ -891,7 +898,9 @@
return null;
}
};
- PortletContext popCtx = createPOPRef(portletSupport);
+ PortletContext popCtx = createPOPRef(info);
+ PortletSupport portletSupport = getPortletSupport(popCtx);
+ portletSupport.addHandler(handler);
addPreference(popCtx, "abc", new StringValue("def"));
//
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -25,8 +25,9 @@
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.NoSuchPortletException;
import org.jboss.portal.portlet.support.info.PortletInfoSupport;
+import org.jboss.portal.portlet.support.PortletInvokerSupport;
+import org.jboss.portal.portlet.support.PortletSupport;
import org.jboss.portal.portlet.impl.state.StateManagementPolicyService;
import org.jboss.portal.portlet.impl.state.StateConverterV0;
import org.jboss.portal.portlet.impl.state.consumer.ConsumerPersistenceManagerService;
@@ -39,7 +40,9 @@
import org.jboss.portal.portlet.state.PropertyMap;
import org.jboss.portal.portlet.state.StateConverter;
import org.jboss.portal.portlet.state.consumer.ConsumerPortletInvoker;
+import org.jboss.portal.portlet.state.consumer.ConsumerPortlet;
import org.jboss.portal.portlet.state.producer.ProducerPortletInvoker;
+import org.jboss.portal.portlet.state.producer.ProducerPortlet;
import org.jboss.portal.common.value.Value;
import static org.jboss.unit.api.Assert.*;
@@ -107,29 +110,49 @@
consumer.setProducer(producer);
}
+ protected PortletSupport getPortletSupport(PortletContext portletRef) throws PortletInvokerException
+ {
+ Portlet portlet = consumer.getPortlet(portletRef);
+
+ //
+ if (portlet instanceof ConsumerPortlet)
+ {
+ portlet = ((ConsumerPortlet)portlet).getNext();
+ }
+
+ //
+ if (portlet instanceof ProducerPortlet)
+ {
+ portlet = ((ProducerPortlet)portlet).getNext();
+ }
+
+ //
+ return (PortletSupport)portlet;
+ }
+
protected Portlet getPortlet(PortletContext portletRef) throws PortletInvokerException
{
return consumer.getPortlet(portletRef);
}
- protected PortletContext createPOPRef(PortletSupport portletSupport) throws PortletInvokerException
+ protected PortletContext createPOPRef(PortletInfoSupport portletSupport) throws PortletInvokerException
{
- container.addInternalPortlet("PortletId", portletSupport);
+ container.addPortlet("PortletId", portletSupport);
Portlet portlet = getSinglePOP();
return portlet.getContext();
}
protected PortletContext createNonExistingPOPRef() throws PortletInvokerException
{
- container.addInternalPortlet("NonExistingPortletId", new PortletInfoSupport());
+ container.addPortlet("NonExistingPortletId", new PortletInfoSupport());
PortletContext popContext = getSinglePOP().getContext();
- container.removeInternalPortlet("NonExistingPortletId");
+ container.removePortlet("NonExistingPortletId");
return popContext;
}
protected PortletContext createInvalidPOPRef() throws PortletInvokerException
{
- container.addInternalPortlet("InvalidPortletId", new PortletInfoSupport());
+ container.addPortlet("InvalidPortletId", new PortletInfoSupport());
PortletContext popContext = getSinglePOP().getContext();
container.setValid("InvalidPortletId", false);
return popContext;
@@ -145,12 +168,12 @@
protected void addPreference(PortletContext popRef, String key, Value defaultValue)
{
- container.getInternalPortlet(popRef.getId()).addPreference(key, defaultValue);
+ container.getPortlet(popRef.getId()).addPreference(key, defaultValue);
}
protected void addPreference(PortletContext popRef, String key, Value defaultValue, Boolean readOnly)
{
- container.getInternalPortlet(popRef.getId()).addPreference(key, defaultValue, readOnly);
+ container.getPortlet(popRef.getId()).addPreference(key, defaultValue, readOnly);
}
protected void destroyClone(PortletContext portletRef) throws Exception
@@ -224,7 +247,7 @@
private Portlet getSinglePOP() throws PortletInvokerException
{
- Set portlets = producer.getPortlets();
+ Set portlets = consumer.getPortlets();
assertNotNull(portlets);
assertEquals(1, portlets.size());
return (Portlet)portlets.iterator().next();
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -1,258 +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.test.portlet.state;
-
-import org.jboss.portal.portlet.InvalidPortletIdException;
-import org.jboss.portal.portlet.NoSuchPortletException;
-import org.jboss.portal.portlet.Portlet;
-import org.jboss.portal.portlet.PortletContext;
-import org.jboss.portal.portlet.PortletInvoker;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.support.info.PortletInfoSupport;
-import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.portlet.state.PropertyChange;
-import org.jboss.portal.portlet.state.PropertyMap;
-import org.jboss.portal.portlet.state.SimplePropertyMap;
-import org.jboss.portal.portlet.state.DestroyCloneFailure;
-import org.jboss.portal.common.value.Value;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Iterator;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 6712 $
- */
-public class PortletInvokerSupport implements PortletInvoker
-{
-
- /** . */
- private Map<String, Portlet> portlets;
-
- public PortletInvokerSupport()
- {
- this.portlets = new HashMap<String, Portlet>();
- }
-
- public void setValid(String portletId, boolean valid)
- {
- getInternalPortlet(portletId).valid = valid;
- }
-
- public InternalPortlet addInternalPortlet(String portletId, PortletInfoSupport info)
- {
- return addInternalPortlet(portletId, new PortletSupport(info));
- }
-
- public InternalPortlet addInternalPortlet(String portletId, PortletSupport support)
- {
- if (portletId == null)
- {
- throw new IllegalArgumentException();
- }
- if (support == null)
- {
- throw new IllegalArgumentException();
- }
- InternalPortlet portlet = new InternalPortlet(portletId, support);
- if (portlets.put(portletId, portlet) != null)
- {
- throw new IllegalStateException();
- }
- return portlet;
- }
-
- public PortletInvokerSupport removeInternalPortlet(String portletId)
- {
- if (portlets.remove(portletId) == null)
- {
- throw new IllegalStateException();
- }
- return this;
- }
-
- public InternalPortlet getInternalPortlet(String portletId)
- {
- if (portletId == null)
- {
- throw new IllegalArgumentException();
- }
- InternalPortlet portlet = (InternalPortlet)portlets.get(portletId);
- if (portlet == null)
- {
- throw new IllegalArgumentException();
- }
- return portlet;
- }
-
- public Set<Portlet> getPortlets()
- {
- return new HashSet<Portlet>(portlets.values());
- }
-
- public Portlet getPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
- {
- return internalGetPortlet(portletContext);
- }
-
- public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException
- {
- PortletContext portletContext = invocation.getTarget();
- InternalPortlet portlet = internalGetPortlet(portletContext);
- return portlet.support.invoke(invocation);
- }
-
- private InternalPortlet internalGetPortlet(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException
- {
- if (portletContext == null)
- {
- throw new IllegalArgumentException();
- }
- String portletId = portletContext.getId();
- InternalPortlet portlet = (InternalPortlet)portlets.get(portletId);
- if (portlet == null)
- {
- throw new NoSuchPortletException(portletId);
- }
- if (portlet.isValid() == false)
- {
- throw new InvalidPortletIdException(portletId);
- }
- return portlet;
- }
-
- public static class InternalPortlet implements Portlet
- {
-
- /** . */
- private final PortletContext portletContext;
-
- /** . */
- private final PortletSupport support;
-
- /** . */
- private boolean valid;
-
- /** . */
- private Map<String, Value> state;
-
- public InternalPortlet(String portletId, PortletSupport support)
- {
- if (portletId == null)
- {
- throw new IllegalArgumentException();
- }
- if (support == null)
- {
- throw new IllegalArgumentException();
- }
- this.portletContext = PortletContext.createPortletContext(portletId);
- this.support = support;
- this.valid = true;
- this.state = new HashMap<String, Value>();
- }
-
- public void addPreference(String key, Value value)
- {
- support.getInfoSupport().getPreferences().addPreference(key);
- state.put(key, value);
- }
-
- public void addPreference(String key, Value value, Boolean readOnly)
- {
- support.getInfoSupport().getPreferences().addPreference(key, readOnly);
- state.put(key, value);
- }
-
- public PortletContext getContext()
- {
- return portletContext;
- }
-
- public PortletInfo getInfo()
- {
- return support.getInfoSupport();
- }
-
- public boolean isRemote()
- {
- return false;
- }
-
- public boolean isValid()
- {
- return valid;
- }
- }
-
- public PropertyMap getProperties(PortletContext portletContext, Set<String> keys) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
- {
- InternalPortlet internalPortlet = internalGetPortlet(portletContext);
- PropertyMap props = new SimplePropertyMap();
- for (String key : keys)
- {
- Value value = internalPortlet.state.get(key);
- if (value != null)
- {
- props.put(key, value.clone());
- }
- }
- return props;
- }
-
- public PropertyMap getProperties(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
- {
- InternalPortlet internalPortlet = internalGetPortlet(portletContext);
- PropertyMap props = new SimplePropertyMap();
- for (String key: internalPortlet.state.keySet())
- {
- Value value = internalPortlet.state.get(key);
- if (value != null)
- {
- props.put(key, value.clone());
- }
- }
- return props;
- }
-
- public PortletContext createClone(PortletContext portletContext) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
- {
- throw new UnsupportedOperationException();
- }
-
- public List<DestroyCloneFailure> destroyClones(List<PortletContext> portletContexts) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
- {
- throw new UnsupportedOperationException();
- }
-
- public PortletContext setProperties(PortletContext portletContext, PropertyChange[] changes) throws IllegalArgumentException, PortletInvokerException, UnsupportedOperationException
- {
- throw new UnsupportedOperationException();
- }
-}
Deleted: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/PortletSupport.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/PortletSupport.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/PortletSupport.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -1,68 +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.test.portlet.state;
-
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.support.info.PortletInfoSupport;
-import org.jboss.portal.portlet.info.PortletInfo;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 6116 $
- */
-public class PortletSupport
-{
-
- /** . */
- protected final PortletInfoSupport info;
-
- /** . */
- protected boolean valid;
-
- public PortletSupport(PortletInfoSupport info)
- {
- if (info == null)
- {
- throw new IllegalArgumentException();
- }
- this.info = info;
- this.valid = true;
- }
-
- public PortletSupport()
- {
- this(new PortletInfoSupport());
- }
-
- public PortletInfoSupport getInfoSupport()
- {
- return info;
- }
-
- public PortletInvocationResponse invoke(PortletInvocation invocation) throws PortletInvokerException
- {
- throw new PortletInvokerException("No implementations");
- }
-}
Modified: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java 2008-02-18 08:26:22 UTC (rev 10013)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portlet/state/ProducerStatefulPortletInvokerTestCase.java 2008-02-18 11:21:08 UTC (rev 10014)
@@ -25,7 +25,6 @@
import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.NoSuchPortletException;
import org.jboss.portal.portlet.impl.state.StateManagementPolicyService;
import org.jboss.portal.portlet.impl.state.StateConverterV0;
import org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService;
@@ -37,7 +36,10 @@
import org.jboss.portal.portlet.state.PropertyMap;
import org.jboss.portal.portlet.state.StateConverter;
import org.jboss.portal.portlet.state.producer.ProducerPortletInvoker;
+import org.jboss.portal.portlet.state.producer.ProducerPortlet;
import org.jboss.portal.portlet.support.info.PortletInfoSupport;
+import org.jboss.portal.portlet.support.PortletInvokerSupport;
+import org.jboss.portal.portlet.support.PortletSupport;
import org.jboss.portal.common.value.Value;
import static org.jboss.unit.api.Assert.*;
@@ -98,24 +100,24 @@
assertEquals(0, persistenceManager.getSize());
}
- protected PortletContext createPOPRef(PortletSupport portletSupport) throws PortletInvokerException
+ protected PortletContext createPOPRef(PortletInfoSupport portletSupport) throws PortletInvokerException
{
- container.addInternalPortlet("PortletId", portletSupport);
+ container.addPortlet("PortletId", portletSupport);
Portlet portlet = getSinglePOP();
return portlet.getContext();
}
protected PortletContext createNonExistingPOPRef()
{
- container.addInternalPortlet("NonExistingPortletId", new PortletInfoSupport());
+ container.addPortlet("NonExistingPortletId", new PortletInfoSupport());
PortletContext popCtx = getSinglePOP().getContext();
- container.removeInternalPortlet("NonExistingPortletId");
+ container.removePortlet("NonExistingPortletId");
return popCtx;
}
protected PortletContext createInvalidPOPRef()
{
- container.addInternalPortlet("InvalidPortletId", new PortletInfoSupport());
+ container.addPortlet("InvalidPortletId", new PortletInfoSupport());
PortletContext popCtx = getSinglePOP().getContext();
container.setValid("InvalidPortletId", false);
return popCtx;
@@ -131,12 +133,12 @@
protected void addPreference(PortletContext popRef, String key, Value defaultValue)
{
- container.getInternalPortlet(popRef.getId()).addPreference(key, defaultValue);
+ container.getPortlet(popRef.getId()).addPreference(key, defaultValue);
}
protected void addPreference(PortletContext popRef, String key, Value defaultValue, Boolean readOnly)
{
- container.getInternalPortlet(popRef.getId()).addPreference(key, defaultValue, readOnly);
+ container.getPortlet(popRef.getId()).addPreference(key, defaultValue, readOnly);
}
protected void destroyClone(PortletContext portletRef) throws Exception
@@ -146,22 +148,22 @@
protected PortletContext createClone(PortletContext portletRef) throws PortletInvokerException
{
- return producer.createClone((PortletContext)portletRef);
+ return producer.createClone(portletRef);
}
protected PortletContext setProperties(PortletContext portletRef, PropertyChange[] changes) throws PortletInvokerException
{
- return producer.setProperties((PortletContext)portletRef, changes);
+ return producer.setProperties(portletRef, changes);
}
protected PropertyMap getProperties(PortletContext portletRef) throws PortletInvokerException
{
- return producer.getProperties((PortletContext)portletRef);
+ return producer.getProperties(portletRef);
}
protected PropertyMap getProperties(PortletContext portletRef, Set keys) throws PortletInvokerException
{
- return producer.getProperties((PortletContext)portletRef, keys);
+ return producer.getProperties(portletRef, keys);
}
protected List destroyClones(List portletRefs) throws PortletInvokerException
@@ -169,6 +171,20 @@
return producer.destroyClones(portletRefs);
}
+ protected PortletSupport getPortletSupport(PortletContext portletRef) throws PortletInvokerException
+ {
+ Portlet portlet = producer.getPortlet(portletRef);
+
+ //
+ if (portlet instanceof ProducerPortlet)
+ {
+ portlet = ((ProducerPortlet)portlet).getNext();
+ }
+
+ //
+ return (PortletSupport)portlet;
+ }
+
protected Portlet getPortlet(PortletContext portletRef) throws PortletInvokerException
{
if (portletRef == null)
@@ -177,13 +193,13 @@
}
else
{
- return producer.getPortlet((PortletContext)portletRef);
+ return producer.getPortlet(portletRef);
}
}
protected String getPortletId(PortletContext portletRef) throws PortletInvokerException
{
- return ((PortletContext)portletRef).getId();
+ return portletRef.getId();
}
protected void invoke(PortletInvocation invocation) throws PortletInvokerException
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r10013 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials/jsf_portlet.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-02-18 03:26:22 -0500 (Mon, 18 Feb 2008)
New Revision: 10013
Added:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials/jsf_portlet/myfaces_ant_deploy.png
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials/jsf_portlet/myfaces_ant_explode.png
Log:
adding images for ant deploy and explode
5.2.4.4. Building your Apache MyFaces JSF Porlet
Added: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials/jsf_portlet/myfaces_ant_deploy.png
===================================================================
(Binary files differ)
Property changes on: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials/jsf_portlet/myfaces_ant_deploy.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials/jsf_portlet/myfaces_ant_explode.png
===================================================================
(Binary files differ)
Property changes on: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/images/tutorials/jsf_portlet/myfaces_ant_explode.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 7 months
- 1
- 0