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 08:45:56 UTC
svn commit: r517121 [2/3] - in /portals/jetspeed-2/trunk:
ant-tasks/src/java/org/apache/jetspeed/anttasks/
applications/demo/src/java/org/apache/jetspeed/demo/servlet/
applications/demo/src/java/org/apache/taglibs/velocity/
applications/gems/src/java/o...
Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java (original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java Mon Mar 12 00:45:49 2007
@@ -34,7 +34,6 @@
import org.apache.jetspeed.page.document.NodeNotFoundException;
import org.apache.jetspeed.page.document.NodeSet;
import org.apache.jetspeed.page.document.proxy.NodeProxy;
-import org.apache.jetspeed.portalsite.Menu;
import org.apache.jetspeed.portalsite.menu.StandardBackMenuDefinition;
import org.apache.jetspeed.portalsite.menu.StandardBreadcrumbsMenuDefinition;
import org.apache.jetspeed.portalsite.menu.StandardNavigationsMenuDefinition;
Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewMenuDefinitionLocator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewMenuDefinitionLocator.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewMenuDefinitionLocator.java (original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewMenuDefinitionLocator.java Mon Mar 12 00:45:49 2007
@@ -83,7 +83,7 @@
{
if (obj instanceof String)
{
- return locator.equals((String)obj);
+ return locator.equals(obj);
}
return locator.equals(obj.toString());
}
Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewSearchPath.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewSearchPath.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewSearchPath.java (original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewSearchPath.java Mon Mar 12 00:45:49 2007
@@ -78,7 +78,7 @@
{
if (obj instanceof String)
{
- return searchPath.equals((String)obj);
+ return searchPath.equals(obj);
}
return searchPath.equals(obj.toString());
}
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=517121&r1=517120&r2=517121
==============================================================================
--- 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 00:45:49 2007
@@ -18,9 +18,6 @@
import java.util.Locale;
-import javax.servlet.ServletConfig;
-
-import org.apache.commons.configuration.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.components.ComponentManager;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/PortalContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/PortalContext.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/PortalContext.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/PortalContext.java Mon Mar 12 00:45:49 2007
@@ -16,8 +16,6 @@
*/
package org.apache.jetspeed;
-import java.util.List;
-
import javax.portlet.PortletMode;
import javax.portlet.WindowState;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java Mon Mar 12 00:45:49 2007
@@ -128,10 +128,8 @@
this.defaultGroups =
config.getList(PortalConfigurationConstants.REGISTRATION_GROUPS_DEFAULT);
- Object[] profileRuleNames = (Object[])
- config.getList(PortalConfigurationConstants.PROFILER_RULE_NAMES_DEFAULT).toArray();
- Object[] profileRuleValues = (Object[])
- config.getList(PortalConfigurationConstants.PROFILER_RULE_VALUES_DEFAULT).toArray();
+ Object[] profileRuleNames = config.getList(PortalConfigurationConstants.PROFILER_RULE_NAMES_DEFAULT).toArray();
+ Object[] profileRuleValues = config.getList(PortalConfigurationConstants.PROFILER_RULE_VALUES_DEFAULT).toArray();
defaultRules = new HashMap();
if (profileRuleNames != null && profileRuleValues != null)
{
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java Mon Mar 12 00:45:49 2007
@@ -250,7 +250,7 @@
Iterator headerOrderListIter = headerOrderConfigList.iterator();
while ( headerOrderListIter.hasNext() )
{
- Object headerNameObj = (String)headerOrderListIter.next();
+ Object headerNameObj = headerOrderListIter.next();
if ( headerNameObj != null )
{
String headerName = headerNameObj.toString();
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java Mon Mar 12 00:45:49 2007
@@ -302,9 +302,6 @@
public RenderingJob createRenderingJob(ContentFragment fragment, RequestContext requestContext)
{
RenderingJob job = null;
- HttpServletRequest servletRequest =null;
- HttpServletResponse servletResponse = null;
- ContentDispatcherCtrl dispatcher = null;
boolean contentIsCached = false;
try
{
@@ -327,7 +324,7 @@
int expirationCache = getExpirationCache(portletDefinition);
if (expirationCache != 0)
{
- portletTracking.setExpiration(portletWindow, (long)expirationCache);
+ portletTracking.setExpiration(portletWindow, expirationCache);
contentIsCached = retrieveCachedContent(requestContext, fragment, portletWindow,
expirationCache, portletDefinition);
if (contentIsCached)
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java Mon Mar 12 00:45:49 2007
@@ -197,8 +197,6 @@
long start = System.currentTimeMillis();
boolean isParallelMode = false;
PortletWindow curWindow = null;
- boolean failedRender = false;
-
try
{
log.debug("Rendering OID "+this.window.getId()+" "+ this.request +" "+this.response);
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/cluster/NodeManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/cluster/NodeManagerImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/cluster/NodeManagerImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/cluster/NodeManagerImpl.java Mon Mar 12 00:45:49 2007
@@ -25,8 +25,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
-import org.apache.pluto.om.common.ObjectID;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvokerFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvokerFactory.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvokerFactory.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvokerFactory.java Mon Mar 12 00:45:49 2007
@@ -16,8 +16,6 @@
*/
package org.apache.jetspeed.container.invoker;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-
/**
* @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
* @version $Id: $
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java Mon Mar 12 00:45:49 2007
@@ -156,7 +156,6 @@
{
windowId = (String)iter.next();
requestState = requestStates.getPortletWindowNavigationalState(windowId);
- PortletWindow portletWindow = null;
if ( requestState == null )
{
requestState = new PortletWindowRequestNavigationalState(windowId);
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java Mon Mar 12 00:45:49 2007
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.container.url.impl;
-import java.io.UnsupportedEncodingException;
import java.util.StringTokenizer;
import javax.servlet.http.HttpServletRequest;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java Mon Mar 12 00:45:49 2007
@@ -79,7 +79,7 @@
int i = 0;
while (dirTokenizer.hasMoreTokens())
{
- this.stagingDirectoriesAsFiles[i] = new File((String) dirTokenizer.nextToken());
+ this.stagingDirectoriesAsFiles[i] = new File(dirTokenizer.nextToken());
i++;
}
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopContextImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopContextImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopContextImpl.java Mon Mar 12 00:45:49 2007
@@ -16,20 +16,10 @@
*/
package org.apache.jetspeed.desktop.impl;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.Properties;
import java.util.ResourceBundle;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.jetspeed.container.url.BasePortalURL;
-import org.apache.jetspeed.decoration.Decoration;
import org.apache.jetspeed.decoration.LayoutDecoration;
import org.apache.jetspeed.decoration.Theme;
import org.apache.jetspeed.desktop.JetspeedDesktopContext;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java Mon Mar 12 00:45:49 2007
@@ -17,8 +17,6 @@
package org.apache.jetspeed.desktop.impl;
import java.io.IOException;
-import java.util.Map;
-import java.util.List;
import java.util.Iterator;
import java.util.ResourceBundle;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java Mon Mar 12 00:45:49 2007
@@ -143,7 +143,7 @@
applicationRoot = webappRoot;
}
- Configuration properties = (Configuration) new PropertiesConfiguration(ServletHelper.getRealPath(
+ Configuration properties = new PropertiesConfiguration(ServletHelper.getRealPath(
config, propertiesFilename));
properties.setProperty(APPLICATION_ROOT_KEY, applicationRoot);
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java Mon Mar 12 00:45:49 2007
@@ -22,9 +22,6 @@
import java.util.Iterator;
import java.util.Vector;
-import javax.portlet.PortletMode;
-import javax.portlet.WindowState;
-
import org.apache.jetspeed.PortalContext;
import org.apache.pluto.services.information.PortalContextProvider;
@@ -153,7 +150,7 @@
Enumeration supportedPortletModes = portalContext.getSupportedPortletModes();
while(supportedPortletModes.hasMoreElements())
{
- m.add((PortletMode) supportedPortletModes.nextElement());
+ m.add(supportedPortletModes.nextElement());
}
return m;
@@ -165,7 +162,7 @@
Enumeration supportedWindowStates = portalContext.getSupportedWindowStates();
while(supportedWindowStates.hasMoreElements())
{
- s.add((WindowState) supportedWindowStates.nextElement());
+ s.add(supportedWindowStates.nextElement());
}
return s;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestFactoryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestFactoryImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestFactoryImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestFactoryImpl.java Mon Mar 12 00:45:49 2007
@@ -16,12 +16,10 @@
*/
package org.apache.jetspeed.engine.servlet;
-import java.io.UnsupportedEncodingException;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
-import org.apache.jetspeed.PortalReservedParameters;
import org.apache.pluto.om.window.PortletWindow;
/**
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java Mon Mar 12 00:45:49 2007
@@ -107,7 +107,7 @@
for (Enumeration parameters = servletRequest.getParameterNames(); parameters.hasMoreElements();)
{
String paramName = (String) parameters.nextElement();
- String[] paramValues = (String[]) servletRequest.getParameterValues(paramName);
+ String[] paramValues = servletRequest.getParameterValues(paramName);
if (decode)
{
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFolderAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFolderAction.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFolderAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFolderAction.java Mon Mar 12 00:45:49 2007
@@ -24,7 +24,6 @@
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
-import org.apache.jetspeed.om.common.SecuredResource;
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.request.RequestContext;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetLinkAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetLinkAction.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetLinkAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetLinkAction.java Mon Mar 12 00:45:49 2007
@@ -24,7 +24,6 @@
import org.apache.jetspeed.ajax.AjaxAction;
import org.apache.jetspeed.ajax.AjaxBuilder;
import org.apache.jetspeed.layout.PortletActionSecurityBehavior;
-import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.page.Link;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.request.RequestContext;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java Mon Mar 12 00:45:49 2007
@@ -17,7 +17,6 @@
package org.apache.jetspeed.layout.impl;
import java.util.HashMap;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
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=517121&r1=517120&r2=517121
==============================================================================
--- 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 Mon Mar 12 00:45:49 2007
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.layout.impl;
-import java.util.List;
import java.util.Map;
import java.util.Iterator;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java Mon Mar 12 00:45:49 2007
@@ -433,7 +433,7 @@
throw new PortletPlacementException("column out of bounds" + fragment.getName());
}
- Vector columnArray = (Vector)this.columnsList[newCol];
+ Vector columnArray = this.columnsList[newCol];
// Make sure the list has enough room for the set
prepareList(columnArray, newRow);
@@ -582,7 +582,7 @@
int oldCol = foundCoordinate.getOldCol();
int oldRow = foundCoordinate.getOldRow();
- Vector columnArray = (Vector)this.columnsList[oldCol];
+ Vector columnArray = this.columnsList[oldCol];
// Check the row and column boundaries to make sure there is room
// to do the move
@@ -639,7 +639,7 @@
throw new PortletPlacementException("column out of bounds:" + fragment.getName());
}
- Vector columnArray = (Vector)this.columnsList[col];
+ Vector columnArray = this.columnsList[col];
if(row < 0 || row > columnArray.size())
{
throw new PortletPlacementException("row out of bounds:" + fragment.getName());
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=517121&r1=517120&r2=517121
==============================================================================
--- 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 Mon Mar 12 00:45:49 2007
@@ -290,7 +290,6 @@
throws AJAXException
{
int count = 0;
- boolean found = false;
String name = getActionParameter(requestContext, "name");
if (name == null)
throw new AJAXException("Missing 'name' parameter");
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=517121&r1=517120&r2=517121
==============================================================================
--- 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 Mon Mar 12 00:45:49 2007
@@ -207,7 +207,7 @@
StringTokenizer toke = new StringTokenizer(roleNames, ",");
while (toke.hasMoreTokens())
{
- String roleName = (String)toke.nextToken();
+ String roleName = toke.nextToken();
Principal role = new RolePrincipalImpl(roleName);
principals.add(role);
}
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/login/filter/PortalFilter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/login/filter/PortalFilter.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/login/filter/PortalFilter.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/login/filter/PortalFilter.java Mon Mar 12 00:45:49 2007
@@ -65,7 +65,7 @@
Subject subject = new Subject(true, principals, new HashSet(), new HashSet());
UserPrincipal userPrincipal = new UserSubjectPrincipalImpl(username, subject);
principals.add(userPrincipal);
- sRequest = wrapperRequest((HttpServletRequest)request, userPrincipal);
+ sRequest = wrapperRequest(request, userPrincipal);
request.getSession().removeAttribute(LoginConstants.ERRORCODE);
HttpSession session = request.getSession(true);
session.setAttribute(PortalReservedParameters.SESSION_KEY_SUBJECT, subject);
@@ -89,7 +89,7 @@
}
else
{
- sRequest = wrapperRequest((HttpServletRequest)request, principal);
+ sRequest = wrapperRequest(request, principal);
}
}
}
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/manager/ManagerServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/manager/ManagerServlet.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/manager/ManagerServlet.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/manager/ManagerServlet.java Mon Mar 12 00:45:49 2007
@@ -203,7 +203,6 @@
}
else
{
- String response = null;
try
{
ApplicationServerManagerResult result = asm.start(pa.getWebApplicationDefinition().getContextRoot());
@@ -258,7 +257,6 @@
}
else
{
- String response = null;
try
{
ApplicationServerManagerResult result = asm.stop(pa.getWebApplicationDefinition().getContextRoot());
@@ -298,7 +296,6 @@
}
PortletApplication pa = registry.getPortletApplication(paName);
- String response = null;
try
{
ApplicationServerManagerResult result = asm.undeploy(pa.getWebApplicationDefinition().getContextRoot());
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/messaging/PortletMessagingImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/messaging/PortletMessagingImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/messaging/PortletMessagingImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/messaging/PortletMessagingImpl.java Mon Mar 12 00:45:49 2007
@@ -24,7 +24,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.request.RequestContext;
import org.apache.pluto.PortletContainerServices;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java Mon Mar 12 00:45:49 2007
@@ -213,7 +213,7 @@
try
{
- pa = (MutablePortletApplication) registry.getPortletApplication(paName);
+ pa = registry.getPortletApplication(paName);
}
catch (Exception e)
{
@@ -439,7 +439,7 @@
register = false;
}
- MutablePortletApplication pa = (MutablePortletApplication) registry.getPortletApplication(contextName);
+ MutablePortletApplication pa = registry.getPortletApplication(contextName);
if (pa != null)
{
@@ -576,7 +576,7 @@
try
{
- pa = (MutablePortletApplication) registry.getPortletApplication(contextName);
+ pa = registry.getPortletApplication(contextName);
}
catch (Exception e)
{
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java Mon Mar 12 00:45:49 2007
@@ -127,8 +127,6 @@
ResourceLocatingServletContext paContext = null;
File paRootDir = null;
- File paWebInfDir = null;
-
paRootDir = new File("../../layout-portlets/target/jetspeed-layout-portlets");
paContext = initPA("jetspeed-layouts", "/jetspeed-layouts", paRootDir);
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/container/TestPortletContainer.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/container/TestPortletContainer.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/container/TestPortletContainer.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/container/TestPortletContainer.java Mon Mar 12 00:45:49 2007
@@ -21,7 +21,6 @@
import junit.framework.TestSuite;
import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletContainerImpl;
/**
* TestPortletContainer
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/container/state/TestNavigationalState.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/container/state/TestNavigationalState.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/container/state/TestNavigationalState.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/container/state/TestNavigationalState.java Mon Mar 12 00:45:49 2007
@@ -228,7 +228,6 @@
assertEquals("maximized window should equal window 111", maximizedWindow.getId(), "111");
Iterator iter = nav.getParameterNames(target);
- int parameterCount = 0;
assertTrue("There should be one parameter",iter.hasNext());
while ( iter.hasNext() ) {
assertEquals("parameter name should equals \"test\"", (String)iter.next(), "test");
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/decoration/TestDecorations.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/decoration/TestDecorations.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/decoration/TestDecorations.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/decoration/TestDecorations.java Mon Mar 12 00:45:49 2007
@@ -254,8 +254,8 @@
Mock servletRequestMock = new Mock(HttpServletRequest.class);
Mock sessionMock = new Mock(HttpSession.class);
- expectAndReturn(atLeastOnce(), servletRequestMock, "getSession", (HttpSession) sessionMock.proxy());
- expectAndReturn(atLeastOnce(), requestContextMock, "getRequest", (HttpServletRequest)servletRequestMock.proxy());
+ expectAndReturn(atLeastOnce(), servletRequestMock, "getSession", sessionMock.proxy());
+ expectAndReturn(atLeastOnce(), requestContextMock, "getRequest", servletRequestMock.proxy());
expectAndReturn(atLeastOnce(), sessionMock, "getAttribute", new Constraint[]{eq(PortalReservedParameters.RESOVLER_CACHE_ATTR)}, new HashMap());
//expectAndReturn(sessionMock, "getAttribute", PortalReservedParameters.RESOVLER_CACHE_ATTR);
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/LocalFragmentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/LocalFragmentImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/LocalFragmentImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/LocalFragmentImpl.java Mon Mar 12 00:45:49 2007
@@ -17,8 +17,6 @@
package org.apache.jetspeed.layout;
import java.util.List;
-import java.util.Map;
-
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.psml.FragmentImpl;
import java.util.ArrayList;
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/test/JetspeedTestSuite.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/test/JetspeedTestSuite.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/test/JetspeedTestSuite.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/test/JetspeedTestSuite.java Mon Mar 12 00:45:49 2007
@@ -107,7 +107,7 @@
return;
}
- Configuration properties = (Configuration) new PropertiesConfiguration(propertiesFilename);
+ Configuration properties = new PropertiesConfiguration(propertiesFilename);
properties.setProperty(JetspeedEngineConstants.APPLICATION_ROOT_KEY, applicationRoot);
//properties.setProperty(WEBAPP_ROOT_KEY, null);
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java Mon Mar 12 00:45:49 2007
@@ -29,7 +29,6 @@
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.util.descriptor.ExtendedPortletMetadata;
import org.apache.jetspeed.util.descriptor.PortletApplicationDescriptor;
-import org.apache.pluto.om.portlet.PortletDefinition;
/**
Modified: portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/AbstractProfilingRule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/AbstractProfilingRule.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/AbstractProfilingRule.java (original)
+++ portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/AbstractProfilingRule.java Mon Mar 12 00:45:49 2007
@@ -19,8 +19,6 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import java.util.Vector;
-
import org.apache.jetspeed.profiler.ProfileLocator;
import org.apache.jetspeed.profiler.Profiler;
import org.apache.jetspeed.profiler.rules.ProfileResolvers;
@@ -75,12 +73,12 @@
*/
public RuleCriterionResolver getResolver(String name)
{
- return (RuleCriterionResolver)resolvers.get(name);
+ return resolvers.get(name);
}
public RuleCriterionResolver getDefaultResolver()
{
- return (RuleCriterionResolver)resolvers.get(RuleCriterionResolver.REQUEST);
+ return resolvers.get(RuleCriterionResolver.REQUEST);
}
/* (non-Javadoc)
Modified: portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java (original)
+++ portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java Mon Mar 12 00:45:49 2007
@@ -84,7 +84,7 @@
StringTokenizer tokenizer = new StringTokenizer(value, StandardResolver.VALUE_DELIMITER);
while (tokenizer.hasMoreTokens())
{
- String token = (String)tokenizer.nextToken();
+ String token = tokenizer.nextToken();
key.append(criterion.getName());
key.append(ProfileLocator.PATH_SEPARATOR);
key.append(token);
@@ -138,7 +138,7 @@
StringTokenizer tokenizer = new StringTokenizer(value, StandardResolver.VALUE_DELIMITER);
while (tokenizer.hasMoreTokens())
{
- String token = (String)tokenizer.nextToken();
+ String token = tokenizer.nextToken();
locator.add(criterion, isControl, isNavigation, token);
}
}
Modified: portals/jetspeed-2/trunk/components/profiler/src/test/org/apache/jetspeed/profiler/TestProfiler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/profiler/src/test/org/apache/jetspeed/profiler/TestProfiler.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/profiler/src/test/org/apache/jetspeed/profiler/TestProfiler.java (original)
+++ portals/jetspeed-2/trunk/components/profiler/src/test/org/apache/jetspeed/profiler/TestProfiler.java Mon Mar 12 00:45:49 2007
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.profiler;
-import java.io.File;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
Modified: portals/jetspeed-2/trunk/components/rdbms/src/test/org/apache/jetspeed/components/TestRDBMS.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rdbms/src/test/org/apache/jetspeed/components/TestRDBMS.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/rdbms/src/test/org/apache/jetspeed/components/TestRDBMS.java (original)
+++ portals/jetspeed-2/trunk/components/rdbms/src/test/org/apache/jetspeed/components/TestRDBMS.java Mon Mar 12 00:45:49 2007
@@ -24,7 +24,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.jetspeed.components.datasource.BoundDBCPDatasourceComponent;
import org.apache.jetspeed.components.datasource.DBCPDatasourceComponent;
import org.apache.jetspeed.components.datasource.DatasourceComponent;
import org.apache.jetspeed.components.util.DatasourceTestCase;
@@ -69,7 +68,7 @@
assertNotNull(conn);
assertFalse(conn.isClosed());
conn.close();
- ((BoundDBCPDatasourceComponent)datasourceComponent).stop();
+ (datasourceComponent).stop();
try
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java Mon Mar 12 00:45:49 2007
@@ -288,7 +288,7 @@
}
}
- return (MutablePortletEntity) portletEntity;
+ return portletEntity;
}
}
@@ -318,7 +318,7 @@
PortletEntityImpl portletEntity = new PortletEntityImpl();
portletEntity.setPortletDefinition(portletDefinition);
portletEntity.setId(id);
- return (PortletEntityImpl) portletEntity;
+ return portletEntity;
}
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/RegistryApplicationCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/RegistryApplicationCache.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/RegistryApplicationCache.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/RegistryApplicationCache.java Mon Mar 12 00:45:49 2007
@@ -22,10 +22,8 @@
import org.apache.jetspeed.cache.CacheElement;
import org.apache.jetspeed.cache.DistributedCacheObject;
import org.apache.jetspeed.cache.JetspeedCache;
-import org.apache.jetspeed.cache.impl.EhCacheDistributedElementImpl;
import org.apache.jetspeed.cache.impl.EhCacheElementImpl;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
-import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.ojb.broker.Identity;
import org.apache.ojb.broker.PersistenceBroker;
import org.apache.ojb.broker.cache.ObjectCache;
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/RegistryPortletCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/RegistryPortletCache.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/RegistryPortletCache.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/RegistryPortletCache.java Mon Mar 12 00:45:49 2007
@@ -22,7 +22,6 @@
import org.apache.jetspeed.cache.CacheElement;
import org.apache.jetspeed.cache.DistributedCacheObject;
import org.apache.jetspeed.cache.JetspeedCache;
-import org.apache.jetspeed.cache.impl.EhCacheDistributedElementImpl;
import org.apache.jetspeed.cache.impl.EhCacheElementImpl;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.ojb.broker.Identity;
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DisplayNameSetImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DisplayNameSetImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DisplayNameSetImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DisplayNameSetImpl.java Mon Mar 12 00:45:49 2007
@@ -22,7 +22,6 @@
import java.util.Iterator;
import java.util.Locale;
-import org.apache.jetspeed.om.common.MutableDisplayName;
import org.apache.jetspeed.om.common.MutableDisplayNameSet;
import org.apache.jetspeed.util.JetspeedLocale;
import org.apache.pluto.om.common.DisplayName;
@@ -99,8 +98,6 @@
*/
public boolean add(Object o)
{
- MutableDisplayName name = (MutableDisplayName) o;
-
return innerCollection.add(o);
}
@@ -109,8 +106,6 @@
*/
public boolean remove(Object o)
{
- DisplayName name = (DisplayName) o;
-
return innerCollection.remove(o);
}
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/PortletParameterSetImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/PortletParameterSetImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/PortletParameterSetImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/PortletParameterSetImpl.java Mon Mar 12 00:45:49 2007
@@ -57,7 +57,7 @@
protected ParameterComposite newParameterInstance()
{
- return (ParameterComposite) new PortletInitParameterImpl();
+ return new PortletInitParameterImpl();
}
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/SecurityRoleRefSetImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/SecurityRoleRefSetImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/SecurityRoleRefSetImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/SecurityRoleRefSetImpl.java Mon Mar 12 00:45:49 2007
@@ -118,7 +118,6 @@
*/
public boolean add(Object o)
{
- SecurityRoleRef ref = (SecurityRoleRef) o;
if(innerCollection.contains(o))
{
remove(o);
@@ -131,8 +130,6 @@
*/
public boolean remove(Object o)
{
- SecurityRoleRef ref = (SecurityRoleRef) o;
-
return innerCollection.remove(o);
}
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=517121&r1=517120&r2=517121
==============================================================================
--- 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 00:45:49 2007
@@ -77,7 +77,6 @@
import org.apache.pluto.om.portlet.ContentTypeSet;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.om.servlet.ServletDefinition;
-import org.odmg.DList;
/**
*
@@ -622,7 +621,7 @@
*/
public void setDisplayNames( DisplayNameSet arg0 )
{
- this.displayNames = (DList) ((DisplayNameSetImpl) arg0).getInnerCollection();
+ this.displayNames = ((DisplayNameSetImpl) arg0).getInnerCollection();
}
/**
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/servlet/impl/SecurityRoleSetImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/servlet/impl/SecurityRoleSetImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/servlet/impl/SecurityRoleSetImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/servlet/impl/SecurityRoleSetImpl.java Mon Mar 12 00:45:49 2007
@@ -82,8 +82,6 @@
* @see java.util.Collection#remove(java.lang.Object)
*/
public boolean remove(Object o) {
- SecurityRole role = (SecurityRole) o;
-
return innerCollection.remove(o);
}
Modified: portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java Mon Mar 12 00:45:49 2007
@@ -26,7 +26,6 @@
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.impl.DublinCoreImpl;
-import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
import org.apache.jetspeed.om.portlet.impl.PortletDefinitionImpl;
import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
@@ -126,7 +125,7 @@
app = null;
- app = (PortletApplicationDefinitionImpl) registry.getPortletApplication("App_1");
+ app = registry.getPortletApplication("App_1");
webApp = (WebApplicationDefinitionImpl) app.getWebApplicationDefinition();
portlet = (PortletDefinitionImpl) app.getPortletDefinitionByName("Portlet 1");
@@ -153,7 +152,7 @@
}
- portlet = (PortletDefinitionComposite) registry.getPortletDefinitionByUniqueName("App_1::Portlet 1");
+ portlet = registry.getPortletDefinitionByUniqueName("App_1::Portlet 1");
assertNotNull("Portlet could not be retreived by unique name.", portlet);
Modified: portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java Mon Mar 12 00:45:49 2007
@@ -223,7 +223,7 @@
app = null;
- app = (PortletApplicationDefinitionImpl) portletRegistry.getPortletApplication("App_1");
+ app = portletRegistry.getPortletApplication("App_1");
assertNotNull(app);
@@ -253,7 +253,7 @@
}
- portlet = (PortletDefinitionComposite) portletRegistry.getPortletDefinitionByUniqueName("App_1::Portlet 1");
+ portlet = portletRegistry.getPortletDefinitionByUniqueName("App_1::Portlet 1");
assertNotNull("Portlet could not be retreived by unique name.", portlet);
Modified: portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/JetspeedRewriterController.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/JetspeedRewriterController.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/JetspeedRewriterController.java (original)
+++ portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/JetspeedRewriterController.java Mon Mar 12 00:45:49 2007
@@ -36,7 +36,6 @@
import org.exolab.castor.mapping.Mapping;
import org.exolab.castor.xml.Unmarshaller;
import org.w3c.dom.Document;
-import org.w3c.dom.Node;
import org.xml.sax.InputSource;
/**
@@ -261,7 +260,7 @@
Unmarshaller unmarshaller = new Unmarshaller(this.mapper);
- ruleset = (Ruleset) unmarshaller.unmarshal((Node) doc);
+ ruleset = (Ruleset) unmarshaller.unmarshal(doc);
ruleset.sync();
rulesets.put(ruleset.getId(), ruleset);
Modified: portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/RulesetRewriterImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/RulesetRewriterImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/RulesetRewriterImpl.java (original)
+++ portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/RulesetRewriterImpl.java Mon Mar 12 00:45:49 2007
@@ -16,13 +16,11 @@
*/
package org.apache.jetspeed.rewriter;
-import java.net.URL;
import java.util.Iterator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.rewriter.html.neko.NekoParserAdaptor;
import org.apache.jetspeed.rewriter.rules.Attribute;
import org.apache.jetspeed.rewriter.rules.Rule;
import org.apache.jetspeed.rewriter.rules.Ruleset;
@@ -125,7 +123,7 @@
{
Attribute attribute = (Attribute)attribRules.next();
String name = attribute.getId();
- String value = (String)attributes.getValue(name);
+ String value = attributes.getValue(name);
if (value != null) // && name.equalsIgnoreCase(attribute.getId()))
{
Modified: portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/CallbackElementRemover.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/CallbackElementRemover.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/CallbackElementRemover.java (original)
+++ portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/CallbackElementRemover.java Mon Mar 12 00:45:49 2007
@@ -16,10 +16,7 @@
*/
package org.apache.jetspeed.rewriter.html.neko;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.jetspeed.rewriter.MutableAttributes;
import org.apache.jetspeed.rewriter.Rewriter;
-import org.apache.jetspeed.rewriter.html.SwingAttributes;
import org.apache.xerces.xni.Augmentations;
import org.apache.xerces.xni.QName;
import org.apache.xerces.xni.XMLAttributes;
Modified: portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/NekoParserAdaptor.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/NekoParserAdaptor.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/NekoParserAdaptor.java (original)
+++ portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/NekoParserAdaptor.java Mon Mar 12 00:45:49 2007
@@ -33,7 +33,6 @@
import org.cyberneko.html.parsers.SAXParser;
import org.cyberneko.html.filters.DefaultFilter;
import org.cyberneko.html.filters.Purifier;
-import org.cyberneko.html.filters.Writer;
/**
Modified: portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/URLRewriterFilter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/URLRewriterFilter.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/URLRewriterFilter.java (original)
+++ portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/URLRewriterFilter.java Mon Mar 12 00:45:49 2007
@@ -159,9 +159,6 @@
*/
public void endElement( QName element, Augmentations augs ) throws XNIException
{
- String elementName = element.rawname;
-
-
super.endElement(element, augs);
}
/**
Modified: portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/rules/impl/RuleImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/rules/impl/RuleImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/rules/impl/RuleImpl.java (original)
+++ portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/rules/impl/RuleImpl.java Mon Mar 12 00:45:49 2007
@@ -112,7 +112,7 @@
StringTokenizer tokenizer = new StringTokenizer(prefixes, ",");
while (tokenizer.hasMoreTokens())
{
- String token = (String)tokenizer.nextToken();
+ String token = tokenizer.nextToken();
ignorePrefixes.add(token);
}
Modified: portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java (original)
+++ portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java Mon Mar 12 00:45:49 2007
@@ -22,26 +22,11 @@
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
import java.io.Reader;
import java.util.Arrays;
-import javax.portlet.PortletException;
-
-import org.w3c.dom.Node;
-
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.xerces.xni.parser.XMLDocumentFilter;
-import org.apache.xerces.xni.parser.XMLInputSource;
-
-import org.cyberneko.html.HTMLConfiguration ;
-import org.cyberneko.html.parsers.DOMParser;
-import org.cyberneko.html.parsers.SAXParser;
-import org.cyberneko.html.filters.Purifier ;
-import org.cyberneko.html.filters.Writer ;
-
-import org.apache.jetspeed.rewriter.html.SwingParserAdaptor;
import org.apache.jetspeed.rewriter.html.neko.NekoParserAdaptor;
import org.apache.jetspeed.rewriter.rules.Ruleset;
import org.apache.jetspeed.rewriter.xml.SaxParserAdaptor;
Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/SecurityHelper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/SecurityHelper.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/SecurityHelper.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/SecurityHelper.java Mon Mar 12 00:45:49 2007
@@ -127,7 +127,7 @@
Principal principal = null;
for (int i = 0; i < principals.length; i++)
{
- Principal p = (Principal) principals[i];
+ Principal p = principals[i];
if (classe.isInstance(p))
{
principal = p;
Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java Mon Mar 12 00:45:49 2007
@@ -159,7 +159,7 @@
groupSecurityHandler
.removeGroupPrincipal(new GroupPrincipalImpl(
GroupPrincipalImpl
- .getPrincipalNameFromFullPath((String) groups[i])));
+ .getPrincipalNameFromFullPath(groups[i])));
} catch (SecurityException se)
{
throw se;
@@ -168,14 +168,14 @@
KeyedMessage msg =
SecurityException.UNEXPECTED.create("GroupManager.removeGroup",
"GroupSecurityHandler.removeGroupPrincipal("+
- GroupPrincipalImpl.getPrincipalNameFromFullPath((String) groups[i])+")",
+ GroupPrincipalImpl.getPrincipalNameFromFullPath(groups[i])+")",
e.getMessage());
log.error(msg, e);
throw new SecurityException(msg, e);
}
// Remove preferences
Preferences groupPref = Preferences.userRoot().node(
- (String) groups[i]);
+ groups[i]);
try
{
groupPref.removeNode();
Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java Mon Mar 12 00:45:49 2007
@@ -153,19 +153,19 @@
try
{
roleSecurityHandler.removeRolePrincipal(new RolePrincipalImpl(RolePrincipalImpl
- .getPrincipalNameFromFullPath((String) roles[i])));
+ .getPrincipalNameFromFullPath(roles[i])));
}
catch (Exception e)
{
KeyedMessage msg =
SecurityException.UNEXPECTED.create("RoleManager.removeRole",
- "RoleSecurityHandler.removeRolePrincipal("+RolePrincipalImpl.getPrincipalNameFromFullPath((String) roles[i])+")",
+ "RoleSecurityHandler.removeRolePrincipal("+RolePrincipalImpl.getPrincipalNameFromFullPath(roles[i])+")",
e.getMessage());
log.error(msg, e);
throw new SecurityException(msg, e);
}
// Remove preferences
- Preferences rolePref = Preferences.userRoot().node((String) roles[i]);
+ Preferences rolePref = Preferences.userRoot().node(roles[i]);
try
{
rolePref.removeNode();
Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/AlgorithmUpgradePBEPasswordService.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/AlgorithmUpgradePBEPasswordService.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/AlgorithmUpgradePBEPasswordService.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/AlgorithmUpgradePBEPasswordService.java Mon Mar 12 00:45:49 2007
@@ -21,8 +21,6 @@
import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Date;
-
import org.apache.jetspeed.security.AlgorithmUpgradePasswordEncodingService;
import org.apache.jetspeed.security.PasswordCredential;
import org.apache.jetspeed.security.SecurityException;
Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultGroupSecurityHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultGroupSecurityHandler.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultGroupSecurityHandler.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultGroupSecurityHandler.java Mon Mar 12 00:45:49 2007
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.security.spi.impl;
-import java.security.Principal;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultRoleSecurityHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultRoleSecurityHandler.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultRoleSecurityHandler.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultRoleSecurityHandler.java Mon Mar 12 00:45:49 2007
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.security.spi.impl;
-import java.security.Principal;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapGroupSecurityHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapGroupSecurityHandler.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapGroupSecurityHandler.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapGroupSecurityHandler.java Mon Mar 12 00:45:49 2007
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.security.spi.impl;
-import java.security.Principal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapRoleSecurityHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapRoleSecurityHandler.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapRoleSecurityHandler.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapRoleSecurityHandler.java Mon Mar 12 00:45:49 2007
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.security.spi.impl;
-import java.security.Principal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -26,10 +25,8 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.security.GroupPrincipal;
import org.apache.jetspeed.security.RolePrincipal;
import org.apache.jetspeed.security.SecurityException;
-import org.apache.jetspeed.security.impl.GroupPrincipalImpl;
import org.apache.jetspeed.security.impl.RolePrincipalImpl;
import org.apache.jetspeed.security.spi.RoleSecurityHandler;
import org.apache.jetspeed.security.spi.impl.ldap.LdapRoleDaoImpl;
Modified: portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapSecurityMappingHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapSecurityMappingHandler.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapSecurityMappingHandler.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapSecurityMappingHandler.java Mon Mar 12 00:45:49 2007
@@ -17,9 +17,7 @@
package org.apache.jetspeed.security.spi.impl;
import java.security.Principal;
-import java.util.Collection;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import java.util.prefs.Preferences;
@@ -36,8 +34,6 @@
import org.apache.jetspeed.security.impl.GroupPrincipalImpl;
import org.apache.jetspeed.security.impl.RolePrincipalImpl;
import org.apache.jetspeed.security.impl.UserPrincipalImpl;
-import org.apache.jetspeed.security.om.InternalGroupPrincipal;
-import org.apache.jetspeed.security.om.InternalUserPrincipal;
import org.apache.jetspeed.security.spi.SecurityMappingHandler;
import org.apache.jetspeed.security.spi.impl.ldap.LdapGroupDaoImpl;
import org.apache.jetspeed.security.spi.impl.ldap.LdapPrincipalDao;
Modified: portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicy.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicy.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicy.java Mon Mar 12 00:45:49 2007
@@ -21,7 +21,6 @@
import java.security.Policy;
import java.security.PrivilegedAction;
-import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
Modified: portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicyFolder.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicyFolder.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicyFolder.java (original)
+++ portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicyFolder.java Mon Mar 12 00:45:49 2007
@@ -20,7 +20,6 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
-import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerBase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerBase.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerBase.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerBase.java Mon Mar 12 00:45:49 2007
@@ -37,7 +37,6 @@
import org.apache.jetspeed.components.ComponentManager;
import org.apache.jetspeed.components.SpringComponentManager;
import org.apache.jetspeed.engine.JetspeedEngineConstants;
-import org.apache.jetspeed.serializer.objects.JSSecondaryData;
import org.apache.jetspeed.serializer.objects.JSSnapshot;
public abstract class JetspeedSerializerBase
@@ -131,7 +130,7 @@
SpringComponentManager cm = new SpringComponentManager(bootConfig,
appConfig, appRoot);
cm.start();
- Configuration properties = (Configuration) new PropertiesConfiguration();
+ Configuration properties = new PropertiesConfiguration();
properties.setProperty(JetspeedEngineConstants.APPLICATION_ROOT_KEY,
appRoot);
this.setComponentManager(cm);
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java Mon Mar 12 00:45:49 2007
@@ -66,7 +66,6 @@
import org.apache.jetspeed.serializer.objects.JSMimeType;
import org.apache.jetspeed.serializer.objects.JSMimeTypes;
import org.apache.jetspeed.serializer.objects.JSNVPElements;
-import org.apache.jetspeed.serializer.objects.JSNameValuePairs;
import org.apache.jetspeed.serializer.objects.JSPWAttributes;
import org.apache.jetspeed.serializer.objects.JSPermission;
import org.apache.jetspeed.serializer.objects.JSPermissions;
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerSecondaryImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerSecondaryImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerSecondaryImpl.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerSecondaryImpl.java Mon Mar 12 00:45:49 2007
@@ -160,7 +160,6 @@
private JSPortlet exportPD(PortletDefinition pd) throws SerializerException
{
- boolean processedAnyEntities = false;
try
{
Collection col = entityAccess.getPortletEntities(pd);
@@ -250,8 +249,6 @@
JSEntityPreference processPreferenceNode(MutablePortletEntity entity,
String child)
{
- boolean processedAny = false;
-
String prefNodePath = MutablePortletEntity.PORTLET_ENTITY_ROOT + "/"
+ entity.getId() + "/" + child + "/"
+ PrefsPreference.PORTLET_PREFERENCES_ROOT;
@@ -278,7 +275,6 @@
Iterator ii = pref.getValues();
while (ii.hasNext())
{
- processedAny = true;
Object o = ii.next();
v.add(name, o.toString());
}
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSApplication.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSApplication.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSApplication.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSApplication.java Mon Mar 12 00:45:49 2007
@@ -16,12 +16,6 @@
*/
package org.apache.jetspeed.serializer.objects;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.sql.Date;
-import java.util.Iterator;
-import java.util.prefs.Preferences;
-
import javolution.xml.XMLFormat;
import javolution.xml.stream.XMLStreamException;
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSCapability.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSCapability.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSCapability.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSCapability.java Mon Mar 12 00:45:49 2007
@@ -15,7 +15,6 @@
* limitations under the License.
*/
package org.apache.jetspeed.serializer.objects;
-import org.apache.jetspeed.capabilities.Capability;
/**
* Jetspeed Serializer - Capability Wrapper
* <p>
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSEntity.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSEntity.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSEntity.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSEntity.java Mon Mar 12 00:45:49 2007
@@ -16,12 +16,6 @@
*/
package org.apache.jetspeed.serializer.objects;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.sql.Date;
-import java.util.Iterator;
-import java.util.prefs.Preferences;
-
import javolution.xml.XMLFormat;
import javolution.xml.stream.XMLStreamException;
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSEntityPreference.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSEntityPreference.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSEntityPreference.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSEntityPreference.java Mon Mar 12 00:45:49 2007
@@ -16,10 +16,6 @@
*/
package org.apache.jetspeed.serializer.objects;
-import java.security.Principal;
-import java.util.ArrayList;
-import java.sql.Date;
-import java.util.Iterator;
import java.util.prefs.Preferences;
import javolution.xml.XMLFormat;
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSGroup.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSGroup.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSGroup.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSGroup.java Mon Mar 12 00:45:49 2007
@@ -19,11 +19,7 @@
import javolution.xml.*;
import javolution.xml.stream.XMLStreamException;
-import java.util.prefs.Preferences;
-import java.util.*;
-
import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.jetspeed.security.Role;
public class JSGroup
{
Modified: portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSMimeType.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSMimeType.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSMimeType.java (original)
+++ portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSMimeType.java Mon Mar 12 00:45:49 2007
@@ -16,11 +16,6 @@
*/
package org.apache.jetspeed.serializer.objects;
-import javolution.xml.XMLFormat;
-import javolution.xml.stream.XMLStreamException;
-
-import org.apache.jetspeed.capabilities.MimeType;
-
public class JSMimeType extends JSGroup
{
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org