portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r755550 - in /portals/jetspeed-2/portal/trunk: components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/ components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/ jetspeed-api/src/main/java/org/ap...
Date Wed, 18 Mar 2009 11:08:49 GMT
Author: ate
Date: Wed Mar 18 11:08:48 2009
New Revision: 755550

URL: http://svn.apache.org/viewvc?rev=755550&view=rev
Log:
JS2-871: Upgrade Pluto container
See: http://issues.apache.org/jira/browse/JS2-871

- realigning PortletContext/PortletConfig implementations and the ContainerInfo (now also
a Pluto provided interface)
- adding supported container runtime option configuration in jetspeed.properties

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfigImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContextImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java
    portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerInfo.java
    portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletWindowRequestContext.java
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfigImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfigImpl.java?rev=755550&r1=755549&r2=755550&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfigImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfigImpl.java
Wed Mar 18 11:08:48 2009
@@ -16,42 +16,34 @@
  */
 package org.apache.jetspeed.container;
 
-import java.util.Enumeration;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.ResourceBundle;
 
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.xml.namespace.QName;
-
 import org.apache.jetspeed.om.portlet.PortletDefinition;
+import org.apache.pluto.container.impl.AbstractPortletConfigImpl;
 
 /**
  * Implements the Portlet API Portlet Config class
- * TODO: 2.2 deprecate ContainerInfo and use central configuration (see ContainerRuntimeOptions)
  * 
  * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
  * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
  * @version $Id$
  */
