taylor 2002/09/24 14:33:36 Modified: src/java/org/apache/jetspeed/om SecurityReference.java src/java/org/apache/jetspeed/om/profile MetaInfo.java PSMLDocument.java ProfileLocator.java src/java/org/apache/jetspeed/om/registry Category.java src/java/org/apache/jetspeed/portal/portlets/browser BrowserIterator.java src/java/org/apache/jetspeed/services/psmlmanager/db DatabasePsmlManagerService.java Log: Extended Serializable interface in the following interfaces: 1. java/org/apache/jetspeed/om/SecurityReference.java 2. java/org/apache/jetspeed/om/profile/MetaInfo.java 3. java/org/apache/jetspeed/om/profile/PSMLDocument.java 4. java/org/apache/jetspeed/om/profile/ProfileLocator.java 5. java/org/apache/jetspeed/om/registry/Category.java 6. java/org/apache/jetspeed/portal/portlets/browser/BrowserIterator.java as they are all stored in the session. This change is required to use the reloadable webapp feature in tomcat. Added a null pointer check in the method DatabasePsmlManagerService.shutdown(). This change is required due to the feature put in earlier which makes caching optional in DatabasePsmlManagerService. Revision Changes Path 1.3 +3 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/om/SecurityReference.java Index: SecurityReference.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/SecurityReference.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SecurityReference.java 28 Jun 2002 05:37:29 -0000 1.2 +++ SecurityReference.java 24 Sep 2002 21:33:35 -0000 1.3 @@ -54,13 +54,14 @@ package org.apache.jetspeed.om; +import java.io.Serializable; /** * SecurityReference * * @author <a href="[EMAIL PROTECTED]">Paul Spencer</a> * @version $Id$ */ -public interface SecurityReference +public interface SecurityReference extends Serializable { /** Getter for property parent. 1.2 +3 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/MetaInfo.java Index: MetaInfo.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/MetaInfo.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- MetaInfo.java 22 Mar 2002 18:38:35 -0000 1.1 +++ MetaInfo.java 24 Sep 2002 21:33:35 -0000 1.2 @@ -54,13 +54,14 @@ package org.apache.jetspeed.om.profile; +import java.io.Serializable; /** * Interface describing meta info for an entry. * * @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a> * @version $Id$ */ -public interface MetaInfo +public interface MetaInfo extends Serializable { /** @return the parameter's title */ 1.6 +3 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/PSMLDocument.java Index: PSMLDocument.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/PSMLDocument.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PSMLDocument.java 22 Mar 2002 18:38:35 -0000 1.5 +++ PSMLDocument.java 24 Sep 2002 21:33:35 -0000 1.6 @@ -57,6 +57,7 @@ import org.apache.jetspeed.om.profile.Portlets; import org.apache.jetspeed.om.profile.Entry; +import java.io.Serializable; /** * This interface represents a loaded PSML document in memory, providing * all facilities for finding and updating specific parts of the @@ -65,7 +66,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Raphaël Luta</a> * @version $Id$ */ -public interface PSMLDocument +public interface PSMLDocument extends Serializable { /** * Return the name of this document 1.8 +3 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/ProfileLocator.java Index: ProfileLocator.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/ProfileLocator.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ProfileLocator.java 3 Jul 2002 02:15:07 -0000 1.7 +++ ProfileLocator.java 24 Sep 2002 21:33:35 -0000 1.8 @@ -58,6 +58,7 @@ import org.apache.jetspeed.om.security.Role; import org.apache.jetspeed.om.security.Group; +import java.io.Serializable; /** * Interface definition for a Profile Locator. * Locators are used by the profiler to describe the parameters used to locate @@ -68,7 +69,7 @@ * @version $Id$ */ -public interface ProfileLocator +public interface ProfileLocator extends Serializable { /* * populates this profile locator from a given path in the format: 1.2 +3 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/Category.java Index: Category.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/Category.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Category.java 28 Mar 2002 23:13:14 -0000 1.1 +++ Category.java 24 Sep 2002 21:33:35 -0000 1.2 @@ -54,13 +54,14 @@ package org.apache.jetspeed.om.registry; +import java.io.Serializable; /** * Interface describing a Category in the registry * * @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a> * @version $Id$ */ -public interface Category +public interface Category extends Serializable { /** @return the string category name */ 1.6 +3 -3 jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/browser/BrowserIterator.java Index: BrowserIterator.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/browser/BrowserIterator.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- BrowserIterator.java 19 Jul 2002 23:25:54 -0000 1.5 +++ BrowserIterator.java 24 Sep 2002 21:33:36 -0000 1.6 @@ -57,7 +57,7 @@ import java.util.Iterator; import java.util.List; import java.util.Comparator; - +import java.io.Serializable; /** * Browser Iterator Interface * @@ -65,7 +65,7 @@ * @version $Id$ * */ -public interface BrowserIterator extends Iterator, Comparator +public interface BrowserIterator extends Iterator, Comparator, Serializable { /** 1.26 +5 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java Index: DatabasePsmlManagerService.java =================================================================== RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/db/DatabasePsmlManagerService.java,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- DatabasePsmlManagerService.java 20 Sep 2002 17:38:07 -0000 1.25 +++ DatabasePsmlManagerService.java 24 Sep 2002 21:33:36 -0000 1.26 @@ -315,7 +315,10 @@ */ public void shutdown() { - this.refresher.setDone(true); + if (this.refresher != null) + { + this.refresher.setDone(true); + } }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>