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 2007/03/08 19:49:02 UTC
svn commit: r516143 [1/2] - in /portals/pluto/trunk:
assembly/src/main/resources/ pluto-container/src/main/java/org/apache/pluto/
pluto-container/src/main/java/org/apache/pluto/core/
pluto-container/src/main/java/org/apache/pluto/internal/impl/ pluto-c...
Author: cziegeler
Date: Thu Mar 8 10:48:59 2007
New Revision: 516143
URL: http://svn.apache.org/viewvc?view=rev&rev=516143
Log:
Code cleanup - no functional changes
Update notice file
Modified:
portals/pluto/trunk/assembly/src/main/resources/NOTICE.txt
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InternalPortletWindowImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java
portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/PortletContextManagerTest.java
portals/pluto/trunk/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java
portals/pluto/trunk/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.java
portals/pluto/trunk/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/AbstractCastorDescriptorService.java
portals/pluto/trunk/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java
portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/AdminPortlet.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/PortletWindowConfig.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/tags/PortletModeAnchorTag.java
portals/pluto/trunk/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ExpressionEvaluatorProxy.java
portals/pluto/trunk/pluto-taglib/src/main/java/org/apache/pluto/tags/el/JSP21ExpressionEvaluatorProxy.java
portals/pluto/trunk/pluto-taglib/src/main/java/org/apache/pluto/tags/el/ParamTag.java
Modified: portals/pluto/trunk/assembly/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/assembly/src/main/resources/NOTICE.txt?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/assembly/src/main/resources/NOTICE.txt (original)
+++ portals/pluto/trunk/assembly/src/main/resources/NOTICE.txt Thu Mar 8 10:48:59 2007
@@ -1,3 +1,6 @@
-This product includes software developed by
+Apache Pluto
+Copyright 1999-2007 The Apache Software Foundation.
+
+This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java Thu Mar 8 10:48:59 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,6 @@
package org.apache.pluto;
import java.io.IOException;
-import java.util.Iterator;
import javax.portlet.PortletException;
import javax.servlet.ServletContext;
@@ -59,7 +58,7 @@
* @param servletContext the servlet context.
* @throws PortletContainerException if an error occurs.
*/
- public void init(ServletContext servletContext)
+ void init(ServletContext servletContext)
throws PortletContainerException;
/**
@@ -68,7 +67,7 @@
* @throws PortletContainerException if an error occurs while shutting down
* the container
*/
- public void destroy() throws PortletContainerException;
+ void destroy() throws PortletContainerException;
/**
* Calls the render method of the given portlet window.
@@ -81,10 +80,10 @@
* @throws PortletContainerException if the portlet container implementation
* has trouble fulfilling the request
*/
- public void doRender(PortletWindow portletWindow,
- HttpServletRequest request,
- HttpServletResponse response)
- throws PortletException, IOException, PortletContainerException;
+ void doRender(PortletWindow portletWindow,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws PortletException, IOException, PortletContainerException;
/**
@@ -98,10 +97,10 @@
* @throws PortletContainerException if the portlet container implementation
* has trouble fulfilling the request
*/
- public void doAction(PortletWindow portletWindow,
- HttpServletRequest request,
- HttpServletResponse response)
- throws PortletException, IOException, PortletContainerException;
+ void doAction(PortletWindow portletWindow,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws PortletException, IOException, PortletContainerException;
/**
* Indicates that the portlet must be initialized
@@ -113,10 +112,10 @@
* @throws PortletContainerException if the portlet container implementation
* has trouble fulfilling the request
*/
- public void doLoad(PortletWindow portletWindow,
- HttpServletRequest servletRequest,
- HttpServletResponse servletResponse)
- throws PortletException, IOException, PortletContainerException;
+ void doLoad(PortletWindow portletWindow,
+ HttpServletRequest servletRequest,
+ HttpServletResponse servletResponse)
+ throws PortletException, IOException, PortletContainerException;
/**
* Indicates that the portal needs to perform administrative
@@ -128,50 +127,47 @@
* @param servletResponse the servlet response
* @throws PortletContainerException if the request can not be fullfilled.
*/
- public void doAdmin(PortletWindow portletWindow,
- HttpServletRequest servletRequest,
- HttpServletResponse servletResponse)
+ void doAdmin(PortletWindow portletWindow,
+ HttpServletRequest servletRequest,
+ HttpServletResponse servletResponse)
throws PortletException, IOException, PortletContainerException;
/**
* Returns whether the container is already initialized or not.
* @return <code>true</code> if the container is initialized
*/
- public boolean isInitialized();
+ boolean isInitialized();
/**
* Retrieve the unique container name
* @return the container name.
*/
- public String getName();
+ String getName();
/**
* Retreive the required container services associated with this container.
* @return the required container services associated with this container.
*/
- public RequiredContainerServices getRequiredContainerServices();
+ RequiredContainerServices getRequiredContainerServices();
/**
* Retrieve the optional container services associated with this contianer.
* @return the container services provided by either the portal or the defaults.
*/
- public OptionalContainerServices getOptionalContainerServices();
-
+ OptionalContainerServices getOptionalContainerServices();
+
/**
* Retrieve the {@link PortletAppDD} for the portlet
* located at the supplied context.
- *
+ *
* Must not return null.
- *
+ *
* @param context the context of the portlet
* @return the portlet application descriptor
* @throws PortletContainerException if the container has trouble obtaining
* the context of the portlet, or retrieving
* the <code>PortletAppDD</code>
- */
- public PortletAppDD getPortletApplicationDescriptor(String context)
- throws PortletContainerException;
-
-
-
+ */
+ PortletAppDD getPortletApplicationDescriptor(String context)
+ throws PortletContainerException;
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java Thu Mar 8 10:48:59 2007
@@ -27,27 +27,25 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
+import org.apache.pluto.OptionalContainerServices;
+import org.apache.pluto.PortletContainer;
+import org.apache.pluto.PortletContainerException;
+import org.apache.pluto.PortletWindow;
+import org.apache.pluto.RequiredContainerServices;
import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.internal.InternalPortletWindow;
-import org.apache.pluto.internal.PortletDescriptorRegistry;
-import org.apache.pluto.internal.InternalActionResponse;
-import org.apache.pluto.internal.InternalRenderRequest;
-import org.apache.pluto.internal.InternalRenderResponse;
import org.apache.pluto.internal.InternalActionRequest;
+import org.apache.pluto.internal.InternalActionResponse;
import org.apache.pluto.internal.InternalPortletRequest;
import org.apache.pluto.internal.InternalPortletResponse;
+import org.apache.pluto.internal.InternalPortletWindow;
+import org.apache.pluto.internal.InternalRenderRequest;
+import org.apache.pluto.internal.InternalRenderResponse;
+import org.apache.pluto.internal.PortletDescriptorRegistry;
import org.apache.pluto.internal.impl.InternalPortletWindowImpl;
import org.apache.pluto.internal.impl.PortletRequestImpl;
import org.apache.pluto.internal.impl.PortletResponseImpl;
import org.apache.pluto.spi.PortletURLProvider;
import org.apache.pluto.spi.optional.PortletInvokerService;
-import org.apache.pluto.OptionalContainerServices;
-import org.apache.pluto.PortletContainer;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.RequiredContainerServices;
-import org.apache.pluto.PortletContainerRuntimeException;
import org.apache.pluto.util.StringManager;
/**
@@ -67,25 +65,25 @@
private static final StringManager EXCEPTIONS = StringManager.getManager(
PortletContainerImpl.class.getPackage().getName());
-
+
/** The portlet container name. */
- private String name = null;
-
+ private final String name;
+
/** The required container services associated with this container. */
- private RequiredContainerServices requiredContainerServices = null;
-
+ private final RequiredContainerServices requiredContainerServices;
+
/** The optional container services associated with this container. */
- private OptionalContainerServices optionalContainerServices = null;
-
+ private final OptionalContainerServices optionalContainerServices;
+
/** The servlet context associated with this container. */
- private ServletContext servletContext = null;
+ private ServletContext servletContext;
/** Flag indicating whether or not we've been initialized. */
private boolean initialized = false;
-
-
+
+
// Constructor -------------------------------------------------------------
-
+
/** Default Constructor. Create a container implementation
* whith the given name and given services.
*
@@ -100,10 +98,10 @@
this.requiredContainerServices = requiredServices;
this.optionalContainerServices = optionalServices;
}
-
-
+
+
// PortletContainer Impl ---------------------------------------------------
-
+
/**
* Initialize the container for use within the given configuration scope.
* @param servletContext the servlet context of the portal webapp.
@@ -147,7 +145,7 @@
* @throws PortletException
* @throws IOException
* @throws PortletContainerException
- *
+ *
* @see javax.portlet.Portlet#render(javax.portlet.RenderRequest,javax.portlet.RenderResponse)
*/
public void doRender(PortletWindow portletWindow,
@@ -156,7 +154,7 @@
throws PortletException, IOException, PortletContainerException {
ensureInitialized();
-
+
InternalPortletWindow internalPortletWindow =
new InternalPortletWindowImpl(
PortletContextManager.getPortletContext(servletContext,
@@ -193,16 +191,16 @@
* @throws PortletException
* @throws IOException
* @throws PortletContainerException
- *
+ *
* @see javax.portlet.Portlet#processAction(javax.portlet.ActionRequest,javax.portlet.ActionResponse)
*/
public void doAction(PortletWindow portletWindow,
HttpServletRequest request,
HttpServletResponse response)
throws PortletException, IOException, PortletContainerException {
-
+
ensureInitialized();
-
+
InternalPortletWindow internalPortletWindow =
new InternalPortletWindowImpl(
PortletContextManager.getPortletContext(servletContext,
@@ -215,7 +213,7 @@
.createActionRequest(this, request, response, internalPortletWindow);
InternalActionResponse actionResponse = getOptionalContainerServices().getPortletEnvironmentService()
- .createActionResponse(this, request, response, internalPortletWindow);
+ .createActionResponse(this, request, response, internalPortletWindow);
PortletInvokerService invoker = optionalContainerServices.getPortletInvokerService();
@@ -229,43 +227,43 @@
debugWithName("Portlet action processed for: "
+ portletWindow.getPortletName());
-
+
// After processing action, send a redirect URL for rendering.
String location = actionResponse.getRedirectLocation();
if (location == null) {
-
+
// Create portlet URL provider to encode redirect URL.
debugWithName("No redirect location specified.");
PortletURLProvider redirectURL = requiredContainerServices
.getPortalCallbackService()
.getPortletURLProvider(request, internalPortletWindow);
-
+
// Encode portlet mode if it is changed.
if (actionResponse.getChangedPortletMode() != null) {
redirectURL.setPortletMode(
actionResponse.getChangedPortletMode());
}
-
+
// Encode window state if it is changed.
if (actionResponse.getChangedWindowState() != null) {
redirectURL.setWindowState(
actionResponse.getChangedWindowState());
}
-
+
// Encode render parameters retrieved from action response.
Map renderParameters = actionResponse.getRenderParameters();
redirectURL.clearParameters();
redirectURL.setParameters(renderParameters);
-
+
// Encode redirect URL as a render URL.
redirectURL.setAction(false);
-
+
// Set secure of the redirect URL if necessary.
if (actionRequest.isSecure()) {
redirectURL.setSecure();
}
-
+
// Encode the redirect URL to a string.
location = actionResponse.encodeRedirectURL(redirectURL.toString());
}
@@ -289,9 +287,9 @@
HttpServletRequest request,
HttpServletResponse response)
throws PortletException, IOException, PortletContainerException {
-
+
ensureInitialized();
-
+
InternalPortletWindow internalPortletWindow =
new InternalPortletWindowImpl(
PortletContextManager.getPortletContext(servletContext,
@@ -304,7 +302,7 @@
InternalRenderRequest renderRequest =
getOptionalContainerServices().getPortletEnvironmentService()
.createRenderRequest(this, request, response, internalPortletWindow);
-
+
InternalRenderResponse renderResponse =
getOptionalContainerServices().getPortletEnvironmentService()
.createRenderResponse(this, request, response, internalPortletWindow);
@@ -317,7 +315,7 @@
} finally {
ContainerInvocation.clearInvocation();
}
-
+
debugWithName("Portlet loaded for: " + portletWindow.getPortletName());
}
@@ -373,20 +371,20 @@
public OptionalContainerServices getOptionalContainerServices() {
return optionalContainerServices;
}
-
- public PortletAppDD getPortletApplicationDescriptor(String context)
+
+ public PortletAppDD getPortletApplicationDescriptor(String context)
throws PortletContainerException {
-
+
// make sure the container has initialized
ensureInitialized();
-
+
// sanity check
if (context == null || context.trim().equals("")) {
final String msg = "Context was null or the empty string.";
errorWithName(msg);
throw new PortletContainerException(msg);
}
-
+
// obtain the context of the portlet
ServletContext portletCtx = PortletContextManager.getPortletContext(servletContext, context);
if (portletCtx == null) {
@@ -396,13 +394,13 @@
errorWithName(msg);
throw new PortletContainerException(msg);
}
-
+
// obtain the portlet application descriptor for the portlet
// context.
PortletAppDD portletAppDD = PortletDescriptorRegistry
.getRegistry()
.getPortletAppDD(portletCtx);
-
+
// we can't return null
if (portletAppDD == null) {
final String msg = "Obtained a null portlet application description for " +
@@ -410,12 +408,12 @@
errorWithName(msg);
throw new PortletContainerException(msg);
}
-
- return portletAppDD;
+
+ return portletAppDD;
}
// Private Methods ---------------------------------------------------------
-
+
/**
* Ensures that the portlet container is initialized.
* @throws IllegalStateException if the container is not initialized.
@@ -426,7 +424,7 @@
"Portlet container [" + name + "] is not initialized.");
}
}
-
+
/**
* Prints a message at DEBUG level with the container name prefix.
* @param message log message.
@@ -436,7 +434,7 @@
LOG.debug("Portlet Container [" + name + "]: " + message);
}
}
-
+
/**
* Prints a message at INFO level with the container name prefix.
* @param message log message.
@@ -446,7 +444,7 @@
LOG.info("Portlet Container [" + name + "]: " + message);
}
}
-
+
/**
* Prints a message at ERROR level with the container name prefix.
* @param message log message.
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletContextManager.java Thu Mar 8 10:48:59 2007
@@ -16,36 +16,36 @@
*/
package org.apache.pluto.core;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.descriptors.portlet.PortletAppDD;
import org.apache.pluto.descriptors.portlet.PortletDD;
-import org.apache.pluto.internal.InternalPortletContext;
-import org.apache.pluto.internal.PortletDescriptorRegistry;
import org.apache.pluto.internal.Configuration;
import org.apache.pluto.internal.InternalPortletConfig;
-import org.apache.pluto.internal.impl.PortletContextImpl;
+import org.apache.pluto.internal.InternalPortletContext;
+import org.apache.pluto.internal.PortletDescriptorRegistry;
import org.apache.pluto.internal.impl.PortletConfigImpl;
+import org.apache.pluto.internal.impl.PortletContextImpl;
import org.apache.pluto.spi.optional.PortletRegistryEvent;
import org.apache.pluto.spi.optional.PortletRegistryListener;
import org.apache.pluto.spi.optional.PortletRegistryService;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletConfig;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
/**
* Manager used to cache the portlet configurations which have
* been previously parsed.
@@ -73,17 +73,17 @@
* The PortletContext cache map: key is servlet context, and value is the
* associated portlet context.
*/
- private Map portletContexts = new HashMap();
+ private final Map portletContexts = new HashMap();
+
+ private final Map portletConfigs = new HashMap();
- private Map portletConfigs = new HashMap();
-
/**
* The registered listeners that should be notified upon
* registry events.
*/
- private List registryListeners = new ArrayList();
+ private final List registryListeners = new ArrayList();
// Constructor -------------------------------------------------------------
@@ -192,7 +192,7 @@
}
public PortletConfig getPortletConfig(String applicationId, String portletName) {
- return (InternalPortletConfig) portletConfigs.get(applicationId + "/" + portletName);
+ return (InternalPortletConfig) portletConfigs.get(applicationId + "/" + portletName);
}
public PortletDD getPortletDescriptor(String applicationId, String portletName) {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InternalPortletWindowImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InternalPortletWindowImpl.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InternalPortletWindowImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InternalPortletWindowImpl.java Thu Mar 8 10:48:59 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,38 +21,36 @@
import javax.servlet.ServletContext;
import org.apache.pluto.PortletWindow;
-import org.apache.pluto.PortletContainerRuntimeException;
import org.apache.pluto.PortletWindowID;
-import org.apache.pluto.util.StringManager;
import org.apache.pluto.internal.InternalPortletWindow;
import org.apache.pluto.internal.PortletEntity;
/**
* Implementation of <code>InternalPortletWindow</code> interface.
- *
+ *
* @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
* @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public class InternalPortletWindowImpl implements InternalPortletWindow {
/** The underlying portlet window instance. */
- private PortletWindow portletWindow = null;
-
+ private final PortletWindow portletWindow;
+
/** The servlet context of the portlet. */
- private ServletContext servletContext = null;
-
+ private final ServletContext servletContext;
+
/** The portlet entity associated with the portlet window. */
- private PortletEntity entity = null;
-
-
+ private PortletEntity entity;
+
+
// Constructor -------------------------------------------------------------
-
+
/**
* Constructs an internal portlet window that wraps a portlet window.
* An internal portlet window instance is created everytime when the portlet
* container's <code>doRender()</code> or <code>doAction()</code> method is
* invoked.
- *
+ *
* @param context the servlet context from which this window is
* being invoked.
* @param portletWindow the underlying portlet window instance.
@@ -62,10 +60,10 @@
this.servletContext = context;
this.portletWindow = portletWindow;
}
-
-
+
+
// PortletWindow Impl ------------------------------------------------------
-
+
public String getContextPath() {
return portletWindow.getContextPath();
}
@@ -81,14 +79,14 @@
public PortletMode getPortletMode() {
return portletWindow.getPortletMode();
}
-
+
public PortletWindowID getId() {
return portletWindow.getId();
}
-
-
+
+
// InternalPortletWindow Impl ----------------------------------------------
-
+
public ServletContext getServletContext() {
return servletContext;
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletContextImpl.java Thu Mar 8 10:48:59 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,21 +16,21 @@
*/
package org.apache.pluto.internal.impl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.internal.InternalPortletContext;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Set;
import javax.portlet.PortletContext;
import javax.portlet.PortletRequestDispatcher;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletContext;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Set;
-import java.util.Enumeration;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.descriptors.portlet.PortletAppDD;
+import org.apache.pluto.internal.InternalPortletContext;
/**
* Pluto's Portlet Context Implementation. This class implements the
@@ -52,12 +52,12 @@
// Private Member Variables ------------------------------------------------
- private String applicationId;
+ private final String applicationId;
private String applicationName;
- private PortletAppDD portletAppDD = null;
- private ServletContext servletContext = null;
- private ClassLoader contextClassLoader = null;
+ private final PortletAppDD portletAppDD;
+ private final ServletContext servletContext;
+ private ClassLoader contextClassLoader;
// Constructor -------------------------------------------------------------
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletEntityImpl.java Thu Mar 8 10:48:59 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,27 +16,26 @@
*/
package org.apache.pluto.internal.impl;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.portlet.PreferencesValidator;
+import javax.portlet.ValidatorException;
+import javax.servlet.ServletContext;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.PortletWindow;
-import org.apache.pluto.internal.InternalPortletPreference;
-import org.apache.pluto.internal.PortletDescriptorRegistry;
-import org.apache.pluto.internal.PortletEntity;
-import org.apache.pluto.internal.PreferencesValidatorRegistry;
import org.apache.pluto.descriptors.portlet.PortletAppDD;
import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.descriptors.portlet.PortletPreferenceDD;
import org.apache.pluto.descriptors.portlet.PortletPreferencesDD;
import org.apache.pluto.descriptors.servlet.ServletDD;
-
-import javax.portlet.PreferencesValidator;
-import javax.portlet.ValidatorException;
-import javax.servlet.ServletContext;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import org.apache.pluto.internal.InternalPortletPreference;
+import org.apache.pluto.internal.PortletDescriptorRegistry;
+import org.apache.pluto.internal.PortletEntity;
+import org.apache.pluto.internal.PreferencesValidatorRegistry;
/**
* The PortletEntity encapsulates all data pertaining to a single portlet
@@ -44,44 +43,44 @@
* PortletEntity consists of two primary peices of information, the Portlet
* Definition as defined by the {@link PortletDD} and the Wrapping Servlet
* information as defined by the{@link ServletDD}
- *
+ *
* @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
* @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public class PortletEntityImpl implements PortletEntity {
-
+
/** Logger. */
private static final Log LOG = LogFactory.getLog(PortletEntityImpl.class);
-
+
/** URI prefix of the portlet invoker servlet. */
private static final String PREFIX = "/PlutoInvoker/";
-
-
+
+
// Private Member Variables ------------------------------------------------
-
+
/** The servlet context. */
- private ServletContext servletContext = null;
-
+ private final ServletContext servletContext;
+
/** The portlet window. */
- private String portletName = null;
+ private final String portletName;
/** The cached PortletDD retrieved from the portlet descriptor registry. */
- private PortletDD portletDefinition = null;
-
+ private PortletDD portletDefinition;
+
/** Default portlet preferences defined for this portlet. */
- private InternalPortletPreference[] defaultPreferences = null;
-
-
+ private InternalPortletPreference[] defaultPreferences;
+
+
// Constructor -------------------------------------------------------------
-
+
PortletEntityImpl(ServletContext servletContext, String portletName) {
this.servletContext = servletContext;
this.portletName = portletName;
}
-
-
+
+
// PortletEntity Impl ------------------------------------------------------
-
+
/**
* Returns the URI to the controller servlet that wraps this portlet.
* @return the URI to the controller servlet that wraps this portlet.
@@ -89,7 +88,7 @@
public String getControllerServletUri() {
return PREFIX + portletName;
}
-
+
/**
* Returns an array of default preferences of this portlet. The default
* preferences are retrieved from the portlet application descriptor.
@@ -109,7 +108,7 @@
* may be null.
* </p>
* @return the preference set
- *
+ *
* @see org.apache.pluto.descriptors.portlet.PortletPreferenceDD
*/
public InternalPortletPreference[] getDefaultPreferences() {
@@ -147,7 +146,7 @@
}
return portletDefinition;
}
-
+
/**
* Returns the preferences validator instance for this portlet.
* One validator instance is created per portlet definition.
@@ -161,21 +160,21 @@
.getPreferencesValidator(getPortletDefinition());
return validator;
}
-
-
+
+
// Private Methods ---------------------------------------------------------
-
+
/**
* Loads the portlet definition.
*/
private void load() {
-
+
// Retrieve the cross servlet context for the portlet.
ServletContext crossContext = servletContext;
if (LOG.isDebugEnabled()) {
LOG.debug("Retrieved cross context: " + crossContext);
}
-
+
// Load PortletAppDD and find out the portlet definition.
try {
PortletAppDD appDD = PortletDescriptorRegistry.getRegistry()
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferencesImpl.java Thu Mar 8 10:48:59 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -45,49 +45,49 @@
/**
* Implementation of the <code>javax.portlet.PortletPreferences</code>
* interface.
- *
+ *
* @see PortletPreferences
* @see PortletPreferenceImpl
- *
+ *
* @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
* @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public class PortletPreferencesImpl implements PortletPreferences {
-
+
/** Logger. */
private static final Log LOG = LogFactory.getLog(PortletPreferencesImpl.class);
-
+
private static final StringManager EXCEPTIONS = StringManager.getManager(
PortletPreferencesImpl.class.getPackage().getName());
-
-
+
+
// Private Member Variables ------------------------------------------------
-
+
/** The portlet preferences service provided by the portal. */
private PortletPreferencesService preferencesService = null;
private InternalPortletWindow window = null;
private InternalPortletRequest request = null;
-
+
/**
* Default portlet preferences retrieved from portlet.xml, and used for
* resetting portlet preferences.
*/
private InternalPortletPreference[] defaultPreferences = null;
-
+
/**
* Current portlet preferences: key is the preference name as a string,
* value is the PortletPreference instance.
*/
- private Map preferences = new HashMap();
+ private final Map preferences = new HashMap();
/** Current method used for managing these preferences. */
private Integer methodId = null;
-
-
+
+
// Constructor -------------------------------------------------------------
-
+
/**
* Constructs an instance.
* @param container the portlet container.
@@ -102,7 +102,7 @@
this.window = window;
this.request = request;
this.methodId = methodId;
-
+
// Get the portlet preferences service from container.
preferencesService = container.getOptionalContainerServices()
.getPortletPreferencesService();
@@ -110,18 +110,18 @@
LOG.debug("Using PortletPreferencesService: "
+ preferencesService.getClass().getName());
}
-
+
// Put default portlet preferences into preferences map.
PortletEntity entity = window.getPortletEntity();
defaultPreferences = entity.getDefaultPreferences();
for (int i = 0; i < defaultPreferences.length; i++) {
preferences.put(defaultPreferences[i].getName(),
- (InternalPortletPreference) defaultPreferences[i].clone());
+ defaultPreferences[i].clone());
}
if (LOG.isDebugEnabled()) {
LOG.debug("Loaded default preferences: " + toString());
}
-
+
// Merge stored portlet preferences into preferences map.
try {
InternalPortletPreference[] storedPreferences = preferencesService
@@ -139,26 +139,26 @@
// PortletPreferencesImpl instance is created.
// So here we do not check the portlet request method ID.
internalStore();
-
+
} catch (PortletContainerException ex) {
LOG.error("Error retrieving preferences.", ex);
//TODO: Rethrow up the stack????
} catch (IOException ex) {
- LOG.error("Error retrieving preferences.", ex);
+ LOG.error("Error retrieving preferences.", ex);
//TODO: Rethrow up the stack????
} catch (ValidatorException ex) {
LOG.warn("ValidatorException initializing portlet preferences. "
+ "This is not illegal at this point "
- + "since we are just retreiving from portlet.xml.", ex);
+ + "since we are just retreiving from portlet.xml.", ex);
}
if (LOG.isDebugEnabled()) {
LOG.debug("Merged stored preferences: " + toString());
}
}
-
-
+
+
// PortletPreferences Impl -------------------------------------------------
-
+
public boolean isReadOnly(String key) {
if (key == null) {
throw new IllegalArgumentException(
@@ -243,7 +243,7 @@
}
return Collections.unmodifiableMap(map);
}
-
+
public void reset(String key) throws ReadOnlyException {
// Read-only preferences cannot be reset.
if (isReadOnly(key)) {
@@ -258,7 +258,7 @@
LOG.debug("Resetting preference for key: " + key);
}
preferences.put(key,
- (InternalPortletPreference) defaultPreferences[i].clone());
+ defaultPreferences[i].clone());
resetDone = true;
}
}
@@ -270,13 +270,13 @@
preferences.remove(key);
}
}
-
+
/**
* Stores the portlet preferences to a persistent storage. This method
* should only be invoked within <code>processAction()</code> method.
- *
+ *
* @see #internalStore()
- *
+ *
* @throws IllegalStateException if this method is not invoked within
* <code>processAction()</code> method.
* @throws ValidatorException if the portlet preferences are not valid.
@@ -289,10 +289,10 @@
}
internalStore();
}
-
-
+
+
// Private Methods ---------------------------------------------------------
-
+
/**
* Stores the portlet preferences to a persistent storage. If a preferences
* validator is defined for this portlet, this method firstly validates the
@@ -314,7 +314,7 @@
validator.validate(this);
}
// Store the portlet preferences.
- InternalPortletPreference[] prefs = (InternalPortletPreference[])
+ InternalPortletPreference[] prefs = (InternalPortletPreference[])
(new ArrayList(preferences.values())).toArray(
new InternalPortletPreference[preferences.size()]);
try {
@@ -324,10 +324,10 @@
throw new IOException("Error storing perferences: " + ex.getMessage());
}
}
-
-
+
+
// Object Methods ----------------------------------------------------------
-
+
/**
* Returns the string representation of this object. Preferences are
* separated by ';' character, while values in one preference are separated
@@ -358,5 +358,5 @@
buffer.append("]");
return buffer.toString();
}
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java Thu Mar 8 10:48:59 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,9 +16,34 @@
*/
package org.apache.pluto.internal.impl;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.security.Principal;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+
+import javax.portlet.PortalContext;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletMode;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletSession;
+import javax.portlet.WindowState;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpSession;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.OptionalContainerServices;
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.descriptors.common.SecurityRoleRefDD;
@@ -29,8 +54,6 @@
import org.apache.pluto.internal.InternalPortletRequest;
import org.apache.pluto.internal.InternalPortletWindow;
import org.apache.pluto.internal.PortletEntity;
-import org.apache.pluto.spi.optional.PortletRegistryService;
-import org.apache.pluto.spi.optional.UserInfoService;
import org.apache.pluto.util.ArgumentUtility;
import org.apache.pluto.util.Enumerator;
import org.apache.pluto.util.NamespaceMapper;
@@ -38,33 +61,6 @@
import org.apache.pluto.util.StringUtils;
import org.apache.pluto.util.impl.NamespaceMapperImpl;
-import javax.portlet.PortalContext;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-import javax.portlet.WindowState;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import javax.servlet.http.HttpSession;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-import java.util.HashMap;
-
/**
* Abstract <code>javax.portlet.PortletRequest</code> implementation.
* This class also implements InternalPortletRequest.
@@ -119,7 +115,7 @@
/**
* TODO: javadoc
*/
- private NamespaceMapper mapper = new NamespaceMapperImpl();
+ private final NamespaceMapper mapper = new NamespaceMapperImpl();
/**
* FIXME: do we really need this?
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RenderRequestImpl.java Thu Mar 8 10:48:59 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -41,33 +41,33 @@
/**
* Implementation of the <code>javax.portlet.RenderRequest</code> interface.
- *
+ *
* @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
* @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public class RenderRequestImpl extends PortletRequestImpl
implements RenderRequest, InternalRenderRequest {
-
+
/** Logger. */
private static final Log LOG = LogFactory.getLog(RenderRequestImpl.class);
-
-
+
+
// Private Member Variables ------------------------------------------------
-
+
/** True if we are in an include call. */
private boolean included = false;
-
+
/** The parameters including parameters appended to the dispatching URI. */
private Map parameters = null;
-
+
/** The portlet preferences. */
private PortletPreferences portletPreferences = null;
-
-
+
+
// Constructors ------------------------------------------------------------
-
+
public RenderRequestImpl(InternalPortletRequest request) {
- super(request);
+ super(request);
}
public RenderRequestImpl(PortletContainer container,
@@ -78,10 +78,10 @@
LOG.debug("Created render request for: " + internalPortletWindow);
}
}
-
-
+
+
// RenderRequest Impl ------------------------------------------------------
-
+
public PortletPreferences getPreferences() {
if (portletPreferences == null) {
portletPreferences = new PortletPreferencesImpl(
@@ -92,8 +92,8 @@
}
return portletPreferences;
}
-
-
+
+
/**
* Checks the included flag and returns the content type. If the included
* flag is set to true, this method returns null.
@@ -101,7 +101,7 @@
public String getContentType() {
return included ? null : super.getContentType();
}
-
+
/**
* Checks the included flag and returns the content length. If the included
* flag is set to true, this method returns 0.
@@ -109,7 +109,7 @@
public int getContentLength() {
return included ? 0 : super.getContentLength();
}
-
+
/**
* Checks the included flag and returns the reader to this rende response.
* If the included flag is set to true, this method returns null.
@@ -118,7 +118,7 @@
throws UnsupportedEncodingException, IOException {
return included ? null : super.getReader();
}
-
+
/**
* Checks the included flag and returns the input stream to this render
* response. If the included flag is set to true, this method returns null.
@@ -126,10 +126,10 @@
public ServletInputStream getInputStream() throws IOException {
return included ? null : super.getInputStream();
}
-
-
+
+
// PortletRequestImpl Overwriting ------------------------------------------
-
+
protected Map baseGetParameterMap() {
if (included && parameters != null) {
super.setBodyAccessed();
@@ -138,10 +138,10 @@
return super.baseGetParameterMap();
}
}
-
-
+
+
// InternalRenderRequest Impl ----------------------------------------------
-
+
public void setIncluded(boolean included) {
this.included = included;
if (!included) {
@@ -155,7 +155,7 @@
public boolean isIncluded() {
return included;
}
-
+
public void setIncludedQueryString(String queryString)
throws IllegalStateException {
if (!included) {
@@ -178,10 +178,10 @@
}
}
}
-
-
+
+
// Included HttpServletRequest (Limited) Impl ------------------------------
-
+
/*
* -------------------------------------------------------------------------
* (non-javadoc)
@@ -196,7 +196,7 @@
* getServletPath
* -------------------------------------------------------------------------
*/
-
+
public String getPathInfo() {
String attr = (String) super.getAttribute(
"javax.servlet.include.path_info");
@@ -208,7 +208,7 @@
"javax.servlet.include.query_string");
return (included && attr != null) ? attr : super.getQueryString();
}
-
+
/**
* TODO: check PLT.16.3.3. page 67, line 10.
*/
@@ -216,19 +216,19 @@
// TODO:
return null;
}
-
+
public String getRequestURI() {
String attr = (String) super.getAttribute(
"javax.servlet.include.request_uri");
return (included && attr != null) ? attr : super.getRequestURI();
}
-
+
public String getServletPath() {
String attr = (String) super.getAttribute(
"javax.servlet.include.servlet_path");
return (included && attr != null) ? attr : super.getServletPath();
}
-
+
/*
* -------------------------------------------------------------------------
* (non-Javadoc)
@@ -241,7 +241,7 @@
* getRequestURL
* -------------------------------------------------------------------------
*/
-
+
public String getProtocol() {
return included ? null : super.getProtocol();
}
@@ -261,7 +261,7 @@
public StringBuffer getRequestURL() {
return included ? null : super.getRequestURL();
}
-
+
/*
* -------------------------------------------------------------------------
* (non-Javadoc)
@@ -276,18 +276,18 @@
* The getContentLength method of the HttpServletRequest must return 0.
* -------------------------------------------------------------------------
*/
-
+
public String getCharacterEncoding() {
return included ? null : super.getCharacterEncoding();
}
-
+
public void setCharacterEncoding(String encoding)
throws UnsupportedEncodingException {
if (!included) {
super.setCharacterEncoding(encoding);
}
}
-
+
/*
* -------------------------------------------------------------------------
* (non-javadoc)
@@ -295,14 +295,14 @@
* The getMethod method of the HttpServletRequest must always return 'GET'.
* -------------------------------------------------------------------------
*/
-
+
public String getMethod() {
return "GET";
}
-
-
+
+
// Private Methods ---------------------------------------------------------
-
+
/**
* Parses the appended query string and merges the appended parameters to
* the original parameters. Query parameters are name-value pairs separated
@@ -311,12 +311,12 @@
* @param queryString the appended query string.
*/
private void mergeQueryString(Map parameters, String queryString) {
-
+
// Create the appended parameters map:
// key is the parameter name as a string,
// value is a List of parameter values (List of String).
Map appendedParameters = new HashMap();
-
+
// Parse the appended query string.
if (LOG.isDebugEnabled()) {
LOG.debug("Parsing appended query string: " + queryString);
@@ -343,7 +343,7 @@
if (LOG.isDebugEnabled()) {
LOG.debug(appendedParameters.size() + " parameters appended.");
}
-
+
// Merge the appended parameters and the original parameters.
if (LOG.isDebugEnabled()) {
LOG.debug("Merging appended parameters and original parameters...");
@@ -361,8 +361,8 @@
}
}
}
- parameters.put(key, (String[]) values.toArray(new String[values.size()]));
+ parameters.put(key, values.toArray(new String[values.size()]));
}
}
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletEnvironmentService.java Thu Mar 8 10:48:59 2007
@@ -16,18 +16,16 @@
*/
package org.apache.pluto.spi.optional;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
import org.apache.pluto.PortletContainer;
+import org.apache.pluto.internal.InternalActionRequest;
import org.apache.pluto.internal.InternalActionResponse;
-import org.apache.pluto.internal.InternalPortletRequest;
-import org.apache.pluto.internal.InternalPortletResponse;
import org.apache.pluto.internal.InternalPortletWindow;
import org.apache.pluto.internal.InternalRenderRequest;
-import org.apache.pluto.internal.InternalActionRequest;
import org.apache.pluto.internal.InternalRenderResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
/**
* Factory Service for creating Portlet request and responses.
*
@@ -36,28 +34,27 @@
*/
public interface PortletEnvironmentService {
- public InternalActionRequest createActionRequest(
+ InternalActionRequest createActionRequest(
PortletContainer container,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse,
InternalPortletWindow internalPortletWindow);
- public InternalActionResponse createActionResponse(
+ InternalActionResponse createActionResponse(
PortletContainer container,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse,
InternalPortletWindow internalPortletWindow);
- public InternalRenderRequest createRenderRequest(
+ InternalRenderRequest createRenderRequest(
PortletContainer container,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse,
InternalPortletWindow internalPortletWindow);
- public InternalRenderResponse createRenderResponse(
+ InternalRenderResponse createRenderResponse(
PortletContainer container,
HttpServletRequest servletRequest,
HttpServletResponse servletResponse,
InternalPortletWindow internalPortletWindow);
-
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java Thu Mar 8 10:48:59 2007
@@ -16,11 +16,6 @@
*/
package org.apache.pluto.spi.optional;
-import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.spi.ContainerService;
-
-import javax.portlet.PortletRequest;
-import java.util.Map;
/**
* Used to access user information attributes as described in
Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/PortletContextManagerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/PortletContextManagerTest.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/PortletContextManagerTest.java (original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/PortletContextManagerTest.java Thu Mar 8 10:48:59 2007
@@ -16,16 +16,11 @@
*/
package org.apache.pluto.core;
-import junit.framework.TestCase;
+import java.net.MalformedURLException;
import javax.servlet.ServletContext;
-/* Java 5 req'd
- import org.easymock.EasyMock;
-*/
-
-import java.net.MalformedURLException;
-import java.net.URL;
+import junit.framework.TestCase;
public class PortletContextManagerTest extends TestCase {
Modified: portals/pluto/trunk/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java (original)
+++ portals/pluto/trunk/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/InitParamDD.java Thu Mar 8 10:48:59 2007
@@ -16,10 +16,8 @@
*/
package org.apache.pluto.descriptors.common;
-import org.apache.pluto.descriptors.common.DescriptionDD;
-
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
/**
* Initialization Parameter configuration.
Modified: portals/pluto/trunk/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.java (original)
+++ portals/pluto/trunk/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/SecurityRoleRefDD.java Thu Mar 8 10:48:59 2007
@@ -16,10 +16,8 @@
*/
package org.apache.pluto.descriptors.common;
-import org.apache.pluto.descriptors.common.DescriptionDD;
-
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
/**
* Security Role Reference Configuration.
Modified: portals/pluto/trunk/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/AbstractCastorDescriptorService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/AbstractCastorDescriptorService.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/AbstractCastorDescriptorService.java (original)
+++ portals/pluto/trunk/pluto-descriptor-impl/src/main/java/org/apache/pluto/descriptors/services/castor/AbstractCastorDescriptorService.java Thu Mar 8 10:48:59 2007
@@ -16,14 +16,17 @@
*/
package org.apache.pluto.descriptors.services.castor;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
import org.exolab.castor.mapping.Mapping;
import org.exolab.castor.mapping.MappingException;
import org.exolab.castor.util.LocalConfiguration;
import org.exolab.castor.xml.Marshaller;
import org.exolab.castor.xml.Unmarshaller;
-import org.xml.sax.helpers.DefaultHandler;
-
-import java.io.*;
/**
* Abstract deployment descriptor support class.
@@ -79,7 +82,7 @@
// Construct the marshaller with a Writer instead of
// a SAX DocumentHandler. When you supply a document
// handler, you can't set call marshaller.setDocType(String, String)
-
+
// See Also:
// https://issues.apache.org/jira/browse/PLUTO-312
// http://castor.org/javadoc/org/exolab/castor/xml/Marshaller.html#setDoctype(java.lang.String,%20java.lang.String)
@@ -106,16 +109,16 @@
protected abstract Mapping getCastorMapping() throws IOException, MappingException;
protected abstract String getPublicId();
protected abstract String getDTDUri();
-
+
/**
* Subclasses should override this method if they need to set
* options on the Castor marshaller, such as a doctype.
- *
+ *
* @param marshaller the Castor Marshaller
* @param beingMarshalled the Object being marshalled by Castor.
*/
protected void setCastorMarshallerOptions(final Marshaller marshaller, final Object beingMarshalled) {
-
+
}
}
Modified: portals/pluto/trunk/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java (original)
+++ portals/pluto/trunk/pluto-descriptor-impl/src/test/java/org/apache/pluto/descriptors/services/castor/PortletAppDescriptorServiceImplTest.java Thu Mar 8 10:48:59 2007
@@ -16,18 +16,17 @@
*/
package org.apache.pluto.descriptors.services.castor;
-import junit.framework.TestCase;
-
import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
+
+import junit.framework.TestCase;
-import org.apache.pluto.descriptors.portlet.PortletAppDD;
-import org.apache.pluto.descriptors.portlet.SecurityConstraintDD;
-import org.apache.pluto.descriptors.portlet.PortletDD;
import org.apache.pluto.descriptors.common.DisplayNameDD;
-import org.apache.pluto.descriptors.common.DescriptionDD;
import org.apache.pluto.descriptors.common.InitParamDD;
+import org.apache.pluto.descriptors.portlet.PortletAppDD;
+import org.apache.pluto.descriptors.portlet.PortletDD;
+import org.apache.pluto.descriptors.portlet.SecurityConstraintDD;
/**
*
@@ -78,12 +77,12 @@
assertNotNull(sc.getUserDataConstraint());
assertEquals(1, sc.getUserDataConstraint().getDescriptions().size());
assertEquals("NONE", sc.getUserDataConstraint().getTransportGuarantee());
-
+
}
- private String xml = "<portlet-app\n" +
+ private final String xml = "<portlet-app\n" +
" xmlns=\"http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd\"\n" +
" version=\"1.0\"\n" +
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java Thu Mar 8 10:48:59 2007
@@ -16,21 +16,20 @@
*/
package org.apache.pluto.driver.services.container;
+import javax.portlet.PortalContext;
+
import org.apache.pluto.OptionalContainerServices;
import org.apache.pluto.RequiredContainerServices;
-import org.apache.pluto.internal.InternalPortletWindow;
import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.spi.PortalCallbackService;
-import org.apache.pluto.spi.optional.PortletPreferencesService;
+import org.apache.pluto.spi.optional.PortalAdministrationService;
import org.apache.pluto.spi.optional.PortletEnvironmentService;
+import org.apache.pluto.spi.optional.PortletInfoService;
import org.apache.pluto.spi.optional.PortletInvokerService;
+import org.apache.pluto.spi.optional.PortletPreferencesService;
import org.apache.pluto.spi.optional.PortletRegistryService;
-import org.apache.pluto.spi.optional.PortletInfoService;
-import org.apache.pluto.spi.optional.PortalAdministrationService;
import org.apache.pluto.spi.optional.UserInfoService;
-import javax.portlet.PortalContext;
-
/**
* The Portal Driver's <code>PortletContainerServices</code> implementation. The
* <code>PortletContainerServices</code> interface is the main integration point
@@ -43,8 +42,8 @@
implements RequiredContainerServices, OptionalContainerServices {
- private PortalContextImpl context;
- private DriverConfiguration driverConfig;
+ private final PortalContextImpl context;
+ private final DriverConfiguration driverConfig;
/**
@@ -84,7 +83,7 @@
/**
- * Returns null to use pluto's default
+ * Returns null to use pluto's default
* @return
*/
public PortletRegistryService getPortletRegistryService() {
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfig.java Thu Mar 8 10:48:59 2007
@@ -16,13 +16,14 @@
*/
package org.apache.pluto.driver.services.impl.resource;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.services.portal.RenderConfig;
-import java.util.*;
-
/**
* Encapsulation of the Pluto Driver ResourceConfig Info.
*
@@ -52,7 +53,7 @@
private Set supportedWindowStates;
/** The portlet applications registered with us. */
- private Map portletApplications;
+ private final Map portletApplications;
/** Encapsulation of render configuration data. */
private RenderConfig renderConfig;
Modified: portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java Thu Mar 8 10:48:59 2007
@@ -16,17 +16,16 @@
*/
package org.apache.pluto.driver.services.impl.resource;
+import java.io.IOException;
+import java.io.InputStream;
+
import org.apache.commons.digester.Digester;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.driver.services.portal.PortletWindowConfig;
import org.apache.pluto.driver.services.portal.PageConfig;
import org.apache.pluto.driver.services.portal.RenderConfig;
import org.xml.sax.SAXException;
-import java.io.IOException;
-import java.io.InputStream;
-
/**
* @author <a href="ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
@@ -51,7 +50,7 @@
return factory;
}
- private Digester digester;
+ private final Digester digester;
private ResourceConfigReader() {
digester = new Digester();
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java Thu Mar 8 10:48:59 2007
@@ -35,15 +35,12 @@
import org.apache.pluto.driver.core.PortletWindowImpl;
import org.apache.pluto.driver.services.portal.PageConfig;
import org.apache.pluto.driver.services.portal.PortletWindowConfig;
-import org.apache.pluto.driver.services.portal.SupportedModesService;
import org.apache.pluto.driver.url.PortalURL;
-import org.springframework.context.ApplicationContext;
-import org.springframework.web.context.WebApplicationContext;
/**
* The controller servlet used to drive the Portal Driver. All requests mapped
* to this servlet will be processed as Portal Requests.
- *
+ *
* @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
* @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @author <a href="mailto:esm@apache.org">Elliot Metsger</a>
@@ -53,26 +50,26 @@
public class PortalDriverServlet extends HttpServlet {
/** Internal Logger. */
- private static final Log LOG = LogFactory.getLog(PortalDriverServlet.class);
-
+ private static final Log LOG = LogFactory.getLog(PortalDriverServlet.class);
+
/** The Portal Driver sServlet Context */
- private ServletContext servletContext = null;
-
+ private ServletContext servletContext;
+
protected static final String DEFAULT_PAGE_URI =
"/WEB-INF/themes/pluto-default-theme.jsp";
-
+
/** The portlet container to which we will forward all portlet requests. */
- protected PortletContainer container = null;
-
-
-
-
+ protected PortletContainer container;
+
+
+
+
// HttpServlet Impl --------------------------------------------------------
-
+
public String getServletInfo() {
return "Pluto Portal Driver Servlet";
}
-
+
/**
* Initialize the Portal Driver. This method retrieves the portlet container
* instance from the servlet context scope.
@@ -81,9 +78,9 @@
public void init() {
servletContext = getServletContext();
container = (PortletContainer) servletContext.getAttribute(
- AttributeKeys.PORTLET_CONTAINER);
+ AttributeKeys.PORTLET_CONTAINER);
}
-
+
/**
* Handle all requests. All POST requests are passed to this method.
@@ -125,7 +122,7 @@
LOG.debug("Action request processed.\n\n");
}
}
-
+
// Otherwise (actionWindowConfig == null), handle the render request.
else {
if (LOG.isDebugEnabled()) {
@@ -134,9 +131,10 @@
PageConfig pageConfig = getPageConfig(portalURL);
if (pageConfig == null)
{
+ // TODO Shouldn't we throw an exception here?
LOG.error("PageConfig for render path [" + portalURL.getRenderPath() + "] could not be found.");
}
-
+
request.setAttribute(AttributeKeys.CURRENT_PAGE, pageConfig);
String uri = (pageConfig.getUri() != null)
? pageConfig.getUri() : DEFAULT_PAGE_URI;
@@ -162,10 +160,10 @@
throws ServletException, IOException {
doGet(request, response);
}
-
-
+
+
// Private Methods ---------------------------------------------------------
-
+
/**
* Returns the config of the portal page to be rendered.
* @param currentURL the current portal URL.
@@ -178,7 +176,7 @@
}
return getDriverConfiguration().getPageConfig(requestedPageId);
}
-
+
/**
* Returns the portal driver configuration object.
* @return the portal driver configuration object.
@@ -186,7 +184,7 @@
private DriverConfiguration getDriverConfiguration() {
return (DriverConfiguration) getServletContext().getAttribute(
AttributeKeys.DRIVER_CONFIG);
- }
-
+ }
+
}
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalStartupListener.java Thu Mar 8 10:48:59 2007
@@ -16,18 +16,21 @@
*/
package org.apache.pluto.driver;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.*;
-import org.apache.pluto.driver.config.DriverConfigurationException;
-import org.apache.pluto.driver.config.DriverConfiguration;
+import org.apache.pluto.OptionalContainerServices;
+import org.apache.pluto.PortletContainer;
+import org.apache.pluto.PortletContainerException;
+import org.apache.pluto.PortletContainerFactory;
+import org.apache.pluto.RequiredContainerServices;
import org.apache.pluto.driver.config.AdminConfiguration;
+import org.apache.pluto.driver.config.DriverConfiguration;
+import org.apache.pluto.driver.config.DriverConfigurationException;
import org.springframework.web.context.WebApplicationContext;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.portlet.PortalContext;
/**
* Listener used to start up / shut down the Pluto Portal Driver upon startup /
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java Thu Mar 8 10:48:59 2007
@@ -16,15 +16,15 @@
*/
package org.apache.pluto.driver.config;
-import org.apache.pluto.driver.services.portal.PortletWindowConfig;
+import java.util.Collection;
+
+import javax.servlet.ServletContext;
+
import org.apache.pluto.driver.services.portal.PageConfig;
import org.apache.pluto.driver.url.PortalURLParser;
import org.apache.pluto.spi.PortalCallbackService;
import org.apache.pluto.spi.optional.PortletPreferencesService;
-import javax.servlet.ServletContext;
-import java.util.Collection;
-
/**
* Interface defining a means for retrieving driver services
* based upon configuration information. Within the portal,
@@ -91,17 +91,17 @@
Collection getPages();
PageConfig getPageConfig(String pageId);
-
+
boolean isPortletModeSupportedByPortal(String mode);
-
+
boolean isPortletModeSupportedByPortlet(String portletId, String mode);
-
+
boolean isPortletModeSupported(String portletId, String mode);
-
+
boolean isWindowStateSupportedByPortal(String windowState);
-
+
boolean isWindowStateSupportedByPortlet(String portletId, String windowState);
-
+
boolean isWindowStateSupported(String portletId, String windowState);
//
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/AdminPortlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/AdminPortlet.java?view=diff&rev=516143&r1=516142&r2=516143
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/AdminPortlet.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/portlets/AdminPortlet.java Thu Mar 8 10:48:59 2007
@@ -16,14 +16,7 @@
*/
package org.apache.pluto.driver.portlets;
-import java.io.IOException;
-
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
public class AdminPortlet extends GenericPlutoPortlet {