-public class JetspeedPortletConfigImpl implements PortletConfig, JetspeedPortletConfig
+public class JetspeedPortletConfigImpl extends AbstractPortletConfigImpl implements JetspeedPortletConfig
 {
-    PortletDefinition portlet;
-    
     public JetspeedPortletConfigImpl(JetspeedPortletContext portletContext, PortletDefinition
portlet)
     {
-//TODO        super(portletContext, portlet, portlet.getApplication());
+        super(portletContext, portlet);
     }
 
     public void setPortletDefinition(PortletDefinition pd)
     {
-        this.portlet = pd;        
+        this.portlet = pd;
+        // clear internal cache
+        this.containerRuntimeOptions = null;
     }
     
-    //  internal portlet config implementation
+    @Override
     public PortletDefinition getPortletDefinition()
     {
         return (PortletDefinition)portlet;
@@ -61,98 +53,4 @@
     {
         return getPortletDefinition().getResourceBundle(locale);
     }
-
-    private List<String> DUMMY_CONFIGURATION = new LinkedList<String>(); // TODO:
2.2 implement
-    
-    protected List<String> getSupportedContainerRuntimeOptions()
-    {
-        // TODO: 2.2 - pull these out of jetspeed.properties or something similiar
-        return DUMMY_CONFIGURATION;
-    }
-    
-    public JetspeedPortletContext getPortletContext()
-    {
-        return null; // TODO (JetspeedPortletContext)super.getPortletContext();
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletConfig#getContainerRuntimeOptions()
-     */
-    public Map<String, String[]> getContainerRuntimeOptions()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletConfig#getDefaultNamespace()
-     */
-    public String getDefaultNamespace()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletConfig#getInitParameter(java.lang.String)
-     */
-    public String getInitParameter(String name)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletConfig#getInitParameterNames()
-     */
-    public Enumeration<String> getInitParameterNames()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletConfig#getPortletName()
-     */
-    public String getPortletName()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletConfig#getProcessingEventQNames()
-     */
-    public Enumeration<QName> getProcessingEventQNames()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletConfig#getPublicRenderParameterNames()
-     */
-    public Enumeration<String> getPublicRenderParameterNames()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletConfig#getPublishingEventQNames()
-     */
-    public Enumeration<QName> getPublishingEventQNames()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletConfig#getSupportedLocales()
-     */
-    public Enumeration<Locale> getSupportedLocales()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
 }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContextImpl.java?rev=755550&r1=755549&r2=755550&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContextImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContextImpl.java
Wed Mar 18 11:08:48 2009
@@ -16,73 +16,32 @@
  */
 package org.apache.jetspeed.container;
 
-import java.io.InputStream;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Enumeration;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
 
-import javax.portlet.PortletRequestDispatcher;
-import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
 
-import org.apache.jetspeed.PortalContext;
-import org.apache.jetspeed.factory.PortletFactory;
+import org.apache.jetspeed.administration.PortalConfiguration;
 import org.apache.jetspeed.om.portlet.JetspeedServiceReference;
 import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.services.JetspeedPortletServices;
 import org.apache.jetspeed.services.PortletServices;
-import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.container.impl.PortletContextImpl;
 
 /**
  * Implements the Portlet API Portlet Context class
- * TODO: 2.2 deprecate ContainerInfo and use central configuration (see ContainerRuntimeOptions)
- * TODO: on LOCAL apps, we need to merge in web.xml props. See PLT 10.3
  *
  * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
  * @version $Id$
  */
-public class JetspeedPortletContextImpl implements JetspeedPortletContext
+public class JetspeedPortletContextImpl extends PortletContextImpl implements JetspeedPortletContext
 {
-    /**
-     * The path to the Local Portlet Apps directory
-     */
-    public static final String LOCAL_PA_ROOT = "/WEB-INF/apps";
-
-    protected PortletFactory factory;
-    protected PortalContext portalContext;
+    private static final String CONTAINER_SUPPORTED_RUNTIME_OPTION = "container.supported.runtimeOption";
     
-    public JetspeedPortletContextImpl(PortalContext portalContext, ServletContext servletContext,
PortletApplication application, PortletFactory factory)
-    {
-// TODO        super(servletContext, (PortletApplicationDefinition)application);
-        this.portalContext = portalContext;
-        this.factory = factory;
-    }
-
-    public int getMajorVersion()
+    public JetspeedPortletContextImpl(ServletContext servletContext, PortletApplication application,
ContainerInfo containerInfo, PortalConfiguration configuration)
     {
-        return ContainerInfo.getMajorSpecificationVersion();
-    }
-
-    public int getMinorVersion()
-    {
-        return ContainerInfo.getMinorSpecificationVersion();
-    }
-
-    public javax.portlet.PortletRequestDispatcher getRequestDispatcher(String path)
-    {
-        return null;// TODO
-    }
-
-    public PortletRequestDispatcher getNamedDispatcher(String name)
-    {
-        return null;// TODO
-    }
-
-    public InputStream getResourceAsStream(String path)
-    {
-        return null;// TODO
+        super(servletContext, application, containerInfo, Arrays.asList(configuration.getStringArray(CONTAINER_SUPPORTED_RUNTIME_OPTION)));
     }
 
     public java.lang.Object getAttribute(java.lang.String name)
@@ -119,173 +78,11 @@
             PortletServices services = JetspeedPortletServices.getSingleton();
             return services.getService(serviceName);
         }
-        return null; //TODO return servletContext.getAttribute(name);
-    }
-
-    public String getRealPath(String path)
-    {
-        return null; //TODO return servletContext.getRealPath(localizePath(path, (PortletApplication)this.portletApp));
-    }
-
-    public java.net.URL getResource(String path) throws java.net.MalformedURLException
-    {
-        return null; //TODO return servletContext.getResource(localizePath(path, (PortletApplication)this.portletApp));
-    }
-
-    public String getServerInfo()
-    {
-        return ContainerInfo.getServerInfo();
-    }
-
-    private String localizePath(String path, PortletApplication app)
-    {
-        if (path == null)
-        {
-            return "/";
-        }
-        return path;
-        // TODO: local PA with own/extra resource paths support
-    }
-    
-    public PortletApplication getPortletApplicationDefinition()
-    {
-        return null; //TODO return (PortletApplication)this.portletApp;
-    }
-
-    private List<String> DUMMY_CONFIGURATION = new LinkedList<String>(); // TODO:
2.2 implement
-    
-    protected List<String> getSupportedContainerRuntimeOptions()
-    {
-        // TODO: 2.2 - pull these out of jetspeed.properties or something similiar
-        return DUMMY_CONFIGURATION;
+        return super.getAttribute(name);
     }
 
     public PortletApplication getApplicationDefinition()
     {
-        return null; //TODO return (PortletApplication)this.portletApp;
-    }
-    
-    public String getContextPath()
-    {
-        return null; //TODO 
-//        
-//        if (getApplicationDefinition().getApplicationType() == PortletApplication.WEBAPP)
-//        {
-//            return super.getContextPath();
-//        }
-//        else
-//        {
-//            return portalContext.getContextPath();
-//        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.jetspeed.container.JetspeedPortletContext#getServletContext()
-     */
-    public ServletContext getServletContext()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletContext#getAttributeNames()
-     */
-    public Enumeration<String> getAttributeNames()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletContext#getContainerRuntimeOptions()
-     */
-    public Enumeration<String> getContainerRuntimeOptions()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletContext#getInitParameter(java.lang.String)
-     */
-    public String getInitParameter(String name)
-    {
-        // TODO Auto-generated method stub
-        return null;
+        return (PortletApplication)portletApp;
     }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletContext#getInitParameterNames()
-     */
-    public Enumeration<String> getInitParameterNames()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletContext#getMimeType(java.lang.String)
-     */
-    public String getMimeType(String file)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletContext#getPortletContextName()
-     */
-    public String getPortletContextName()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletContext#getResourcePaths(java.lang.String)
-     */
-    public Set<String> getResourcePaths(String path)
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletContext#log(java.lang.String, java.lang.Throwable)
-     */
-    public void log(String message, Throwable throwable)
-    {
-        // TODO Auto-generated method stub
-        
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletContext#log(java.lang.String)
-     */
-    public void log(String msg)
-    {
-        // TODO Auto-generated method stub
-        
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletContext#removeAttribute(java.lang.String)
-     */
-    public void removeAttribute(String name)
-    {
-        // TODO Auto-generated method stub
-        
-    }
-
-    /* (non-Javadoc)
-     * @see javax.portlet.PortletContext#setAttribute(java.lang.String, java.lang.Object)
-     */
-    public void setAttribute(String name, Object object)
-    {
-        // TODO Auto-generated method stub
-        
-    }
-    
-    
 }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java?rev=755550&r1=755549&r2=755550&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
Wed Mar 18 11:08:48 2009
@@ -22,15 +22,14 @@
 
 import javax.portlet.Portlet;
 import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
 import javax.portlet.PreferencesValidator;
 import javax.portlet.UnavailableException;
-import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jetspeed.PortalContext;
+import org.apache.jetspeed.container.ContainerInfo;
 import org.apache.jetspeed.container.JetspeedPortletConfig;
 import org.apache.jetspeed.container.JetspeedPortletContext;
 import org.apache.jetspeed.container.JetspeedPortletConfigImpl;
@@ -38,7 +37,6 @@
 import org.apache.jetspeed.om.portlet.PortletApplication;
 import org.apache.jetspeed.om.portlet.PortletDefinition;
 import org.apache.jetspeed.portlet.PortletObjectProxy;
-import org.apache.pluto.container.impl.PortletRequestDispatcherImpl;
 
 /**
  * <p>
@@ -137,7 +135,7 @@
         {
             synchronized (portletCache)
             {
-                PortletFactoryInfo info = (PortletFactoryInfo) classLoaderMap.remove(pa.getName());
+                PortletFactoryInfo info = classLoaderMap.remove(pa.getName());
                 if (info != null)
                 {
                     ClassLoader cl = info.getClassLoader();
@@ -177,7 +175,7 @@
                 validator = (instanceCache != null) ? instanceCache.get(pdName) : null; 
                 if (validator == null)
                 {
-                    String className = ((PortletDefinition) pd).getPreferenceValidatorClassname();
+                    String className = pd.getPreferenceValidatorClassname();
                     if (className != null)
                     {
                         PortletFactoryInfo info = classLoaderMap.get(paName);
@@ -299,25 +297,24 @@
                         log.error(msg, e);
                         throw new UnavailableException(msg);
                     }
-                    JetspeedPortletContext portletContext = new JetspeedPortletContextImpl(portalContext,
servletContext, pa, this);                    
+                    JetspeedPortletContext portletContext = new JetspeedPortletContextImpl(servletContext,
pa, ContainerInfo.getInfo(), portalContext.getConfiguration());                    
                     JetspeedPortletConfig portletConfig = new JetspeedPortletConfigImpl(portletContext,
pd); 
                     try
                     {
                         try
                         {
                             Thread.currentThread().setContextClassLoader(paCl);
-                            //TODO portlet.init(portletConfig);
+                            portlet.init(portletConfig);
                         }
                         finally
                         {
                             Thread.currentThread().setContextClassLoader(currentContextClassLoader);
                         }
                     }
-                    catch (RuntimeException re)
-                    // TODO catch (PortletException e1)
+                    catch (PortletException e1)
                     {
-//                        log.error("Failed to initialize Portlet "+pd.getPortletClass()+"
for Portlet Application "+paName, e1);
-//                        throw e1;
+                        log.error("Failed to initialize Portlet "+pd.getPortletClass()+"
for Portlet Application "+paName, e1);
+                        throw e1;
                     }                   
                     if (instanceCache == null)
                     {
@@ -375,16 +372,4 @@
     {
         return getPortletApplicationClassLoader(pa) != null;
     }
-
-    public PortletRequestDispatcher createRequestDispatcher(RequestDispatcher requestDispatcher)
-    {
-        // return new JetspeedRequestDispatcher(requestDispatcher);
-        return null; //TODO return new PortletRequestDispatcherImpl(requestDispatcher);
-    }
-    
-    public PortletRequestDispatcher createRequestDispatcher(RequestDispatcher requestDispatcher,
String path)
-    {
-        // return new JetspeedRequestDispatcher(requestDispatcher);
-        return null; //TODO return new PortletRequestDispatcherImpl(requestDispatcher, path);
-    }    
 }

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java?rev=755550&r1=755549&r2=755550&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
Wed Mar 18 11:08:48 2009
@@ -16,18 +16,19 @@
  */
 package org.apache.jetspeed.container;
 
+import javax.portlet.PortletConfig;
+
 import org.apache.jetspeed.om.portlet.PortletDefinition;
 
 /**
- * This interface defines the internal methods used on the Portlet Config.
+ * This interface defines the Jetspeed specific methods added on the Portlet Config.
  * 
  *
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
  * @version $Id$
  */
-public interface JetspeedPortletConfig
+public interface JetspeedPortletConfig extends PortletConfig
 {
-    JetspeedPortletContext getPortletContext();
     PortletDefinition getPortletDefinition();
     void setPortletDefinition(PortletDefinition pd);
 }

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java?rev=755550&r1=755549&r2=755550&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
Wed Mar 18 11:08:48 2009
@@ -22,7 +22,7 @@
 import org.apache.jetspeed.om.portlet.PortletApplication;
 
 /**
- * This interface defines the internal methods used on the Portlet Context.
+ * This interface defines the Jetspeed specific methods added on the Portlet Context.
  * 
  *
  * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java?rev=755550&r1=755549&r2=755550&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java
Wed Mar 18 11:08:48 2009
@@ -17,9 +17,7 @@
 package org.apache.jetspeed.factory;
 
 import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
 import javax.portlet.PreferencesValidator;
-import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
 
 import org.apache.jetspeed.PortalContext;
@@ -49,6 +47,4 @@
     PortletInstance getPortletInstance( ServletContext servletContext, PortletDefinition
pd ) throws PortletException;
     PreferencesValidator getPreferencesValidator(PortletDefinition pd);
     void updatePortletConfig(PortletDefinition pd);
-    PortletRequestDispatcher createRequestDispatcher(RequestDispatcher requestDispatcher);
-    PortletRequestDispatcher createRequestDispatcher(RequestDispatcher requestDispatcher,
String path);
 }

Modified: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerInfo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerInfo.java?rev=755550&r1=755549&r2=755550&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerInfo.java
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerInfo.java
Wed Mar 18 11:08:48 2009
@@ -23,46 +23,53 @@
  *
  * @author <a href="mailto:shinsuke@yahoo.co.jp">Shinsuke Sugaya</a>
  */
-public final class ContainerInfo
+public final class ContainerInfo implements org.apache.pluto.container.ContainerInfo
 {
-    public static final ResourceBundle CONTAINER_INFO;
+    public static final ResourceBundle CONTAINER_INFO = ResourceBundle.getBundle("org.apache.jetspeed.container.resources.ContainerInfo");
+    
+    private static final ContainerInfo instance = new ContainerInfo();
+    
+    public static ContainerInfo getInfo()
+    {
+        return instance;
+    }
+    
+    private ContainerInfo()
+    {
+    }
+    
+    public int getMajorSpecificationVersion()
+    {
+        return Integer.parseInt(CONTAINER_INFO.getString("javax.portlet.version.major"));
+    }
 
-    static
+    public int getMinorSpecificationVersion()
     {
-        CONTAINER_INFO = ResourceBundle.getBundle("org.apache.jetspeed.container.resources.ContainerInfo");
+        return Integer.parseInt(CONTAINER_INFO.getString("javax.portlet.version.minor"));
     }
 
-    public static final String getPortletContainerName()
+    public String getPortletContainerName()
     {
         return CONTAINER_INFO.getString("jetspeed.container.name");
     }
 
-    public static final String getPortletContainerMajorVersion()
+    public String getPortletContainerMajorVersion()
     {
         return CONTAINER_INFO.getString("jetspeed.container.version.major");
     }
 
-    public static final String getPortletContainerMinorVersion()
+    public String getPortletContainerMinorVersion()
     {
         return CONTAINER_INFO.getString("jetspeed.container.version.minor");
     }
 
-    public static final int getMajorSpecificationVersion()
+    public String getPortletContainerVersion()
     {
-        return Integer.parseInt(CONTAINER_INFO.getString("javax.portlet.version.major"));
+        return getPortletContainerMajorVersion()+"."+getPortletContainerMinorVersion();
     }
 
-    public static final int getMinorSpecificationVersion()
+    public String getServerInfo()
     {
-        return Integer.parseInt(CONTAINER_INFO.getString("javax.portlet.version.minor"));
+        return getPortletContainerName()+"/"+getPortletContainerMajorVersion()+"."+getPortletContainerMinorVersion();
     }
-
-    public static final String getServerInfo()
-    {
-        StringBuffer sb = new StringBuffer(getPortletContainerName()).append(
-                CONTAINER_INFO.getString("jetspeed.container.separator")).append(getPortletContainerMajorVersion())
-                .append(".").append(getPortletContainerMinorVersion());
-        return sb.toString();
-    }
-
 }

Modified: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletWindowRequestContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletWindowRequestContext.java?rev=755550&r1=755549&r2=755550&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletWindowRequestContext.java
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletWindowRequestContext.java
Wed Mar 18 11:08:48 2009
@@ -21,7 +21,6 @@
 import javax.portlet.PortletResponse;
 
 import org.apache.jetspeed.factory.PortletInstance;
-import org.apache.jetspeed.request.RequestContext;
 import org.apache.pluto.container.PortletRequestContext;
 import org.apache.pluto.container.PortletResponseContext;
 

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties?rev=755550&r1=755549&r2=755550&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/conf/jetspeed/jetspeed.properties
Wed Mar 18 11:08:48 2009
@@ -90,6 +90,12 @@
 supported.windowstate = maximized
 supported.windowstate = minimized
 supported.windowstate = solo
+
+    
+# -------------------------------------------------------------------
+#  Portlet Container Runtime Options 
+# -------------------------------------------------------------------
+container.supported.runtimeOption=escapeXML    
     
 # -------------------------------------------------------------------
 #  Security Information



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message