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/13 16:05:52 UTC
svn commit: r517719 [1/2] - in /portals/jetspeed-2/trunk:
ant-tasks/src/java/org/apache/jetspeed/anttasks/
applications/demo/src/java/org/apache/jetspeed/portlet/helloworld/
applications/gems/src/java/org/apache/portals/gems/util/
applications/j2-admin...
Author: ate
Date: Tue Mar 13 08:05:48 2007
New Revision: 517719
URL: http://svn.apache.org/viewvc?view=rev&rev=517719
Log:
Last code cleanup action for now.
Time again to start working on some real issues/features ;)
Modified:
portals/jetspeed-2/trunk/ant-tasks/src/java/org/apache/jetspeed/anttasks/StopDatabase.java
portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/portlet/helloworld/HelloWorld.java
portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/ValidationHelper.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationDetail.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/security/permissions/SecurityPermissionsPortlet.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/security/users/UserManagerPortlet.java
portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java
portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/RSSPortlet.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/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityImpl.java
portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/MimeTypeImpl.java
portals/jetspeed-2/trunk/components/capability/src/test/org/apache/jetspeed/capabilities/TestCapability.java
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/components/SpringComponentManager.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/page/PageImporter.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/PageManagerUtils.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/test/org/apache/jetspeed/page/PageManagerTestShared.java
portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java
portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/LayoutDecorationImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/caches/SessionPathResolverCache.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.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/engine/JetspeedServlet.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/engine/servlet/StaticResourceCachingFilter.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFoldersListAction.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/manager/ManagerServlet.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/registration/RegistrationTool.java
portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/administration/TestPortalAdministrationImpl.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/deployment/TestSimpleDeployment.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestConstraintsAction.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestLayout.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/TestWebXML.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java
portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/userinfo/TestUserInfoManager.java
portals/jetspeed-2/trunk/components/profiler/src/test/org/apache/jetspeed/profiler/TestProfiler.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/om/impl/DublinCoreImpl.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/preference/impl/FragmentPortletPreferenceSet.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/window/impl/PortletWindowImpl.java
portals/jetspeed-2/trunk/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/CallbackElementRemover.java
portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java
portals/jetspeed-2/trunk/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestRewriterController.java
portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestGroupManager.java
portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestRoleManager.java
portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/TestUserManager.java
portals/jetspeed-2/trunk/components/security/src/test/org/apache/jetspeed/security/util/TestPBEPasswordTool.java
portals/jetspeed-2/trunk/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedDDLApplication.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/sso/src/java/org/apache/jetspeed/sso/impl/PersistenceBrokerSSOProvider.java
portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestBasicSSO.java
portals/jetspeed-2/trunk/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java
portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/BatchedStatistics.java
portals/jetspeed-2/trunk/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/WebContentPortlet.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/WebContentResource.java
portals/jetspeed-2/trunk/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/PageManagerLayoutEventListener.java
portals/jetspeed-2/trunk/taglibs/treecontrol/src/java/org/apache/jetspeed/portlets/tags/PortletTreeControlTag.java
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.anttasks;
-import java.util.ArrayList;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import java.sql.SQLException;
@@ -25,8 +24,6 @@
public class StopDatabase
extends Task {
- private ArrayList subTasks;
-
private String url;
public String getUrl() {
Modified: portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/portlet/helloworld/HelloWorld.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/portlet/helloworld/HelloWorld.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/portlet/helloworld/HelloWorld.java (original)
+++ portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/portlet/helloworld/HelloWorld.java Tue Mar 13 08:05:48 2007
@@ -24,7 +24,6 @@
import javax.portlet.PortletContext;
import javax.portlet.PortletException;
import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletURL;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
@@ -92,9 +91,6 @@
ResourceBundle resource = getPortletConfig().getResourceBundle(request.getLocale());
response.setContentType("text/html");
- PortletURL url = response.createRenderURL();
- // url.addParameter("test", "value");
-
response.getWriter().println("<br/><b>"+resource.getString("helloworld.label.InitParamHello")+" = " + this.getInitParameter("hello") + "</b>");
// response.getWriter().println("<br/><b>Render URL = " + url + "</b>");
Modified: portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/ValidationHelper.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/ValidationHelper.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/ValidationHelper.java (original)
+++ portals/jetspeed-2/trunk/applications/gems/src/java/org/apache/portals/gems/util/ValidationHelper.java Tue Mar 13 08:05:48 2007
@@ -16,7 +16,6 @@
*/
package org.apache.portals.gems.util;
-import java.net.URL;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -190,7 +189,7 @@
return true;
}
- URL url = new URL(evalString);
+ //URL url = new URL(evalString);
/*
Perl5Util util = new Perl5Util();
@@ -357,13 +356,13 @@
try
{
- Date date = EUROPEAN_DATE_FORMAT.parse(formatted);
+ EUROPEAN_DATE_FORMAT.parse(formatted);
}
catch (ParseException e)
{
try
{
- Date date = AMERICAN_DATE_FORMAT.parse(formatted);
+ AMERICAN_DATE_FORMAT.parse(formatted);
}
catch (ParseException ee)
{
@@ -380,13 +379,13 @@
try
{
- Date date = EUROPEAN_DATETIME_FORMAT.parse(formatted);
+ EUROPEAN_DATETIME_FORMAT.parse(formatted);
}
catch (ParseException e)
{
try
{
- Date date = AMERICAN_DATETIME_FORMAT.parse(formatted);
+ AMERICAN_DATETIME_FORMAT.parse(formatted);
}
catch (ParseException ee)
{
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/entityeditor/PortletEntityEditorPortlet.java Tue Mar 13 08:05:48 2007
@@ -28,7 +28,6 @@
import org.apache.jetspeed.CommonPortletServices;
import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
import org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException;
-import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.om.common.preference.PreferenceComposite;
import org.apache.jetspeed.om.common.preference.PreferenceSetComposite;
import org.apache.pluto.om.entity.PortletEntity;
@@ -38,8 +37,6 @@
{
private PortletEntityAccessComponent entityAccess;
- private PortletRegistry registry;
-
/* (non-Javadoc)
* @see org.apache.portals.bridges.velocity.GenericVelocityPortlet#init(javax.portlet.PortletConfig)
*/
@@ -48,7 +45,6 @@
super.init(config);
PortletContext context = getPortletContext();
entityAccess = (PortletEntityAccessComponent)context.getAttribute(CommonPortletServices.CPS_ENTITY_ACCESS_COMPONENT);
- registry = (PortletRegistry)context.getAttribute(CommonPortletServices.CPS_REGISTRY_COMPONENT);
}
/* (non-Javadoc)
@@ -154,7 +150,6 @@
{
PortletEntity entity = getPortletEntity(request);
String prefString= request.getParameter("selectedPref");
- String updatedValue = request.getParameter("selectedPrefValue");
String[] info = prefString.split("::");
String prefName = info[1];
int valueIndex = Integer.parseInt(info[2]);
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/palm/PortletApplicationLifecycleManager.java Tue Mar 13 08:05:48 2007
@@ -34,7 +34,6 @@
import org.apache.jetspeed.CommonPortletServices;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.components.portletregistry.RegistryException;
-import org.apache.jetspeed.deployment.DeploymentManager;
import org.apache.jetspeed.factory.PortletFactory;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager;
@@ -54,7 +53,6 @@
private ApplicationServerManager asm;
private PortletRegistry registry;
private PortletFactory portletFactory;
- private DeploymentManager dm;
private boolean serverManagerAvailable;
public void init(PortletConfig config)
@@ -64,7 +62,6 @@
PortletContext context = getPortletContext();
registry = (PortletRegistry)context.getAttribute(CommonPortletServices.CPS_REGISTRY_COMPONENT);
portletFactory = (PortletFactory)context.getAttribute(CommonPortletServices.CPS_PORTLET_FACTORY_COMPONENT);
- dm = (DeploymentManager)context.getAttribute(CommonPortletServices.CPS_DEPLOYMENT_MANAGER_COMPONENT);
asm = (ApplicationServerManager)context.getAttribute(CommonPortletServices.CPS_APPLICATION_SERVER_MANAGER_COMPONENT);
if (null == registry)
{
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationDetail.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationDetail.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationDetail.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationDetail.java Tue Mar 13 08:05:48 2007
@@ -52,7 +52,6 @@
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.portlets.pam.beans.PortletApplicationBean;
import org.apache.jetspeed.search.SearchEngine;
-import org.apache.pluto.om.common.DescriptionSet;
import org.apache.pluto.om.common.SecurityRoleRef;
import org.apache.pluto.om.portlet.ContentType;
import org.apache.portals.bridges.beans.TabBean;
@@ -1040,6 +1039,7 @@
// registry.getPersistenceStore().getTransaction().commit();
}
+ /*
private String createXml(MutablePortletApplication pa)
{
StringBuffer buffer = new StringBuffer();
@@ -1064,7 +1064,9 @@
return buffer.toString();
}
+ */
+ /*
private String createPortletDefinitionXml(PortletDefinitionComposite pDef)
{
StringBuffer buffer = new StringBuffer();
@@ -1155,11 +1157,11 @@
while (langIter.hasNext())
{
MutableLanguage lang = (MutableLanguage) langIter.next();
- /*
- supportedLocaleBuffer.append("\t<supported-locale>");
- supportedLocaleBuffer.append(lang.getLocale().getCountry());
- supportedLocaleBuffer.append("</supported-locale>\n");
- */
+
+ //supportedLocaleBuffer.append("\t<supported-locale>");
+ //supportedLocaleBuffer.append(lang.getLocale().getCountry());
+ //supportedLocaleBuffer.append("</supported-locale>\n");
+
//lang.
portletInfoBuffer.append("\t<portlet-info>\n");
@@ -1231,7 +1233,9 @@
return buffer.toString();
}
+ */
+ /*
private void addDescriptions(StringBuffer buffer, DescriptionSet descriptions)
{
Iterator descIter = descriptions.iterator();
@@ -1247,5 +1251,5 @@
buffer.append(desc.getDescription());
buffer.append("</description>\n");
}
-
+ */
}
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -580,8 +580,7 @@
boolean userIdExistsFlag = true;
try
{
- User user = userManager.getUser((String) userInfo
- .get("user.name"));
+ userManager.getUser((String) userInfo.get("user.name"));
} catch (SecurityException e)
{
userIdExistsFlag = false;
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/permissions/SecurityPermissionsPortlet.java Tue Mar 13 08:05:48 2007
@@ -167,8 +167,6 @@
public void processAction(ActionRequest request,
ActionResponse actionResponse) throws PortletException, IOException
{
- PortletSession session = request.getPortletSession();
- //session.setAttribute(SESSION_RESULTS, stats);
}
public class PermissionData
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -43,7 +43,6 @@
import org.apache.jetspeed.CommonPortletServices;
import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.container.JetspeedPortletContext;
-import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.common.UserAttribute;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.folder.Folder;
@@ -1083,10 +1082,12 @@
}
}
+ /*
private void setSecurityConstraints(Folder folder, String userName)
{
SecurityConstraints constraints = pageManager.newSecurityConstraints();
constraints.setOwner(userName);
folder.setSecurityConstraints(constraints);
}
+ */
}
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserManagerPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserManagerPortlet.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserManagerPortlet.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/security/users/UserManagerPortlet.java Tue Mar 13 08:05:48 2007
@@ -54,8 +54,7 @@
while (users.hasNext()) {
User user = (User) users.next();
// System.out.println("++++ User = " + user);
- Principal principal = getPrincipal(user.getSubject(),
- UserPrincipal.class);
+ getPrincipal(user.getSubject(), UserPrincipal.class);
// System.out.println("principal = " + principal.getName());
}
} catch (SecurityException se) {
Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/tracking/PortletTrackingPortlet.java Tue Mar 13 08:05:48 2007
@@ -34,8 +34,6 @@
import org.apache.jetspeed.CommonPortletServices;
import org.apache.jetspeed.aggregator.PortletTrackingManager;
-import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
-import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.pluto.om.window.PortletWindow;
import org.apache.portals.bridges.velocity.GenericVelocityPortlet;
@@ -43,8 +41,6 @@
public class PortletTrackingPortlet extends GenericVelocityPortlet
{
- private PortletEntityAccessComponent entityAccess;
- private PortletRegistry registry;
private PortletTrackingManager trackingManager;
@@ -55,8 +51,6 @@
{
super.init(config);
PortletContext context = getPortletContext();
- entityAccess = (PortletEntityAccessComponent)context.getAttribute(CommonPortletServices.CPS_ENTITY_ACCESS_COMPONENT);
- registry = (PortletRegistry)context.getAttribute(CommonPortletServices.CPS_REGISTRY_COMPONENT);
trackingManager = (PortletTrackingManager)context.getAttribute(CommonPortletServices.CPS_PORTLET_TRACKING_MANAGER);
}
Modified: portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/RSSPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/RSSPortlet.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/RSSPortlet.java (original)
+++ portals/jetspeed-2/trunk/applications/rss/src/java/org/apache/portals/applications/rss/RSSPortlet.java Tue Mar 13 08:05:48 2007
@@ -194,7 +194,6 @@
{
// Java 1.5 only
// String t = document.getDocumentElement().getElementsByTagName("title").item(0).getTextContent();
- String t = document.getDocumentElement().getElementsByTagName("title").item(0).getNodeValue();
NodeList nodes = document.getDocumentElement().getElementsByTagName("title");
if (nodes != null)
{
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -42,7 +42,6 @@
private int evictionPercentage = 10;
private boolean enable = true;
- private Transform transform = null;
private TreeMap cache = null;
private Object lock = new Object();
@@ -52,7 +51,6 @@
*/
public MemoryTransformCache(Transform transform, int maxSize, int evictionPercentage, boolean enable, boolean debug)
{
- this.transform = transform;
cache = new TreeMap();
this.maxSize = maxSize;
this.evictionPercentage = evictionPercentage;
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -105,7 +105,7 @@
subject = JSSubject.getSubject(null);
threadLocal.set(subject);
if (subject != null)
- return subject.doAs(subject,action);
+ return Subject.doAs(subject,action);
else
return Subject.doAs(subject,action);
@@ -145,7 +145,7 @@
subject = JSSubject.getSubject(null);
threadLocal.set(subject);
if (subject != null)
- return subject.doAs(subject,action);
+ return Subject.doAs(subject,action);
else
return Subject.doAs(subject,action);
}
@@ -180,7 +180,7 @@
subject = JSSubject.getSubject(acc);
threadLocal.set(subject);
if (subject != null)
- return subject.doAsPrivileged(subject,action,acc);
+ return Subject.doAsPrivileged(subject,action,acc);
else
return Subject.doAsPrivileged(subject,action,acc);
@@ -224,7 +224,7 @@
s = JSSubject.getSubject(acc);
threadLocal.set(s);
if (s != null)
- return s.doAsPrivileged(s,action,acc);
+ return Subject.doAsPrivileged(s,action,acc);
else
return Subject.doAsPrivileged(s,action,acc);
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -69,8 +69,7 @@
*/
public int hashCode()
{
- int h = (name != null?capabilityId*31^(name.length()):capabilityId);
- return name.hashCode(); //ignore id + h;
+ return name.hashCode();
}
/**
Modified: portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/MimeTypeImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/MimeTypeImpl.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/MimeTypeImpl.java (original)
+++ portals/jetspeed-2/trunk/components/capability/src/java/org/apache/jetspeed/capabilities/impl/MimeTypeImpl.java Tue Mar 13 08:05:48 2007
@@ -68,8 +68,7 @@
*/
public int hashCode()
{
- int h = (name != null?mimeTypeId*31^(name.length()):mimeTypeId);
- return name.hashCode(); //ignore id: + h;
+ return name.hashCode();
}
/**
* Implements the equals operation so that 2 elements are equal if
Modified: portals/jetspeed-2/trunk/components/capability/src/test/org/apache/jetspeed/capabilities/TestCapability.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/capability/src/test/org/apache/jetspeed/capabilities/TestCapability.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/capability/src/test/org/apache/jetspeed/capabilities/TestCapability.java (original)
+++ portals/jetspeed-2/trunk/components/capability/src/test/org/apache/jetspeed/capabilities/TestCapability.java Tue Mar 13 08:05:48 2007
@@ -453,10 +453,6 @@
// setting fields
String name = "TEST CLIENT";
- int preferredMimeTypeId = 2;
-
- int evalOrder = 0;
-
int numCapabilities = 3;
int numMimeTypes = 4;
@@ -477,7 +473,6 @@
String userAgentPattern = "TEST.*|TESTBROWSER.*";
String manufacturer = "Test Manufacturer";
String model = "XYZ";
- String version = "1.0";
// set object fields
client.setUserAgentPattern(userAgentPattern);
Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java Tue Mar 13 08:05:48 2007
@@ -176,7 +176,6 @@
return false;
removed = ehcache.remove(key);
EhPortletContentCacheElementImpl impl = (EhPortletContentCacheElementImpl)element;
- Element ehl = impl.getImplElement();
String userKey = impl.getUserKey();
String entity = impl.getEntityKey();
Element userElement = ehcache.get(userKey);
Modified: portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/components/SpringComponentManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/components/SpringComponentManager.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/components/SpringComponentManager.java (original)
+++ portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/components/SpringComponentManager.java Tue Mar 13 08:05:48 2007
@@ -97,7 +97,6 @@
public SpringComponentManager(String[] bootConfigs, String[] appConfigs, String appRoot)
{
- File appRootDir = new File(appRoot);
PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
Properties p = new Properties();
//p.setProperty(APPLICATION_ROOT_KEY,appRootDir.getAbsolutePath());
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -36,7 +36,6 @@
public class JetspeedProfileLocator implements ProfileLocatorControl
{
private LinkedList elements = new LinkedList();
- private Profiler profiler;
private String requestPath;
public List getElements()
@@ -46,7 +45,6 @@
public void init(Profiler profiler, String requestPath)
{
- this.profiler = profiler;
if (requestPath != null)
if (requestPath.indexOf("/") != -1)
this.requestPath = requestPath;
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/PageImporter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/PageImporter.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/PageImporter.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/PageImporter.java Tue Mar 13 08:05:48 2007
@@ -119,7 +119,7 @@
throws JetspeedException
{
Folder fsRoot = sourceManager.getFolder(rootFolder);
- Folder root = importFolder(fsRoot);
+ importFolder(fsRoot);
// create the root page security
@@ -144,7 +144,7 @@
throws JetspeedException
{
Folder fsRoot = sourceManager.getFolder(rootFolder);
- Folder root = importFolder(fsRoot);
+ importFolder(fsRoot);
}
private Folder importFolder(Folder srcFolder)
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/PageManagerUtils.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/PageManagerUtils.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/PageManagerUtils.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/PageManagerUtils.java Tue Mar 13 08:05:48 2007
@@ -216,7 +216,7 @@
boolean found = true;
try
{
- Folder check = pageManager.getFolder(destinationPath);
+ pageManager.getFolder(destinationPath);
}
catch (FolderNotFoundException e)
{
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -63,7 +63,6 @@
public class FileSystemFolderHandler implements FolderHandler, FileCacheEventListener
{
- private String documentRoot;
private File documentRootDir;
private DocumentHandler metadataDocHandler;
private DocumentHandlerFactory handlerFactory;
@@ -101,7 +100,6 @@
throws FileNotFoundException, UnsupportedDocumentTypeException
{
super();
- this.documentRoot = documentRoot;
this.documentRootDir = new File(documentRoot);
verifyPath(documentRootDir);
this.handlerFactory = handlerFactory;
Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/PageManagerTestShared.java Tue Mar 13 08:05:48 2007
@@ -479,7 +479,7 @@
Link link = pageManager.getLink("/default.link");
try
{
- Page page1 = pageManager.getPage("/user-page.psml");
+ pageManager.getPage("/user-page.psml");
TestCase.assertTrue("Page /user-page.psml not viewable for manager", false);
}
catch (SecurityException se)
@@ -539,7 +539,7 @@
Link link = pageManager.getLink("/default.link");
try
{
- Page page1 = pageManager.getPage("/user-page.psml");
+ pageManager.getPage("/user-page.psml");
TestCase.assertTrue("Page /user-page.psml not viewable for guest", false);
}
catch (SecurityException se)
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -930,7 +930,7 @@
// verify root folder deep removal
try
{
- Folder check = pageManager.getFolder("/");
+ pageManager.getFolder("/");
assertTrue("Folder / FOUND", false);
}
catch (FolderNotFoundException e)
@@ -938,7 +938,7 @@
}
try
{
- PageSecurity check = pageManager.getPageSecurity();
+ pageManager.getPageSecurity();
assertTrue("PageSecurity FOUND", false);
}
catch (DocumentNotFoundException e)
@@ -946,7 +946,7 @@
}
try
{
- Link check = pageManager.getLink("/default.link");
+ pageManager.getLink("/default.link");
assertTrue("Link /default.link FOUND", false);
}
catch (DocumentNotFoundException e)
@@ -954,7 +954,7 @@
}
try
{
- Page check = pageManager.getPage("/default-page.psml");
+ pageManager.getPage("/default-page.psml");
assertTrue("Page /default-page.psml FOUND", false);
}
catch (PageNotFoundException e)
@@ -962,7 +962,7 @@
}
try
{
- Folder check = pageManager.getFolder("/");
+ pageManager.getFolder("/");
assertTrue("Folder / FOUND", false);
}
catch (FolderNotFoundException e)
@@ -970,7 +970,7 @@
}
try
{
- Folder check = pageManager.getFolder(deepFolderPath);
+ pageManager.getFolder(deepFolderPath);
assertTrue("Folder " + deepFolderPath + " FOUND", false);
}
catch (FolderNotFoundException e)
@@ -978,7 +978,7 @@
}
try
{
- Page check = pageManager.getPage(deepPagePath);
+ pageManager.getPage(deepPagePath);
assertTrue("Page " + deepPagePath + " FOUND", false);
}
catch (PageNotFoundException e)
Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java Tue Mar 13 08:05:48 2007
@@ -1037,12 +1037,13 @@
*
* @param locator request profile locator
* @return request path
- */
+
private static String locatorRequestPath(ProfileLocator locator)
{
// use request path in locator as default
return locatorRequestPath(locator, locator.getRequestPath());
}
+ */
/**
* locatorRequestPath - extract request specific path from profile locator
@@ -1050,7 +1051,7 @@
* @param locator request profile locator
* @param requestPath request path
* @return request path
- */
+
private static String locatorRequestPath(ProfileLocator locator, String requestPath)
{
// search locator using the most specific,
@@ -1105,6 +1106,7 @@
}
return requestPath;
}
+ */
/**
* newNode - invoked when the definition of a node is
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -400,7 +400,6 @@
fragment.setPortletContent(portletContent);
ContentDispatcherCtrl dispatcher = new ContentDispatcherImpl(portletContent);
HttpServletRequest servletRequest = requestContext.getRequestForWindow(portletWindow);
- HttpServletResponse servletResponse = dispatcher.getResponseForWindow(portletWindow, requestContext);
this.addTitleService.setDynamicTitle(portletWindow, servletRequest, dispatcher.getPortletContent(fragment).getTitle());
return true;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java Tue Mar 13 08:05:48 2007
@@ -27,7 +27,6 @@
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.pipeline.valve.CapabilityValve;
import org.apache.jetspeed.pipeline.valve.ValveContext;
-import org.apache.jetspeed.profiler.rules.ProfilingRule;
import org.apache.jetspeed.request.RequestContext;
/**
@@ -57,8 +56,6 @@
public void invoke( RequestContext request, ValveContext context ) throws PipelineException
{
-
- String requestMediaType = request.getRequestParameter(ProfilingRule.STANDARD_MEDIATYPE);
String agent = request.getRequest().getHeader("User-Agent");
// Get capability map
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/LocalPortletInvoker.java Tue Mar 13 08:05:48 2007
@@ -29,7 +29,6 @@
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -162,9 +161,6 @@
// gather all required data from request and response
ServletRequest servletRequest = ((javax.servlet.http.HttpServletRequestWrapper) portletRequest).getRequest();
-
- ServletResponse servletResponse = ((javax.servlet.http.HttpServletResponseWrapper) portletResponse)
- .getResponse();
ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
try
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/invoker/ServletPortletInvoker.java Tue Mar 13 08:05:48 2007
@@ -41,7 +41,6 @@
import org.apache.jetspeed.factory.PortletFactory;
import org.apache.jetspeed.factory.PortletInstance;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
-import org.apache.jetspeed.om.common.portlet.PortletApplication;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.aggregator.Worker;
import org.apache.jetspeed.aggregator.CurrentWorkerContext;
@@ -184,8 +183,6 @@
portletDefinition = this.portletDefinition;
}
- ClassLoader paClassLoader = portletFactory.getPortletApplicationClassLoader((PortletApplication)portletDefinition.getPortletApplicationDefinition());
-
MutablePortletApplication app = (MutablePortletApplication)portletDefinition.getPortletApplicationDefinition();
WebApplicationDefinition webApplicationDefinition = app.getWebApplicationDefinition();
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/container/window/impl/PortletWindowAccessorImpl.java Tue Mar 13 08:05:48 2007
@@ -57,7 +57,6 @@
private Map windows = Collections.synchronizedMap(new HashMap());
private PortletEntityAccessComponent entityAccessor;
- private PortletRegistry registry = null;
private PortletFactory portletFactory;
private boolean validateWindows = false;
@@ -76,7 +75,6 @@
{
this.entityAccessor = entityAccessor;
this.portletFactory = portletFactory;
- this.registry = registry;
this.validateWindows = validateWindows;
registry.addRegistryListener(this);
}
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/LayoutDecorationImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/LayoutDecorationImpl.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/LayoutDecorationImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/LayoutDecorationImpl.java Tue Mar 13 08:05:48 2007
@@ -30,8 +30,6 @@
*/
public class LayoutDecorationImpl extends BaseDecoration implements LayoutDecoration
{
- private DecorationFactory decorationFactory;
-
public LayoutDecorationImpl(Properties config, ResourceValidator validator, Path basePath, Path baseClientPath, PathResolverCache cache)
{
super(config, validator, basePath, baseClientPath, cache);
@@ -39,7 +37,7 @@
public void setDecorationFactory(DecorationFactory decorationFactory)
{
- this.decorationFactory = decorationFactory;
+ // TODO Ate: this seems like an obsolete constructor to me, no?
}
public String getHeader()
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/caches/SessionPathResolverCache.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/caches/SessionPathResolverCache.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/caches/SessionPathResolverCache.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/decoration/caches/SessionPathResolverCache.java Tue Mar 13 08:05:48 2007
@@ -32,11 +32,8 @@
*/
public class SessionPathResolverCache extends HashMapPathResolverCache implements PathResolverCache
{
- private final HttpSession session;
-
public SessionPathResolverCache(HttpSession session)
{
- this.session = session;
cache = (Map) session.getAttribute(PortalReservedParameters.RESOVLER_CACHE_ATTR);
if(cache == null)
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java Tue Mar 13 08:05:48 2007
@@ -53,8 +53,6 @@
private String localAppStagingDir;
private boolean stripLoggers;
private PortletApplicationManagement pam;
- private PortletRegistry registry;
-
/**
* @param pam
* @param webAppDir
@@ -81,7 +79,6 @@
String localAppDir, String localAppStagingDir, boolean stripLoggers) throws FileNotFoundException
{
this.pam = pam;
- this.registry = registry;
this.stripLoggers = stripLoggers;
localPAPrefixLength = PortletApplicationManagement.LOCAL_PA_PREFIX.length();
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -42,7 +42,6 @@
// base portal url to override default url server info from servlet
private BasePortalURL baseUrlAccess = null;
- private Theme theme;
private LayoutDecoration layoutDecoration;
// default extension for layout templates
@@ -60,7 +59,6 @@
// String layoutDecorator, String layoutDecoratorRootPath, String resourceName
this.context = context;
this.baseUrlAccess = baseUrlAccess;
- this.theme = theme;
this.layoutDecoration = theme.getPageLayoutDecoration();
this.headerResource = headerResource;
this.defaultLayoutTemplateExtension = defaultLayoutTemplateExtension;
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -16,7 +16,6 @@
*/
package org.apache.jetspeed.engine;
-import java.io.File;
import java.io.IOException;
import java.security.Principal;
@@ -311,14 +310,9 @@
protected ComponentManager initializeComponentManager(ServletConfig servletConfig, String appRoot, Configuration configuration) throws IOException
{
ServletConfigFactoryBean.setServletConfig(servletConfig);
- // String relativeApplicationRoot = getRealPath("/");
- String relativeApplicationRoot = appRoot;
- String absApplicationRoot = new File(relativeApplicationRoot).getCanonicalPath();
-
final String assemblyDir = configuration.getString("assembly.dir","/WEB-INF/assembly");
final String assemblyFileExtension = configuration.getString("assembly.extension",".xml");
-
-
+
String[] bootConfigs = new String[] {"/WEB-INF/assembly/boot/*.xml"};
String[] appConfigs = new String[] {assemblyDir+"/*"+assemblyFileExtension};
ServletContext servletContext = servletConfig.getServletContext();
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -50,7 +50,6 @@
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.aggregator.Worker;
import org.apache.jetspeed.aggregator.CurrentWorkerContext;
-import org.apache.pluto.om.entity.PortletApplicationEntity;
import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.om.window.PortletWindow;
@@ -403,8 +402,6 @@
{
entityID = entity.getId().toString();
}
- PortletApplicationEntity portletAppEntity = portletWindow.getPortletEntity()
- .getPortletApplicationEntity();
PortletApplicationDefinition portletAppDef = entity.getPortletDefinition()
.getPortletApplicationDefinition();
@@ -484,7 +481,6 @@
{
locales.add(localeEnums.nextElement());
}
- Iterator i = locales.iterator();
return new Enumerator(locales);
}
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/servlet/StaticResourceCachingFilter.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/servlet/StaticResourceCachingFilter.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/servlet/StaticResourceCachingFilter.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/engine/servlet/StaticResourceCachingFilter.java Tue Mar 13 08:05:48 2007
@@ -16,10 +16,6 @@
*/
package org.apache.jetspeed.engine.servlet;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Locale;
import java.util.TimeZone;
import javax.servlet.Filter;
@@ -91,7 +87,7 @@
}
- /* unused (we're only doing Cache-Control max-age), but works for generating Expires header */
+ /* unused (we're only doing Cache-Control max-age), but works for generating Expires header
private String createExpiresHeader( int expiresInHours )
{
SimpleDateFormat sdf = new SimpleDateFormat( "EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US );
@@ -102,4 +98,5 @@
Date d = new Date( millis );
return sdf.format( d );
}
+ */
}
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFoldersListAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFoldersListAction.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFoldersListAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/layout/impl/GetFoldersListAction.java Tue Mar 13 08:05:48 2007
@@ -66,7 +66,6 @@
return success;
}
String folderName = getActionParameter(requestContext, "data");
- String format = getActionParameter(requestContext, FORMAT);
if (folderName == null)
{
success = false;
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -59,9 +59,6 @@
*/
public class PortletPlacementContextImpl implements PortletPlacementContext
{
- private static final String COLUMN = "column";
- private static final String ROW = "row";
-
private static final int NO_DEPTH_LIMIT = -1;
/** Logger */
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -95,7 +95,6 @@
{
// Prepare our output writer to generate the response message
response.setContentType("text/plain; charset=utf-8");
- StringBuffer output = new StringBuffer();
CharArrayWriter buffer = new CharArrayWriter();
PrintWriter writer = new PrintWriter(buffer);
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java Tue Mar 13 08:05:48 2007
@@ -87,11 +87,6 @@
private PortalSite portalSite;
/**
- * pageManager - page manager component
- */
- private PageManager pageManager;
-
- /**
* requestFallback - flag indicating whether request should fallback to root folder
* if locators do not select a page or access is forbidden
*/
@@ -117,7 +112,6 @@
{
this.profiler = profiler;
this.portalSite = portalSite;
- this.pageManager = pageManager;
this.requestFallback = requestFallback;
this.useHistory = useHistory;
}
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/security/impl/SecurityValveImpl.java Tue Mar 13 08:05:48 2007
@@ -21,10 +21,7 @@
import java.util.Set;
import javax.security.auth.Subject;
-import javax.servlet.http.HttpSession;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.pipeline.valve.SecurityValve;
import org.apache.jetspeed.profiler.Profiler;
import org.apache.jetspeed.request.RequestContext;
@@ -45,7 +42,6 @@
*/
public class SecurityValveImpl extends AbstractSecurityValve implements SecurityValve
{
- private static final Log log = LogFactory.getLog(SecurityValveImpl.class);
private UserManager userMgr;
private PortalStatistics statistics;
@@ -80,7 +76,6 @@
*/
protected final Subject getSubject(RequestContext request) throws Exception
{
- HttpSession session = request.getRequest().getSession();
Principal userPrincipal = getUserPrincipal(request);
Subject subject = getSubjectFromSession(request);
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java Tue Mar 13 08:05:48 2007
@@ -16,12 +16,8 @@
*/
package org.apache.jetspeed.services.information;
-import java.util.Map;
import java.util.Iterator;
import java.util.HashSet;
-import java.util.HashMap;
-import java.util.Enumeration;
-
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletRequest;
import javax.portlet.WindowState;
@@ -30,13 +26,10 @@
import org.apache.pluto.services.information.DynamicInformationProvider;
import org.apache.pluto.services.information.PortletActionProvider;
import org.apache.pluto.services.information.ResourceURLProvider;
-import org.apache.pluto.factory.NamespaceMapperFactory;
import org.apache.pluto.om.window.PortletWindow;
-import org.apache.pluto.util.NamespaceMapper;
import org.apache.pluto.services.information.PortletURLProvider;
import org.apache.jetspeed.container.state.MutableNavigationalState;
import org.apache.jetspeed.container.state.NavigationalState;
-import org.apache.jetspeed.container.url.PortalURL;
import org.apache.jetspeed.engine.core.PortletActionProviderImpl;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.request.RequestContextComponent;
@@ -131,13 +124,7 @@
return context.getPortalURL().getBaseURL();
}
- /**
- * this method is deprecated but Im going to keep it around for reference
- *
- * @param portletWindow
- * @deprecated
- * @return
- */
+ /*
private Map getAllParameters(PortletWindow portletWindow)
{
Enumeration parameters = request.getParameterNames();
@@ -173,6 +160,7 @@
return portletParameters;
}
+ */
private final static int NumberOfKnownMimetypes = 15;
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java Tue Mar 13 08:05:48 2007
@@ -47,9 +47,6 @@
private static final String DEFAULT_MANAGER_APP_PATH = "/manager";
protected static final Log log = LogFactory.getLog("deployment");
- private String catalinaBase;
- private String catalinaEngine;
- private String catalinaContextPath;
private String hostUrl;
private int hostPort;
private String userName;
@@ -61,42 +58,30 @@
private String startPath = managerAppPath + "/start";
private String deployPath = managerAppPath + "/deploy";
private String undeployPath = managerAppPath + "/undeploy";
- private String reloadPath = managerAppPath + "/reload";
- private String serverInfoPath = managerAppPath + "/serverinfo";
-
private HttpClient client;
private HttpMethod start;
private HttpMethod stop;
- private HttpMethod reload;
-
private HttpMethod undeploy;
private PutMethod deploy;
- private HttpMethod install;
-
public TomcatManager(String catalinaBase, String catalinaEngine, String hostName, int hostPort, String userName, String password) throws IOException
{
super();
if ( !catalinaBase.endsWith("/") )
{
- this.catalinaBase = catalinaBase + "/";
}
else
{
- this.catalinaBase = catalinaBase;
}
- this.catalinaEngine = catalinaEngine;
this.hostUrl = hostName;
this.hostPort = hostPort;
this.userName = userName;
- this.password = password;
-
- this.catalinaContextPath = this.catalinaBase + "/conf/" + this.catalinaEngine + "/" + this.hostUrl + "/";
+ this.password = password;
}
private ApplicationServerManagerResult parseResult(String responseBody)
@@ -129,7 +114,6 @@
start = new GetMethod(startPath);
stop = new GetMethod(stopPath);
- reload = new GetMethod(reloadPath);
undeploy = new GetMethod(undeployPath);
deploy = new PutMethod(deployPath);
}
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/registration/RegistrationTool.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/registration/RegistrationTool.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/registration/RegistrationTool.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/tools/registration/RegistrationTool.java Tue Mar 13 08:05:48 2007
@@ -46,7 +46,6 @@
public class RegistrationTool
{
private PortletRegistry registry;
- private boolean overwriteApps = true;
public static void main(String args[])
{
@@ -100,7 +99,6 @@
public RegistrationTool(PortletRegistry registry, boolean overwriteApps)
{
this.registry = registry;
- this.overwriteApps = overwriteApps;
}
public void unregister(String appName)
Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java Tue Mar 13 08:05:48 2007
@@ -31,8 +31,6 @@
private Class jptClass;
private Constructor constructor;
- private String jptClassName;
-
private DynamicTitleService titleService;
/* Allows us to render portlets and other fragments */
@@ -41,7 +39,6 @@
public JetspeedPowerToolFactory(String jptClassName, DynamicTitleService titleService, PortletRenderer renderer)
throws ClassNotFoundException, NoSuchMethodException
{
- this.jptClassName = jptClassName;
jptClass = Thread.currentThread().getContextClassLoader().loadClass(jptClassName);
constructor =
jptClass.getConstructor(
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/administration/TestPortalAdministrationImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/administration/TestPortalAdministrationImpl.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/administration/TestPortalAdministrationImpl.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/administration/TestPortalAdministrationImpl.java Tue Mar 13 08:05:48 2007
@@ -53,8 +53,6 @@
return new TestSuite(TestPortalAdministrationImpl.class);
}
- private static final int JOB_COUNT = 2;
-
public void testPasswordGen() throws Exception
{
PortalAdministrationImpl pai = new PortalAdministrationImpl(null,null,null,null,null,null,null,null);
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -48,7 +48,6 @@
import org.apache.jetspeed.request.RequestContextComponent;
import org.apache.jetspeed.security.JSSubject;
import org.apache.jetspeed.security.SecurityHelper;
-import org.apache.jetspeed.security.UserManager;
import org.apache.jetspeed.testhelpers.SpringEngineHelper;
import com.mockrunner.mock.web.MockHttpServletRequest;
@@ -78,7 +77,6 @@
private ServletContext servletContext;
private PortletRegistry portletRegistry;
private RequestContextComponent rcc;
- private UserManager userManager;
private String testPage = "/default-page.psml";
/**
@@ -125,16 +123,15 @@
portletFactory = (PortletFactory) engine.getComponentManager().getComponent("portletFactory");
rcc = (RequestContextComponent) engine.getComponentManager().getComponent("org.apache.jetspeed.request.RequestContextComponent");
- ResourceLocatingServletContext paContext = null;
File paRootDir = null;
paRootDir = new File("../../layout-portlets/target/jetspeed-layout-portlets");
- paContext = initPA("jetspeed-layouts", "/jetspeed-layouts", paRootDir);
+ initPA("jetspeed-layouts", "/jetspeed-layouts", paRootDir);
paRootDir = new File("../../applications/demo/target/demo");
- paContext = initPA("demo", "/demo", paRootDir);
+ initPA("demo", "/demo", paRootDir);
paRootDir = new File("../../applications/j2-admin/target/j2-admin");
- paContext = initPA("j2-admin", "/j2-admin", paRootDir);
+ initPA("j2-admin", "/j2-admin", paRootDir);
// j2-admin portlet needs user manager component, but the followings does not effect..
// userManager = (UserManager) engine.getComponentManager().getComponent(UserManager.class);
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -20,8 +20,6 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.pluto.PortletContainer;
-
/**
* TestPortletContainer
*
@@ -30,9 +28,6 @@
*/
public class TestPortletContainer extends TestCase
{
-
- private PortletContainer portletContainer;
-
/**
* Defines the testcase name for JUnit.
*
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=517719&r1=517718&r2=517719
==============================================================================
--- 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 Tue Mar 13 08:05:48 2007
@@ -70,9 +70,6 @@
// needed to be able to Mock PortletWindowListCtrl
private interface CompositeWindowList extends PortletWindowList, PortletWindowListCtrl{}
- private NavigationalStateComponent navFullSession;
- private NavigationalStateComponent navSession;
- private NavigationalStateComponent navPluto;
private SpringEngineHelper engineHelper;
private Engine engine;
private NavigationalStateCodec codec;
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/deployment/TestSimpleDeployment.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/deployment/TestSimpleDeployment.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/deployment/TestSimpleDeployment.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/deployment/TestSimpleDeployment.java Tue Mar 13 08:05:48 2007
@@ -37,7 +37,6 @@
import org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager;
import org.apache.jetspeed.util.DirectoryHelper;
import org.apache.jetspeed.util.JarHelper;
-import org.apache.jetspeed.util.descriptor.PortletApplicationWar;
import org.apache.pluto.om.portlet.PortletDefinition;
/**
@@ -59,9 +58,6 @@
protected File deployRootFile;
protected String testDb;
- private PortletApplicationWar paWar1;
- private PortletApplicationWar paWar2;
- private PortletApplicationWar paWar3;
protected File webAppsDirFile;
protected File copyFrom;
protected PortletWindowAccessor windowAccess;
@@ -347,13 +343,14 @@
* </p>
*
* @param demoApp
- */
+ *
private void verifyDemoAppDeleted( String appName, File appFile )
{
assertNull(appName + " was not removed from the registry.", portletRegistry
.getPortletApplicationByIdentifier(TEST_PORTLET_APP_NAME));
assertFalse(appName+" directory was not deleted.", appFile.exists());
}
+ */
/**
* @see junit.framework.TestCase#setUp()
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestConstraintsAction.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestConstraintsAction.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestConstraintsAction.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestConstraintsAction.java Tue Mar 13 08:05:48 2007
@@ -26,7 +26,6 @@
import junit.framework.TestCase;
-import org.apache.jetspeed.ajax.AjaxRequestService;
import org.apache.jetspeed.components.ComponentManager;
import org.apache.jetspeed.components.SpringComponentManager;
import org.apache.jetspeed.components.factorybeans.ServletConfigFactoryBean;
@@ -42,8 +41,6 @@
import org.apache.jetspeed.security.JSSubject;
import org.apache.jetspeed.security.impl.RolePrincipalImpl;
import org.apache.jetspeed.security.impl.UserPrincipalImpl;
-import org.apache.velocity.app.VelocityEngine;
-
import com.mockrunner.mock.web.MockHttpServletRequest;
import com.mockrunner.mock.web.MockHttpServletResponse;
import com.mockrunner.mock.web.MockHttpSession;
@@ -63,10 +60,6 @@
private LayoutValve valve;
- private VelocityEngine velocity;
-
- private AjaxRequestService ajax;
-
private PageManager pageManager;
public static void main(String[] args)
@@ -99,8 +92,6 @@
cm = new SpringComponentManager(bootConfigs, appConfigs, servletContent, ".");
cm.start();
valve = (LayoutValve) cm.getComponent("layoutValve");
- velocity = (VelocityEngine) cm.getComponent("AjaxVelocityEngine");
- ajax = (AjaxRequestService) cm.getComponent("AjaxRequestService");
pageManager = (PageManager) cm.getComponent("pageManager");
}
@@ -269,7 +260,7 @@
principals.add(new RolePrincipalImpl("admin"));
Subject subject = new Subject(true, principals, new HashSet(), new HashSet());
- PipelineException pe = (PipelineException) JSSubject.doAsPrivileged(subject, new PrivilegedAction()
+ JSSubject.doAsPrivileged(subject, new PrivilegedAction()
{
public Object run()
{
Modified: portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestLayout.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestLayout.java?view=diff&rev=517719&r1=517718&r2=517719
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestLayout.java (original)
+++ portals/jetspeed-2/trunk/components/portal/src/test/org/apache/jetspeed/layout/TestLayout.java Tue Mar 13 08:05:48 2007
@@ -20,7 +20,6 @@
import junit.framework.TestCase;
-import org.apache.jetspeed.ajax.AjaxRequestService;
import org.apache.jetspeed.components.ComponentManager;
import org.apache.jetspeed.components.SpringComponentManager;
import org.apache.jetspeed.components.factorybeans.ServletConfigFactoryBean;
@@ -28,8 +27,6 @@
import org.apache.jetspeed.mocks.ResourceLocatingServletContext;
import org.apache.jetspeed.pipeline.PipelineException;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.velocity.app.VelocityEngine;
-
import com.mockrunner.mock.web.MockServletConfig;
/**
@@ -45,10 +42,6 @@
private LayoutValve valve;
- private VelocityEngine velocity;
-
- private AjaxRequestService ajax;
-
public static void main(String[] args)
{
junit.swingui.TestRunner.run(TestLayout.class);
@@ -78,9 +71,6 @@
cm = new SpringComponentManager(bootConfigs, appConfigs, servletContent, ".");
cm.start();
valve = (LayoutValve) cm.getComponent("layoutValve");
- velocity = (VelocityEngine) cm.getComponent("AjaxVelocityEngine");
- ajax = (AjaxRequestService) cm.getComponent("AjaxRequestService");
-
}
protected void tearDown() throws Exception
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org