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 at...@apache.org on 2009/03/17 15:23:55 UTC
svn commit: r755263 [4/4] - in /portals/jetspeed-2/portal/trunk:
components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/
components/jetspeed-portal/src/main/java/org/apache/jetspeed/
components/jetspeed-portal/src/main/java/org...
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java Tue Mar 17 14:23:52 2009
@@ -52,7 +52,7 @@
import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
import org.apache.jetspeed.util.JetspeedLocale;
-import org.apache.pluto.om.portlet.UserDataConstraint;
+import org.apache.pluto.container.om.portlet.UserDataConstraint;
/**
* <p>
@@ -171,7 +171,7 @@
PortletApplicationDefinitionImpl app = new PortletApplicationDefinitionImpl();
app.setName("App_1");
- app.setContextRoot("/app1");
+ app.setContextPath("/app1");
app.addDescription(Locale.FRENCH.toString()).setDescription("Description: Le fromage est dans mon pantalon!");
app.addDisplayName(Locale.FRENCH.toString()).setDisplayName("Display Name: Le fromage est dans mon pantalon!");
@@ -340,7 +340,7 @@
Description en1 = event.addDescription("en");
en1.setDescription("The Plain Old Event");
Description fr1 = event.addDescription("fr");
- fr1.setDescription("Le Vieux Ordinaire vnement");
+ fr1.setDescription("Le Vieux Ordinaire �v�nement");
QName q2 = new QName("http:portals.apache.org/events", "qualifiedEvent");
EventDefinition event2 = app.addEventDefinition(q2);
@@ -419,44 +419,44 @@
Description d5 = listener1.addDescription("en");
d5.setDescription("Listen to me once");
Description d6 = listener1.addDescription("fr");
- d6.setDescription("coutez moi une fois");
+ d6.setDescription("�coutez moi une fois");
DisplayName dn5 = listener1.addDisplayName("en");
dn5.setDisplayName("Listen to me twice");
DisplayName dn6 = listener1.addDisplayName("fr");
- dn6.setDisplayName("coutez moi deux fois");
+ dn6.setDisplayName("�coutez moi deux fois");
Listener listener2 = app.addListener("org.apache.listener.ListenerTwo");
Description d7 = listener2.addDescription("en");
d7.setDescription("Don't listen to me");
Description d8 = listener2.addDescription("fr");
- d8.setDescription("N'coutez pas moi");
+ d8.setDescription("N'�coutez pas moi");
DisplayName dn7 = listener2.addDisplayName("en");
dn7.setDisplayName("Listen!");
DisplayName dn8 = listener2.addDisplayName("fr");
- dn8.setDisplayName("coutez!");
+ dn8.setDisplayName("�coutez!");
SecurityConstraint sc = app.addSecurityConstraint(UserDataConstraint.INTEGRAL);
DisplayName scdn1 = sc.addDisplayName("en");
scdn1.setDisplayName("Integral Security Transport");
DisplayName scdn2 = sc.addDisplayName("fr");
- scdn2.setDisplayName("Transport Intgral de Scurit");
+ scdn2.setDisplayName("Transport Int�gral de S�curit�");
sc.addPortletName("PortletOne");
sc.addPortletName("PortletTwo");
sc.addPortletName("PortletThree");
Description des1 = sc.getUserDataConstraint().addDescription("en");
des1.setDescription("This is the Integral Security Transport");
Description des2 = sc.getUserDataConstraint().addDescription("fr");
- des2.setDescription("Ceci est le Transport Intgral de Scurit");
+ des2.setDescription("Ceci est le Transport Int�gral de S�curit�");
SecurityConstraint sc2 = app.addSecurityConstraint(UserDataConstraint.CONFIDENTIAL);
scdn1 = sc2.addDisplayName("en");
scdn1.setDisplayName("Confidential Security Transport");
scdn2 = sc2.addDisplayName("fr");
- scdn2.setDisplayName("Transport Confidentiel de Scurit");
+ scdn2.setDisplayName("Transport Confidentiel de S�curit�");
sc2.addPortletName("PortletA");
sc2.addPortletName("PortletB");
des1 = sc2.getUserDataConstraint().addDescription("en");
des1.setDescription("This is the Confidential Security Transport");
des2 = sc2.getUserDataConstraint().addDescription("fr");
- des2.setDescription("Ceci est le Transport Confidentiel de Scurit");
+ des2.setDescription("Ceci est le Transport Confidentiel de S�curit�");
}
public static void verifyPortlet20Data(PortletApplication app, PortletDefinition portlet)
@@ -480,7 +480,7 @@
Description en = event1.getDescription(new Locale("en"));
assertEquals(en.getDescription(), "The Plain Old Event");
Description fr = event1.getDescription(new Locale("fr"));
- assertEquals(fr.getDescription(), "Le Vieux Ordinaire vnement");
+ assertEquals(fr.getDescription(), "Le Vieux Ordinaire �v�nement");
EventDefinition event2 = events.get(1);
assertNotNull(event2);
@@ -617,7 +617,7 @@
assertEquals(d5.getDescription(), "Listen to me once");
Description d6 = descs.get(1);
assertEquals(d6.getLang(), "fr");
- assertEquals(d6.getDescription(), "coutez moi une fois");
+ assertEquals(d6.getDescription(), "�coutez moi une fois");
dnames = listener1.getDisplayNames();
assertEquals(dnames.size(), 2);
DisplayName dn5 = dnames.get(0);
@@ -625,7 +625,7 @@
assertEquals(dn5.getDisplayName(), "Listen to me twice");
DisplayName dn6 = dnames.get(1);
assertEquals(dn6.getLang(), "fr");
- assertEquals(dn6.getDisplayName(), "coutez moi deux fois");
+ assertEquals(dn6.getDisplayName(), "�coutez moi deux fois");
Listener listener2 = listeners.get(1);
assertEquals(listener2.getListenerClass(), "org.apache.listener.ListenerTwo");
@@ -636,7 +636,7 @@
assertEquals(d5.getDescription(), "Don't listen to me");
d6 = descs.get(1);
assertEquals(d6.getLang(), "fr");
- assertEquals(d6.getDescription(), "N'coutez pas moi");
+ assertEquals(d6.getDescription(), "N'�coutez pas moi");
dnames = listener2.getDisplayNames();
assertEquals(dnames.size(), 2);
dn5 = dnames.get(0);
@@ -644,7 +644,7 @@
assertEquals(dn5.getDisplayName(), "Listen!");
dn6 = dnames.get(1);
assertEquals(dn6.getLang(), "fr");
- assertEquals(dn6.getDisplayName(), "coutez!");
+ assertEquals(dn6.getDisplayName(), "�coutez!");
List<SecurityConstraint> scs = app.getSecurityConstraints();
assertEquals(scs.size(), 2);
@@ -654,7 +654,7 @@
assertEquals(scdn1.getLang(), "en");
assertEquals(scdn1.getDisplayName(), "Integral Security Transport");
DisplayName scdn2 = sc1.getDisplayName(new Locale("fr"));
- assertEquals(scdn2.getDisplayName(), "Transport Intgral de Scurit");
+ assertEquals(scdn2.getDisplayName(), "Transport Int�gral de S�curit�");
assertEquals(sc1.getPortletNames().get(0), "PortletOne");
assertEquals(sc1.getPortletNames().get(1), "PortletTwo");
assertEquals(sc1.getPortletNames().get(2), "PortletThree");
@@ -663,7 +663,7 @@
assertEquals(des1.getDescription(), "This is the Integral Security Transport");
Description des2 = sc1.getUserDataConstraint().getDescription(new Locale("fr"));
assertEquals(des2.getLang(), "fr");
- assertEquals(des2.getDescription(), "Ceci est le Transport Intgral de Scurit");
+ assertEquals(des2.getDescription(), "Ceci est le Transport Int�gral de S�curit�");
SecurityConstraint sc2 = scs.get(1);
assertEquals(sc2.getUserDataConstraint().getTransportGuarantee(), UserDataConstraint.CONFIDENTIAL);
@@ -671,7 +671,7 @@
assertEquals(scdn1.getLang(), "en");
assertEquals(scdn1.getDisplayName(), "Confidential Security Transport");
scdn2 = sc2.getDisplayName(new Locale("fr"));
- assertEquals(scdn2.getDisplayName(), "Transport Confidentiel de Scurit");
+ assertEquals(scdn2.getDisplayName(), "Transport Confidentiel de S�curit�");
assertEquals(sc2.getPortletNames().get(0), "PortletA");
assertEquals(sc2.getPortletNames().get(1), "PortletB");
des1 = sc2.getUserDataConstraint().getDescription(new Locale("en"));
@@ -679,7 +679,7 @@
assertEquals(des1.getDescription(), "This is the Confidential Security Transport");
des2 = sc2.getUserDataConstraint().getDescription(new Locale("fr"));
assertEquals(des2.getLang(), "fr");
- assertEquals(des2.getDescription(), "Ceci est le Transport Confidentiel de Scurit");
+ assertEquals(des2.getDescription(), "Ceci est le Transport Confidentiel de S�curit�");
}
}
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java Tue Mar 17 14:23:52 2009
@@ -108,7 +108,7 @@
PortletApplicationDefinitionImpl app = new PortletApplicationDefinitionImpl();
app.setName("PA-001");
- app.setContextRoot("/pa-001");
+ app.setContextPath("/pa-001");
UserAttributeRef uaRef = app.addUserAttributeRef("user-name-family");
uaRef.setNameLink("user.name.family");
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java Tue Mar 17 14:23:52 2009
@@ -78,7 +78,7 @@
// Create an Application and a Web app
PortletApplicationDefinitionImpl app = new PortletApplicationDefinitionImpl();
app.setName("App_1");
- app.setContextRoot("/app1");
+ app.setContextPath("/app1");
app.addDescription(Locale.FRENCH.toString()).setDescription("Description: Le fromage est dans mon pantalon!");
app.addDisplayName(Locale.FRENCH.toString()).setDisplayName("Display Name: Le fromage est dans mon pantalon!");
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-registry/src/test/java/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java Tue Mar 17 14:23:52 2009
@@ -83,7 +83,7 @@
// Create an Application and a Web app
PortletApplicationDefinitionImpl app = new PortletApplicationDefinitionImpl();
app.setName("App_1");
- app.setContextRoot("/app1");
+ app.setContextPath("/app1");
UserAttributeRef uaRef = app.addUserAttributeRef("user-name-family");
uaRef.setNameLink("user.name.family");
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesProvider.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesProvider.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesProvider.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/components/portletpreferences/PortletPreferencesProvider.java Tue Mar 17 14:23:52 2009
@@ -20,7 +20,8 @@
import org.apache.jetspeed.om.portlet.PortletApplication;
import org.apache.jetspeed.om.portlet.PortletDefinition;
-import org.apache.pluto.internal.InternalPortletPreference;
+import org.apache.pluto.container.PortletPreference;
+import org.apache.pluto.container.PortletPreferencesService;
/**
@@ -28,7 +29,7 @@
* @version $Id$
*
*/
-public interface PortletPreferencesProvider extends org.apache.pluto.spi.optional.PortletPreferencesService
+public interface PortletPreferencesProvider extends PortletPreferencesService
{
public void preloadApplicationPreferences(String portletApplicationName);
public void preloadAllEntities();
@@ -36,5 +37,5 @@
public void storeDefaults(PortletApplication app);
public void removeDefaults(PortletDefinition pd);
public void removeDefaults(PortletApplication app);
- public Map<String, InternalPortletPreference> getDefaultPreferences(PortletDefinition pd);
+ public Map<String, PortletPreference> getDefaultPreferences(PortletDefinition pd);
}
Copied: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java (from r754582, portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java?p2=portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java&p1=portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java&r1=754582&r2=755263&rev=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletConfig.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java Tue Mar 17 14:23:52 2009
@@ -25,9 +25,9 @@
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id$
*/
-public interface InternalPortletConfig extends org.apache.pluto.internal.InternalPortletConfig
+public interface JetspeedPortletConfig
{
- InternalPortletContext getPortletContext();
+ JetspeedPortletContext getPortletContext();
PortletDefinition getPortletDefinition();
void setPortletDefinition(PortletDefinition pd);
}
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.3
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletConfig.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java (from r754582, portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java?p2=portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java&p1=portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java&r1=754582&r2=755263&rev=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/InternalPortletContext.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java Tue Mar 17 14:23:52 2009
@@ -16,6 +16,9 @@
*/
package org.apache.jetspeed.container;
+import javax.portlet.PortletContext;
+import javax.servlet.ServletContext;
+
import org.apache.jetspeed.om.portlet.PortletApplication;
/**
@@ -25,7 +28,8 @@
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id$
*/
-public interface InternalPortletContext extends org.apache.pluto.internal.InternalPortletContext
+public interface JetspeedPortletContext extends PortletContext
{
- public PortletApplication getApplicationDefinition();
+ PortletApplication getApplicationDefinition();
+ ServletContext getServletContext();
}
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/JetspeedPortletContext.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletEntity.java Tue Mar 17 14:23:52 2009
@@ -24,7 +24,7 @@
* @version $Id$
*
*/
-public interface PortletEntity extends org.apache.pluto.PortletEntity
+public interface PortletEntity extends org.apache.pluto.container.PortletEntity
{
Long getOid();
String getId();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindow.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindow.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindow.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindow.java Tue Mar 17 14:23:52 2009
@@ -26,7 +26,7 @@
* @version $Id$
*
*/
-public interface PortletWindow extends org.apache.pluto.PortletWindow, Serializable
+public interface PortletWindow extends org.apache.pluto.container.PortletWindow, Serializable
{
PortletWindowID getId();
void setId(String id);
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindowID.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindowID.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindowID.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/container/PortletWindowID.java Tue Mar 17 14:23:52 2009
@@ -23,6 +23,6 @@
* @version $Id$
*
*/
-public interface PortletWindowID extends org.apache.pluto.PortletWindowID, Serializable
+public interface PortletWindowID extends org.apache.pluto.container.PortletWindowID, Serializable
{
}
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorService.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorService.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorService.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/descriptor/JetspeedDescriptorService.java Tue Mar 17 14:23:52 2009
@@ -34,5 +34,5 @@
* @return Object representation of the descriptor.
* @throws Exception if an loading or parsing error occurs.
*/
- PortletApplication read(InputStream webDescriptor, InputStream portletDescriptor, InputStream jetspeedPortletDescriptor, ClassLoader paClassLoader) throws Exception;
+ PortletApplication read(String name, String contextPath, InputStream webDescriptor, InputStream portletDescriptor, InputStream jetspeedPortletDescriptor, ClassLoader paClassLoader) throws Exception;
}
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/events/PortletEventQueue.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/events/PortletEventQueue.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/events/PortletEventQueue.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/events/PortletEventQueue.java Tue Mar 17 14:23:52 2009
@@ -18,7 +18,7 @@
import java.util.List;
-import org.apache.pluto.PortletWindow;
+import org.apache.jetspeed.container.PortletWindow;
/**
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/events/ProcessEvent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/events/ProcessEvent.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/events/ProcessEvent.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/events/ProcessEvent.java Tue Mar 17 14:23:52 2009
@@ -20,7 +20,7 @@
import javax.portlet.Event;
-import org.apache.pluto.PortletWindow;
+import org.apache.pluto.container.PortletWindow;
/**
* ProcessEvent extends the Portlet API Event to give Jetspeed internals access to processing status as well other state information
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletInstance.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletInstance.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletInstance.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/factory/PortletInstance.java Tue Mar 17 14:23:52 2009
@@ -18,7 +18,7 @@
import javax.portlet.Portlet;
-import org.apache.jetspeed.container.InternalPortletConfig;
+import org.apache.jetspeed.container.JetspeedPortletConfig;
/**
* PortletInstance
@@ -29,6 +29,6 @@
*/
public interface PortletInstance extends Portlet
{
- InternalPortletConfig getConfig();
+ JetspeedPortletConfig getConfig();
Portlet getRealPortlet();
}
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/mockobjects/request/MockRequestContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/mockobjects/request/MockRequestContext.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/mockobjects/request/MockRequestContext.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/mockobjects/request/MockRequestContext.java Tue Mar 17 14:23:52 2009
@@ -475,7 +475,7 @@
* getPreferedLanguage
* </p>
*
- * @see org.apache.jetspeed.request.RequestContext#getPreferedLanguage(org.apache.pluto.om.portlet.PortletDefinition)
+ * @see org.apache.jetspeed.request.RequestContext#getPreferedLanguage(org.apache.pluto.container.om.portlet.PortletDefinition)
* @param portlet
* @return
*/
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/ContainerRuntimeOption.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/ContainerRuntimeOption.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/ContainerRuntimeOption.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/ContainerRuntimeOption.java Tue Mar 17 14:23:52 2009
@@ -22,6 +22,6 @@
* @version $Id$
*
*/
-public interface ContainerRuntimeOption extends org.apache.pluto.om.portlet.ContainerRuntimeOption, Serializable
+public interface ContainerRuntimeOption extends org.apache.pluto.container.om.portlet.ContainerRuntimeOption, Serializable
{
}
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/CustomPortletMode.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/CustomPortletMode.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/CustomPortletMode.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/CustomPortletMode.java Tue Mar 17 14:23:52 2009
@@ -27,7 +27,7 @@
* @version $Id$
*
*/
-public interface CustomPortletMode extends org.apache.pluto.om.portlet.CustomPortletMode, Serializable
+public interface CustomPortletMode extends org.apache.pluto.container.om.portlet.CustomPortletMode, Serializable
{
Description getDescription(Locale locale);
List<Description> getDescriptions();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/CustomWindowState.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/CustomWindowState.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/CustomWindowState.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/CustomWindowState.java Tue Mar 17 14:23:52 2009
@@ -27,7 +27,7 @@
* @version $Id$
*
*/
-public interface CustomWindowState extends org.apache.pluto.om.portlet.CustomWindowState, Serializable
+public interface CustomWindowState extends org.apache.pluto.container.om.portlet.CustomWindowState, Serializable
{
Description getDescription(Locale locale);
List<Description> getDescriptions();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Description.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Description.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Description.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Description.java Tue Mar 17 14:23:52 2009
@@ -24,6 +24,6 @@
* @version $Id$
*
*/
-public interface Description extends org.apache.pluto.om.portlet.Description, LocalizedObject, Serializable
+public interface Description extends org.apache.pluto.container.om.portlet.Description, LocalizedObject, Serializable
{
}
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/DisplayName.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/DisplayName.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/DisplayName.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/DisplayName.java Tue Mar 17 14:23:52 2009
@@ -24,6 +24,6 @@
* @version $Id$
*
*/
-public interface DisplayName extends org.apache.pluto.om.portlet.DisplayName, LocalizedObject, Serializable
+public interface DisplayName extends org.apache.pluto.container.om.portlet.DisplayName, LocalizedObject, Serializable
{
}
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/EventDefinition.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/EventDefinition.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/EventDefinition.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/EventDefinition.java Tue Mar 17 14:23:52 2009
@@ -24,7 +24,7 @@
* @version $Id$
*
*/
-public interface EventDefinition extends org.apache.pluto.om.portlet.EventDefinition, Serializable
+public interface EventDefinition extends org.apache.pluto.container.om.portlet.EventDefinition, Serializable
{
Description getDescription(Locale locale);
List<Description> getDescriptions();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/EventDefinitionReference.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/EventDefinitionReference.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/EventDefinitionReference.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/EventDefinitionReference.java Tue Mar 17 14:23:52 2009
@@ -22,6 +22,6 @@
* @version $Id$
*
*/
-public interface EventDefinitionReference extends org.apache.pluto.om.portlet.EventDefinitionReference, Serializable
+public interface EventDefinitionReference extends org.apache.pluto.container.om.portlet.EventDefinitionReference, Serializable
{
}
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Filter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Filter.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Filter.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Filter.java Tue Mar 17 14:23:52 2009
@@ -24,7 +24,7 @@
* @version $Id$
*
*/
-public interface Filter extends org.apache.pluto.om.portlet.Filter, Serializable
+public interface Filter extends org.apache.pluto.container.om.portlet.Filter, Serializable
{
Description getDescription(Locale locale);
List<Description> getDescriptions();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/FilterMapping.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/FilterMapping.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/FilterMapping.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/FilterMapping.java Tue Mar 17 14:23:52 2009
@@ -22,6 +22,6 @@
* @version $Id$
*
*/
-public interface FilterMapping extends org.apache.pluto.om.portlet.FilterMapping, Serializable
+public interface FilterMapping extends org.apache.pluto.container.om.portlet.FilterMapping, Serializable
{
}
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/InitParam.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/InitParam.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/InitParam.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/InitParam.java Tue Mar 17 14:23:52 2009
@@ -25,7 +25,7 @@
* @version $Id$
*
*/
-public interface InitParam extends org.apache.pluto.om.portlet.InitParam, Serializable
+public interface InitParam extends org.apache.pluto.container.om.portlet.InitParam, Serializable
{
Description getDescription(Locale locale);
List<Description> getDescriptions();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Listener.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Listener.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Listener.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Listener.java Tue Mar 17 14:23:52 2009
@@ -24,7 +24,7 @@
* @version $Id$
*
*/
-public interface Listener extends org.apache.pluto.om.portlet.Listener, Serializable
+public interface Listener extends org.apache.pluto.container.om.portlet.Listener, Serializable
{
Description getDescription(Locale locale);
List<Description> getDescriptions();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletApplication.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletApplication.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletApplication.java Tue Mar 17 14:23:52 2009
@@ -24,13 +24,13 @@
import javax.portlet.WindowState;
import javax.xml.namespace.QName;
-import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
/**
* PortletApplication
*
- * Extends the <code>org.apache.pluto.om.portlet.PortletApplicationDefinition</code>
+ * Extends the <code>org.apache.pluto.container.om.portlet.PortletApplicationDefinition</code>
* interface adding methods for those attributes that do not have them
* so as to make manipulating the portlet OM easier.
*
@@ -39,9 +39,6 @@
*/
public interface PortletApplication extends PortletApplicationDefinition, Serializable
{
- String getContextRoot();
- void setContextRoot(String contextRoot);
-
/**
* Marks this application as a standard web application,
* stored in the web application server's web application space.
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletDefinition.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletDefinition.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletDefinition.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletDefinition.java Tue Mar 17 14:23:52 2009
@@ -31,7 +31,7 @@
* @version $Id$
*
*/
-public interface PortletDefinition extends org.apache.pluto.om.portlet.PortletDefinition, Serializable
+public interface PortletDefinition extends org.apache.pluto.container.om.portlet.PortletDefinition, Serializable
{
PortletApplication getApplication();
InitParam getInitParam(String paramName);
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletInfo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletInfo.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletInfo.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PortletInfo.java Tue Mar 17 14:23:52 2009
@@ -22,6 +22,6 @@
* @version $Id$
*
*/
-public interface PortletInfo extends org.apache.pluto.om.portlet.PortletInfo, Serializable
+public interface PortletInfo extends org.apache.pluto.container.om.portlet.PortletInfo, Serializable
{
}
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preference.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preference.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preference.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preference.java Tue Mar 17 14:23:52 2009
@@ -22,6 +22,6 @@
* @version $Id$
*
*/
-public interface Preference extends org.apache.pluto.om.portlet.Preference, Serializable
+public interface Preference extends org.apache.pluto.container.om.portlet.Preference, Serializable
{
}
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preferences.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preferences.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preferences.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Preferences.java Tue Mar 17 14:23:52 2009
@@ -23,7 +23,7 @@
* @version $Id$
*
*/
-public interface Preferences extends org.apache.pluto.om.portlet.Preferences, Serializable
+public interface Preferences extends org.apache.pluto.container.om.portlet.Preferences, Serializable
{
Preference getPortletPreference(String name);
List<Preference> getPortletPreferences();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PublicRenderParameter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PublicRenderParameter.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PublicRenderParameter.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/PublicRenderParameter.java Tue Mar 17 14:23:52 2009
@@ -24,7 +24,7 @@
* @version $Id$
*
*/
-public interface PublicRenderParameter extends org.apache.pluto.om.portlet.PublicRenderParameter, Serializable
+public interface PublicRenderParameter extends org.apache.pluto.container.om.portlet.PublicRenderParameter, Serializable
{
Description getDescription(Locale locale);
List<Description> getDescriptions();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityConstraint.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityConstraint.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityConstraint.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityConstraint.java Tue Mar 17 14:23:52 2009
@@ -24,7 +24,7 @@
* @version $Id$
*
*/
-public interface SecurityConstraint extends org.apache.pluto.om.portlet.SecurityConstraint, Serializable
+public interface SecurityConstraint extends org.apache.pluto.container.om.portlet.SecurityConstraint, Serializable
{
UserDataConstraint getUserDataConstraint();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityRoleRef.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityRoleRef.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityRoleRef.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/SecurityRoleRef.java Tue Mar 17 14:23:52 2009
@@ -25,7 +25,7 @@
* @version $Id$
*
*/
-public interface SecurityRoleRef extends org.apache.pluto.om.portlet.SecurityRoleRef, Serializable
+public interface SecurityRoleRef extends org.apache.pluto.container.om.portlet.SecurityRoleRef, Serializable
{
Description getDescription(Locale locale);
List<Description> getDescriptions();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Supports.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Supports.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Supports.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/Supports.java Tue Mar 17 14:23:52 2009
@@ -22,6 +22,6 @@
* @version $Id$
*
*/
-public interface Supports extends org.apache.pluto.om.portlet.Supports, Serializable
+public interface Supports extends org.apache.pluto.container.om.portlet.Supports, Serializable
{
}
\ No newline at end of file
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttribute.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttribute.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttribute.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserAttribute.java Tue Mar 17 14:23:52 2009
@@ -24,7 +24,7 @@
* @version $Id$
*
*/
-public interface UserAttribute extends org.apache.pluto.om.portlet.UserAttribute, Serializable
+public interface UserAttribute extends org.apache.pluto.container.om.portlet.UserAttribute, Serializable
{
Description getDescription(Locale locale);
List<Description> getDescriptions();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserDataConstraint.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserDataConstraint.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserDataConstraint.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/om/portlet/UserDataConstraint.java Tue Mar 17 14:23:52 2009
@@ -24,7 +24,7 @@
* @version $Id$
*
*/
-public interface UserDataConstraint extends org.apache.pluto.om.portlet.UserDataConstraint, Serializable
+public interface UserDataConstraint extends org.apache.pluto.container.om.portlet.UserDataConstraint, Serializable
{
Description getDescription(Locale locale);
List<Description> getDescriptions();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserInfoManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserInfoManager.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserInfoManager.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/userinfo/UserInfoManager.java Tue Mar 17 14:23:52 2009
@@ -19,7 +19,7 @@
import java.util.Map;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.pluto.spi.optional.UserInfoService;
+import org.apache.pluto.container.UserInfoService;
/**
* <p>The {@link UserInfoManager} retrieve the Map that will be set as a
Modified: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedContainerServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedContainerServlet.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedContainerServlet.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/JetspeedContainerServlet.java Tue Mar 17 14:23:52 2009
@@ -29,7 +29,9 @@
import javax.portlet.EventPortlet;
import javax.portlet.EventRequest;
import javax.portlet.EventResponse;
+import javax.portlet.PortletConfig;
import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.portlet.ResourceRequest;
@@ -42,7 +44,6 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
import org.apache.jetspeed.container.session.PortalSessionsManager;
@@ -53,7 +54,9 @@
import org.apache.jetspeed.tools.pamanager.PortletApplicationManagement;
import org.apache.jetspeed.util.DirectoryHelper;
import org.apache.jetspeed.aggregator.CurrentWorkerContext;
-import org.apache.pluto.internal.InternalPortletRequest;
+import org.apache.pluto.container.PortletInvokerService;
+import org.apache.pluto.container.PortletRequestContext;
+import org.apache.pluto.container.PortletResponseContext;
/**
* Jetspeed Container entry point.
@@ -229,6 +232,14 @@
boolean destroyPortlet = false;
boolean isParallelMode = false;
+ PortletConfig portletConfig;
+ PortletRequest portletRequest;
+ PortletResponse portletResponse;
+ PortletRequestContext requestContext;
+ PortletResponseContext responseContext;
+ // TODO: add FilterManager support
+ //FilterManager filterManager;
+
try
{
isParallelMode = CurrentWorkerContext.getParallelRenderingMode();
@@ -245,86 +256,55 @@
{
return;
}
- // Inject the current webcontainer provided request *above* the PortletRequest wrapped Jetspeed portlet specific servletRequest (o.a.j.engine.servlet.ServletRequestImpl).
- // This makes it possible to access the path encoded portlet parameters using the servlet.getParameterMap() which the jetspeed servlet takes care of.
- // Injecting the webcontainer provided request *above* it is needed to ensure the "cross-context" specific state and handling is still provided correctly
- PortletRequest portletRequest = (PortletRequest)request.getAttribute(ContainerConstants.PORTLET_REQUEST);
- HttpServletRequestWrapper jetspeedServletWrapper = (HttpServletRequestWrapper)((HttpServletRequestWrapper)portletRequest).getRequest();
- jetspeedServletWrapper.setRequest(request);
+
if (isParallelMode)
{
+ portletConfig = (PortletConfig)CurrentWorkerContext.getAttribute(ContainerConstants.PORTLET_CONFIG);
+ portletRequest = (PortletRequest)CurrentWorkerContext.getAttribute(ContainerConstants.PORTLET_REQUEST);
+ portletResponse = (PortletResponse)CurrentWorkerContext.getAttribute(ContainerConstants.PORTLET_RESPONSE);
+ requestContext = (PortletRequestContext)CurrentWorkerContext.getAttribute(PortletInvokerService.REQUEST_CONTEXT);
+ responseContext = (PortletResponseContext)CurrentWorkerContext.getAttribute(PortletInvokerService.RESPONSE_CONTEXT);
+ //filterManager = (FilterManager)CurrentWorkerContext.getAttribute(PortletInvokerService.FILTER_MANAGER);
portlet = (PortletInstance) CurrentWorkerContext.getAttribute(ContainerConstants.PORTLET);
portletName = (String) CurrentWorkerContext.getAttribute(ContainerConstants.PORTLET_NAME);
}
else
{
+ portletConfig = (PortletConfig)request.getAttribute(ContainerConstants.PORTLET_CONFIG);
+ portletRequest = (PortletRequest)request.getAttribute(ContainerConstants.PORTLET_REQUEST);
+ portletResponse = (PortletResponse)request.getAttribute(ContainerConstants.PORTLET_RESPONSE);
+ requestContext = (PortletRequestContext)request.getAttribute(PortletInvokerService.REQUEST_CONTEXT);
+ responseContext = (PortletResponseContext)request.getAttribute(PortletInvokerService.RESPONSE_CONTEXT);
+ //filterManager = (FilterManager)request.getAttribute(PortletInvokerService.FILTER_MANAGER);
portlet = (PortletInstance)request.getAttribute(ContainerConstants.PORTLET);
portletName = (String)request.getAttribute(ContainerConstants.PORTLET_NAME);
- request.removeAttribute(ContainerConstants.PORTLET);
}
+ requestContext.init(portletConfig.getPortletContext(), getServletContext(), request, response);
+ responseContext.init(request, response);
+
if (method == ContainerConstants.METHOD_ACTION)
{
- ActionRequest actionRequest = (ActionRequest) request.getAttribute(ContainerConstants.PORTLET_REQUEST);
- ActionResponse actionResponse = (ActionResponse) request.getAttribute(ContainerConstants.PORTLET_RESPONSE);
- ((InternalPortletRequest)actionRequest).init(portlet.getConfig().getPortletContext(), jetspeedServletWrapper);
+ ActionRequest actionRequest = (ActionRequest)portletRequest;
+ ActionResponse actionResponse = (ActionResponse)portletResponse;
portlet.processAction(actionRequest, actionResponse);
}
else if (method == ContainerConstants.METHOD_RENDER)
{
- RenderRequest renderRequest = null;
- RenderResponse renderResponse = null;
-
- if (isParallelMode)
- {
- renderRequest = (RenderRequest) CurrentWorkerContext.getAttribute(ContainerConstants.PORTLET_REQUEST);
- renderResponse = (RenderResponse) CurrentWorkerContext.getAttribute(ContainerConstants.PORTLET_RESPONSE);
- }
- else
- {
- renderRequest = (RenderRequest) request.getAttribute(ContainerConstants.PORTLET_REQUEST);
- renderResponse = (RenderResponse) request.getAttribute(ContainerConstants.PORTLET_RESPONSE);
-
- }
- ((InternalPortletRequest)renderRequest).init(portlet.getConfig().getPortletContext(), jetspeedServletWrapper);
+ RenderRequest renderRequest = (RenderRequest)portletRequest;
+ RenderResponse renderResponse = (RenderResponse)portletResponse;
portlet.render(renderRequest, renderResponse);
}
- else if (method == ContainerConstants.METHOD_EVENT)
+ else if (method == ContainerConstants.METHOD_EVENT && portlet.getRealPortlet() instanceof EventPortlet)
{
- EventRequest eventRequest = null;
- EventResponse eventResponse = null;
-
- if (isParallelMode)
- {
- eventRequest = (EventRequest) CurrentWorkerContext.getAttribute(ContainerConstants.PORTLET_REQUEST);
- eventResponse = (EventResponse) CurrentWorkerContext.getAttribute(ContainerConstants.PORTLET_RESPONSE);
- }
- else
- {
- eventRequest = (EventRequest) request.getAttribute(ContainerConstants.PORTLET_REQUEST);
- eventResponse = (EventResponse) request.getAttribute(ContainerConstants.PORTLET_RESPONSE);
-
- }
- ((InternalPortletRequest)eventRequest).init(portlet.getConfig().getPortletContext(), jetspeedServletWrapper);
+ EventRequest eventRequest = (EventRequest)portletRequest;
+ EventResponse eventResponse = (EventResponse)portletResponse;
((EventPortlet)portlet.getRealPortlet()).processEvent(eventRequest, eventResponse);
}
else if (method == ContainerConstants.METHOD_RESOURCE && portlet.getRealPortlet() instanceof ResourceServingPortlet)
{
- ResourceRequest resourceRequest = null;
- ResourceResponse resourceResponse = null;
-
- if (isParallelMode)
- {
- resourceRequest = (ResourceRequest) CurrentWorkerContext.getAttribute(ContainerConstants.PORTLET_REQUEST);
- resourceResponse = (ResourceResponse) CurrentWorkerContext.getAttribute(ContainerConstants.PORTLET_RESPONSE);
- }
- else
- {
- resourceRequest = (ResourceRequest) request.getAttribute(ContainerConstants.PORTLET_REQUEST);
- resourceResponse = (ResourceResponse) request.getAttribute(ContainerConstants.PORTLET_RESPONSE);
-
- }
- ((InternalPortletRequest)resourceRequest).init(portlet.getConfig().getPortletContext(), jetspeedServletWrapper);
+ ResourceRequest resourceRequest = (ResourceRequest)portletRequest;
+ ResourceResponse resourceResponse = (ResourceResponse)portletResponse;
((ResourceServingPortlet)portlet.getRealPortlet()).serveResource(resourceRequest, resourceResponse);
}
@@ -395,9 +375,9 @@
}
finally
{
- if ( destroyPortlet )
+ if ( destroyPortlet && portlet != null)
{
- // portlet throwed UnavailableException: take it out of service
+ // portlet threw UnavailableException: take it out of service
try
{
portlet.destroy();
Modified: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletRequestContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletRequestContext.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletRequestContext.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletRequestContext.java Tue Mar 17 14:23:52 2009
@@ -20,7 +20,7 @@
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
-import org.apache.pluto.om.portlet.PortletDefinition;
+import org.apache.pluto.container.om.portlet.PortletDefinition;
public class PortletRequestContext
{
Added: 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=755263&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletWindowRequestContext.java (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletWindowRequestContext.java Tue Mar 17 14:23:52 2009
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jetspeed.container;
+
+import javax.portlet.PortletRequest;
+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;
+
+/**
+ * @version $Id$
+ *
+ */
+public interface PortletWindowRequestContext
+{
+ final class Current
+ {
+ private static final ThreadLocal<PortletWindowRequestContext> current = new ThreadLocal<PortletWindowRequestContext>();
+
+ public static PortletWindowRequestContext create(PortletWindowRequestContext context)
+ {
+ current.set(context);
+ return context;
+ }
+ public static PortletWindowRequestContext get()
+ {
+ return current.get();
+ }
+ public static PortletWindowRequestContext remove()
+ {
+ PortletWindowRequestContext pwrc = current.get();
+ current.remove();
+ return pwrc;
+ }
+ }
+
+ enum Action { NOOP, LOAD, ACTION, EVENT, RESOURCE, RENDER };
+
+ Action getAction();
+ PortletWindow getPortletWindow();
+ PortletRequest getPortletRequest();
+ PortletResponse getPortletResponse();
+ PortletRequestContext getPortletRequestContext();
+ PortletResponseContext getPortletResponseContext();
+ PortletInstance getPortletInstance();
+}
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletWindowRequestContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletWindowRequestContext.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/container/PortletWindowRequestContext.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/PortletObjectProxy.java Tue Mar 17 14:23:52 2009
@@ -46,7 +46,7 @@
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.container.JetspeedPortletConfig;
import org.apache.jetspeed.om.portlet.PortletApplication;
import org.apache.jetspeed.om.portlet.PortletDefinition;
import org.apache.jetspeed.om.portlet.Supports;
@@ -295,7 +295,7 @@
{
try
{
- InternalPortletConfig config = (InternalPortletConfig) portlet.getPortletConfig();
+ JetspeedPortletConfig config = (JetspeedPortletConfig) portlet.getPortletConfig();
PortletDefinition portletDef = config.getPortletDefinition();
this.supports = portletDef.getSupports();
}
@@ -328,10 +328,9 @@
PortletFactory portletFactory = (PortletFactory) Jetspeed.getComponentManager().getComponent("portletFactory");
ServletContext portalAppContext = ((ServletConfig) Jetspeed.getComponentManager().getComponent("ServletConfig")).getServletContext();
- PortletDefinition portletDef = (PortletDefinition) registry.getPortletDefinitionByUniqueName(this.customConfigModePortletUniqueName);
- PortletApplication portletApp = (PortletApplication) portletDef.getApplication();
- String portletAppName = portletApp.getContextRoot();
- ServletContext portletAppContext = portalAppContext.getContext(portletAppName);
+ PortletDefinition portletDef = registry.getPortletDefinitionByUniqueName(this.customConfigModePortletUniqueName);
+ PortletApplication portletApp = portletDef.getApplication();
+ ServletContext portletAppContext = portalAppContext.getContext(portletApp.getContextPath());
setPortletObjectProxied(true);
this.customConfigModePortletInstance = portletFactory.getPortletInstance(portletAppContext, portletDef);
Modified: portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/ServletContextProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/ServletContextProviderImpl.java?rev=755263&r1=755262&r2=755263&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/ServletContextProviderImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-commons/src/main/java/org/apache/jetspeed/portlet/ServletContextProviderImpl.java Tue Mar 17 14:23:52 2009
@@ -21,11 +21,11 @@
import javax.portlet.PortletResponse;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
-import org.apache.jetspeed.container.InternalPortletContext;
+import org.apache.jetspeed.container.JetspeedPortletContext;
+import org.apache.pluto.container.PortletInvokerService;
+import org.apache.pluto.container.PortletRequestContext;
import org.apache.portals.bridges.common.ServletContextProvider;
/**
@@ -36,18 +36,22 @@
*/
public class ServletContextProviderImpl implements ServletContextProvider
{
+ private PortletRequestContext getRequestContext(PortletRequest request)
+ {
+ return ((PortletRequestContext)request.getAttribute(PortletInvokerService.REQUEST_CONTEXT));
+ }
public ServletContext getServletContext(GenericPortlet portlet)
{
- return ((InternalPortletContext)portlet.getPortletContext()).getServletContext();
+ return ((JetspeedPortletContext)portlet.getPortletContext()).getServletContext();
}
public HttpServletRequest getHttpServletRequest(GenericPortlet portlet, PortletRequest request)
{
- return (HttpServletRequest) ((HttpServletRequestWrapper) request).getRequest();
+ return getRequestContext(request).getServletRequest();
}
public HttpServletResponse getHttpServletResponse(GenericPortlet portlet, PortletResponse response)
{
- return (HttpServletResponse) ((HttpServletResponseWrapper) response).getResponse();
+ return getRequestContext(org.apache.jetspeed.container.PortletRequestContext.getContext().getRequest()).getServletResponse();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org