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 2007/07/04 01:10:58 UTC
svn commit: r553014 - in /portals/jetspeed-2/trunk:
applications/demo/src/java/org/apache/jetspeed/demo/simple/
applications/gems/src/java/org/apache/portals/gems/util/
applications/j2-admin/src/java/org/apache/jetspeed/portlets/palm/
applications/j2-a...
Author: ate
Date: Tue Jul 3 16:10:53 2007
New Revision: 553014
URL: http://svn.apache.org/viewvc?view=rev&rev=553014
Log:
JS2-727: Appy Findbugs patches
Findbugs checking and patches provided by Dennis Dam, thanks!
See: http://issues.apache.org/jira/browse/JS2-727
Modified:
portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/simple/AttributeScopeServlet.java
portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/ValidationHelper.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/RepositoryConfigHandler.java
portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/JetspeedLongObjectID.java
portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityMapImpl.java
portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java
portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseGetResourceAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseSiteUpdateAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenuAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenusAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPagesAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetThemesAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/MutablePortletApplicationProxy.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreference.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/PolicyWrapper.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/PasswordHistoryInterceptor.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPermission.java
portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java
portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java
Modified: portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/simple/AttributeScopeServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/simple/AttributeScopeServlet.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/simple/AttributeScopeServlet.java (original)
+++ portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/simple/AttributeScopeServlet.java Tue Jul 3 16:10:53 2007
@@ -122,7 +122,7 @@
requestScopeAttribute = new Long(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);
Modified: portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/ValidationHelper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/ValidationHelper.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/ValidationHelper.java (original)
+++ portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/ValidationHelper.java Tue Jul 3 16:10:53 2007
@@ -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
@@ -273,13 +273,19 @@
}
try
{
- date = EUROPEAN_DATE_FORMAT.parse(formatted);
+ synchronized (EUROPEAN_DATE_FORMAT)
+ {
+ date = EUROPEAN_DATE_FORMAT.parse(formatted);
+ }
}
catch (ParseException e)
{
try
{
- date = AMERICAN_DATE_FORMAT.parse(formatted);
+ synchronized (AMERICAN_DATE_FORMAT)
+ {
+ date = AMERICAN_DATE_FORMAT.parse(formatted);
+ }
}
catch (ParseException ee)
{
@@ -298,13 +304,19 @@
try
{
- date = EUROPEAN_DATETIME_FORMAT.parse(formatted);
+ synchronized (EUROPEAN_DATETIME_FORMAT)
+ {
+ date = EUROPEAN_DATETIME_FORMAT.parse(formatted);
+ }
}
catch (ParseException e)
{
try
{
- date = AMERICAN_DATETIME_FORMAT.parse(formatted);
+ synchronized (AMERICAN_DATETIME_FORMAT)
+ {
+ date = AMERICAN_DATETIME_FORMAT.parse(formatted);
+ }
}
catch (ParseException ee)
{
@@ -319,7 +331,10 @@
{
return null;
}
- return EUROPEAN_DATE_FORMAT.format(date);
+ synchronized (EUROPEAN_DATE_FORMAT)
+ {
+ return EUROPEAN_DATE_FORMAT.format(date);
+ }
}
public static String formatAmericanDate(Date date)
@@ -328,7 +343,10 @@
{
return null;
}
- return AMERICAN_DATE_FORMAT.format(date);
+ synchronized (AMERICAN_DATE_FORMAT)
+ {
+ return AMERICAN_DATE_FORMAT.format(date);
+ }
}
public static String formatEuropeanDatetime(Date date)
@@ -337,7 +355,10 @@
{
return null;
}
- return EUROPEAN_DATETIME_FORMAT.format(date);
+ synchronized (EUROPEAN_DATETIME_FORMAT)
+ {
+ return EUROPEAN_DATETIME_FORMAT.format(date);
+ }
}
public static String formatAmericanDatetime(Date date)
@@ -346,7 +367,10 @@
{
return null;
}
- return AMERICAN_DATETIME_FORMAT.format(date);
+ synchronized (AMERICAN_DATETIME_FORMAT)
+ {
+ return AMERICAN_DATETIME_FORMAT.format(date);
+ }
}
public static boolean isValidDate(String formatted)
@@ -362,7 +386,10 @@
{
try
{
- AMERICAN_DATE_FORMAT.parse(formatted);
+ synchronized (AMERICAN_DATE_FORMAT)
+ {
+ AMERICAN_DATE_FORMAT.parse(formatted);
+ }
}
catch (ParseException ee)
{
@@ -379,13 +406,19 @@
try
{
- EUROPEAN_DATETIME_FORMAT.parse(formatted);
+ synchronized (EUROPEAN_DATETIME_FORMAT)
+ {
+ EUROPEAN_DATETIME_FORMAT.parse(formatted);
+ }
}
catch (ParseException e)
{
try
{
- AMERICAN_DATETIME_FORMAT.parse(formatted);
+ synchronized (AMERICAN_DATETIME_FORMAT)
+ {
+ AMERICAN_DATETIME_FORMAT.parse(formatted);
+ }
}
catch (ParseException ee)
{
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java Tue Jul 3 16:10:53 2007
@@ -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 )
{
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java Tue Jul 3 16:10:53 2007
@@ -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)
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java Tue Jul 3 16:10:53 2007
@@ -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()
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/RepositoryConfigHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/RepositoryConfigHandler.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/RepositoryConfigHandler.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/RepositoryConfigHandler.java Tue Jul 3 16:10:53 2007
@@ -125,8 +125,7 @@
{
if ("repository".equals(qName))
{
- if (className != null && repositoryName != null
- && !repositories.equals(""))
+ if (className != null && repositoryName != null)
{
Repository repo = loadRepository(className, properties);
if (repo != null)
Modified: portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/JetspeedLongObjectID.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/JetspeedLongObjectID.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/JetspeedLongObjectID.java (original)
+++ portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/JetspeedLongObjectID.java Tue Jul 3 16:10:53 2007
@@ -16,13 +16,15 @@
*/
package org.apache.jetspeed.util;
+import java.io.Serializable;
+
/**
* JetspeedLongObjectID
*
* @author <a href="mailto:ate@douma.nu">Ate Douma</a>
* @version $Id$
*/
-public class JetspeedLongObjectID implements PortalObjectID
+public class JetspeedLongObjectID implements PortalObjectID, Serializable
{
private Long oid;
Modified: portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityMapImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityMapImpl.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityMapImpl.java (original)
+++ portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityMapImpl.java Tue Jul 3 16:10:53 2007
@@ -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;
}
@@ -206,7 +206,7 @@
Iterator mimetypes = mimeTypeMap.values().iterator();
while (mimetypes.hasNext())
{
- if (((MimeType) mimetypes.next()).getName() == mimeType.getName())
+ if (((MimeType) mimetypes.next()).getName().equals(mimeType.getName()))
{
return true;
}
Modified: portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java (original)
+++ portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java Tue Jul 3 16:10:53 2007
@@ -170,23 +170,15 @@
{
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;
+ while (path !=null && (lastSeperator = path.lastIndexOf(PATH_SEPARATOR))> 0)
{
+ path = path.substring(0, lastSeperator);
+
workingPath = path + PATH_SEPARATOR + templateName;
realPath = root + workingPath;
@@ -208,19 +200,7 @@
// 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;
- }
}
- while (path != null);
-
return null;
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java Tue Jul 3 16:10:53 2007
@@ -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;
Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java Tue Jul 3 16:10:53 2007
@@ -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();
- }
+ folderPageHistory = null;
if (menuDefinitionLocatorCache != null)
{
menuDefinitionLocatorCache.clear();
@@ -1254,4 +1250,13 @@
log.debug("Session unbound event: clear page manager listener and session context state");
}
}
+
+ private Map getFolderPageHistory()
+ {
+ if (folderPageHistory == null)
+ {
+ folderPageHistory = new HashMap();
+ }
+ return folderPageHistory;
+ }
}
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/DecorationFactoryImpl.java Tue Jul 3 16:10:53 2007
@@ -145,7 +145,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 );
}
}
}
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseGetResourceAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseGetResourceAction.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseGetResourceAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseGetResourceAction.java Tue Jul 3 16:10:53 2007
@@ -36,7 +36,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(BaseSiteUpdateAction.class);
+ protected static final Log log = LogFactory.getLog(BaseSiteUpdateAction.class);
public BaseGetResourceAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java Tue Jul 3 16:10:53 2007
@@ -41,7 +41,7 @@
public abstract class BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(BasePortletAction.class);
+ protected static final Log log = LogFactory.getLog(BasePortletAction.class);
protected String template = null;
protected PageManager pageManager = null;
protected String errorTemplate = null;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseSiteUpdateAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseSiteUpdateAction.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseSiteUpdateAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/BaseSiteUpdateAction.java Tue Jul 3 16:10:53 2007
@@ -44,7 +44,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(BaseSiteUpdateAction.class);
+ protected static final Log log = LogFactory.getLog(BaseSiteUpdateAction.class);
public BaseSiteUpdateAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java Tue Jul 3 16:10:53 2007
@@ -54,7 +54,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(ChangePortletAction.class);
+ protected static final Log log = LogFactory.getLog(ChangePortletAction.class);
protected String action;
protected Map validWindowStates = new HashMap();
protected Map validPortletModes = new HashMap();
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenuAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenuAction.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenuAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenuAction.java Tue Jul 3 16:10:53 2007
@@ -43,7 +43,7 @@
public class GetMenuAction extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(GetMenusAction.class);
+ protected static final Log log = LogFactory.getLog(GetMenusAction.class);
public GetMenuAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenusAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenusAction.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenusAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetMenusAction.java Tue Jul 3 16:10:53 2007
@@ -46,7 +46,7 @@
public class GetMenusAction extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(GetMenusAction.class);
+ protected static final Log log = LogFactory.getLog(GetMenusAction.class);
public GetMenusAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPagesAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPagesAction.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPagesAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPagesAction.java Tue Jul 3 16:10:53 2007
@@ -47,7 +47,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants, Comparator
{
- protected Log log = LogFactory.getLog(GetPortletsAction.class);
+ protected static final Log log = LogFactory.getLog(GetPortletsAction.class);
public GetPagesAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletActionsAction.java Tue Jul 3 16:10:53 2007
@@ -47,7 +47,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(GetPortletActionsAction.class);
+ protected static final Log log = LogFactory.getLog(GetPortletActionsAction.class);
protected String action;
private DecorationValve decorationValve;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPortletsAction.java Tue Jul 3 16:10:53 2007
@@ -55,7 +55,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants, Comparator
{
- protected Log log = LogFactory.getLog(GetPortletsAction.class);
+ protected static final Log log = LogFactory.getLog(GetPortletsAction.class);
private PortletRegistry registry = null;
private SearchEngine searchEngine = null;
private SecurityAccessController securityAccessController;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetThemesAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetThemesAction.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetThemesAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetThemesAction.java Tue Jul 3 16:10:53 2007
@@ -41,7 +41,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(GetThemesAction.class);
+ protected static final Log log = LogFactory.getLog(GetThemesAction.class);
protected DecorationFactory decorationFactory;
public GetThemesAction(String template,
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java Tue Jul 3 16:10:53 2007
@@ -55,7 +55,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(MovePortletAction.class);
+ protected static final Log log = LogFactory.getLog(MovePortletAction.class);
private int iMoveType = -1;
private String sMoveType = null;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/RemovePortletAction.java Tue Jul 3 16:10:53 2007
@@ -48,7 +48,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(RemovePortletAction.class);
+ protected static final Log log = LogFactory.getLog(RemovePortletAction.class);
public RemovePortletAction(String template, String errorTemplate)
throws PipelineException
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java Tue Jul 3 16:10:53 2007
@@ -54,7 +54,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(SecurityConstraintsAction.class);
+ protected static final Log log = LogFactory.getLog(SecurityConstraintsAction.class);
public SecurityConstraintsAction(String template,
String errorTemplate,
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java Tue Jul 3 16:10:53 2007
@@ -55,7 +55,7 @@
extends BasePortletAction
implements AjaxAction, AjaxBuilder, Constants
{
- protected Log log = LogFactory.getLog(SecurityPermissionAction.class);
+ protected static final Log log = LogFactory.getLog(SecurityPermissionAction.class);
protected PermissionManager pm = null;
protected Map permissionMap = null;
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/MutablePortletApplicationProxy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/MutablePortletApplicationProxy.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/MutablePortletApplicationProxy.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/MutablePortletApplicationProxy.java Tue Jul 3 16:10:53 2007
@@ -25,16 +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;
private String name;
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java Tue Jul 3 16:10:53 2007
@@ -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;
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletApplicationDefinitionImpl.java Tue Jul 3 16:10:53 2007
@@ -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;
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreference.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreference.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreference.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreference.java Tue Jul 3 16:10:53 2007
@@ -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;
}
/**
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java Tue Jul 3 16:10:53 2007
@@ -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)
{
Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/PolicyWrapper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/PolicyWrapper.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/PolicyWrapper.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/PolicyWrapper.java Tue Jul 3 16:10:53 2007
@@ -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;
Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/PasswordHistoryInterceptor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/PasswordHistoryInterceptor.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/PasswordHistoryInterceptor.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/PasswordHistoryInterceptor.java Tue Jul 3 16:10:53 2007
@@ -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()
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPermission.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPermission.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPermission.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPermission.java Tue Jul 3 16:10:53 2007
@@ -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
{
Modified: portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java (original)
+++ portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java Tue Jul 3 16:10:53 2007
@@ -17,9 +17,7 @@
package org.apache.jetspeed.sso;
-import org.apache.jetspeed.security.GroupManager;
import org.apache.jetspeed.security.SecurityException;
-import org.apache.jetspeed.security.UserManager;
import org.apache.jetspeed.security.impl.GroupPrincipalImpl;
import org.apache.jetspeed.security.impl.UserPrincipalImpl;
import org.apache.jetspeed.security.util.test.AbstractSecurityTestcase;
@@ -70,11 +68,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 +78,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)
{
Modified: portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java?view=diff&rev=553014&r1=553013&r2=553014
==============================================================================
--- portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java (original)
+++ portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java Tue Jul 3 16:10:53 2007
@@ -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());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org