Author: chris.laprun(a)jboss.com
Date: 2008-03-12 23:03:44 -0400 (Wed, 12 Mar 2008)
New Revision: 10279
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupAttribute.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupElement.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java
Log:
- Fixed problem with IncompatibleClassChangeError after updating modules libraries but
header injection
still does not work (properties set in HeaderInterceptor are lost along the way by the
time the
fragment, which might actually not be the same as the one processed in HeaderInterceptor
but this needs
to be determined, gets to InternalContentProvider)...
- Adapted to use PortletInfo.getAttachment: CorePortletInfo is now an attachment on
ContainerPortletInfo.
- Added toString on MarkupAttribute and MarkupElement.
- More generification.
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java 2008-03-13
02:51:41 UTC (rev 10278)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java 2008-03-13
03:03:44 UTC (rev 10279)
@@ -28,7 +28,6 @@
import org.jboss.portal.core.portlet.info.MarkupHeaderInfo;
import org.jboss.portal.portlet.container.PortletContainer;
import org.jboss.portal.portlet.container.PortletContainerInvoker;
-import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.invocation.PortletInterceptor;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.response.FragmentResponse;
@@ -58,11 +57,11 @@
// Add declaratively injected header content here if needed (get it via the
component)
PortletContainer container =
(PortletContainer)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE,
PortletContainerInvoker.PORTLET_CONTAINER);
- PortletInfo info = container.getInfo();
+
// only proceed if we have JBoss Portal specific metadata
- if (info instanceof CorePortletInfo)
+ CorePortletInfo corePortletInfo =
container.getInfo().getAttachment(CorePortletInfo.class);
+ if (corePortletInfo != null)
{
- CorePortletInfo corePortletInfo = (CorePortletInfo)info;
MarkupHeaderInfo headerContentInfo = corePortletInfo.getMarkupHeader();
if (headerContentInfo != null)
{
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java 2008-03-13
02:51:41 UTC (rev 10278)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/impl/portlet/info/CoreInfoBuilder.java 2008-03-13
03:03:44 UTC (rev 10279)
@@ -89,13 +89,11 @@
org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData
jbPortletMD =
(org.jboss.portal.portlet.deployment.jboss.metadata.JBossPortletMetaData)jbossApplicationMetaData.getPortlets().get(containerInfo.getName());
if (jbPortletMD instanceof JBossPortletMetaData)
{
- CorePortletInfo cpi = new CorePortletInfo(containerInfo, new
PortletApplicationContextImpl(builderContext.getWebApp()),
(JBossPortletMetaData)jbPortletMD, containerInfo.getBundleManager());
- portlets.put(jbPortletMD.getName(), cpi);
+ CorePortletInfo cpi = new CorePortletInfo(new
PortletApplicationContextImpl(builderContext.getWebApp()),
(JBossPortletMetaData)jbPortletMD);
+ containerInfo.setAttachment(CorePortletInfo.class, cpi);
}
- else
- {
- portlets.put(jbPortletMD.getName(), containerInfo);
- }
+
+ portlets.put(jbPortletMD.getName(), containerInfo);
}
}
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupAttribute.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupAttribute.java 2008-03-13
02:51:41 UTC (rev 10278)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupAttribute.java 2008-03-13
03:03:44 UTC (rev 10279)
@@ -77,6 +77,12 @@
this.type = type;
}
+ @Override
+ public String toString()
+ {
+ return toString("");
+ }
+
public String getName()
{
return name;
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupElement.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupElement.java 2008-03-13
02:51:41 UTC (rev 10278)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/metadata/portlet/MarkupElement.java 2008-03-13
03:03:44 UTC (rev 10279)
@@ -196,6 +196,12 @@
return buffer.toString();
}
+ @Override
+ public String toString()
+ {
+ return toString("");
+ }
+
public Element toElement(String contextPath)
{
return new SimpleElement(contextPath);
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java 2008-03-13
02:51:41 UTC (rev 10278)
+++
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/info/CorePortletInfo.java 2008-03-13
03:03:44 UTC (rev 10279)
@@ -22,7 +22,6 @@
******************************************************************************/
package org.jboss.portal.core.portlet.info;
-import org.jboss.portal.common.i18n.ResourceBundleManager;
import org.jboss.portal.common.transaction.Transactions;
import org.jboss.portal.core.impl.portlet.info.AjaxInfoImpl;
import org.jboss.portal.core.impl.portlet.info.MarkupHeaderInfoImpl;
@@ -32,13 +31,13 @@
import org.jboss.portal.core.metadata.portlet.JBossPortletMetaData;
import org.jboss.portal.core.metadata.portlet.PortletInfoMetaData;
import org.jboss.portal.portlet.container.PortletApplicationContext;
-import org.jboss.portal.portlet.impl.info.ContainerPortletInfo;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
* @version $Revision: 8786 $
*/
-public class CorePortletInfo extends ContainerPortletInfo
+public class CorePortletInfo
{
/** . */
private final Transactions.Type txType;
@@ -52,13 +51,8 @@
/** . */
private final PortletInfoInfoImpl portletInfo;
- public CorePortletInfo(ContainerPortletInfo delegate, PortletApplicationContext
portletApplicationContext, JBossPortletMetaData jbossPortletMD, ResourceBundleManager
bundleMgr)
+ public CorePortletInfo(PortletApplicationContext portletApplicationContext,
JBossPortletMetaData jbossPortletMD)
{
- super(delegate.getCapabilities(), delegate.getPreferences(), delegate.getMeta(),
delegate.getSecurity(),
- delegate.getCache(), delegate.getSession(), delegate.getEventing(),
delegate.getNavigation(),
- delegate.getFilterRefs(), delegate.getName(), delegate.getApplicationName(),
delegate.getClassName(),
- delegate.getInitParameters(), delegate.isRemotable(),
delegate.getBundleManager(), delegate.getOptions());
-
//
AjaxMetaData ajaxMD = jbossPortletMD.getAjax();
HeaderContentMetaData headerContentMD = jbossPortletMD.getHeaderContent();
Modified:
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2008-03-13
02:51:41 UTC (rev 10278)
+++
branches/JBoss_Portal_Branch_2_7/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2008-03-13
03:03:44 UTC (rev 10279)
@@ -59,7 +59,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import java.util.Iterator;
import java.util.Map;
/**
@@ -116,9 +115,8 @@
log.debug("Found default jboss portlet meta data");
if (defaultJBossPortletMD != null)
{
- for (Iterator i = portletAppMD.getPortlets().values().iterator();
i.hasNext();)
+ for (PortletMetaData portletMD : portletAppMD.getPortlets().values())
{
- PortletMetaData portletMD = (PortletMetaData)i.next();
String name = portletMD.getPortletName();
JBossPortletMetaData jbossPortletMD =
(JBossPortletMetaData)jbossAppMD.getPortlets().get(name);
if (jbossPortletMD != null)
Modified:
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2008-03-13
02:51:41 UTC (rev 10278)
+++
branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/consumer/portlet/info/WSRPPortletInfo.java 2008-03-13
03:03:44 UTC (rev 10279)
@@ -213,6 +213,11 @@
return null; // todo: implement with WSRP 2.0
}
+ public <T> T getAttachment(Class<T> tClass) throws
IllegalArgumentException
+ {
+ throw new UnsupportedOperationException("Implement if needed!");
+ }
+
public boolean isUsesMethodGet()
{
return usesMethodGet;