You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cz...@apache.org on 2004/12/29 10:40:58 UTC
svn commit: r123614 - in portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl: . core om/common/impl om/entity/impl om/servlet/impl om/window/impl services/pageregistry servlet util
Author: cziegeler
Date: Wed Dec 29 01:40:55 2004
New Revision: 123614
URL: http://svn.apache.org/viewcvs?view=rev&rev=123614
Log:
Code cleanup: remove unused imports, private variables/methods - no real code changes
Modified:
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/Deploy.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/Servlet.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/DynamicInformationProviderImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/DynamicTitleServiceFactoryImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/ObjectIDFactoryImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalContextProviderImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalControlParameter.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalURL.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortletActionProviderImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/ResourceURLProviderImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/StaticInformationProviderImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageSetImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/WebApplicationDefinitionImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/pageregistry/PageRegistryServiceFileImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactoryImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseFactoryImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/StoredServletResponseImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/TCKdriver.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Parameters.java
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/Deploy.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/Deploy.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/Deploy.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/Deploy.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/Deploy.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/Deploy.java Wed Dec 29 01:40:55 2004
@@ -55,7 +55,6 @@
import org.apache.pluto.portalImpl.om.portlet.impl.PortletApplicationDefinitionImpl;
import org.apache.pluto.portalImpl.om.servlet.impl.ServletDefinitionImpl;
import org.apache.pluto.portalImpl.om.servlet.impl.ServletMappingImpl;
-import org.apache.pluto.portalImpl.om.servlet.impl.TagDefinitionImpl;
import org.apache.pluto.portalImpl.om.servlet.impl.WebApplicationDefinitionImpl;
import org.apache.pluto.portalImpl.xml.Constants;
import org.apache.pluto.portalImpl.xml.XmlParser;
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/Servlet.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/Servlet.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/Servlet.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/Servlet.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/Servlet.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/Servlet.java Wed Dec 29 01:40:55 2004
@@ -197,13 +197,9 @@
}
catch (Throwable t)
{
- ;
+ // nothing to do
}
- finally
- {
-
- }
-
+
}
public void doPost (HttpServletRequest request,
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/DynamicInformationProviderImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/DynamicInformationProviderImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/DynamicInformationProviderImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/DynamicInformationProviderImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/DynamicInformationProviderImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/DynamicInformationProviderImpl.java Wed Dec 29 01:40:55 2004
@@ -42,7 +42,6 @@
private ServletConfig config;
private PortalEnvironment env;
- private PortalURL currentURL;
HttpServletRequest request;
@@ -53,7 +52,6 @@
this.config = config;
env = PortalEnvironment.getPortalEnvironment(request);
- currentURL = env.getRequestedPortalURL();
}
// DynamicInformationProviderImpl implementation.
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/DynamicTitleServiceFactoryImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/DynamicTitleServiceFactoryImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/DynamicTitleServiceFactoryImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/DynamicTitleServiceFactoryImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/DynamicTitleServiceFactoryImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/DynamicTitleServiceFactoryImpl.java Wed Dec 29 01:40:55 2004
@@ -24,8 +24,6 @@
public class DynamicTitleServiceFactoryImpl implements DynamicTitleServiceFactory {
- private javax.servlet.ServletConfig servletConfig;
-
public DynamicTitleService getDynamicTitleService()
{
return new DynamicTitleServiceImpl();
@@ -35,11 +33,12 @@
public void init(javax.servlet.ServletConfig config, java.util.Map properties) throws Exception
{
- servletConfig = config;
+ // nothing to do
}
public void destroy() throws Exception
{
+ // nothing to do
}
}
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/ObjectIDFactoryImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/ObjectIDFactoryImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/ObjectIDFactoryImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/ObjectIDFactoryImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/ObjectIDFactoryImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/ObjectIDFactoryImpl.java Wed Dec 29 01:40:55 2004
@@ -21,8 +21,6 @@
public class ObjectIDFactoryImpl implements org.apache.pluto.factory.ObjectIDFactory {
- private ServletConfig servletConfig;
-
// org.apache.pluto.factory.ObjectIDFactory implementation.
public ObjectID createObjectID(String portletGUID)
@@ -34,11 +32,12 @@
public void init(ServletConfig config, java.util.Map properties) throws Exception
{
- servletConfig = config;
+ // nothing to do
}
public void destroy() throws Exception
{
+ // nothing to do
}
}
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalContextProviderImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalContextProviderImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalContextProviderImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalContextProviderImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalContextProviderImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalContextProviderImpl.java Wed Dec 29 01:40:55 2004
@@ -28,16 +28,7 @@
import org.apache.pluto.portalImpl.services.config.Config;
import org.apache.pluto.services.information.PortalContextProvider;
-import org.apache.pluto.Environment;
-/**
-
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
public class PortalContextProviderImpl implements PortalContextProvider {
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalControlParameter.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalControlParameter.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalControlParameter.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalControlParameter.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalControlParameter.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalControlParameter.java Wed Dec 29 01:40:55 2004
@@ -54,18 +54,6 @@
return paramValue;
}
- private static String decodeRenderParamName(String encodedParamName)
- {
- StringTokenizer tokenizer = new StringTokenizer(encodedParamName, "_");
- if (!tokenizer.hasMoreTokens()) return null;
- String constant = tokenizer.nextToken();
- if (!tokenizer.hasMoreTokens()) return null;
- String objectId = tokenizer.nextToken();
- if (!tokenizer.hasMoreTokens()) return null;
- String name = tokenizer.nextToken();
- return name;
- }
-
private static String[] decodeRenderParamValues(String encodedParamValues)
{
StringTokenizer tokenizer = new StringTokenizer(encodedParamValues, "_");
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalURL.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalURL.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalURL.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalURL.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalURL.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortalURL.java Wed Dec 29 01:40:55 2004
@@ -237,10 +237,8 @@
public String getControlParameterAsString(PortalControlParameter controlParam)
{
Map stateFullParams = startControlParameter;
- Map stateLessParams = null;
if (controlParam != null) {
stateFullParams = controlParam.getStateFullControlParameter();
- stateLessParams = controlParam.getStateLessControlParameter();
}
StringBuffer result = new StringBuffer(100);
@@ -284,7 +282,7 @@
result.append(name);
result.append("=");
result.append(values[i]);
- };
+ }
hasNext=iterator.hasNext();
if (hasNext) {
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortletActionProviderImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortletActionProviderImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortletActionProviderImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortletActionProviderImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortletActionProviderImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/PortletActionProviderImpl.java Wed Dec 29 01:40:55 2004
@@ -27,19 +27,10 @@
import org.apache.pluto.om.window.PortletWindow;
import org.apache.pluto.services.information.PortletActionProvider;
-/**
-
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
public class PortletActionProviderImpl implements PortletActionProvider {
private HttpServletRequest request;
- private ServletConfig config;
private PortletWindow portletWindow;
public PortletActionProviderImpl(HttpServletRequest request,
@@ -47,7 +38,6 @@
PortletWindow portletWindow)
{
this.request = request;
- this.config = config;
this.portletWindow = portletWindow;
}
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/ResourceURLProviderImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/ResourceURLProviderImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/ResourceURLProviderImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/ResourceURLProviderImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/ResourceURLProviderImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/ResourceURLProviderImpl.java Wed Dec 29 01:40:55 2004
@@ -25,14 +25,12 @@
public class ResourceURLProviderImpl implements ResourceURLProvider
{
- private PortletWindow portletWindow = null;
private String stringUrl = "";
private String base = "";
public ResourceURLProviderImpl(DynamicInformationProviderImpl provider,
PortletWindow portletWindow)
{
- this.portletWindow = portletWindow;
this.base = PortalURL.getBaseURLexcludeContext();
}
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/StaticInformationProviderImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/StaticInformationProviderImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/StaticInformationProviderImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/StaticInformationProviderImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/StaticInformationProviderImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/core/StaticInformationProviderImpl.java Wed Dec 29 01:40:55 2004
@@ -29,12 +29,11 @@
public class StaticInformationProviderImpl implements StaticInformationProvider
{
- private ServletConfig config = null;
- private PortalContextProvider provider = null;
+ private PortalContextProvider provider;
public StaticInformationProviderImpl(ServletConfig config)
{
- this.config = config;
+ // nothing do to
}
// StaticInformationProvider implementation.
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageSetImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageSetImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageSetImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageSetImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageSetImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageSetImpl.java Wed Dec 29 01:40:55 2004
@@ -24,7 +24,6 @@
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import java.util.StringTokenizer;
import java.util.Vector;
import org.apache.pluto.om.common.Language;
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityImpl.java Wed Dec 29 01:40:55 2004
@@ -48,7 +48,6 @@
private PortletApplicationEntity applicationEntity;
private PortletWindowList portletWindows;
private ObjectID objectId;
- private PortletEntity modifiedObject;
private DescriptionSet descriptions;
public PortletEntityImpl()
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/WebApplicationDefinitionImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/WebApplicationDefinitionImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/WebApplicationDefinitionImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/WebApplicationDefinitionImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/WebApplicationDefinitionImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/servlet/impl/WebApplicationDefinitionImpl.java Wed Dec 29 01:40:55 2004
@@ -321,7 +321,7 @@
}
public Collection getCastorTagDefinitions() {
- return (TagDefinitionSet) taglibs;
+ return taglibs;
}
public void setCastorTagDefinitions(TagDefinitionSet taglibs)
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowImpl.java Wed Dec 29 01:40:55 2004
@@ -30,9 +30,6 @@
private String id;
private PortletEntity portletEntity;
- //counter used to generate unique id's
- private static int counter;
-
public PortletWindowImpl(String id) {
this.id = id;
}
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/pageregistry/PageRegistryServiceFileImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/pageregistry/PageRegistryServiceFileImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/pageregistry/PageRegistryServiceFileImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/pageregistry/PageRegistryServiceFileImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/pageregistry/PageRegistryServiceFileImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/pageregistry/PageRegistryServiceFileImpl.java Wed Dec 29 01:40:55 2004
@@ -21,7 +21,6 @@
import java.io.File;
import java.io.FileReader;
-import java.io.FileWriter;
import java.util.HashMap;
import javax.servlet.ServletConfig;
@@ -34,7 +33,6 @@
import org.apache.pluto.portalImpl.util.Properties;
import org.apache.pluto.services.log.Logger;
import org.exolab.castor.mapping.Mapping;
-import org.exolab.castor.xml.Marshaller;
import org.exolab.castor.xml.Unmarshaller;
/**
@@ -128,23 +126,6 @@
throw new Exception(msg);
}
- }
-
- private void store() throws Exception
- {
- String filename = CONFIG_FILE;
-
- File f = new File(filename);
- if (!f.isAbsolute())
- filename = servletContext.getRealPath(filename);
-
- FileWriter writer = new FileWriter(filename);
-
- Marshaller marshaller = new Marshaller(writer);
-
- marshaller.setMapping(this.mapping);
-
- marshaller.marshal(registry);
}
private void load() throws Exception
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactoryImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactoryImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactoryImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactoryImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactoryImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactoryImpl.java Wed Dec 29 01:40:55 2004
@@ -25,8 +25,6 @@
public class ServletRequestFactoryImpl implements ServletRequestFactory
{
- private javax.servlet.ServletConfig servletConfig;
-
// ServletRequestFactory implementation.
public HttpServletRequest getServletRequest(HttpServletRequest request, PortletWindow portletWindow)
@@ -39,13 +37,13 @@
public void init(javax.servlet.ServletConfig config, java.util.Map properties)
throws Exception
{
- servletConfig = config;
+ // nothing to do
}
public void destroy()
throws Exception
{
-
+ // nothing to do
}
}
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestImpl.java Wed Dec 29 01:40:55 2004
@@ -45,11 +45,6 @@
}
- private javax.servlet.http.HttpServletRequest _getHttpServletRequest()
- {
- return(javax.servlet.http.HttpServletRequest) super.getRequest();
- }
-
// HttpServletRequestWrapper overlay
public java.lang.String getContentType()
@@ -91,7 +86,7 @@
if (pid.equals(wid)) {
for (Enumeration parameters = super.getParameterNames(); parameters.hasMoreElements();) {
String paramName = (String)parameters.nextElement();
- String[] paramValues = (String[])super.getParameterValues(paramName);
+ String[] paramValues = super.getParameterValues(paramName);
String[] values = (String[])portletParameters.get(paramName);
if (values != null) {
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseFactoryImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseFactoryImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseFactoryImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseFactoryImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseFactoryImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseFactoryImpl.java Wed Dec 29 01:40:55 2004
@@ -26,8 +26,6 @@
public class ServletResponseFactoryImpl implements ServletResponseFactory
{
- private javax.servlet.ServletConfig servletConfig;
-
// ServletResponseFactory implementation.
public javax.servlet.http.HttpServletResponse getServletResponse(HttpServletResponse response)
@@ -47,11 +45,12 @@
public void init(javax.servlet.ServletConfig config, java.util.Map properties)
throws Exception
{
- servletConfig = config;
+ // nothing to do
}
public void destroy()
throws Exception
{
+ // nothing to do
}
}
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseImpl.java Wed Dec 29 01:40:55 2004
@@ -35,11 +35,6 @@
return contentType;
}
- private javax.servlet.http.HttpServletResponse _getHttpServletResponse()
- {
- return(javax.servlet.http.HttpServletResponse) super.getResponse();
- }
-
public void setResponse(HttpServletResponse response)
{
super.setResponse(response);
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/StoredServletResponseImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/StoredServletResponseImpl.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/StoredServletResponseImpl.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/StoredServletResponseImpl.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/StoredServletResponseImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/StoredServletResponseImpl.java Wed Dec 29 01:40:55 2004
@@ -34,11 +34,6 @@
writer = _writer;
}
- private javax.servlet.http.HttpServletResponse _getHttpServletResponse()
- {
- return(javax.servlet.http.HttpServletResponse) super.getResponse();
- }
-
public void setResponse(HttpServletResponse response)
{
super.setResponse(response);
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/TCKdriver.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/TCKdriver.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/TCKdriver.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/TCKdriver.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/TCKdriver.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/TCKdriver.java Wed Dec 29 01:40:55 2004
@@ -231,8 +231,4 @@
doGet (request, response);
}
- // --- PRIVATE MEMBERS --- //
-
- private static boolean IS_DEBUG_ENABLED;
-
}
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java Wed Dec 29 01:40:55 2004
@@ -342,7 +342,7 @@
private EntryIterator (NameValuePairs aPairs)
{
iPairs = aPairs;
- iIterator = iPairs.getEntries().iterator();;
+ iIterator = iPairs.getEntries().iterator();
}
// Iterator implementation.
@@ -372,7 +372,7 @@
{
iPairs = iPairs.getParent();
if (iPairs==null) return false;
- iIterator = iPairs.getEntries().iterator();;
+ iIterator = iPairs.getEntries().iterator();
}
return true;
}
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java Wed Dec 29 01:40:55 2004
@@ -30,16 +30,9 @@
public class ObjectID implements org.apache.pluto.om.common.ObjectID, java.io.Serializable
{
- private String stringOID = null;
+ private String stringOID;
private int intOID;
- private ObjectID (int oid)
- {
- stringOID = String.valueOf (oid);
- intOID = oid;
- }
-
-
private ObjectID (int oid, String stringOID)
{
this.stringOID = stringOID;
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Parameters.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Parameters.java?view=diff&rev=123614&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Parameters.java&r1=123613&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Parameters.java&r2=123614
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Parameters.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Parameters.java Wed Dec 29 01:40:55 2004
@@ -31,9 +31,6 @@
public class Parameters extends NameValuePairs
{
- private final static String RAW_ENCODING = "8859_1";
- private final static String DEFAULT_ENCODING = "UTF-8";
-
public Parameters (Map params)
{
Iterator iterator = params.keySet().iterator();