Index: components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityMapImpl.java =================================================================== --- components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityMapImpl.java (revision 545568) +++ components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityMapImpl.java (working copy) @@ -182,7 +182,7 @@ Iterator capabilities = capabilityMap.values().iterator(); while (capabilities.hasNext()) { - if (((Capability) capabilities.next()).getName() == capability) + if (((Capability) capabilities.next()).getName().equals(capability)) { return true; } @@ -228,7 +228,7 @@ Iterator mediatypes = mediaTypeMap.values().iterator(); while (mediatypes.hasNext()) { - if (((MediaType) mediatypes.next()).getName() == media) + if (((MediaType) mediatypes.next()).getName().equals(media)) { return true; } Index: components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java =================================================================== --- components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java (revision 545568) +++ components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java (working copy) @@ -38,7 +38,7 @@ */ public class FolderMetaDataImpl extends DocumentImpl implements Document { - public static String DOCUMENT_TYPE = "folder.metadata"; + public static final String DOCUMENT_TYPE = "folder.metadata"; private DefaultsImpl defaults = new DefaultsImpl(); private List docOrder; Index: components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java =================================================================== --- components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java (revision 545568) +++ components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java (working copy) @@ -109,14 +109,10 @@ */ public boolean equals(Object obj) { - boolean equals = true; if(!(obj instanceof UserStats)) return false; UserStats userstat = (UserStats)obj; - if(this.inetAddress.equals(userstat.getInetAddress()) && this.username.equals(userstat.getUsername())) - equals = true; - - return equals; + return this.inetAddress.equals(userstat.getInetAddress()) && this.username.equals(userstat.getUsername()); } } Index: components/portal/src/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java =================================================================== --- components/portal/src/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java (revision 545568) +++ components/portal/src/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java (working copy) @@ -139,7 +139,7 @@ if ( decoration == null ) { String errMsg = "Cannot locate default desktop " + fragment.getType() + " decoration " + ( defaultDecoration == null ? "null" : ("\"" + defaultDecoration + "\"") ) + " (decoration " + ( defaultDecoration == null ? "null" : ("\"" + decorationName + "\"") ) + " specified for page could either not be located or does not support desktop). No desktop compatible " + fragment.getType() + " decoration is available."; - log.equals( errMsg ); + log.warn( errMsg ); } } } Index: components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java =================================================================== --- components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java (revision 545568) +++ components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java (working copy) @@ -55,7 +55,7 @@ extends BasePortletAction implements AjaxAction, AjaxBuilder, Constants { - protected Log log = LogFactory.getLog(MovePortletAction.class); + private Log log_mpa = LogFactory.getLog(MovePortletAction.class); private int iMoveType = -1; private String sMoveType = null; @@ -417,7 +417,7 @@ catch (Exception e) { // Log the exception - log.error("exception while moving a portlet", e); + log_mpa.error("exception while moving a portlet", e); resultMap.put(REASON, e.toString()); // Return a failure indicator success = false; Index: components/portal/src/java/org/apache/jetspeed/layout/impl/AddPortletAction.java =================================================================== --- components/portal/src/java/org/apache/jetspeed/layout/impl/AddPortletAction.java (revision 545568) +++ components/portal/src/java/org/apache/jetspeed/layout/impl/AddPortletAction.java (working copy) @@ -50,7 +50,7 @@ extends MovePortletAction implements AjaxAction, AjaxBuilder, Constants { - protected Log log = LogFactory.getLog(AddPortletAction.class); + private Log log_apa = LogFactory.getLog(AddPortletAction.class); protected GetPortletsAction getPortletsAction = null; protected boolean allowDuplicatePortlets = true; @@ -153,7 +153,7 @@ catch (Exception e) { // Log the exception - log.error("exception while adding a portlet", e); + log_apa.error("exception while adding a portlet", e); resultMap.put(REASON, e.toString()); // Return a failure indicator Index: components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java =================================================================== --- components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java (revision 545568) +++ components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java (working copy) @@ -55,7 +55,7 @@ extends BasePortletAction implements AjaxAction, AjaxBuilder, Constants, Comparator { - protected Log log = LogFactory.getLog(GetPortletsAction.class); + private Log log_gpa = LogFactory.getLog(GetPortletsAction.class); private PortletRegistry registry = null; private SearchEngine searchEngine = null; private SecurityAccessController securityAccessController; @@ -106,7 +106,7 @@ catch (Exception e) { // Log the exception - log.error("exception while getting portlet info", e); + log_gpa.error("exception while getting portlet info", e); // Return a failure indicator success = false; Index: components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java =================================================================== --- components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java (revision 545568) +++ components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java (working copy) @@ -170,23 +170,14 @@ { String templateName = locator.getName(); String path = locator.toPath(); - - int last = path.lastIndexOf(PATH_SEPARATOR); - if (last > -1) - { - // drop off the name - path = path.substring(0, last); - } - else - { - path = null; - } String realPath = null; String workingPath = null; - - do // fallback - { + + int lastSeperator = path.lastIndexOf(PATH_SEPARATOR); + while (path !=null && lastSeperator > -1){ + path = path.substring(0, lastSeperator); + workingPath = path + PATH_SEPARATOR + templateName; realPath = root + workingPath; @@ -208,18 +199,9 @@ // return createTemplateFromPath(path, templateName, realPath, "/WEB-INF/templates" + workingPath); return createTemplateFromPath(path, templateName, realPath, appRelativePath); } - // else strip path of one of its components and loop - int pt = path.lastIndexOf(PATH_SEPARATOR); - if (pt > -1) - { - path = path.substring(0, pt); - } - else - { - path = null; - } + + lastSeperator = path.lastIndexOf(PATH_SEPARATOR); } - while (path != null); return null; } Index: components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java =================================================================== --- components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java (revision 545568) +++ components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java (working copy) @@ -130,7 +130,6 @@ public PortalSiteSessionContextImpl(PageManager pageManager) { this.pageManager = pageManager; - this.folderPageHistory = new HashMap(); } /** @@ -271,7 +270,7 @@ // clear all history entries for fallback // request path in advance to make fallback // page selection more predictable - Iterator folderIter = folderPageHistory.keySet().iterator(); + Iterator folderIter = getFolderPageHistory().keySet().iterator(); while (folderIter.hasNext()) { Folder folder = (Folder)folderIter.next(); @@ -538,7 +537,7 @@ // occur in multiple site views if (useHistory) { - requestPage = (Page)folderPageHistory.get(requestFolder); + requestPage = (Page)getFolderPageHistory().get(requestFolder); if ((requestPage != null) && requestFolderPages.contains(requestPage)) { // log selected request page @@ -569,7 +568,7 @@ requestPage = requestFolder.getPage(defaultPageName); if (!requestPage.isHidden()) { - folderPageHistory.put(requestFolder, requestPage); + getFolderPageHistory().put(requestFolder, requestPage); } // log selected request page @@ -598,7 +597,7 @@ requestPage = (Page)requestFolderPages.iterator().next(); if (!requestPage.isHidden()) { - folderPageHistory.put(requestFolder, requestPage); + getFolderPageHistory().put(requestFolder, requestPage); } // log selected request page @@ -619,7 +618,7 @@ Folder requestFolder = (Folder)requestPage.getParent(); if (!requestPage.isHidden()) { - folderPageHistory.put(requestFolder, requestPage); + getFolderPageHistory().put(requestFolder, requestPage); } // log selected request page @@ -805,10 +804,7 @@ profileLocators = null; userPrincipal = null; siteView = null; - if (folderPageHistory != null) - { - folderPageHistory.clear(); - } + getFolderPageHistory().clear(); if (menuDefinitionLocatorCache != null) { menuDefinitionLocatorCache.clear(); @@ -1254,4 +1250,11 @@ log.debug("Session unbound event: clear page manager listener and session context state"); } } + + public Map getFolderPageHistory() { + if (folderPageHistory == null){ + folderPageHistory = new HashMap(); + } + return folderPageHistory; + } } Index: components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java =================================================================== --- components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java (revision 545568) +++ components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java (working copy) @@ -70,11 +70,6 @@ /** The property manager. */ private static SSOProvider ssoBroker = null; - /** The user manager. */ - protected UserManager ums; - - protected GroupManager gms; // Group Manager - /** * @see junit.framework.TestCase#setUp() */ @@ -85,8 +80,6 @@ try { ssoBroker = (SSOProvider) ctx.getBean("ssoProvider"); - ums = (UserManager) ctx.getBean("org.apache.jetspeed.security.UserManager"); - gms = (GroupManager) ctx.getBean("org.apache.jetspeed.security.GroupManager"); } catch (Exception ex) { Index: components/security/src/java/org/apache/jetspeed/security/PolicyWrapper.java =================================================================== --- components/security/src/java/org/apache/jetspeed/security/PolicyWrapper.java (revision 545568) +++ components/security/src/java/org/apache/jetspeed/security/PolicyWrapper.java (working copy) @@ -33,7 +33,7 @@ private static final long serialVersionUID = 3386468724328997598L; /** The policy. */ - private Policy policy; + private transient Policy policy; /** Whether to use as a policy. */ private boolean useAsPolicy = false; Index: components/security/src/java/org/apache/jetspeed/security/spi/impl/PasswordHistoryInterceptor.java =================================================================== --- components/security/src/java/org/apache/jetspeed/security/spi/impl/PasswordHistoryInterceptor.java (revision 545568) +++ components/security/src/java/org/apache/jetspeed/security/spi/impl/PasswordHistoryInterceptor.java (working copy) @@ -55,7 +55,7 @@ /** * Value used for {@link InternalCredential#getClassname()} to distinguish from current password credentials */ - public static String HISTORICAL_PASSWORD_CREDENTIAL = "org.apache.jetspeed.security.spi.impl.HistoricalPasswordCredentialImpl"; + public static final String HISTORICAL_PASSWORD_CREDENTIAL = "org.apache.jetspeed.security.spi.impl.HistoricalPasswordCredentialImpl"; private static final Comparator internalCredentialCreationDateComparator = new Comparator() Index: components/registry/src/java/org/apache/jetspeed/components/portletregistry/MutablePortletApplicationProxy.java =================================================================== --- components/registry/src/java/org/apache/jetspeed/components/portletregistry/MutablePortletApplicationProxy.java (revision 545568) +++ components/registry/src/java/org/apache/jetspeed/components/portletregistry/MutablePortletApplicationProxy.java (working copy) @@ -25,15 +25,6 @@ public class MutablePortletApplicationProxy implements InvocationHandler, PortletApplicationProxy { - public boolean equals(Object obj) - { - return super.equals(obj); - // if (obj instanceof MutablePortletApplicationProxy) -// { -// MutablePortletApplicationProxy other = (MutablePortletApplicationProxy)obj; -// if (this.getRealApplication().g) -// } - } private MutablePortletApplication app = null; private static PortletRegistry registry; Index: components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java =================================================================== --- components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java (revision 545568) +++ components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java (working copy) @@ -43,7 +43,7 @@ */ public class LanguageSetImpl implements LanguageSet, Serializable, Support { - private ClassLoader classLoader = null; + private transient ClassLoader classLoader = null; private String resources; protected Collection innerCollection; Index: components/registry/src/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java =================================================================== --- components/registry/src/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java (revision 545568) +++ components/registry/src/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java (working copy) @@ -38,7 +38,7 @@ public class PortletWindowImpl implements PortletWindow, PortletWindowCtrl, Serializable { private ObjectID objectId = null; - private PortletEntity portletEntity = null; + private transient PortletEntity portletEntity = null; public PortletWindowImpl(String id) { Index: components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java =================================================================== --- components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java (revision 545568) +++ components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java (working copy) @@ -73,7 +73,7 @@ private String applicationIdentifier; /** WebApplication property */ - private WebApplicationDefinition webApplication; + private transient WebApplicationDefinition webApplication; /** PK of this Portlet Application's Web Application */ protected long webApplicationId; Index: components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreferenceSetImpl.java =================================================================== --- components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreferenceSetImpl.java (revision 545568) +++ components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreferenceSetImpl.java (working copy) @@ -16,6 +16,7 @@ */ package org.apache.jetspeed.om.preference.impl; +import java.io.Serializable; import java.util.Arrays; import java.util.ConcurrentModificationException; import java.util.HashSet; @@ -37,7 +38,7 @@ * * */ -public class PrefsPreferenceSetImpl implements PreferenceSetComposite +public class PrefsPreferenceSetImpl implements PreferenceSetComposite, Serializable { protected Preferences prefsRootNode; protected PreferenceSetComposite defaults; Index: components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreference.java =================================================================== --- components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreference.java (revision 545568) +++ components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreference.java (working copy) @@ -453,15 +453,16 @@ */ public String[] cloneValues() { - synchronized (prefValueNode) + String[] clonedValues; + synchronized (prefValueNode) { String[] currentValues = getValueArray(); - String[] clonedValues = new String[currentValues.length]; + clonedValues = new String[currentValues.length]; System.arraycopy(currentValues, 0, clonedValues, 0, currentValues.length); } - return cloneValues(); + return clonedValues; } /** Index: components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPermission.java =================================================================== --- components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPermission.java (revision 545568) +++ components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPermission.java (working copy) @@ -60,36 +60,36 @@ private JSUserUsers userString; - public static String TYPE_FOLDER = "folder".intern(); + public static final String TYPE_FOLDER = "folder".intern(); - public static String TYPE_FRAGMENT = "fragment".intern(); + public static final String TYPE_FRAGMENT = "fragment".intern(); - public static String TYPE_PAGE = "page".intern(); + public static final String TYPE_PAGE = "page".intern(); - public static String TYPE_PORTALRESOURCE = "portalResource".intern(); + public static final String TYPE_PORTALRESOURCE = "portalResource".intern(); - public static String TYPE_PORTALRESOURCECOLLECTION = "portalResource" + public static final String TYPE_PORTALRESOURCECOLLECTION = "portalResource" .intern(); - public static String TYPE_PORTAL = "portal".intern(); + public static final String TYPE_PORTAL = "portal".intern(); - public static String TYPE_UNKNOWN = "unknown".intern(); + public static final String TYPE_UNKNOWN = "unknown".intern(); public String getClassForType(String type) { - if ((type == null) || (type.length() == 0) || (type == TYPE_UNKNOWN)) + if ((type == null) || (type.length() == 0) || (type.equals(TYPE_UNKNOWN))) return ""; - if (type == TYPE_FOLDER) + if (type.equals(TYPE_FOLDER)) return "org.apache.jetspeed.security.FolderPermission"; - if (type == TYPE_FRAGMENT) + if (type.equals(TYPE_FRAGMENT)) return "org.apache.jetspeed.security.FragmentPermission"; - if (type == TYPE_PAGE) + if (type.equals(TYPE_PAGE)) return "org.apache.jetspeed.security.PagePermission"; - if (type == TYPE_PORTALRESOURCE) + if (type.equals(TYPE_PORTALRESOURCE)) return "org.apache.jetspeed.security.PortalResourcePermission"; - if (type == TYPE_PORTALRESOURCECOLLECTION) + if (type.equals(TYPE_PORTALRESOURCECOLLECTION)) return "org.apache.jetspeed.security.PortalResourcePermissionCollection"; - if (type == TYPE_PORTAL) + if (type.equals(TYPE_PORTAL)) return "org.apache.jetspeed.security.PortletPermission"; return ""; } @@ -121,7 +121,7 @@ public PortalResourcePermission getPermissionForType() { PortalResourcePermission newPermission = null; - if ((this.type == null) || (this.type == TYPE_UNKNOWN)) + if ((this.type == null) || (this.type.equals(TYPE_UNKNOWN))) return null; try { Index: applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java =================================================================== --- applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java (revision 545568) +++ applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java (working copy) @@ -47,7 +47,7 @@ private static final String FALLBACK_STOP = "Stop"; private static final String FALLBACK_LOOP = "Loop"; - private transient SelectItem[] resolvers = + private static final SelectItem[] RESOLVERS = { new SelectItem("request"), new SelectItem("session"), @@ -70,7 +70,7 @@ new SelectItem("hostname") }; - private transient SelectItem[] fallbackTypes = + private static final SelectItem[] FALLBACK_TYPES = { new SelectItem(FALLBACK_CONTINUE), new SelectItem(FALLBACK_LOOP), @@ -88,12 +88,12 @@ public SelectItem[] getResolvers() { - return resolvers; + return RESOLVERS; } public SelectItem[] getFallbackTypes() { - return fallbackTypes; + return FALLBACK_TYPES; } public void listen(ActionEvent event) Index: applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java =================================================================== --- applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java (revision 545568) +++ applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java (working copy) @@ -41,7 +41,7 @@ private boolean isNew = false; private transient Profiler profiler = null; private transient ProfilingRule rule = null; - private transient SelectItem[] classnames = + private static final SelectItem[] CLASSNAMES = { new SelectItem("org.apache.jetspeed.profiler.rules.impl.StandardProfilingRule"), new SelectItem("org.apache.jetspeed.profiler.rules.impl.RoleFallbackProfilingRule") @@ -71,7 +71,7 @@ public SelectItem[] getClassnames() { - return classnames; + return CLASSNAMES; } public String getTitle() Index: applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/RepositoryConfigHandler.java =================================================================== --- applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/RepositoryConfigHandler.java (revision 545568) +++ applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/RepositoryConfigHandler.java (working copy) @@ -126,7 +126,7 @@ if ("repository".equals(qName)) { if (className != null && repositoryName != null - && !repositories.equals("")) + && repositoryName.length() > 0) { Repository repo = loadRepository(className, properties); if (repo != null) Index: applications/j2-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java =================================================================== --- applications/j2-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java (revision 545568) +++ applications/j2-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java (working copy) @@ -118,7 +118,7 @@ MutablePortletApplication pa = registry.getPortletApplication(value); if ( pa == null ) { - publishStatusMessage(request, "PALM", "status", null, "Portlet Application "+pa.getName()+" no longer exists"); + publishStatusMessage(request, "PALM", "status", null, "Portlet Application for lookup value "+value+" no longer exists"); } else if ( pa.getApplicationType() == MutablePortletApplication.LOCAL ) { Index: applications/demo/src/java/org/apache/jetspeed/demo/simple/AttributeScopeServlet.java =================================================================== --- applications/demo/src/java/org/apache/jetspeed/demo/simple/AttributeScopeServlet.java (revision 545568) +++ applications/demo/src/java/org/apache/jetspeed/demo/simple/AttributeScopeServlet.java (working copy) @@ -103,26 +103,26 @@ Long applicationScopeAttribute = (Long)session.getAttribute(APPLICATION_SCOPE_NAME, PortletSession.PORTLET_SCOPE); if (applicationScopeAttribute == null) { - applicationScopeAttribute = new Long(0); + applicationScopeAttribute = Long.valueOf(0); } Long portletScopeAttribute = (Long)session.getAttribute(PORTLET_SCOPE_NAME, PortletSession.PORTLET_SCOPE); if (portletScopeAttribute == null) { - portletScopeAttribute = new Long(0); + portletScopeAttribute = Long.valueOf(0); } Long requestScopeAttribute = (Long)request.getAttribute(REQUEST_SCOPE_NAME); if (requestScopeAttribute == null) { - requestScopeAttribute = new Long(0); + requestScopeAttribute = Long.valueOf(0); } // Increment the values - applicationScopeAttribute = new Long(applicationScopeAttribute.longValue() + 1); - portletScopeAttribute = new Long(portletScopeAttribute.longValue() + 1); - requestScopeAttribute = new Long(requestScopeAttribute.longValue() + 1); + applicationScopeAttribute = Long.valueOf(applicationScopeAttribute.longValue() + 1); + portletScopeAttribute = Long.valueOf(portletScopeAttribute.longValue() + 1); + requestScopeAttribute = Long.valueOf(requestScopeAttribute.longValue() + 1); // Update the attribute values - session.setAttribute( APPLICATION_SCOPE_NAME, portletScopeAttribute, PortletSession.APPLICATION_SCOPE); + session.setAttribute( APPLICATION_SCOPE_NAME, applicationScopeAttribute, PortletSession.APPLICATION_SCOPE); session.setAttribute( PORTLET_SCOPE_NAME, portletScopeAttribute, PortletSession.PORTLET_SCOPE); request.setAttribute( REQUEST_SCOPE_NAME, requestScopeAttribute); Index: applications/gems/src/java/org/apache/portals/gems/util/ValidationHelper.java =================================================================== --- applications/gems/src/java/org/apache/portals/gems/util/ValidationHelper.java (revision 545568) +++ applications/gems/src/java/org/apache/portals/gems/util/ValidationHelper.java (working copy) @@ -30,10 +30,10 @@ */ public abstract class ValidationHelper { - public static SimpleDateFormat EUROPEAN_DATE_FORMAT = new SimpleDateFormat("dd-MM-yyyy"); - public static SimpleDateFormat EUROPEAN_DATETIME_FORMAT = new SimpleDateFormat("dd-MM-yyyy HH:mm"); - public static SimpleDateFormat AMERICAN_DATE_FORMAT = new SimpleDateFormat("MM-dd-yyyy"); - public static SimpleDateFormat AMERICAN_DATETIME_FORMAT = new SimpleDateFormat("MM-dd-yyyy HH:mm"); + public static final SimpleDateFormat EUROPEAN_DATE_FORMAT = new SimpleDateFormat("dd-MM-yyyy"); + public static final SimpleDateFormat EUROPEAN_DATETIME_FORMAT = new SimpleDateFormat("dd-MM-yyyy HH:mm"); + public static final SimpleDateFormat AMERICAN_DATE_FORMAT = new SimpleDateFormat("MM-dd-yyyy"); + public static final SimpleDateFormat AMERICAN_DATETIME_FORMAT = new SimpleDateFormat("MM-dd-yyyy HH:mm"); /** * Tests that the input string contains only alpha numeric or white spaces Index: commons/src/java/org/apache/jetspeed/util/JetspeedLongObjectID.java =================================================================== --- commons/src/java/org/apache/jetspeed/util/JetspeedLongObjectID.java (revision 545568) +++ commons/src/java/org/apache/jetspeed/util/JetspeedLongObjectID.java (working copy) @@ -16,13 +16,15 @@ */ package org.apache.jetspeed.util; +import java.io.Serializable; + /** * JetspeedLongObjectID * * @author Ate Douma * @version $Id$ */ -public class JetspeedLongObjectID implements PortalObjectID +public class JetspeedLongObjectID implements PortalObjectID, Serializable { private Long oid;