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 [1/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...
Author: ate
Date: Mon Mar 12 00:45:49 2007
New Revision: 517121
URL: http://svn.apache.org/viewvc?view=rev&rev=517121
Log:
code cleanup
Modified:
portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/ExecuteSQL.java
portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StartDatabase.java
portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StartDerby.java
portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StopDatabase.java
portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StopDerby.java
portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/servlet/SSODemoServlet.java
portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/taglibs/velocity/VelocityTag.java
portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/browser/BrowserPortlet.java
portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/browser/DatabaseBrowserIterator.java
portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/AbstractDojoVelocityPortlet.java
portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java
portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/file/FilePortlet.java
portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRulesExtent.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/portlet/web/deployer/EditRepositoryPage.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/groups/GroupBrowser.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/roles/RoleBrowser.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/sso/SSODetails.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserBrowser.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/PortletSelector.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/servlets/SpringInitServlet.java
portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/transform/impl/MemoryTransformCache.java
portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/security/JSSubject.java
portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/HashCodeBuilder.java
portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityImpl.java
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedElementImpl.java
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheElementImpl.java
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java
portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/testhelpers/TestOJBHelper.java
portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter.java
portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_3.java
portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_4.java
portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java
portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfileLocator.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseSecurityConstraintsRef.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java
portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java
portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureCastorXmlPageManager.java
portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureDatabasePageManager.java
portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/LinkProxy.java
portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/PageProxy.java
portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java
portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java
portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java
portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewMenuDefinitionLocator.java
portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewSearchPath.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/PortalContext.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/RenderingJobImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/cluster/NodeManagerImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvokerFactory.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/state/impl/PortletWindowSessionNavigationalStates.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/url/impl/PathInfoEncodingPortalURL.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopContextImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestFactoryImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFolderAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetLinkAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityPermissionAction.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/login/filter/PortalFilter.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/manager/ManagerServlet.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/messaging/PortletMessagingImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/container/TestPortletContainer.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/container/state/TestNavigationalState.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/decoration/TestDecorations.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/LocalFragmentImpl.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/test/JetspeedTestSuite.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/tools/pamanager/TestJetspeedPortletDescriptor.java
portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/AbstractProfilingRule.java
portals/jetspeed-2/trunk/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RoleFallbackProfilingRule.java
portals/jetspeed-2/trunk/components/profiler/src/test/org/apache/jetspeed/profiler/TestProfiler.java
portals/jetspeed-2/trunk/components/rdbms/src/test/org/apache/jetspeed/components/TestRDBMS.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/RegistryApplicationCache.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletregistry/RegistryPortletCache.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/DisplayNameSetImpl.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/PortletParameterSetImpl.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/SecurityRoleRefSetImpl.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/servlet/impl/SecurityRoleSetImpl.java
portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java
portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java
portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/JetspeedRewriterController.java
portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/RulesetRewriterImpl.java
portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/CallbackElementRemover.java
portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/NekoParserAdaptor.java
portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/URLRewriterFilter.java
portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/rules/impl/RuleImpl.java
portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/SecurityHelper.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/GroupManagerImpl.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/impl/RoleManagerImpl.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/AlgorithmUpgradePBEPasswordService.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultGroupSecurityHandler.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultRoleSecurityHandler.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapGroupSecurityHandler.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapRoleSecurityHandler.java
portals/jetspeed-2/trunk/components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapSecurityMappingHandler.java
portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicy.java
portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRdbmsPolicyFolder.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerBase.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerSecondaryImpl.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSApplication.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSCapability.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSEntity.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSEntityPreference.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSGroup.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSMimeType.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNVPElement.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNVPElements.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNameValuePairs.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPWAttributes.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSPortlet.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSProcessOrder.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRole.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSecondaryData.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSeedData.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSSnapshot.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSUserAttributes.java
portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/PersistenceBrokerSSOProvider.java
portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOCookieImpl.java
portals/jetspeed-2/trunk/components/sso/src/java/org/apache/jetspeed/sso/impl/SSOPrincipalImpl.java
portals/jetspeed-2/trunk/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java
portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/sso/SSOProxyPortlet.java
portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryPage.java
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/administration/PortalAdministration.java
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/capabilities/MediaType.java
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/preference/FragmentPreference.java
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/spi/GroupSecurityHandler.java
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/security/spi/RoleSecurityHandler.java
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/sso/SSOProvider.java
portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/statistics/AggregateStatistics.java
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/PageManagerLayoutEventListener.java
Modified: portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/ExecuteSQL.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/ExecuteSQL.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/ExecuteSQL.java (original)
+++ portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/ExecuteSQL.java Mon Mar 12 00:45:49 2007
@@ -17,18 +17,12 @@
package org.apache.jetspeed.anttasks;
-import java.sql.DriverManager;
import java.sql.Connection;
-import java.sql.Driver;
import java.sql.SQLException;
-import java.util.ArrayList;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.SQLExec;
import java.util.Properties;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.apache.tools.ant.taskdefs.SQLExec;;
+import org.apache.tools.ant.Project;;
public class ExecuteSQL extends SQLExec
{
Modified: portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StartDatabase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StartDatabase.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StartDatabase.java (original)
+++ portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StartDatabase.java Mon Mar 12 00:45:49 2007
@@ -16,13 +16,9 @@
*/
package org.apache.jetspeed.anttasks;
-import java.sql.DriverManager;
-import java.util.ArrayList;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.JDBCTask;
import java.sql.Connection;
-import java.sql.Driver;
import java.sql.SQLException;
import java.util.Properties;
import org.apache.tools.ant.Project;
Modified: portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StartDerby.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StartDerby.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StartDerby.java (original)
+++ portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StartDerby.java Mon Mar 12 00:45:49 2007
@@ -18,7 +18,6 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
-import java.sql.DriverManager;
import java.sql.Driver;
import java.sql.Connection;
import org.apache.tools.ant.Project;
Modified: portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StopDatabase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StopDatabase.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StopDatabase.java (original)
+++ portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StopDatabase.java Mon Mar 12 00:45:49 2007
@@ -16,12 +16,9 @@
*/
package org.apache.jetspeed.anttasks;
-import java.sql.DriverManager;
import java.util.ArrayList;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
-import java.sql.Connection;
-import java.sql.Driver;
import java.sql.SQLException;
Modified: portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StopDerby.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StopDerby.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StopDerby.java (original)
+++ portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StopDerby.java Mon Mar 12 00:45:49 2007
@@ -16,15 +16,10 @@
*/
package org.apache.jetspeed.anttasks;
-import java.sql.DriverManager;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
-import java.sql.Connection;
-import java.sql.Driver;
import java.sql.SQLException;
import java.util.Properties;
-import java.util.Properties;
-import org.apache.tools.ant.Project;
public class StopDerby
Modified: portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/servlet/SSODemoServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/servlet/SSODemoServlet.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/servlet/SSODemoServlet.java (original)
+++ portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/servlet/SSODemoServlet.java Mon Mar 12 00:45:49 2007
@@ -17,8 +17,6 @@
package org.apache.jetspeed.demo.servlet;
import java.io.IOException;
-import java.security.Principal;
-
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
Modified: portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/taglibs/velocity/VelocityTag.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/taglibs/velocity/VelocityTag.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/taglibs/velocity/VelocityTag.java (original)
+++ portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/taglibs/velocity/VelocityTag.java Mon Mar 12 00:45:49 2007
@@ -168,11 +168,11 @@
*/
if (strictAccess)
{
- vc = (Context) new VelocityContext();
+ vc = new VelocityContext();
}
else
{
- vc = (Context) new JSPContext( pageContext );
+ vc = new JSPContext( pageContext );
}
/*
Modified: portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/browser/BrowserPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/browser/BrowserPortlet.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/browser/BrowserPortlet.java (original)
+++ portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/browser/BrowserPortlet.java Mon Mar 12 00:45:49 2007
@@ -303,7 +303,7 @@
if (searchString != null)
{
String searchColumn = request.getParameter(SEARCH_COLUMN);
- String filtered = (String)request.getParameter(FILTERED);
+ String filtered = request.getParameter(FILTERED);
if (filtered != null)
{
clearBrowserIterator(request);
@@ -448,12 +448,11 @@
protected void readUserParameters(RenderRequest request, Context context)
{
- List userObjectList;
Object userObjRead = request.getPortletSession().getAttribute(
USER_OBJECTS, PortletSession.PORTLET_SCOPE);
if (userObjRead != null)
{
- context.put(USER_OBJECTS, (List) userObjRead);
+ context.put(USER_OBJECTS, userObjRead);
// System.out.println("userObjectListSize: "+
// ((List)userObjRead).size());
} else
Modified: portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/browser/DatabaseBrowserIterator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/browser/DatabaseBrowserIterator.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/browser/DatabaseBrowserIterator.java (original)
+++ portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/browser/DatabaseBrowserIterator.java Mon Mar 12 00:45:49 2007
@@ -245,8 +245,8 @@
if (obj1 instanceof String)
{
- col1 = (String)obj1;
- col2 = (String)obj2;
+ col1 = obj1;
+ col2 = obj2;
}
else if (obj1 instanceof List)
{
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=517121&r1=517120&r2=517121
==============================================================================
--- 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 00:45:49 2007
@@ -16,9 +16,6 @@
*/
package org.apache.portals.gems.dojo;
-import java.util.HashMap;
-import java.util.Map;
-
import javax.portlet.PortletConfig;
import javax.portlet.PortletException;
Modified: portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java (original)
+++ portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/dojo/DojoSpringMVCPortlet.java Mon Mar 12 00:45:49 2007
@@ -16,8 +16,6 @@
*/
package org.apache.portals.gems.dojo;
-import java.io.BufferedReader;
-import java.io.StringReader;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
@@ -26,11 +24,6 @@
import javax.portlet.PortletException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -38,10 +31,6 @@
import org.apache.jetspeed.portlet.PortletHeaderRequest;
import org.apache.jetspeed.portlet.PortletHeaderResponse;
import org.apache.jetspeed.portlet.SupportsHeaderPhase;
-import org.apache.pluto.core.impl.RenderRequestImpl;
-import org.apache.pluto.core.impl.RenderResponseImpl;
-import org.apache.portals.gems.util.HttpBufferedResponse;
-import org.apache.portals.gems.util.PortletContentImpl;
import org.springframework.beans.BeansException;
import org.springframework.web.portlet.DispatcherPortlet;
Modified: portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/file/FilePortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/file/FilePortlet.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/file/FilePortlet.java (original)
+++ portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/file/FilePortlet.java Mon Mar 12 00:45:49 2007
@@ -99,7 +99,7 @@
if (null == path && this.defaultSourceBasePath != null )
{
- String filepath = (String)request.getParameter(PARAM_SOURCE_FILE_PATH);
+ String filepath = request.getParameter(PARAM_SOURCE_FILE_PATH);
if (filepath == null)
{
filepath = (String)request.getAttribute(PARAM_SOURCE_FILE_PATH);
Modified: portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java (original)
+++ portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/googlemaps/YahooGeocodeProxyServlet.java Mon Mar 12 00:45:49 2007
@@ -21,7 +21,6 @@
import java.net.URLEncoder;
import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.params.HttpMethodParams;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler;
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileCriterionForm.java Mon Mar 12 00:45:49 2007
@@ -97,9 +97,9 @@
public void listen(ActionEvent event)
{
- Map appMap = (Map)FacesContext.getCurrentInstance().getExternalContext().getApplicationMap();
+ Map appMap = FacesContext.getCurrentInstance().getExternalContext().getApplicationMap();
profiler = (Profiler)appMap.get(CommonPortletServices.CPS_PROFILER_COMPONENT);
- Map params = (Map)FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
+ Map params = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
String selectedRule = (String)params.get("selectedRule");
if (selectedRule != null && profiler != null)
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRuleForm.java Mon Mar 12 00:45:49 2007
@@ -58,9 +58,9 @@
public void listen(ActionEvent event)
{
- Map appMap = (Map)FacesContext.getCurrentInstance().getExternalContext().getApplicationMap();
+ Map appMap = FacesContext.getCurrentInstance().getExternalContext().getApplicationMap();
profiler = (Profiler)appMap.get(CommonPortletServices.CPS_PROFILER_COMPONENT);
- Map params = (Map)FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
+ Map params = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap();
String selected = (String)params.get("selectedRule");
if (selected != null && profiler != null)
{
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRulesExtent.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRulesExtent.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRulesExtent.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/profiler/ProfileRulesExtent.java Mon Mar 12 00:45:49 2007
@@ -37,7 +37,7 @@
public Collection getExtent()
{
- Map appMap = (Map)FacesContext.getCurrentInstance().getExternalContext().getApplicationMap();
+ Map appMap = FacesContext.getCurrentInstance().getExternalContext().getApplicationMap();
Profiler profiler = (Profiler)appMap.get(CommonPortletServices.CPS_PROFILER_COMPONENT);
return profiler.getRules(); // TODO: optimize with cache
}
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java Mon Mar 12 00:45:49 2007
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.portlets.registration;
-import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/portlet/web/deployer/EditRepositoryPage.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/portlet/web/deployer/EditRepositoryPage.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/portlet/web/deployer/EditRepositoryPage.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/rpad/portlet/web/deployer/EditRepositoryPage.java Mon Mar 12 00:45:49 2007
@@ -120,7 +120,7 @@
Repository repo = (Repository) sessionMap.get(RPADConstants.REPOSITORY);
if (repo != null)
{
- Repository r = (Repository) getRepositoryManager().getRepository(
+ Repository r = getRepositoryManager().getRepository(
repo.getName());
//TODO support repositories other than SimpleRepository
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/groups/GroupBrowser.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/groups/GroupBrowser.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/groups/GroupBrowser.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/groups/GroupBrowser.java Mon Mar 12 00:45:49 2007
@@ -155,7 +155,7 @@
}
}
- String filtered = (String)request.getParameter(FILTERED);
+ String filtered = request.getParameter(FILTERED);
if (filtered != null)
{
PortletMessaging.publish(request, SecurityResources.TOPIC_GROUPS, SecurityResources.MESSAGE_FILTERED, "on");
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/roles/RoleBrowser.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/roles/RoleBrowser.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/roles/RoleBrowser.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/roles/RoleBrowser.java Mon Mar 12 00:45:49 2007
@@ -153,7 +153,7 @@
}
}
- String filtered = (String)request.getParameter(FILTERED);
+ String filtered = request.getParameter(FILTERED);
if (filtered != null)
{
PortletMessaging.publish(request, SecurityResources.TOPIC_ROLES, SecurityResources.MESSAGE_FILTERED, "on");
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/sso/SSODetails.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/sso/SSODetails.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/sso/SSODetails.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/sso/SSODetails.java Mon Mar 12 00:45:49 2007
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.sql.Types;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.portlet.ActionRequest;
@@ -89,7 +88,6 @@
try
{
SSOSite site = null;
- Iterator principals = null;
List list = null;
resultSetTypeList.add(String.valueOf(Types.VARCHAR));
resultSetTitleList.add("Principal");
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserBrowser.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserBrowser.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserBrowser.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserBrowser.java Mon Mar 12 00:45:49 2007
@@ -120,7 +120,7 @@
}
// TODO: if request parameters were working correctly we could replace this with render parameters
- String filtered = (String)request.getParameter(FILTERED);
+ String filtered = request.getParameter(FILTERED);
if (filtered != null)
{
PortletMessaging.publish(request, SecurityResources.TOPIC_USERS, SecurityResources.MESSAGE_FILTERED, "on");
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserDetailsPortlet.java Mon Mar 12 00:45:49 2007
@@ -47,7 +47,6 @@
import org.apache.jetspeed.om.common.UserAttribute;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.folder.Folder;
-import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.portlets.security.SecurityResources;
import org.apache.jetspeed.portlets.security.SecurityUtil;
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/PortletSelector.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/PortletSelector.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/PortletSelector.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/selector/PortletSelector.java Mon Mar 12 00:45:49 2007
@@ -174,12 +174,12 @@
public void processAction(ActionRequest request, ActionResponse response)
throws PortletException, IOException
{
- String filtered = (String)request.getParameter(FILTERED);
+ String filtered = request.getParameter(FILTERED);
Set checkBoxes = getCheckBoxSet(request);
PortletMessaging.publish(request, PortletApplicationResources.TOPIC_PORTLET_SELECTOR, PortletApplicationResources.MESSAGE_SELECTED, checkBoxes);
- String searchString = (String)request.getParameter(SEARCH_STRING);
+ String searchString = request.getParameter(SEARCH_STRING);
// huh, apparently this messaging API won't basically take a null and assume that's equivalent to a cancel. In fact the null won't even
// overwrite the previous value.. it does nothing...
// So, we'll write some extra code to get around that
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java Mon Mar 12 00:45:49 2007
@@ -17,15 +17,10 @@
package org.apache.jetspeed.portlets.site;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletConfig;
import javax.portlet.PortletException;
-import javax.portlet.PortletPreferences;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
@@ -40,7 +35,6 @@
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.request.RequestContext;
import org.apache.portals.gems.dojo.AbstractDojoVelocityPortlet;
-import org.apache.velocity.context.Context;
/**
* Manage the Portal Site
Modified: portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/servlets/SpringInitServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/servlets/SpringInitServlet.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/servlets/SpringInitServlet.java (original)
+++ portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/servlets/SpringInitServlet.java Mon Mar 12 00:45:49 2007
@@ -16,8 +16,6 @@
*/
package org.apache.portals.applications.rss.servlets;
-import java.io.InputStream;
-
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
Modified: portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/transform/impl/MemoryTransformCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/transform/impl/MemoryTransformCache.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/transform/impl/MemoryTransformCache.java (original)
+++ portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/transform/impl/MemoryTransformCache.java Mon Mar 12 00:45:49 2007
@@ -190,7 +190,7 @@
public Object getDocument(String key)
{
- TransformCacheEntry entry = (TransformCacheEntry)get(key);
+ TransformCacheEntry entry = get(key);
if (entry != null)
{
return entry.getDocument();
Modified: portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/security/JSSubject.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/security/JSSubject.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/security/JSSubject.java (original)
+++ portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/security/JSSubject.java Mon Mar 12 00:45:49 2007
@@ -27,22 +27,8 @@
*/
import javax.security.auth.*;
-import java.util.*;
-import java.io.*;
-import java.lang.reflect.*;
-import java.text.MessageFormat;
-import java.security.AccessController;
import java.security.AccessControlContext;
-import java.security.DomainCombiner;
-import java.security.Permission;
-import java.security.PermissionCollection;
-import java.security.Principal;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedActionException;
-import java.security.ProtectionDomain;
-import sun.security.util.ResourcesMgr;
-import sun.security.util.SecurityConstants;
Modified: portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/HashCodeBuilder.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/HashCodeBuilder.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/HashCodeBuilder.java (original)
+++ portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/HashCodeBuilder.java Mon Mar 12 00:45:49 2007
@@ -361,7 +361,7 @@
*/
public HashCodeBuilder append(short value)
{
- iTotal = iTotal * iConstant + (int) value;
+ iTotal = iTotal * iConstant + value;
return this;
}
@@ -373,7 +373,7 @@
*/
public HashCodeBuilder append(char value)
{
- iTotal = iTotal * iConstant + (int) value;
+ iTotal = iTotal * iConstant + value;
return this;
}
@@ -385,7 +385,7 @@
*/
public HashCodeBuilder append(byte value)
{
- iTotal = iTotal * iConstant + (int) value;
+ iTotal = iTotal * iConstant + value;
return this;
}
Modified: portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityImpl.java (original)
+++ portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityImpl.java Mon Mar 12 00:45:49 2007
@@ -18,7 +18,6 @@
package org.apache.jetspeed.capabilities.impl;
import org.apache.jetspeed.capabilities.Capability;
-import org.apache.jetspeed.capabilities.MimeType;
/**
* Capability implementation class.
Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedElementImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedElementImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedElementImpl.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedElementImpl.java Mon Mar 12 00:45:49 2007
@@ -20,7 +20,6 @@
import net.sf.ehcache.Element;
-import org.apache.jetspeed.cache.CacheElement;
import org.apache.jetspeed.cache.DistributedCacheObject;
Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java Mon Mar 12 00:45:49 2007
@@ -17,11 +17,9 @@
package org.apache.jetspeed.cache.impl;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import net.sf.ehcache.Cache;
@@ -34,7 +32,6 @@
import org.apache.jetspeed.cache.CacheElement;
import org.apache.jetspeed.cache.DistributedCacheObject;
import org.apache.jetspeed.cache.JetspeedCache;
-import org.apache.jetspeed.cache.JetspeedCacheEventListener;
public class EhCacheDistributedImpl extends EhCacheImpl implements JetspeedCache, CacheEventListener
{
@@ -71,7 +68,7 @@
{
if ((key == null) || (!(key instanceof Serializable)))
return false;
- return ehcache.isKeyInCache((Serializable)key);
+ return ehcache.isKeyInCache(key);
}
public boolean isKeyInCache(Serializable key)
Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheElementImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheElementImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheElementImpl.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheElementImpl.java Mon Mar 12 00:45:49 2007
@@ -17,13 +17,9 @@
package org.apache.jetspeed.cache.impl;
-import java.util.StringTokenizer;
-
import net.sf.ehcache.Element;
import org.apache.jetspeed.cache.CacheElement;
-import org.apache.jetspeed.cache.JetspeedCache;
-import org.apache.jetspeed.cache.JetspeedCacheEventListener;
/**
* Wrapper around actual cache element implementation
Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java Mon Mar 12 00:45:49 2007
@@ -179,8 +179,6 @@
protected void loadServlets()
{
- Servlet containerServlet = null;
-
this.servletInfoList.clear();
this.servletMappingInfoList.clear();
Modified: portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/testhelpers/TestOJBHelper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/testhelpers/TestOJBHelper.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/testhelpers/TestOJBHelper.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/test/org/apache/jetspeed/testhelpers/TestOJBHelper.java Mon Mar 12 00:45:49 2007
@@ -19,7 +19,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.ApplicationContext;
import junit.framework.TestCase;
Modified: portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter.java (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter.java Mon Mar 12 00:45:49 2007
@@ -137,8 +137,8 @@
protected void insertContextNameParam(Element jetspeedServletElement)
{
Namespace namespace = jetspeedServletElement.getNamespace();
- Element param2Name = (Element) new Element("param-name", namespace).addContent("contextName");
- Element param2Value = (Element) new Element("param-value", namespace).addContent(portletApplication);
+ Element param2Name = new Element("param-name", namespace).addContent("contextName");
+ Element param2Value = new Element("param-value", namespace).addContent(portletApplication);
Element init2Param = new Element("init-param", namespace);
init2Param.addContent(param2Name);
init2Param.addContent(param2Value);
@@ -149,7 +149,7 @@
protected void insertLoadOnStartup(Element jetspeedServletElement)
{
Namespace namespace = jetspeedServletElement.getNamespace();
- Element loadOnStartup = (Element) new Element("load-on-startup", namespace).addContent("0");
+ Element loadOnStartup = new Element("load-on-startup", namespace).addContent("0");
jetspeedServletElement.addContent(loadOnStartup);
}
Modified: portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_3.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_3.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_3.java (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_3.java Mon Mar 12 00:45:49 2007
@@ -96,11 +96,11 @@
{
Namespace namespace = root.getNamespace();
Element jetspeedServletElement = new Element("servlet", namespace);
- Element servletName = (Element) new Element("servlet-name", namespace).addContent(JETSPEED_CONTAINER);
- Element servletDspName = (Element) new Element("display-name", namespace).addContent(JETSPEED_SERVLET_DISPLAY_NAME);
- Element servletDesc = (Element) new Element("description", namespace)
+ Element servletName = new Element("servlet-name", namespace).addContent(JETSPEED_CONTAINER);
+ Element servletDspName = new Element("display-name", namespace).addContent(JETSPEED_SERVLET_DISPLAY_NAME);
+ Element servletDesc = new Element("description", namespace)
.addContent(JETSPEED_SERVLET_DESCRIPTION);
- Element servletClass = (Element) new Element("servlet-class", namespace)
+ Element servletClass = new Element("servlet-class", namespace)
.addContent(JETSPEED_SERVLET_CLASS);
jetspeedServletElement.addContent(servletName);
jetspeedServletElement.addContent(servletDspName);
@@ -122,8 +122,8 @@
Namespace namespace = root.getNamespace();
Element jetspeedServletMappingElement = new Element("servlet-mapping", namespace);
- Element servletMapName = (Element) new Element("servlet-name", namespace).addContent(JETSPEED_CONTAINER);
- Element servletUrlPattern = (Element) new Element("url-pattern", namespace).addContent("/container/*");
+ Element servletMapName = new Element("servlet-name", namespace).addContent(JETSPEED_CONTAINER);
+ Element servletUrlPattern = new Element("url-pattern", namespace).addContent("/container/*");
jetspeedServletMappingElement.addContent(servletMapName);
jetspeedServletMappingElement.addContent(servletUrlPattern);
@@ -141,8 +141,8 @@
{
Namespace namespace = root.getNamespace();
Element taglib = new Element ("taglib", namespace);
- Element taguri = (Element) new Element("taglib-uri", namespace).addContent("http://java.sun.com/portlet");
- Element taglocation = (Element) new Element("taglib-location", namespace).addContent("/WEB-INF/tld/portlet.tld");
+ Element taguri = new Element("taglib-uri", namespace).addContent("http://java.sun.com/portlet");
+ Element taglocation = new Element("taglib-location", namespace).addContent("/WEB-INF/tld/portlet.tld");
taglib.addContent(taguri);
taglib.addContent(taglocation);
Modified: portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_4.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_4.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_4.java (original)
+++ portals/jetspeed-2/trunk/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedWebApplicationRewriter2_4.java Mon Mar 12 00:45:49 2007
@@ -95,11 +95,11 @@
{
Namespace namespace = root.getNamespace();
Element jetspeedServletElement = new Element("servlet", namespace);
- Element servletName = (Element) new Element("servlet-name", namespace).addContent(JETSPEED_CONTAINER);
- Element servletDspName = (Element) new Element("display-name", namespace).addContent(JETSPEED_SERVLET_DISPLAY_NAME);
- Element servletDesc = (Element) new Element("description", namespace)
+ Element servletName = new Element("servlet-name", namespace).addContent(JETSPEED_CONTAINER);
+ Element servletDspName = new Element("display-name", namespace).addContent(JETSPEED_SERVLET_DISPLAY_NAME);
+ Element servletDesc = new Element("description", namespace)
.addContent(JETSPEED_SERVLET_DESCRIPTION);
- Element servletClass = (Element) new Element("servlet-class", namespace)
+ Element servletClass = new Element("servlet-class", namespace)
.addContent(JETSPEED_SERVLET_CLASS);
// order is important
jetspeedServletElement.addContent(servletDesc);
@@ -122,8 +122,8 @@
Namespace namespace = root.getNamespace();
Element jetspeedServletMappingElement = new Element("servlet-mapping", namespace);
- Element servletMapName = (Element) new Element("servlet-name", namespace).addContent(JETSPEED_CONTAINER);
- Element servletUrlPattern = (Element) new Element("url-pattern", namespace).addContent("/container/*");
+ Element servletMapName = new Element("servlet-name", namespace).addContent(JETSPEED_CONTAINER);
+ Element servletUrlPattern = new Element("url-pattern", namespace).addContent("/container/*");
jetspeedServletMappingElement.addContent(servletMapName);
jetspeedServletMappingElement.addContent(servletUrlPattern);
@@ -147,8 +147,8 @@
insertElementCorrectly(root, jspConfig, ELEMENTS_BEFORE_JSP_CONFIG);
}
Element taglib = new Element ("taglib", namespace);
- Element taguri = (Element) new Element("taglib-uri", namespace).addContent("http://java.sun.com/portlet");
- Element taglocation = (Element) new Element("taglib-location", namespace).addContent("/WEB-INF/tld/portlet.tld");
+ Element taguri = new Element("taglib-uri", namespace).addContent("http://java.sun.com/portlet");
+ Element taglocation = new Element("taglib-location", namespace).addContent("/WEB-INF/tld/portlet.tld");
taglib.addContent(taguri);
taglib.addContent(taglocation);
Modified: portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java (original)
+++ portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java Mon Mar 12 00:45:49 2007
@@ -182,7 +182,6 @@
path = null;
}
- String basePath = root;
String realPath = null;
String workingPath = null;
@@ -255,7 +254,7 @@
StringTokenizer tok = new StringTokenizer(path, "/");
while (tok.hasMoreTokens())
{
- String name = (String)tok.nextToken();
+ String name = tok.nextToken();
if (name.equals(LocatorDescriptor.PARAM_TYPE) && tok.hasMoreTokens())
{
locator.setType( tok.nextToken() );
@@ -303,7 +302,7 @@
int count = 0;
while (tok.hasMoreTokens())
{
- String token = (String)tok.nextToken();
+ String token = tok.nextToken();
switch (count)
{
case 0:
Modified: portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfileLocator.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfileLocator.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfileLocator.java (original)
+++ portals/jetspeed-2/trunk/components/locator/src/java/org/apache/jetspeed/profiler/impl/JetspeedProfileLocator.java Mon Mar 12 00:45:49 2007
@@ -127,7 +127,7 @@
StringTokenizer tokenizer = new StringTokenizer(path, ProfileLocator.PATH_SEPARATOR);
while (tokenizer.hasMoreTokens())
{
- String name = (String)tokenizer.nextToken();
+ String name = tokenizer.nextToken();
if (tokenizer.hasMoreTokens())
{
String value = tokenizer.nextToken();
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java Mon Mar 12 00:45:49 2007
@@ -57,7 +57,7 @@
// make sure element is unique
if (folder.accessMenus().contains(definition))
{
- throw new IllegalArgumentException("Unable to add duplicate entry to list: " + ((FolderMenuDefinitionImpl)definition).getName());
+ throw new IllegalArgumentException("Unable to add duplicate entry to list: " + (definition).getName());
}
// retrieve from removed list to reuse
// previously removed element copying
@@ -68,7 +68,7 @@
if (removedIndex >= 0)
{
// reuse menu definition with matching name
- FolderMenuDefinitionImpl addDefinition = (FolderMenuDefinitionImpl)definition;
+ FolderMenuDefinitionImpl addDefinition = definition;
definition = (FolderMenuDefinitionImpl)removedMenuDefinitions.remove(removedIndex);
// TODO: move this logic to copy methods on implementations
// copy menu definition members
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseSecurityConstraintsRef.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseSecurityConstraintsRef.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseSecurityConstraintsRef.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseSecurityConstraintsRef.java Mon Mar 12 00:45:49 2007
@@ -16,8 +16,6 @@
*/
package org.apache.jetspeed.om.page.impl;
-import java.util.List;
-
/**
* BaseSecurityConstraintsRef
*
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentList.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentList.java Mon Mar 12 00:45:49 2007
@@ -17,7 +17,6 @@
package org.apache.jetspeed.om.page.impl;
import java.util.AbstractList;
-import java.util.List;
/**
* FragmentList
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionList.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionList.java Mon Mar 12 00:45:49 2007
@@ -58,7 +58,7 @@
// make sure element is unique
if (page.accessMenus().contains(definition))
{
- throw new IllegalArgumentException("Unable to add duplicate entry to list: " + ((PageMenuDefinitionImpl)definition).getName());
+ throw new IllegalArgumentException("Unable to add duplicate entry to list: " + (definition).getName());
}
// retrieve from removed list to reuse
// previously removed element copying
@@ -69,7 +69,7 @@
if (removedIndex >= 0)
{
// reuse menu definition with matching name
- PageMenuDefinitionImpl addDefinition = (PageMenuDefinitionImpl)definition;
+ PageMenuDefinitionImpl addDefinition = definition;
definition = (PageMenuDefinitionImpl)removedMenuDefinitions.remove(removedIndex);
// TODO: move this logic to copy methods on implementations
// copy menu definition members
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentList.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentList.java Mon Mar 12 00:45:49 2007
@@ -17,7 +17,6 @@
package org.apache.jetspeed.om.page.psml;
import java.util.AbstractList;
-import java.util.List;
/**
* FragmentList
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java Mon Mar 12 00:45:49 2007
@@ -17,7 +17,6 @@
package org.apache.jetspeed.om.page.psml;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java Mon Mar 12 00:45:49 2007
@@ -46,7 +46,6 @@
import org.apache.jetspeed.page.document.FailedToUpdateDocumentException;
import org.apache.jetspeed.page.document.Node;
import org.apache.jetspeed.page.document.NodeException;
-import org.apache.jetspeed.page.document.NodeNotFoundException;
import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.Serializer;
import org.apache.xml.serialize.XMLSerializer;
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java Mon Mar 12 00:45:49 2007
@@ -39,9 +39,7 @@
import org.apache.jetspeed.page.document.DocumentHandler;
import org.apache.jetspeed.page.document.DocumentHandlerFactory;
import org.apache.jetspeed.page.document.DocumentNotFoundException;
-import org.apache.jetspeed.page.document.FailedToDeleteDocumentException;
import org.apache.jetspeed.page.document.FailedToDeleteFolderException;
-import org.apache.jetspeed.page.document.FailedToUpdateDocumentException;
import org.apache.jetspeed.page.document.FailedToUpdateFolderException;
import org.apache.jetspeed.page.document.FolderHandler;
import org.apache.jetspeed.page.document.Node;
@@ -327,7 +325,7 @@
Iterator copyIter = folderImpl.getAllNodes().iterator();
while (copyIter.hasNext())
{
- removeNodes.add((Node)copyIter.next());
+ removeNodes.add(copyIter.next());
}
// remove folder nodes
@@ -531,7 +529,6 @@
protected String[] getChildrenNames( String path, FilenameFilter filter ) throws FolderNotFoundException
{
File parent = new File(documentRootDir, path);
- String[] relativeNames = null;
if (!parent.exists())
{
throw new FolderNotFoundException("No folder exists at the path: " + parent.getAbsolutePath());
@@ -718,7 +715,7 @@
entry.setDocument(getFolder(folder.getPath(), false));
if (((AbstractNode)folder).getParent(false) != null)
{
- FileCacheEntry parentEntry = (FileCacheEntry)fileCache.get(((AbstractNode)folder).getParent(false).getPath());
+ FileCacheEntry parentEntry = fileCache.get(((AbstractNode)folder).getParent(false).getPath());
refresh(parentEntry);
}
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java Mon Mar 12 00:45:49 2007
@@ -235,7 +235,7 @@
cacheLRUList.addFirst(entry);
// refresh cache entry and return object
entry.touch();
- return (NodeImpl)entry.getObject();
+ return entry.getObject();
}
else
{
Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java Mon Mar 12 00:45:49 2007
@@ -43,11 +43,8 @@
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Link;
import org.apache.jetspeed.om.page.Page;
-import org.apache.jetspeed.om.page.PageSecurity;
import org.apache.jetspeed.om.preference.FragmentPreference;
import org.apache.jetspeed.page.document.DocumentNotFoundException;
-import org.apache.jetspeed.page.document.FailedToDeleteFolderException;
-import org.apache.jetspeed.page.document.FolderHandler;
import org.apache.jetspeed.page.psml.CastorXmlPageManager;
/**
Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java Mon Mar 12 00:45:49 2007
@@ -20,8 +20,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
-import java.util.StringTokenizer;
-
import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.SecurityConstraint;
Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureCastorXmlPageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureCastorXmlPageManager.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureCastorXmlPageManager.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureCastorXmlPageManager.java Mon Mar 12 00:45:49 2007
@@ -16,9 +16,6 @@
*/
package org.apache.jetspeed.page;
-import java.io.File;
-import java.io.FileFilter;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureDatabasePageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureDatabasePageManager.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureDatabasePageManager.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestSecureDatabasePageManager.java Mon Mar 12 00:45:49 2007
@@ -16,30 +16,7 @@
*/
package org.apache.jetspeed.page;
-import java.security.Principal;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.security.auth.Subject;
-
import org.apache.jetspeed.components.util.DatasourceEnabledSpringTestCase;
-import org.apache.jetspeed.om.common.SecurityConstraint;
-import org.apache.jetspeed.om.common.SecurityConstraints;
-import org.apache.jetspeed.om.folder.Folder;
-import org.apache.jetspeed.om.folder.FolderNotFoundException;
-import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.Link;
-import org.apache.jetspeed.om.page.Page;
-import org.apache.jetspeed.om.page.PageSecurity;
-import org.apache.jetspeed.om.page.SecurityConstraintsDef;
-import org.apache.jetspeed.security.UserPrincipal;
-import org.apache.jetspeed.security.impl.PrincipalsSet;
-import org.apache.jetspeed.security.impl.RolePrincipalImpl;
-import org.apache.jetspeed.security.impl.UserPrincipalImpl;
-
import junit.framework.Test;
import junit.framework.TestSuite;
Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/LinkProxy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/LinkProxy.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/LinkProxy.java (original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/LinkProxy.java Mon Mar 12 00:45:49 2007
@@ -22,7 +22,6 @@
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.page.Link;
-import org.apache.jetspeed.page.document.Node;
import org.apache.jetspeed.page.document.proxy.NodeProxy;
import org.apache.jetspeed.portalsite.view.SiteView;
Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/PageProxy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/PageProxy.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/PageProxy.java (original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/PageProxy.java Mon Mar 12 00:45:49 2007
@@ -23,7 +23,6 @@
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.folder.proxy.FolderProxy;
import org.apache.jetspeed.om.page.Page;
-import org.apache.jetspeed.page.document.Node;
import org.apache.jetspeed.page.document.proxy.NodeProxy;
import org.apache.jetspeed.portalsite.view.SiteView;
Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java Mon Mar 12 00:45:49 2007
@@ -26,7 +26,6 @@
import java.util.Collections;
import org.apache.jetspeed.om.folder.Folder;
-import org.apache.jetspeed.om.folder.MenuDefinition;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.page.document.Node;
import org.apache.jetspeed.page.document.NodeException;
Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java?view=diff&rev=517121&r1=517120&r2=517121
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java (original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/menu/StandardBreadcrumbsMenuDefinition.java Mon Mar 12 00:45:49 2007
@@ -16,8 +16,6 @@
*/
package org.apache.jetspeed.portalsite.menu;
-import java.util.Locale;
-
import org.apache.jetspeed.portalsite.view.SiteView;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org