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/03/12 09:10:28 UTC
svn commit: r517124 - in /portals/jetspeed-2/trunk:
applications/gems/src/java/org/apache/portals/gems/dojo/
applications/j2-admin/src/java/org/apache/jetspeed/portlets/pam/
applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/constrain...
Author: ate
Date: Mon Mar 12 01:10:25 2007
New Revision: 517124
URL: http://svn.apache.org/viewvc?view=rev&rev=517124
Log:
cleanup unused assignments
Modified:
portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/AbstractDojoVelocityPortlet.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationBrowser.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/constraints/ConstraintsViewController.java
portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java
portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedContextRewriter.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/DocumentHandlerFactoryImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/util/interceptors/PageManagerInterceptor.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/Jetspeed.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/AggregatorValve.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/FileServerValve.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/HeaderAggregatorValve.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/PortletValve.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/ContainerValve.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/PortletInvokerFactoryImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateComponent.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/url/impl/PortalURLValveImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeploymentEventImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/DesktopValveImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/LayoutValve.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/util/DirectoryUtils.java
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/SecurityRoleRefImpl.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/PasswordHistoryInterceptor.java
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java
Modified: portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/AbstractDojoVelocityPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/AbstractDojoVelocityPortlet.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/AbstractDojoVelocityPortlet.java (original)
+++ portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/AbstractDojoVelocityPortlet.java Mon Mar 12 01:10:25 2007
@@ -19,8 +19,6 @@
import javax.portlet.PortletConfig;
import javax.portlet.PortletException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.headerresource.HeaderResource;
import org.apache.jetspeed.portlet.PortletHeaderRequest;
import org.apache.jetspeed.portlet.PortletHeaderResponse;
@@ -35,11 +33,6 @@
*/
public abstract class AbstractDojoVelocityPortlet extends GenericVelocityPortlet implements SupportsHeaderPhase
{
- /*
- * Class specific logger.
- */
- private final static Log log = LogFactory.getLog(AbstractDojoVelocityPortlet.class);
-
protected String headerPage;
/*
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationBrowser.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationBrowser.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationBrowser.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationBrowser.java Mon Mar 12 01:10:25 2007
@@ -54,7 +54,6 @@
*/
public class PortletApplicationBrowser extends GenericServletPortlet
{
- private String template;
private PortletContext context;
private PortletRegistry registry;
private SearchEngine searchEngine;
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/constraints/ConstraintsViewController.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/constraints/ConstraintsViewController.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/constraints/ConstraintsViewController.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/constraints/ConstraintsViewController.java Mon Mar 12 01:10:25 2007
@@ -27,8 +27,6 @@
import javax.portlet.RenderResponse;
import javax.portlet.PortletSession;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.CommonPortletServices;
import org.apache.jetspeed.om.page.PageSecurity;
import org.apache.jetspeed.page.PageManager;
@@ -41,8 +39,6 @@
public class ConstraintsViewController extends AbstractController implements InitializingBean, PortletConfigAware
{
- private static final Log log = LogFactory.getLog( ConstraintsViewController.class);
-
private static final String ROLES_CACHE_SESSION_ATTRIBUTE_NAME = "j2Roles";
private static final String GROUPS_CACHE_SESSION_ATTRIBUTE_NAME = "j2Groups";
Modified: portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java (original)
+++ portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java Mon Mar 12 01:10:25 2007
@@ -49,8 +49,6 @@
*/
public class JetspeedCapabilities extends InitablePersistenceBrokerDaoSupport implements Capabilities ,BeanFactoryAware
{
- private String originalAlias;
-
private static final Log log =
LogFactory.getLog(JetspeedCapabilities.class);
Modified: portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedContextRewriter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedContextRewriter.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedContextRewriter.java (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedContextRewriter.java Mon Mar 12 01:10:25 2007
@@ -29,8 +29,6 @@
{
private Document document;
private String portletApplication;
- private boolean changed = false;
-
public JetspeedContextRewriter(Document doc, String portletApplication)
{
this.document = doc;
@@ -61,7 +59,6 @@
if ((pathAttribute == null) || !pathAttribute.equals("/" + portletApplication))
{
root.setAttribute("path", "/" + portletApplication);
- changed = true;
}
// set Context docBase
@@ -69,7 +66,6 @@
if ((docBaseAttribute == null) || !docBaseAttribute.equals(portletApplication))
{
root.setAttribute("docBase", portletApplication);
- changed = true;
}
}
catch (Exception e)
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java Mon Mar 12 01:10:25 2007
@@ -61,8 +61,6 @@
private final static String PAGE_NODE_TYPE = "page";
private final static String FRAGMENT_NODE_TYPE = "fragment";
private final static String LINK_NODE_TYPE = "link";
- private final static String PAGE_SECURITY_NODE_TYPE = "pageSecurity";
-
protected Class fragmentClass;
protected Class pageClass;
protected Class folderClass;
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/DocumentHandlerFactoryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/DocumentHandlerFactoryImpl.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/DocumentHandlerFactoryImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/DocumentHandlerFactoryImpl.java Mon Mar 12 01:10:25 2007
@@ -23,7 +23,6 @@
import org.apache.jetspeed.page.document.DocumentHandler;
import org.apache.jetspeed.page.document.DocumentHandlerFactory;
import org.apache.jetspeed.page.document.DocumentTypeAlreadyRegisteredException;
-import org.apache.jetspeed.page.document.FolderHandler;
import org.apache.jetspeed.page.document.UnsupportedDocumentTypeException;
import org.apache.jetspeed.util.ArgUtil;
@@ -44,8 +43,6 @@
public class DocumentHandlerFactoryImpl implements DocumentHandlerFactory
{
private Map handlers;
-
- private FolderHandler folderHanlder;
private boolean permissionsEnabled;
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/util/interceptors/PageManagerInterceptor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/util/interceptors/PageManagerInterceptor.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/util/interceptors/PageManagerInterceptor.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/util/interceptors/PageManagerInterceptor.java Mon Mar 12 01:10:25 2007
@@ -18,8 +18,6 @@
import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.page.impl.DatabasePageManagerCache;
/**
@@ -29,9 +27,6 @@
*/
public class PageManagerInterceptor implements MethodInterceptor
{
-
- /** Log reference */
- private Log log = LogFactory.getLog(PageManagerInterceptor.class);
/** Serialization version identifier */
private static final long serialVersionUID = -1316279974504594833L;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/Jetspeed.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/Jetspeed.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/Jetspeed.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/Jetspeed.java Mon Mar 12 01:10:25 2007
@@ -18,8 +18,6 @@
import java.util.Locale;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.components.ComponentManager;
import org.apache.jetspeed.engine.Engine;
import org.apache.jetspeed.exception.JetspeedException;
@@ -37,8 +35,6 @@
public class Jetspeed
{
private static Engine engine = null;
- private static final Log log = LogFactory.getLog(Jetspeed.class);
-
/**
* Shuts down the currently running instance of the portal
* Engine.
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/AggregatorValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/AggregatorValve.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/AggregatorValve.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/AggregatorValve.java Mon Mar 12 01:10:25 2007
@@ -17,8 +17,6 @@
package org.apache.jetspeed.aggregator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
import org.apache.jetspeed.pipeline.valve.ValveContext;
@@ -33,7 +31,6 @@
public class AggregatorValve
extends AbstractValve
{
- private static final Log log = LogFactory.getLog( AggregatorValve.class );
private Aggregator aggregator;
public AggregatorValve(Aggregator aggregator)
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/FileServerValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/FileServerValve.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/FileServerValve.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/FileServerValve.java Mon Mar 12 01:10:25 2007
@@ -16,8 +16,6 @@
*/
package org.apache.jetspeed.aggregator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
@@ -32,7 +30,6 @@
*/
public class FileServerValve extends AbstractValve
{
- private static final Log log = LogFactory.getLog( PortletValve.class );
private String portletName;
private String portletEntity;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/HeaderAggregatorValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/HeaderAggregatorValve.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/HeaderAggregatorValve.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/HeaderAggregatorValve.java Mon Mar 12 01:10:25 2007
@@ -17,8 +17,6 @@
package org.apache.jetspeed.aggregator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
import org.apache.jetspeed.pipeline.valve.ValveContext;
@@ -33,7 +31,6 @@
public class HeaderAggregatorValve
extends AbstractValve
{
- private static final Log log = LogFactory.getLog(HeaderAggregatorValve.class);
private Aggregator aggregator;
public HeaderAggregatorValve(Aggregator aggregator)
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/PortletValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/PortletValve.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/PortletValve.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/PortletValve.java Mon Mar 12 01:10:25 2007
@@ -16,8 +16,6 @@
*/
package org.apache.jetspeed.aggregator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
import org.apache.jetspeed.pipeline.valve.ValveContext;
@@ -31,7 +29,6 @@
*/
public class PortletValve extends AbstractValve
{
- private static final Log log = LogFactory.getLog( PortletValve.class );
private PortletAggregator aggregator;
public PortletValve(PortletAggregator aggregator)
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorImpl.java Mon Mar 12 01:10:25 2007
@@ -19,8 +19,6 @@
import java.io.IOException;
import java.util.HashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.aggregator.PortletAggregator;
import org.apache.jetspeed.aggregator.PortletRenderer;
@@ -38,8 +36,6 @@
*/
public class PortletAggregatorImpl implements PortletAggregator
{
- private final static Log log = LogFactory.getLog(PortletAggregatorImpl.class);
-
private PortletRenderer renderer;
public PortletAggregatorImpl(PortletRenderer renderer)
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/ContainerValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/ContainerValve.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/ContainerValve.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/ContainerValve.java Mon Mar 12 01:10:25 2007
@@ -16,9 +16,6 @@
*/
package org.apache.jetspeed.container;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.container.state.NavigationalState;
import org.apache.jetspeed.container.url.PortalURL;
@@ -39,8 +36,6 @@
public class ContainerValve
extends AbstractValve
{
- private static final Log log = LogFactory.getLog( ContainerValve.class );
-
public void invoke( RequestContext request, ValveContext context )
throws PipelineException
{
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/PortletInvokerFactoryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/PortletInvokerFactoryImpl.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/PortletInvokerFactoryImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/PortletInvokerFactoryImpl.java Mon Mar 12 01:10:25 2007
@@ -20,8 +20,6 @@
import javax.servlet.ServletConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.PortalContext;
import org.apache.jetspeed.factory.PortletFactory;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
@@ -63,8 +61,6 @@
public final static String INVOKER_SERVLET_MAPPING_NAME = "factory.invoker.servlet.mapping.name";
public final static String DEFAULT_MAPPING_NAME = "/container";
- private final static Log log = LogFactory.getLog(PortletInvokerFactoryImpl.class);
-
/** The servlet configuration for the Jetspeed portal */
private final ServletConfig servletConfig;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateComponent.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateComponent.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateComponent.java Mon Mar 12 01:10:25 2007
@@ -25,8 +25,6 @@
import javax.portlet.WindowState;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.PortalContext;
import org.apache.jetspeed.container.state.FailedToCreateNavStateException;
import org.apache.jetspeed.container.state.NavigationalState;
@@ -54,7 +52,6 @@
private final Map supportedPortletModes = Collections.synchronizedMap(new HashMap());
private final Map supportedWindowStates = Collections.synchronizedMap(new HashMap());
- private final static Log log = LogFactory.getLog(JetspeedNavigationalStateComponent.class);
private BeanFactory beanFactory;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/url/impl/PortalURLValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/url/impl/PortalURLValveImpl.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/url/impl/PortalURLValveImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/url/impl/PortalURLValveImpl.java Mon Mar 12 01:10:25 2007
@@ -17,8 +17,6 @@
package org.apache.jetspeed.container.url.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.container.state.NavigationalStateComponent;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
@@ -33,7 +31,6 @@
*/
public class PortalURLValveImpl extends AbstractValve
{
- private static final Log log = LogFactory.getLog(PortalURLValveImpl.class);
private NavigationalStateComponent navComponent;
public PortalURLValveImpl(NavigationalStateComponent navComponent)
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeploymentEventImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeploymentEventImpl.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeploymentEventImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeploymentEventImpl.java Mon Mar 12 01:10:25 2007
@@ -32,24 +32,11 @@
public class DeploymentEventImpl implements DeploymentEvent
{
private DeploymentObject handler;
- private String deploymentRoot;
private int status = STATUS_EVAL;
protected String name;
protected String path;
- /**
- *
- */
- public DeploymentEventImpl(DeploymentObject handler, String depRoot)
- {
- super();
- this.handler = handler;
- this.deploymentRoot = depRoot;
- this.name = handler.getName();
- this.path = handler.getPath();
- }
-
public DeploymentEventImpl(DeploymentObject handler)
{
super();
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/DesktopValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/DesktopValveImpl.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/DesktopValveImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/DesktopValveImpl.java Mon Mar 12 01:10:25 2007
@@ -16,8 +16,6 @@
*/
package org.apache.jetspeed.desktop.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.desktop.JetspeedDesktop;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.AbstractValve;
@@ -32,7 +30,6 @@
*/
public class DesktopValveImpl extends AbstractValve
{
- private static final Log log = LogFactory.getLog(DesktopValveImpl.class);
private JetspeedDesktop desktop;
public DesktopValveImpl(JetspeedDesktop desktop)
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/LayoutValve.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/LayoutValve.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/LayoutValve.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/LayoutValve.java Mon Mar 12 01:10:25 2007
@@ -16,8 +16,6 @@
*/
package org.apache.jetspeed.layout.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.ajax.AjaxRequestService;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.Valve;
@@ -29,9 +27,6 @@
// Ajax service handler
AjaxRequestService ajaxService = null;
-
- /** Logger */
- private Log log = LogFactory.getLog(LayoutValve.class);
public LayoutValve(AjaxRequestService ajaxService)
{
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java Mon Mar 12 01:10:25 2007
@@ -46,20 +46,17 @@
public class SecurityValveImpl extends AbstractSecurityValve implements SecurityValve
{
private static final Log log = LogFactory.getLog(SecurityValveImpl.class);
- private Profiler profiler;
private UserManager userMgr;
private PortalStatistics statistics;
public SecurityValveImpl( Profiler profiler, UserManager userMgr, PortalStatistics statistics )
{
- this.profiler = profiler;
this.userMgr = userMgr;
this.statistics = statistics;
}
public SecurityValveImpl(Profiler profiler, UserManager userMgr)
{
- this.profiler = profiler;
this.userMgr = userMgr;
this.statistics = null;
}
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java Mon Mar 12 01:10:25 2007
@@ -20,8 +20,6 @@
import javax.servlet.ServletConfig;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.pluto.factory.Factory;
import org.apache.pluto.services.information.DynamicInformationProvider;
import org.apache.pluto.services.information.InformationProviderService;
@@ -36,7 +34,6 @@
public class InformationProviderServiceImpl implements Factory, InformationProviderService
{
private javax.servlet.ServletConfig servletConfig;
- private static final Log log = LogFactory.getLog(InformationProviderServiceImpl.class);
private final StaticInformationProvider staticInformationProvider;
public InformationProviderServiceImpl(StaticInformationProvider staticInformationProvider, ServletConfig config)
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/util/DirectoryUtils.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/util/DirectoryUtils.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/util/DirectoryUtils.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/util/DirectoryUtils.java Mon Mar 12 01:10:25 2007
@@ -18,9 +18,6 @@
import java.io.File;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/*
* File System Directory Utilities. Some utilities that java.io doesn't give us.
@@ -33,8 +30,6 @@
*/
public class DirectoryUtils
{
- private final static Log log = LogFactory.getLog(DirectoryUtils.class);
-
public static void main(String[] args)
{
DirectoryUtils.rmdir(new File(args[0]));
Modified: portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java (original)
+++ portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java Mon Mar 12 01:10:25 2007
@@ -63,8 +63,6 @@
private byte whenExhausted;
- private boolean autoCommit;
-
private PoolableConnectionFactory dsConnectionFactory;
/**
*
@@ -114,7 +112,6 @@
this.connectURI = connectURI;
this.maxActive = maxActive;
this.maxWait = maxWait;
- this.autoCommit = autoCommit;
}
/**
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java Mon Mar 12 01:10:25 2007
@@ -28,8 +28,6 @@
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.aggregator.RenderTrackable;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.components.persistence.store.PersistenceStoreRuntimeExcpetion;
@@ -70,7 +68,6 @@
protected static PortletRegistry registry;
protected static RequestContextComponent rcc;
- private static final Log log = LogFactory.getLog(PortletEntityImpl.class);
protected Map perPrincipalPrefs = new HashMap();
protected Map originalValues;
private PortletApplicationEntity applicationEntity = null;
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/SecurityRoleRefImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/SecurityRoleRefImpl.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/SecurityRoleRefImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/SecurityRoleRefImpl.java Mon Mar 12 01:10:25 2007
@@ -21,8 +21,6 @@
import java.util.Collection;
import java.util.Locale;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.om.common.MutableDescription;
import org.apache.jetspeed.om.common.SecurityRoleRefComposite;
import org.apache.jetspeed.util.HashCodeBuilder;
@@ -48,8 +46,6 @@
private String name;
private Collection descriptions;
private DescriptionSetImpl descCollWrapper = new DescriptionSetImpl(DescriptionImpl.TYPE_SEC_ROLE_REF);
-
- private static final Log log = LogFactory.getLog(SecurityRoleRefImpl.class);
/**
* @see org.apache.pluto.om.common.SecurityRoleRef#getRoleLink()
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java Mon Mar 12 01:10:25 2007
@@ -30,8 +30,6 @@
import javax.portlet.PreferencesValidator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.components.portletregistry.RegistryException;
import org.apache.jetspeed.factory.PortletFactory;
@@ -88,8 +86,6 @@
*/
public class PortletDefinitionImpl implements PortletDefinitionComposite, PreferencesValidatorFactory, Serializable, Support
{
- private static final Log log = LogFactory.getLog(PortletDefinitionImpl.class);
-
/**
* This is a static instance of the PortletREgistry that can be used by
* all instances of the PortletDefinitionImpl to support the
Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java Mon Mar 12 01:10:25 2007
@@ -44,9 +44,6 @@
private String defaultAuthenticationProvider = null;
- /** The default authentication provider name for raw passwords. */
- private String defaultRawAuthenticationProvider = null;
-
/**
* <p>
* Constructor given a list of {@link AuthenticationProvider}.
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=517124&r1=517123&r2=517124
==============================================================================
--- 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 Mon Mar 12 01:10:25 2007
@@ -105,7 +105,7 @@
Collections.sort(historicalPasswordCredentials,internalCredentialCreationDateComparator);
}
- int historyCount = historyCount = historicalPasswordCredentials.size();
+ int historyCount = historicalPasswordCredentials.size();
InternalCredential historicalPasswordCredential;
if ( authenticated )
{
Modified: portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java?view=diff&rev=517124&r1=517123&r2=517124
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java (original)
+++ portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java Mon Mar 12 01:10:25 2007
@@ -85,12 +85,6 @@
/** Width settings for eacah column */
private final String[] columnWidths;
- /**
- * The type of layout this is, required for extract row/column properties
- * from a fragment.
- */
- private final String layoutType;
-
/** Efficent way to always be aware of the next available row in a column */
private final int[] nextRowNumber;
@@ -118,7 +112,6 @@
public ColumnLayout(int numberOfColumns, String layoutType, String[] columnWidths)
{
this.numberOfColumns = numberOfColumns;
- this.layoutType = layoutType;
this.columnWidths = columnWidths;
eventListeners = new ArrayList();
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org