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 2002/09/26 19:36:00 UTC
cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/util MetaData.java
taylor 2002/09/26 10:35:59
Modified: src/java/org/apache/jetspeed/om/registry ContentURL.java
src/java/org/apache/jetspeed/portal Portlet.java
PortletController.java
src/java/org/apache/jetspeed/services/security
PortalResource.java
src/java/org/apache/jetspeed/util MetaData.java
Log:
Changed the following files to implement Serializable, needed to use the reloadable feature for sessions in tomcat.
Revision Changes Path
1.2 +3 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/ContentURL.java
Index: ContentURL.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/ContentURL.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContentURL.java 26 Mar 2002 09:06:53 -0000 1.1
+++ ContentURL.java 26 Sep 2002 17:35:58 -0000 1.2
@@ -54,13 +54,14 @@
package org.apache.jetspeed.om.registry;
+import java.io.Serializable;
/**
* Interface describing a ContentURL in the registry
*
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id$
*/
-public interface ContentURL
+public interface ContentURL extends Serializable
{
/** @return the string URL */
1.46 +3 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/Portlet.java
Index: Portlet.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/Portlet.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Portlet.java 24 Jul 2002 03:21:17 -0000 1.45
+++ Portlet.java 26 Sep 2002 17:35:58 -0000 1.46
@@ -58,6 +58,7 @@
import org.apache.turbine.util.RunData;
import org.apache.ecs.ConcreteElement;
+import java.io.Serializable;
/**
A portlet is an implementation of a small control (usually rendered in HTML)
that is available to a client application. Portlets were designed to be
@@ -66,7 +67,7 @@
@author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
@version $Id$
*/
-public interface Portlet
+public interface Portlet extends Serializable
{
public int PORTLET_NORMAL = 0;
1.53 +3 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletController.java
Index: PortletController.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/PortletController.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- PortletController.java 4 Jun 2001 17:46:53 -0000 1.52
+++ PortletController.java 26 Sep 2002 17:35:58 -0000 1.53
@@ -58,6 +58,7 @@
import org.apache.turbine.util.RunData;
import org.apache.ecs.ConcreteElement;
import java.util.Map;
+import java.io.Serializable;
/**
* A PortletController is responsible for laying out and rendering the content of
@@ -73,7 +74,7 @@
* @author <a href="mailto:burton@apache.org">Kevin A. Burton</a>
* @version $Id$
*/
-public interface PortletController
+public interface PortletController extends Serializable
{
/**
1.4 +3 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/PortalResource.java
Index: PortalResource.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/security/PortalResource.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PortalResource.java 25 Aug 2002 19:20:12 -0000 1.3
+++ PortalResource.java 26 Sep 2002 17:35:59 -0000 1.4
@@ -59,13 +59,14 @@
import org.apache.jetspeed.om.profile.Entry;
import org.apache.jetspeed.om.registry.RegistryEntry;
+import java.io.Serializable;
/**
* PortalResource
*
* @author <a href="paulsp@apache.org">Paul Spencer</a>
* @version $Id$
*/
-public class PortalResource
+public class PortalResource implements Serializable
{
public static final int TYPE_PORTLET = 100;
public static final int TYPE_ENTRY = 200;
1.9 +7 -5 jakarta-jetspeed/src/java/org/apache/jetspeed/util/MetaData.java
Index: MetaData.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/MetaData.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MetaData.java 13 Aug 2002 13:25:36 -0000 1.8
+++ MetaData.java 26 Sep 2002 17:35:59 -0000 1.9
@@ -58,8 +58,9 @@
import java.util.Hashtable;
import java.util.Locale;
import java.util.Enumeration;
-import java.util.Dictionary;
+import java.util.Map;
import org.apache.jetspeed.services.resources.JetspeedResources;
+import java.io.Serializable;
/**
A class for storing MetaData about an object.
@@ -67,7 +68,7 @@
@author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
@version $Id$
*/
-public class MetaData
+public class MetaData implements Serializable
{
public static final String DEFAULT_TITLE =
@@ -283,7 +284,7 @@
/**
Retrieves a property by name for a given locale
*/
- private Dictionary getProperties()
+ private Map getProperties()
{
return data;
}
@@ -295,7 +296,8 @@
*/
public void merge(MetaData meta)
{
- Dictionary params = meta.getProperties();
+ Map map = meta.getProperties();
+ Hashtable params = (Hashtable)map;
Enumeration en = params.keys();
while (en.hasMoreElements())
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>