Author: chris.laprun(a)jboss.com
Date: 2009-06-03 19:13:30 -0400 (Wed, 03 Jun 2009)
New Revision: 13429
Added:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerRuntimeOptionInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/RuntimeOptionInfo.java
Removed:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerOptionInfo.java
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletConfigImpl.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletContextImpl.java
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java
modules/portlet/trunk/releaseLibs.sh
Log:
- Now allowing access to runtime container options via PortletInfo.getRuntimeOptionsInfo()
and RuntimeOptionInfo class.
- Will need to add related tests.
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2009-06-03
15:57:20 UTC (rev 13428)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/aspects/portlet/RequestAttributeConversationInterceptor.java 2009-06-03
23:13:30 UTC (rev 13429)
@@ -22,33 +22,33 @@
******************************************************************************/
package org.jboss.portal.portlet.aspects.portlet;
+import org.jboss.portal.common.util.UUIDGenerator;
+import org.jboss.portal.portlet.ParametersStateString;
+import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.container.ContainerPortletInvoker;
+import org.jboss.portal.portlet.container.PortletContainer;
+import org.jboss.portal.portlet.impl.info.ContainerPortletInfo;
+import org.jboss.portal.portlet.info.RuntimeOptionInfo;
+import org.jboss.portal.portlet.invocation.ActionInvocation;
+import org.jboss.portal.portlet.invocation.EventInvocation;
import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.RenderInvocation;
-import org.jboss.portal.portlet.invocation.EventInvocation;
import org.jboss.portal.portlet.invocation.ResourceInvocation;
-import org.jboss.portal.portlet.PortletInvokerInterceptor;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse;
-import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
-import org.jboss.portal.portlet.container.PortletContainer;
-import org.jboss.portal.portlet.container.ContainerPortletInvoker;
-import org.jboss.portal.portlet.impl.info.ContainerPortletInfo;
-import org.jboss.portal.portlet.impl.info.ContainerOptionInfo;
-import org.jboss.portal.portlet.ParametersStateString;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.common.util.UUIDGenerator;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionBindingEvent;
import javax.servlet.http.HttpSessionBindingListener;
-import javax.servlet.http.HttpSessionBindingEvent;
-import java.util.Map;
-import java.util.HashMap;
import java.util.Collections;
-import java.util.List;
+import java.util.Comparator;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.LinkedList;
-import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -66,8 +66,8 @@
ContainerPortletInfo containerInfo = (ContainerPortletInfo)container.getInfo();
//
- Map<String, ContainerOptionInfo> options = containerInfo.getOptions();
- ContainerOptionInfo scopingOption =
options.get("javax.portlet.actionScopedRequestAttributes");
+ Map<String, RuntimeOptionInfo> options =
containerInfo.getRuntimeOptionsInfo();
+ RuntimeOptionInfo scopingOption =
options.get(RuntimeOptionInfo.JAVAX_PORTLET_ACTION_SCOPED_REQUEST_ATTRIBUTES);
//
int maxScope = 0;
@@ -77,7 +77,7 @@
//
List<String> values = scopingOption.getValues();
- if (values.size() >= 3 &&
"numberOfCachedScopes".equals(values.get(1)))
+ if (values.size() >= 3 &&
RuntimeOptionInfo.NUMBER_OF_CACHED_SCOPES.equals(values.get(1)))
{
try
{
@@ -249,7 +249,7 @@
// Make a first can
int size = 0;
- for (Enumeration e = session.getAttributeNames();e.hasMoreElements();)
+ for (Enumeration e = session.getAttributeNames(); e.hasMoreElements();)
{
String name = (String)e.nextElement();
if
(name.startsWith("org.jboss.portal.portlet.conversation."))
@@ -262,7 +262,7 @@
if (size >= maxScope)
{
LinkedList<Conversation> allConversations = null;
- for (Enumeration e = session.getAttributeNames();e.hasMoreElements();)
+ for (Enumeration e = session.getAttributeNames();
e.hasMoreElements();)
{
String name = (String)e.nextElement();
if
(name.startsWith("org.jboss.portal.portlet.conversation."))
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2009-06-03
15:57:20 UTC (rev 13428)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerInfoBuilder.java 2009-06-03
23:13:30 UTC (rev 13429)
@@ -55,6 +55,7 @@
import org.jboss.portal.portlet.impl.metadata.portlet.WindowStateMetaData;
import org.jboss.portal.portlet.impl.metadata.security.SecurityConstraintMetaData;
import org.jboss.portal.portlet.info.MetaInfo;
+import org.jboss.portal.portlet.info.RuntimeOptionInfo;
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
@@ -165,7 +166,7 @@
private final Map<String, ContainerPortletInfo> portlets;
/** . */
- private final Map<String, ContainerOptionInfo> applicationOptions;
+ private final Map<String, RuntimeOptionInfo> applicationOptions;
/** . */
private final Map<Mode, ContainerModeInfo> customModes;
@@ -187,7 +188,7 @@
this.events = new LinkedHashMap<QName, ContainerEventInfo>();
this.publicParameters = new LinkedHashMap<String, ContainerParameterInfo>();
this.portlets = new LinkedHashMap<String, ContainerPortletInfo>();
- this.applicationOptions = new HashMap<String, ContainerOptionInfo>();
+ this.applicationOptions = new HashMap<String, RuntimeOptionInfo>();
this.customModes = new HashMap<Mode, ContainerModeInfo>();
this.customWindowStates = new HashMap<WindowState,
ContainerWindowStateInfo>();
}
@@ -414,7 +415,7 @@
}
//
- Map<String, ContainerOptionInfo> applicationOptions =
build(tmp.getContainerRuntimeOptions().values());
+ Map<String, RuntimeOptionInfo> applicationOptions =
build(tmp.getContainerRuntimeOptions().values());
if (applicationOptions != null)
{
this.applicationOptions.putAll(applicationOptions);
@@ -675,10 +676,10 @@
}
//
- Map<String, ContainerOptionInfo> options =
build(portletMD.getContainerRuntimeOptions().values());
+ Map<String, RuntimeOptionInfo> options =
build(portletMD.getContainerRuntimeOptions().values());
if (options != null)
{
- for (Map.Entry<String, ContainerOptionInfo> entry :
applicationOptions.entrySet())
+ for (Map.Entry<String, RuntimeOptionInfo> entry :
applicationOptions.entrySet())
{
if (!options.containsKey(entry.getKey()))
{
@@ -731,24 +732,24 @@
return containerPortletInfo;
}
- private Map<String, ContainerOptionInfo>
build(Collection<ContainerRuntimeMetaData> optionsMD)
+ private Map<String, RuntimeOptionInfo>
build(Collection<ContainerRuntimeMetaData> optionsMD)
{
- Map<String, ContainerOptionInfo> options = null;
+ Map<String, RuntimeOptionInfo> options = null;
for (ContainerRuntimeMetaData containerRuntimeMD : optionsMD)
{
- ContainerOptionInfo optionInfo = build(containerRuntimeMD);
+ RuntimeOptionInfo optionInfo = build(containerRuntimeMD);
if (options == null)
{
- options = new HashMap<String, ContainerOptionInfo>();
+ options = new HashMap<String, RuntimeOptionInfo>();
}
options.put(optionInfo.getName(), optionInfo);
}
return options;
}
- private ContainerOptionInfo build(ContainerRuntimeMetaData containerRuntimeMD)
+ private ContainerRuntimeOptionInfo build(ContainerRuntimeMetaData containerRuntimeMD)
{
- return new ContainerOptionInfo(containerRuntimeMD.getName(),
Collections.unmodifiableList(containerRuntimeMD.getValues()));
+ return new ContainerRuntimeOptionInfo(containerRuntimeMD.getName(),
Collections.unmodifiableList(containerRuntimeMD.getValues()));
}
private ContainerNavigationInfo buildContainerNavigationInfo(PortletMetaData
portletMD)
Deleted:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerOptionInfo.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerOptionInfo.java 2009-06-03
15:57:20 UTC (rev 13428)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerOptionInfo.java 2009-06-03
23:13:30 UTC (rev 13429)
@@ -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.impl.info;
-
-import java.util.List;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class ContainerOptionInfo
-{
-
- /** . */
- private final String name;
-
- /** . */
- private final List<String> values;
-
- public ContainerOptionInfo(String name, List<String> values)
- {
- this.name = name;
- this.values = values;
- }
-
- public String getName()
- {
- return name;
- }
-
- public List<String> getValues()
- {
- return values;
- }
-}
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java 2009-06-03
15:57:20 UTC (rev 13428)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerPortletInfo.java 2009-06-03
23:13:30 UTC (rev 13429)
@@ -24,12 +24,13 @@
import org.jboss.portal.common.i18n.ResourceBundleManager;
import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.info.RuntimeOptionInfo;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.HashMap;
/**
* For now implementation that use the portlet container directly.
@@ -84,7 +85,7 @@
private final List<String> filterRefs;
/** . */
- private final Map<String, ContainerOptionInfo> options;
+ private final Map<String, RuntimeOptionInfo> options;
public ContainerPortletInfo(
ContainerCapabilitiesInfo capabilities,
@@ -130,7 +131,7 @@
Map<String, String> initParameters,
Boolean remotable,
ResourceBundleManager bundleManager,
- Map<String, ContainerOptionInfo> options)
+ Map<String, RuntimeOptionInfo> options)
{
this.attachments = new HashMap<Class, Object>();
this.capabilities = capabilities;
@@ -157,7 +158,7 @@
}
return type.cast(attachments.get(type));
}
-
+
public <T> void setAttachment(Class<T> type, T object)
{
if (type == null)
@@ -184,9 +185,9 @@
return applicationName;
}
- public Map<String, ContainerOptionInfo> getOptions()
+ public Map<String, RuntimeOptionInfo> getRuntimeOptionsInfo()
{
- return options;
+ return Collections.unmodifiableMap(options);
}
public ResourceBundleManager getBundleManager()
Copied:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerRuntimeOptionInfo.java
(from rev 13338,
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerOptionInfo.java)
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerRuntimeOptionInfo.java
(rev 0)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/info/ContainerRuntimeOptionInfo.java 2009-06-03
23:13:30 UTC (rev 13429)
@@ -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.impl.info;
+
+import org.jboss.portal.portlet.info.RuntimeOptionInfo;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class ContainerRuntimeOptionInfo implements RuntimeOptionInfo
+{
+
+ /** . */
+ private final String name;
+
+ /** . */
+ private final List<String> values;
+
+ public ContainerRuntimeOptionInfo(String name, List<String> values)
+ {
+ this.name = name;
+ this.values = values;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public List<String> getValues()
+ {
+ return Collections.unmodifiableList(values);
+ }
+}
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletConfigImpl.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletConfigImpl.java 2009-06-03
15:57:20 UTC (rev 13428)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletConfigImpl.java 2009-06-03
23:13:30 UTC (rev 13429)
@@ -27,7 +27,7 @@
import org.jboss.portal.portlet.impl.info.ContainerParameterInfo;
import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo;
import org.jboss.portal.portlet.impl.info.ContainerPortletInfo;
-import org.jboss.portal.portlet.impl.info.ContainerOptionInfo;
+import org.jboss.portal.portlet.info.RuntimeOptionInfo;
import javax.portlet.PortletConfig;
import javax.portlet.PortletContext;
@@ -86,10 +86,10 @@
//
ParameterMap tmp = null;
- for (ContainerOptionInfo option : portletInfo.getOptions().values())
+ for (RuntimeOptionInfo option : portletInfo.getRuntimeOptionsInfo().values())
{
String name = option.getName();
- if (PortletContextImpl.SUPPORTED_OPTIONS.contains(name))
+ if (RuntimeOptionInfo.SUPPORTED_OPTIONS.contains(name))
{
if (tmp == null)
{
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletContextImpl.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletContextImpl.java 2009-06-03
15:57:20 UTC (rev 13428)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/api/PortletContextImpl.java 2009-06-03
23:13:30 UTC (rev 13429)
@@ -22,8 +22,9 @@
******************************************************************************/
package org.jboss.portal.portlet.impl.jsr168.api;
-import org.jboss.portal.common.util.Tools;
import org.jboss.portal.portlet.impl.info.ContainerPortletApplicationInfo;
+import org.jboss.portal.portlet.info.RuntimeOptionInfo;
+import org.jboss.portal.portlet.spi.PortalContext;
import javax.portlet.PortletContext;
import javax.portlet.PortletRequestDispatcher;
@@ -32,9 +33,9 @@
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.Set;
-import java.util.Collections;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -49,11 +50,9 @@
/** . */
private ContainerPortletApplicationInfo info;
- /** . */
- public static final Set<String> SUPPORTED_OPTIONS =
Collections.unmodifiableSet(Tools.toSet(
- "javax.portlet.actionScopedRequestAttributes",
- "javax.portlet.escapeXml",
- "javax.portlet.servletDefaultSessionScope"));
+ private static final String VERSION = PortalContext.VERSION.getName().replace("
", "") + "/"
+ + PortalContext.VERSION.getMajor() + "." +
PortalContext.VERSION.getMinor() + "."
+ + PortalContext.VERSION.getQualifier();
public PortletContextImpl(ServletContext servletContext)
{
@@ -62,7 +61,7 @@
public String getServerInfo()
{
- return "JBossPortletContainer/" + 2 + "." + 0;
+ return VERSION;
}
public PortletRequestDispatcher getRequestDispatcher(String path)
@@ -197,6 +196,6 @@
public Enumeration<String> getContainerRuntimeOptions()
{
- return Collections.enumeration(SUPPORTED_OPTIONS);
+ return Collections.enumeration(RuntimeOptionInfo.SUPPORTED_OPTIONS);
}
}
Modified:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java 2009-06-03
15:57:20 UTC (rev 13428)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/PortletInfo.java 2009-06-03
23:13:30 UTC (rev 13429)
@@ -22,6 +22,8 @@
******************************************************************************/
package org.jboss.portal.portlet.info;
+import java.util.Map;
+
/**
* Runtime meta data for a portlet.
*
@@ -104,4 +106,11 @@
* @throws IllegalArgumentException if the parameter type is null
*/
<T> T getAttachment(Class<T> type) throws IllegalArgumentException;
+
+ /**
+ * Retrieves the runtime container options set by the associated portlet, if any.
+ *
+ * @return the runtime container options set by the associated portlet, if any
+ */
+ Map<String, RuntimeOptionInfo> getRuntimeOptionsInfo();
}
Added:
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/RuntimeOptionInfo.java
===================================================================
---
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/RuntimeOptionInfo.java
(rev 0)
+++
modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/info/RuntimeOptionInfo.java 2009-06-03
23:13:30 UTC (rev 13429)
@@ -0,0 +1,53 @@
+/*
+* 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.info;
+
+import org.jboss.portal.common.util.Tools;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
+ * @version $Revision$
+ */
+public interface RuntimeOptionInfo
+{
+ String JAVAX_PORTLET_ACTION_SCOPED_REQUEST_ATTRIBUTES =
"javax.portlet.actionScopedRequestAttributes";
+ String NUMBER_OF_CACHED_SCOPES = "numberOfCachedScopes";
+ String JAVAX_PORTLET_ESCAPE_XML = "javax.portlet.escapeXml";
+ String JAVAX_PORTLET_SERVLET_DEFAULT_SESSION_SCOPE =
"javax.portlet.servletDefaultSessionScope";
+
+ String ORG_JBOSS_PORTLETCONTAINER_REMOTABLE =
"org.jboss.portletcontainer.remotable";
+
+ Set<String> SUPPORTED_OPTIONS = Collections.unmodifiableSet(Tools.toSet(
+ JAVAX_PORTLET_ACTION_SCOPED_REQUEST_ATTRIBUTES,
+ JAVAX_PORTLET_ESCAPE_XML,
+ JAVAX_PORTLET_SERVLET_DEFAULT_SESSION_SCOPE,
+ ORG_JBOSS_PORTLETCONTAINER_REMOTABLE));
+
+ String getName();
+
+ List<String> getValues();
+}
Modified:
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/PortletInfoSupport.java 2009-06-03
15:57:20 UTC (rev 13428)
+++
modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/portlet/support/info/PortletInfoSupport.java 2009-06-03
23:13:30 UTC (rev 13429)
@@ -24,7 +24,10 @@
import org.jboss.portal.portlet.info.CapabilitiesInfo;
import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.info.RuntimeOptionInfo;
+import java.util.Map;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5448 $
@@ -104,4 +107,9 @@
}
return null;
}
+
+ public Map<String, RuntimeOptionInfo> getRuntimeOptionsInfo()
+ {
+ throw new UnsupportedOperationException("Implement me");
+ }
}
Modified: modules/portlet/trunk/releaseLibs.sh
===================================================================
--- modules/portlet/trunk/releaseLibs.sh 2009-06-03 15:57:20 UTC (rev 13428)
+++ modules/portlet/trunk/releaseLibs.sh 2009-06-03 23:13:30 UTC (rev 13429)
@@ -25,9 +25,9 @@
echo "Releasing to Portal thirdparty"
fi
-cp bridge/target/portlet-bridge-2.1.0-SNAPSHOT.jar $loc/portal-portlet-bridge-lib.jar
-cp controller/target/portlet-controller-2.1.0-SNAPSHOT.jar
$loc/portal-portlet-controller-lib.jar
-cp federation/target/portlet-federation-2.1.0-SNAPSHOT.jar
$loc/portal-portlet-federation-lib.jar
-cp management/target/portlet-management-2.1.0-SNAPSHOT.jar
$loc/portal-portlet-management-lib.jar
-cp portlet/target/portlet-portlet-2.1.0-SNAPSHOT.jar $loc/portal-portlet-lib.jar
-cp samples/target/portlet-samples-2.1.0-SNAPSHOT.jar $loc/portal-portlet-samples-lib.jar
+cp bridge/target/portlet-bridge-trunk-SNAPSHOT.jar $loc/portal-portlet-bridge-lib.jar
+cp controller/target/portlet-controller-trunk-SNAPSHOT.jar
$loc/portal-portlet-controller-lib.jar
+cp federation/target/portlet-federation-trunk-SNAPSHOT.jar
$loc/portal-portlet-federation-lib.jar
+cp management/target/portlet-management-trunk-SNAPSHOT.jar
$loc/portal-portlet-management-lib.jar
+cp portlet/target/portlet-portlet-trunk-SNAPSHOT.jar $loc/portal-portlet-lib.jar
+cp samples/target/portlet-samples-trunk-SNAPSHOT.jar $loc/portal-portlet-samples-lib.jar