You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2008/10/24 07:13:55 UTC
svn commit: r707546 - in
/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade:
components/jetspeed-portlet-factory/
components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/
components/jetspeed-portlet-factory/src/main/j...
Author: taylor
Date: Thu Oct 23 22:13:54 2008
New Revision: 707546
URL: http://svn.apache.org/viewvc?rev=707546&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-871
Implementing portlet context and config factories, and requeest dispatcher
NOTE: Had to move the JetspeedPortletConfig and JetspeedPortletContext into the factory from commons, as i cannot inherit from pluto container impl in commons
NOTE: there is an issue with getting the ServletConfig to the PortletConfig during registration, as the apis currently don't provide a path
This is noted in the source. All outstanding issues are noted with "TODO: 2.2"
more subprojects successfully compiling: jetspeed-commons, jetspeed-capabilities, jetspeed-portlet-factory
Added:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java (contents, props changed)
- copied, changed from r707527, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java (contents, props changed)
- copied, changed from r707527, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java (contents, props changed)
- copied, changed from r707527, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java (contents, props changed)
- copied, changed from r707527, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java
Removed:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerRequest.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/ContainerResponse.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortalAccessor.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletConfigFactory.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletContextFactory.java
Modified:
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/pom.xml
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/PortletFactoryInfo.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/resources/ContainerInfo.properties
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/dispatcher/JetspeedRequestDispatcher.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/ServletContextProviderImpl.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/BaseObjectProxy.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedLongObjectID.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedObjectID.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/PortalObjectID.java
portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-factories.xml
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/pom.xml?rev=707546&r1=707545&r2=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/pom.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/pom.xml Thu Oct 23 22:13:54 2008
@@ -54,6 +54,15 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-container-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-container</artifactId>
+ </dependency>
+
</dependencies>
</project>
Copied: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java (from r707527, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java?p2=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java&r1=707527&r2=707546&rev=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java Thu Oct 23 22:13:54 2008
@@ -16,99 +16,30 @@
*/
package org.apache.jetspeed.container;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.ResourceBundle;
+import java.util.LinkedList;
+import java.util.List;
import javax.portlet.PortletConfig;
import javax.portlet.PortletContext;
-import javax.xml.namespace.QName;
+import javax.servlet.ServletConfig;
-import org.apache.jetspeed.om.portlet.Language;
-import org.apache.pluto.om.portlet.InitParam;
import org.apache.jetspeed.om.portlet.PortletDefinition;
-import org.apache.jetspeed.util.JetspeedLocale;
+import org.apache.pluto.internal.impl.PortletConfigImpl;
/**
* 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 JetspeedPortletConfig implements PortletConfig, InternalPortletConfig
+public class JetspeedPortletConfig extends PortletConfigImpl implements PortletConfig, InternalPortletConfig
{
- // private static final Log log = LogFactory.getLog(JetspeedPortletConfig.class);
- private PortletContext portletContext;
- private PortletDefinition portlet;
-
- public JetspeedPortletConfig(PortletContext portletContext, PortletDefinition portletEntity)
- {
- this.portletContext = portletContext;
- this.portlet = portletEntity;
- }
-
- public String getPortletName()
- {
- return portlet.getPortletName();
- }
-
- public PortletContext getPortletContext()
- {
- return portletContext;
- }
-
- public ResourceBundle getResourceBundle(Locale locale)
+ public JetspeedPortletConfig(ServletConfig servletConfig, PortletContext portletContext, PortletDefinition portlet)
{
- Language lang = portlet.getLanguage(locale);
-
- if (lang == null)
- {
- lang = portlet.getLanguage(JetspeedLocale.getDefaultLocale());
- }
- return lang.getResourceBundle();
- }
-
- public String getInitParameter(java.lang.String name)
- {
- if ( name == null )
- {
- throw new IllegalArgumentException("Required parameter name is null");
- }
- //if (log.isDebugEnabled()) log.debug("Getting init parameter for: " + name);
- for (InitParam param : portlet.getInitParams())
- {
- if (param.getParamName().equals(name))
- {
- return param.getParamValue();
- }
- }
- return null;
- }
-
- public Enumeration<String> getInitParameterNames()
- {
- return new java.util.Enumeration<String>()
- {
- private Iterator<InitParam> iterator = portlet.getInitParams().iterator();
-
- public boolean hasMoreElements()
- {
- return iterator.hasNext();
- }
-
- public String nextElement()
- {
- if (iterator.hasNext())
- {
- return iterator.next().getParamName();
- }
- return null;
- }
- };
+ super(servletConfig, portletContext, portlet, portlet.getApplication());
}
public void setPortletDefinition(PortletDefinition pd)
@@ -119,41 +50,15 @@
// internal portlet config implementation
public PortletDefinition getPortletDefinition()
{
- return portlet;
+ return (PortletDefinition)portlet;
}
-
- public Map<String, String[]> getContainerRuntimeOptions()
- {
- return null;
- }
-
- public String getDefaultNamespace()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Enumeration<QName> getProcessingEventQNames()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Enumeration<String> getPublicRenderParameterNames()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Enumeration<QName> getPublishingEventQNames()
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Enumeration<Locale> getSupportedLocales()
+
+ private List<String> DUMMY_CONFIGURATION = new LinkedList<String>(); // TODO: 2.2 implement
+
+ protected List<String> getSupportedContainerRuntimeOptions()
{
- // TODO Auto-generated method stub
- return null;
+ // TODO: 2.2 - pull these out of jetspeed.properties or something similiar
+ return DUMMY_CONFIGURATION;
}
+
}
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.7
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java (from r707527, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java?p2=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java&r1=707527&r2=707546&rev=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java Thu Oct 23 22:13:54 2008
@@ -18,42 +18,42 @@
import java.io.InputStream;
import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
import javax.portlet.PortletRequestDispatcher;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
-import org.apache.jetspeed.dispatcher.JetspeedRequestDispatcher;
+import org.apache.jetspeed.factory.PortletFactory;
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.internal.impl.PortletContextImpl;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
/**
* 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 JetspeedPortletContext implements org.apache.pluto.internal.InternalPortletContext
+public class JetspeedPortletContext extends PortletContextImpl implements InternalPortletContext
{
/**
* The path to the Local Portlet Apps directory
*/
public static final String LOCAL_PA_ROOT = "/WEB-INF/apps";
- private ServletContext servletContext;
- private PortletApplication application;
-
- public JetspeedPortletContext(ServletContext servletContext, PortletApplicationDefinition application)
+ protected PortletFactory factory;
+
+ public JetspeedPortletContext(ServletContext servletContext, PortletApplication application, PortletFactory factory)
{
- this.servletContext = servletContext;
- this.application = (PortletApplication)application;
+ super(servletContext, (PortletApplicationDefinition)application);
+ this.factory = factory;
}
public int getMajorVersion()
@@ -66,18 +66,10 @@
return ContainerInfo.getMinorSpecificationVersion();
}
- // Delegated methods
-
- public java.util.Set getResourcePaths(String path)
- {
- return servletContext.getResourcePaths(path);
- }
-
public javax.portlet.PortletRequestDispatcher getRequestDispatcher(String path)
{
- String localizedPath = localizePath(path, this.application);
- RequestDispatcher rd = null;
-
+ String localizedPath = localizePath(path, (PortletApplication)this.portletApp);
+ RequestDispatcher rd = null;
try
{
rd = servletContext.getRequestDispatcher(localizedPath);
@@ -86,21 +78,16 @@
{
// Portlet API says: return null
}
-
- // TODO: factory
- if ( rd != null )
+ if (rd != null)
{
- return new JetspeedRequestDispatcher(rd);
+ return factory.createRequestDispatcher(rd);
}
return null;
}
public PortletRequestDispatcher getNamedDispatcher(String name)
{
- // TODO: localize name
-
RequestDispatcher rd = null;
-
try
{
rd = servletContext.getNamedDispatcher(name);
@@ -109,24 +96,16 @@
{
// Portlet API says: return null
}
-
- // TODO: factory
-
- if ( rd != null )
+ if (rd != null)
{
- return new JetspeedRequestDispatcher(rd);
+ return factory.createRequestDispatcher(rd);
}
return null;
}
- public String getMimeType(String file)
- {
- return servletContext.getMimeType(file);
- }
-
public InputStream getResourceAsStream(String path)
{
- return servletContext.getResourceAsStream(localizePath(path, this.application));
+ return servletContext.getResourceAsStream(localizePath(path, (PortletApplication)this.portletApp));
}
public java.lang.Object getAttribute(java.lang.String name)
@@ -141,28 +120,24 @@
String serviceName = name.substring("cps:".length());
// validate service
- Collection validServices = application.getJetspeedServices();
+ Collection<JetspeedServiceReference> validServices = ((PortletApplication)portletApp).getJetspeedServices();
if (null == validServices)
{
return null;
}
boolean found = false;
- Iterator iterator = validServices.iterator();
- while (iterator.hasNext())
+ for (JetspeedServiceReference validService : validServices)
{
- JetspeedServiceReference validService = (JetspeedServiceReference)iterator.next();
if (validService.getName().equals(serviceName))
{
found = true;
break;
}
}
-
if (!found)
{
return null;
}
-
// return the service
PortletServices services = JetspeedPortletServices.getSingleton();
return services.getService(serviceName);
@@ -170,64 +145,14 @@
return servletContext.getAttribute(name);
}
- public void log(java.lang.String msg)
- {
- // TODO: setup a logger for the portlet application
- servletContext.log(msg);
- }
-
- public void log(java.lang.String message, java.lang.Throwable throwable)
- {
- // TODO: setup a logger for the portlet application
- servletContext.log(message, throwable);
- }
-
public String getRealPath(String path)
{
- return servletContext.getRealPath(localizePath(path, this.application));
+ return servletContext.getRealPath(localizePath(path, (PortletApplication)this.portletApp));
}
public java.net.URL getResource(String path) throws java.net.MalformedURLException
{
- return servletContext.getResource(localizePath(path, this.application));
- }
-
- public Enumeration getAttributeNames()
- {
- return servletContext.getAttributeNames();
- }
-
- public java.lang.String getInitParameter(java.lang.String name)
- {
- if ( name == null )
- {
- throw new IllegalArgumentException("Required parameter name is null");
- }
- return servletContext.getInitParameter(name);
- }
-
- public java.util.Enumeration getInitParameterNames()
- {
- return servletContext.getInitParameterNames();
- }
-
- public void removeAttribute(java.lang.String name)
- {
- if (name == null)
- {
- throw new IllegalArgumentException("Attribute name == null");
- }
-
- servletContext.removeAttribute(name);
- }
-
- public void setAttribute(java.lang.String name, java.lang.Object object)
- {
- if (name == null)
- {
- throw new IllegalArgumentException("Attribute name == null");
- }
- servletContext.setAttribute(name, object);
+ return servletContext.getResource(localizePath(path, (PortletApplication)this.portletApp));
}
public String getServerInfo()
@@ -235,26 +160,6 @@
return ContainerInfo.getServerInfo();
}
- // internal portlet context implementation
-
- public ServletContext getServletContext()
- {
- return this.servletContext;
- }
-
- /**
- * @see org.apache.jetspeed.container.InternalPortletContext#getApplication()
- */
- public PortletApplicationDefinition getApplication()
- {
- return this.application;
- }
-
- public String getPortletContextName()
- {
- return servletContext.getServletContextName();
- }
-
private String localizePath(String path, PortletApplication app)
{
if (path == null)
@@ -263,37 +168,24 @@
}
return path;
// TODO: local PA with own/extra resource paths support
-/*
- if (app.getApplicationType() == PortletApplication.WEBAPP)
- {
- return path;
- }
-
- StringBuffer pathBuffer = new StringBuffer(LOCAL_PA_ROOT);
- pathBuffer.append(app.getWebApplicationDefinition().getContextRoot());
- if (!path.startsWith("/"))
- {
- pathBuffer.append("/");
- }
- pathBuffer.append(path);
- String result = pathBuffer.toString();
- return result;
-*/
}
-
- public String getApplicationName()
+
+ public PortletApplication getPortletApplicationDefinition()
{
- return this.application.getName();
+ return (PortletApplication)this.portletApp;
}
- public PortletApplicationDefinition getPortletApplicationDefinition()
+ private List<String> DUMMY_CONFIGURATION = new LinkedList<String>(); // TODO: 2.2 implement
+
+ protected List<String> getSupportedContainerRuntimeOptions()
{
- return this.application;
+ // TODO: 2.2 - pull these out of jetspeed.properties or something similiar
+ return DUMMY_CONFIGURATION;
}
- public Enumeration<String> getContainerRuntimeOptions()
+ public PortletApplication getApplicationDefinition()
{
- // TODO: 2.2
- return null;
+ return (PortletApplication)this.portletApp;
}
+
}
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.8
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java?rev=707546&r1=707545&r2=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/JetspeedPortletFactory.java Thu Oct 23 22:13:54 2008
@@ -24,22 +24,24 @@
import javax.portlet.PortletConfig;
import javax.portlet.PortletContext;
import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
import javax.portlet.PreferencesValidator;
import javax.portlet.UnavailableException;
+import javax.servlet.RequestDispatcher;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.container.InternalPortletConfig;
+import org.apache.jetspeed.container.InternalPortletContext;
import org.apache.jetspeed.container.JetspeedPortletConfig;
import org.apache.jetspeed.container.JetspeedPortletContext;
-import org.apache.jetspeed.container.PortalAccessor;
import org.apache.jetspeed.om.portlet.PortletApplication;
import org.apache.jetspeed.om.portlet.PortletDefinition;
import org.apache.jetspeed.portlet.PortletObjectProxy;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.internal.InternalPortletContext;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.internal.impl.PortletRequestDispatcherImpl;
/**
* <p>
@@ -122,8 +124,8 @@
unregisterPortletApplication(pa);
ServletContext servletContext = jetspeedConfig.getServletContext();
ServletContext portletAppContext = servletContext.getContext(pa.getName());
- InternalPortletContext context = new JetspeedPortletContext(portletAppContext, pa);
- classLoaderMap.put(pa.getName(), new PortletFactoryInfo(cl, context));
+ InternalPortletContext context = this.createPortletContext(portletAppContext, pa);
+ classLoaderMap.put(pa.getName(), new PortletFactoryInfo(cl, context)); // // TODO: 2.2 need to get servletConfig in registration process
}
}
@@ -295,8 +297,8 @@
log.error(msg, e);
throw new UnavailableException(msg);
}
- PortletContext portletContext = PortalAccessor.createPortletContext(servletContext, pa);
- PortletConfig portletConfig = PortalAccessor.createPortletConfig(portletContext, pd);
+ PortletContext portletContext = this.createPortletContext(servletContext, pa);
+ PortletConfig portletConfig = this.createPortletConfig(null, portletContext, pd); // TODO: 2.2 need to get servletConfig in registration process
try
{
try
@@ -371,7 +373,7 @@
return getPortletApplicationClassLoader(pa) != null;
}
- public InternalPortletContext getPortletContext(PortletApplicationDefinition pad)
+ public org.apache.pluto.internal.InternalPortletContext getPortletContext(PortletApplication pad)
throws PortletContainerException
{
PortletFactoryInfo info = classLoaderMap.get(pad.getName());
@@ -382,4 +384,19 @@
throw new PortletContainerException("App context not found for application " + pad.getName());
}
+ public InternalPortletContext createPortletContext(ServletContext servletContext, PortletApplication application)
+ {
+ return new JetspeedPortletContext(servletContext, application, this);
+ }
+
+ public InternalPortletConfig createPortletConfig(ServletConfig servletConfig, PortletContext portletContext, PortletDefinition pd)
+ {
+ return new JetspeedPortletConfig(servletConfig, portletContext, pd);
+ }
+
+ public PortletRequestDispatcher createRequestDispatcher(RequestDispatcher requestDispatcher)
+ {
+ // return new JetspeedRequestDispatcher(requestDispatcher);
+ return new PortletRequestDispatcherImpl(requestDispatcher);
+ }
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/PortletFactoryInfo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/PortletFactoryInfo.java?rev=707546&r1=707545&r2=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/PortletFactoryInfo.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/components/jetspeed-portlet-factory/src/main/java/org/apache/jetspeed/factory/PortletFactoryInfo.java Thu Oct 23 22:13:54 2008
@@ -16,7 +16,8 @@
*/
package org.apache.jetspeed.factory;
-import org.apache.pluto.internal.InternalPortletContext;
+import org.apache.jetspeed.container.InternalPortletContext;
+
class PortletFactoryInfo
{
Copied: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java (from r707527, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java?p2=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java&r1=707527&r2=707546&rev=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java Thu Oct 23 22:13:54 2008
@@ -16,7 +16,7 @@
*/
package org.apache.jetspeed.container;
-import org.apache.pluto.om.portlet.Portlet;
+import org.apache.jetspeed.om.portlet.PortletDefinition;
/**
* This interface defines the internal methods used on the Portlet Config.
@@ -25,8 +25,8 @@
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id$
*/
-public interface InternalPortletConfig
+public interface InternalPortletConfig extends org.apache.pluto.internal.InternalPortletConfig
{
- Portlet getPortletDefinition();
- void setPortletDefinition(Portlet pd);
+ PortletDefinition getPortletDefinition();
+ void setPortletDefinition(PortletDefinition pd);
}
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.3
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java (from r707527, portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java?p2=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java&p1=portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java&r1=707527&r2=707546&rev=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java Thu Oct 23 22:13:54 2008
@@ -16,11 +16,7 @@
*/
package org.apache.jetspeed.container;
-import javax.servlet.ServletContext;
-
-import org.apache.pluto.om.portlet.PortletApp;
-
-
+import org.apache.jetspeed.om.portlet.PortletApplication;
/**
* This interface defines the internal methods used on the Portlet Context.
@@ -29,9 +25,7 @@
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id$
*/
-public interface InternalPortletContext
+public interface InternalPortletContext extends org.apache.pluto.internal.InternalPortletContext
{
- public ServletContext getServletContext();
-
- public PortletApp getApplication();
+ public PortletApplication getApplicationDefinition();
}
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java?rev=707546&r1=707545&r2=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletFactory.java Thu Oct 23 22:13:54 2008
@@ -16,15 +16,19 @@
*/
package org.apache.jetspeed.factory;
+import javax.portlet.PortletContext;
import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
import javax.portlet.PreferencesValidator;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
+import org.apache.jetspeed.container.InternalPortletConfig;
+import org.apache.jetspeed.container.InternalPortletContext;
import org.apache.jetspeed.om.portlet.PortletApplication;
import org.apache.jetspeed.om.portlet.PortletDefinition;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.internal.InternalPortletContext;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
/**
* <p>
@@ -48,5 +52,9 @@
PortletInstance getPortletInstance( ServletContext servletContext, PortletDefinition pd ) throws PortletException;
PreferencesValidator getPreferencesValidator(PortletDefinition pd);
void updatePortletConfig(PortletDefinition pd);
- InternalPortletContext getPortletContext(PortletApplicationDefinition pa) throws PortletContainerException;
+ org.apache.pluto.internal.InternalPortletContext getPortletContext(PortletApplication pa) throws PortletContainerException;
+ // TODO: 2.2 refactor following 3 interfaces to a more common factory interface
+ InternalPortletContext createPortletContext(ServletContext servletContext, PortletApplication application);
+ InternalPortletConfig createPortletConfig(ServletConfig config, PortletContext portletContext, PortletDefinition pd);
+ PortletRequestDispatcher createRequestDispatcher(RequestDispatcher requestDispatcher);
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/resources/ContainerInfo.properties
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/resources/ContainerInfo.properties?rev=707546&r1=707545&r2=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/resources/ContainerInfo.properties (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/container/resources/ContainerInfo.properties Thu Oct 23 22:13:54 2008
@@ -20,7 +20,7 @@
jetspeed.container.name=Jetspeed
jetspeed.container.separator=/
jetspeed.container.version.major=2
-jetspeed.container.version.minor=0
+jetspeed.container.version.minor=2
-javax.portlet.version.major=1
+javax.portlet.version.major=2
javax.portlet.version.minor=0
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/dispatcher/JetspeedRequestDispatcher.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/dispatcher/JetspeedRequestDispatcher.java?rev=707546&r1=707545&r2=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/dispatcher/JetspeedRequestDispatcher.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/dispatcher/JetspeedRequestDispatcher.java Thu Oct 23 22:13:54 2008
@@ -18,22 +18,25 @@
import java.io.IOException;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletResponse;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderResponse;
-import javax.portlet.RenderRequest;
-import javax.portlet.PortletException;
import org.apache.jetspeed.container.PortletDispatcherIncludeAware;
-import org.apache.pluto.core.impl.RenderRequestImpl;
-import org.apache.pluto.core.impl.RenderResponseImpl;
+import org.apache.pluto.internal.InternalRenderRequest;
+import org.apache.pluto.internal.InternalRenderResponse;
/**
* Implements the Portlet API Request Dispatcher to dispatch to portlets
- *
+ * TODO: 2.2 may or may not deprecrate, look into extending Pluto's PortletRequestDispatcherImp
+ *
* @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
* @version $Id$
*/
@@ -58,8 +61,9 @@
HttpServletResponse servletResponse = null;
try
{
- servletRequest = (HttpServletRequest) ((RenderRequestImpl) request).getRequest();
- servletResponse = (HttpServletResponse) ((RenderResponseImpl) response).getResponse();
+ // TODO: 2.2 Might want to use Pluto Container's InternalImplConverter instead
+ servletRequest = ((InternalRenderRequest)request).getHttpServletRequest();
+ servletResponse = ((InternalRenderResponse)response).getHttpServletResponse();
if ( servletRequest instanceof PortletDispatcherIncludeAware )
{
@@ -115,4 +119,18 @@
}
}
+
+ public void forward(PortletRequest request, PortletResponse response)
+ throws PortletException, IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void include(PortletRequest request, PortletResponse response)
+ throws PortletException, IOException
+ {
+ // TODO Auto-generated method stub
+
+ }
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java?rev=707546&r1=707545&r2=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java Thu Oct 23 22:13:54 2008
@@ -37,19 +37,19 @@
import org.apache.jetspeed.JetspeedActions;
import org.apache.jetspeed.portlet.SupportsHeaderPhase;
import org.apache.jetspeed.util.BaseObjectProxy;
-import org.apache.jetspeed.container.JetspeedPortletConfig;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.portlet.UnavailableException;
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
+import org.apache.jetspeed.container.InternalPortletConfig;
import org.apache.jetspeed.om.portlet.PortletApplication;
import org.apache.jetspeed.om.portlet.PortletDefinition;
+import org.apache.jetspeed.om.portlet.Supports;
import org.apache.jetspeed.om.servlet.WebApplicationDefinition;
import org.apache.jetspeed.factory.PortletFactory;
import org.apache.jetspeed.factory.PortletInstance;
-import org.apache.pluto.om.portlet.Supports;
/**
* PortletObjectProxy
@@ -280,7 +280,7 @@
{
try
{
- JetspeedPortletConfig config = (JetspeedPortletConfig) portlet.getPortletConfig();
+ InternalPortletConfig config = (InternalPortletConfig) portlet.getPortletConfig();
PortletDefinition portletDef = config.getPortletDefinition();
this.supports = portletDef.getSupports();
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/ServletContextProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/ServletContextProviderImpl.java?rev=707546&r1=707545&r2=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/ServletContextProviderImpl.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/ServletContextProviderImpl.java Thu Oct 23 22:13:54 2008
@@ -25,7 +25,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import org.apache.jetspeed.container.JetspeedPortletContext;
+import org.apache.jetspeed.container.InternalPortletContext;
import org.apache.portals.bridges.common.ServletContextProvider;
/**
@@ -38,7 +38,7 @@
{
public ServletContext getServletContext(GenericPortlet portlet)
{
- return ((JetspeedPortletContext)portlet.getPortletContext()).getServletContext();
+ return ((InternalPortletContext)portlet.getPortletContext()).getServletContext();
}
public HttpServletRequest getHttpServletRequest(GenericPortlet portlet, PortletRequest request)
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/BaseObjectProxy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/BaseObjectProxy.java?rev=707546&r1=707545&r2=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/BaseObjectProxy.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/BaseObjectProxy.java Thu Oct 23 22:13:54 2008
@@ -36,9 +36,9 @@
{
try
{
- hashCodeMethod = Object.class.getMethod("hashCode", null);
+ hashCodeMethod = Object.class.getMethod("hashCode", (Class [])null);
equalsMethod = Object.class.getMethod("equals", new Class [] { Object.class });
- toStringMethod = Object.class.getMethod("toString", null);
+ toStringMethod = Object.class.getMethod("toString", (Class [])null);
}
catch (NoSuchMethodException e)
{
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedLongObjectID.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedLongObjectID.java?rev=707546&r1=707545&r2=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedLongObjectID.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedLongObjectID.java Thu Oct 23 22:13:54 2008
@@ -24,7 +24,7 @@
* @author <a href="mailto:ate@douma.nu">Ate Douma</a>
* @version $Id$
*/
-public class JetspeedLongObjectID implements PortalObjectID, Serializable
+public class JetspeedLongObjectID implements Serializable
{
private Long oid;
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedObjectID.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedObjectID.java?rev=707546&r1=707545&r2=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedObjectID.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/JetspeedObjectID.java Thu Oct 23 22:13:54 2008
@@ -18,9 +18,6 @@
import java.io.Serializable;
-import org.apache.pluto.om.portlet.ObjectID;
-import org.apache.pluto.om.portlet.PortletDefinition;
-
/**
*
* JetspeedObjectID
@@ -31,7 +28,7 @@
* @version $Id$
*
*/
-public class JetspeedObjectID implements ObjectID, Serializable
+public class JetspeedObjectID implements Serializable
{
private String stringOID = null;
@@ -73,13 +70,4 @@
return new JetspeedObjectID(idStr);
}
- /**
- * @param portletDefinition
- * @param instanceName
- * @return
- */
- public static JetspeedObjectID createPortletEntityId(PortletDefinition portletDefinition, String instanceName)
- {
- return createFromString(portletDefinition.getPortletName() + ":" + portletDefinition.getId().toString() + ":" + instanceName);
- }
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/PortalObjectID.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/PortalObjectID.java?rev=707546&r1=707545&r2=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/PortalObjectID.java (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-commons/src/main/java/org/apache/jetspeed/util/PortalObjectID.java Thu Oct 23 22:13:54 2008
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.util;
-import org.apache.pluto.om.portlet.ObjectID;
/**
* PortalObjectID
@@ -24,7 +23,7 @@
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id$
*/
-public interface PortalObjectID extends ObjectID
+public interface PortalObjectID
{
long getOID();
}
Modified: portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-factories.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-factories.xml?rev=707546&r1=707545&r2=707546&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-factories.xml (original)
+++ portals/jetspeed-2/portal/branches/JS2-871-pluto-2.0-upgrade/jetspeed-portal-resources/src/main/resources/assembly/pluto-factories.xml Thu Oct 23 22:13:54 2008
@@ -18,6 +18,7 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+<!-- DST: moved to pluto-services.xml -->
<bean id="JetspeedNamespaceMapper" class="org.apache.jetspeed.container.namespace.JetspeedNamespaceMapperImpl">
<meta key="j2:cat" value="default" />
<constructor-arg index="0">
@@ -25,10 +26,12 @@
</constructor-arg>
</bean>
+<!-- DST: replaced by org.apache.pluto.services.PortletInvokerService -->
<bean id="LocalPortletInvokerFactory" class="org.apache.jetspeed.container.invoker.LocalPortletInvokerFactory">
<meta key="j2:cat" value="default" />
</bean>
+<!-- DST: replaced by org.apache.pluto.services.PortletInvokerService -->
<bean id="ServletPortletInvokerFactory" class="org.apache.jetspeed.container.invoker.ServletPortletInvokerFactory">
<meta key="j2:cat" value="default" />
<constructor-arg index="0">
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org