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/09 09:55:35 UTC
svn commit: r516335 [1/2] - in /portals/pluto/trunk:
maven-pluto-plugin/src/main/java/org/apache/pluto/maven/
pluto-ant-tasks/src/main/java/org/apache/pluto/ant/
pluto-container/src/main/java/org/apache/pluto/
pluto-container/src/main/java/org/apache/p...
Author: cziegeler
Date: Fri Mar 9 00:55:30 2007
New Revision: 516335
URL: http://svn.apache.org/viewvc?view=rev&rev=516335
Log:
Start removing author tags and code cleanup - no functional changes
Modified:
portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractManagementMojo.java
portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPlutoMojo.java
portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPortletMojo.java
portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java
portals/pluto/trunk/pluto-ant-tasks/src/main/java/org/apache/pluto/ant/AssembleTask.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/OptionalContainerServices.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PlutoConfigurationException.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainer.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletWindow.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletWindowID.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/RequiredContainerServices.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocation.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.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/core/PortletServlet.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/UserInfoAttribute.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/Configuration.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalActionRequest.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalActionResponse.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletPreference.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletRequest.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletResponse.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletWindow.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalRenderRequest.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalRenderResponse.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletEntity.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PreferencesValidatorRegistry.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionRequestImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/CombinedPortletResourceBundle.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/Environment.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InlinePortletResourceBundle.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InternalImplConverter.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/PortletPreferenceImpl.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/PortletRequestDispatcherImpl.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/PortletResponseImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletSessionImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/RandomStringUtils.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/internal/impl/RenderResponseImpl.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ResourceBundleFactory.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ContainerService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/ResourceURLProvider.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/P3PAttributes.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/PortletInfoService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletInvokerService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletPreferencesService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryEvent.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryListener.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/PortletRegistryService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoAttributesService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoService.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/ArgumentUtility.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/StringManager.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/StringUtils.java
portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/util/impl/NamespaceMapperImpl.java
portals/pluto/trunk/pluto-container/src/site/xdoc/embed.xml
portals/pluto/trunk/pluto-container/src/site/xdoc/getting-started.xml
portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java
portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/ResourceBundleFactoryTest.java
portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/ArgumentUtilityTest.java
portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/PlutoTestCase.java
portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/StringUtilsTest.java
portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/util/impl/NamespaceMapperImplTest.java
portals/pluto/trunk/pluto-site/src/site/xdoc/index.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/news.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/powered.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/arch.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/build_source.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/index.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/integrate.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v101/developer/subversion.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v101/install.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v101/resources.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/index.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/portal.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v101/userguide/testsuite.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v11/app-servers.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v11/architecture.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v11/deploying.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v11/getting-started.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v11/resources.xml
portals/pluto/trunk/pluto-site/src/site/xdoc/v11/subprojects.xml
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/Assembler.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AssemblerConfig.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/AssemblerFactory.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/WebXmlRewritingAssembler.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/file/FileAssembler.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/war/WarAssembler.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/cli/AssemblerCLI.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/TomcatCrossContextGenerator.java
portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java
portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java
Modified: portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractManagementMojo.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractManagementMojo.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractManagementMojo.java (original)
+++ portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractManagementMojo.java Fri Mar 9 00:55:30 2007
@@ -40,7 +40,6 @@
* Abstract Mojo for installation tasks.
*
* @since 07/29/2005
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
*/
public abstract class AbstractManagementMojo extends AbstractPlutoMojo {
Modified: portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPlutoMojo.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPlutoMojo.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPlutoMojo.java (original)
+++ portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPlutoMojo.java Fri Mar 9 00:55:30 2007
@@ -23,7 +23,6 @@
import java.io.File;
/**
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
* @todo Document
* @since Jul 30, 2005
*/
@@ -32,14 +31,14 @@
/**
* @parameter expression="${installDir}"
*/
- protected File installationDirectory = null;
+ protected File installationDirectory;
/**
* @parameter expression="${project}"
* @required
* @readonly
*/
- protected MavenProject project = null;
+ protected MavenProject project;
public void execute() throws MojoExecutionException {
// Validation of the installDir property is done by maven.
Modified: portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPortletMojo.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPortletMojo.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPortletMojo.java (original)
+++ portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPortletMojo.java Fri Mar 9 00:55:30 2007
@@ -17,7 +17,6 @@
package org.apache.pluto.maven;
/**
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
* @todo Document
* @since Jul 30, 2005
*/
Modified: portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java (original)
+++ portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java Fri Mar 9 00:55:30 2007
@@ -27,47 +27,46 @@
/**
* TODO: Document
* TODO: Refactor this and the assembler to model deployer and allow no arg constructor
- *
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
+ *
* @since Jul 30, 2005
* @see org.apache.pluto.util.assemble.Assembler
- *
+ *
* @goal assemble
* @description prepares a web application as a portlet application
* @phase process-resources
*/
public class AssembleMojo extends AbstractPortletMojo {
-
+
// Private Member Variables ------------------------------------------------
-
+
/**
* The portlet application descriptor (<code>WEB-INF/portlet.xml</code>).
* @parameter expression="${basedir}/src/main/webapp/WEB-INF/portlet.xml"
* @required
*/
- private File portletXml = null;
+ private File portletXml;
/**
* The original webapp descriptor (<code>WEB-INF/web.xml</code>).
* @parameter expression="${basedir}/src/main/webapp/WEB-INF/web.xml"
* @required
*/
- private File webXml = null;
-
+ private File webXml;
+
/**
- * The file to which the updated webapp descriptor is written.
+ * The file to which the updated webapp descriptor is written.
* @parameter expression="${project.build.directory}/pluto-resources/web.xml"
*/
- private File webXmlDestination = null;
+ private File webXmlDestination;
/**
* The name of the dispatch servlet class to use
* @parameter
*/
- private String dispatchServletClass = null;
+ private String dispatchServletClass;
// AbstractPlutoMojo Impl --------------------------------------------------
-
+
protected void doExecute() throws Exception {
// Log parameter values.
Log log = getLog();
@@ -91,9 +90,9 @@
throw new MojoExecutionException("Portlet descriptor must be a valid portlet.xml");
}
}
-
+
// Private Methods ---------------------------------------------------------
-
+
private AssemblerConfig createAssemblerConfig() {
AssemblerConfig config = new AssemblerConfig();
config.setPortletDescriptor(portletXml);
@@ -102,5 +101,5 @@
config.setDispatchServletClass(dispatchServletClass);
return config;
}
-
+
}
Modified: portals/pluto/trunk/pluto-ant-tasks/src/main/java/org/apache/pluto/ant/AssembleTask.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-ant-tasks/src/main/java/org/apache/pluto/ant/AssembleTask.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-ant-tasks/src/main/java/org/apache/pluto/ant/AssembleTask.java (original)
+++ portals/pluto/trunk/pluto-ant-tasks/src/main/java/org/apache/pluto/ant/AssembleTask.java Fri Mar 9 00:55:30 2007
@@ -33,7 +33,6 @@
/**
* TODO JavaDoc
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>:
* @version 1.0
* @since Nov 23, 2005
*/
@@ -46,11 +45,11 @@
private File destfile;
private File webapp;
-
+
private File war;
-
+
private File destdir;
-
+
private Collection warFileSets = new LinkedList();
public File getPortletxml() {
@@ -90,7 +89,7 @@
public void setWebapp(File webapp) {
this.webapp = webapp;
}
-
+
public File getWar() {
return this.war;
}
@@ -109,7 +108,7 @@
public void setDestdir(File destDir) {
this.destdir = destDir;
}
-
+
public void addWars(FileSet fileSet) {
this.warFileSets.add(fileSet);
}
@@ -123,17 +122,17 @@
for (final Iterator fileSetItr = this.warFileSets.iterator(); fileSetItr.hasNext();) {
final FileSet fileSet = (FileSet)fileSetItr.next();
final DirectoryScanner directoryScanner = fileSet.getDirectoryScanner(this.getProject());
-
+
final File basedir = directoryScanner.getBasedir();
final String[] includedFiles = directoryScanner.getIncludedFiles();
-
+
for (int index = 0; index < includedFiles.length; index++) {
AssemblerConfig config = new AssemblerConfig();
-
+
final File warSource = new File(basedir, includedFiles[index]);
config.setWarSource(warSource);
config.setDestination(getDestdir());
-
+
this.log("Assembling '" + warSource + "' to '" + getDestdir() + "'");
Assembler assembler = AssemblerFactory.getFactory().createAssembler(config);
assembler.assemble(config);
@@ -142,7 +141,7 @@
}
else {
AssemblerConfig config = new AssemblerConfig();
-
+
final File warSource = getWar();
if (warSource != null) {
config.setWarSource(warSource);
@@ -155,8 +154,8 @@
config.setDestination(getDestfile());
this.log("Assembling '" + getWebxml() + "' to '" + getDestfile() + "'");
}
-
-
+
+
Assembler assembler = AssemblerFactory.getFactory().createAssembler(config);
assembler.assemble(config);
}
@@ -173,7 +172,7 @@
if(!webapp.exists()) {
throw new BuildException("webapp "+webapp.getAbsolutePath()+ " does not exist");
}
-
+
if (war != null) {
throw new BuildException("war should not be specified if webapp is specified");
}
@@ -183,16 +182,16 @@
if (destdir != null) {
throw new BuildException("destfile should not be specified if webapp is specified");
}
-
+
return;
}
-
+
//Check if running with war arg
if (war != null) {
if(!war.exists()) {
throw new BuildException("WAR "+war.getAbsolutePath()+ " does not exist");
}
-
+
if (this.warFileSets.size() > 0) {
throw new BuildException("wars should not be specified if war is specified");
}
@@ -211,7 +210,7 @@
return;
}
-
+
//Check if running with war arg
if (this.warFileSets.size() > 0) {
if (war != null) {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/OptionalContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/OptionalContainerServices.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/OptionalContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/OptionalContainerServices.java Fri Mar 9 00:55:30 2007
@@ -35,7 +35,6 @@
* modicications in the future.</p>
*
* @since 1.1.0
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
*/
public interface OptionalContainerServices {
@@ -63,7 +62,7 @@
*/
PortletRegistryService getPortletRegistryService();
-
+
/**
* Returns an invoker for the specified PortletWindow.
*
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PlutoConfigurationException.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PlutoConfigurationException.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PlutoConfigurationException.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PlutoConfigurationException.java Fri Mar 9 00:55:30 2007
@@ -19,7 +19,6 @@
/**
* Exception thrown when Pluto configuration fails.
*
- * @author ddewolf@apache.org
* @since Jul 2, 2005
*/
public class PlutoConfigurationException extends RuntimeException {
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=516335&r1=516334&r2=516335
==============================================================================
--- 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 Fri Mar 9 00:55:30 2007
@@ -47,8 +47,6 @@
* <p/>
* <TR><TD>{@link #destroy()}</TD> <TD>Destroy and remove container from
* service.</TD> <TD>Performed only once per container lifecylce</TD></TR>
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:esm@apache.org">Elliot Metsger</a>
* @version $Id: PortletContainer.java 36010 2004-07-30 14:16:06Z ddewolf $
*/
public interface PortletContainer {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletContainerFactory.java Fri Mar 9 00:55:30 2007
@@ -27,7 +27,6 @@
* the underlying pluto container implementation by using the the given
* container services.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
* @version 1.0
* @since Sep 18, 2004
*/
@@ -78,15 +77,15 @@
String containerName,
RequiredContainerServices requiredServices,
OptionalContainerServices optionalServices) {
-
+
ArgumentUtility.validateNotNull("requiredServices", requiredServices);
ArgumentUtility.validateNotEmpty("containerName", containerName);
-
+
DefaultOptionalContainerServices optionalServicesWrapper =
new DefaultOptionalContainerServices(optionalServices);
PortletContainer container = new PortletContainerImpl(
containerName, requiredServices, optionalServicesWrapper);
-
+
if (LOG.isInfoEnabled()) {
LOG.info("Portlet Container [" + containerName + "] created.");
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletWindow.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletWindow.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletWindow.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletWindow.java Fri Mar 9 00:55:30 2007
@@ -27,8 +27,6 @@
* @see org.apache.pluto.internal.impl.InternalPortletWindowImpl
* @see org.apache.pluto.descriptors.portlet.PortletDD
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @version 1.0
* @since Sep 22, 2004
*/
@@ -65,5 +63,5 @@
* @return the current portlet mode.
*/
public PortletMode getPortletMode();
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletWindowID.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletWindowID.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletWindowID.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/PortletWindowID.java Fri Mar 9 00:55:30 2007
@@ -18,11 +18,10 @@
/**
* The portlet window ID.
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @version 1.0
*/
public interface PortletWindowID {
-
+
/**
* Returns the unique string ID of the portlet window.
* <p>
@@ -32,6 +31,6 @@
* </p>
* @return the unique string ID of the portlet window.
*/
- public String getStringId();
-
+ String getStringId();
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/RequiredContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/RequiredContainerServices.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/RequiredContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/RequiredContainerServices.java Fri Mar 9 00:55:30 2007
@@ -23,8 +23,7 @@
/**
* This interface defines the services required for integration between the
* Pluto Portlet Container and a Portal.
- *
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
+ *
*/
public interface RequiredContainerServices {
@@ -33,13 +32,13 @@
* portlet container services.
* @return a PortalContext implementation.
*/
- public PortalContext getPortalContext();
+ PortalContext getPortalContext();
/**
* Returns the portal callback service implementation instance associated
- * with this group of portlet container services.
+ * with this group of portlet container services.
* @return a PortalCallbackService implementation.
*/
- public PortalCallbackService getPortalCallbackService();
-
+ PortalCallbackService getPortalCallbackService();
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocation.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocation.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocation.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/ContainerInvocation.java Fri Mar 9 00:55:30 2007
@@ -29,9 +29,8 @@
* Provides static access to the currently executing container.
* This is critical for instance of the PortletContext and PortletConfig
* to be able to access container specific services.
- *
*
- * @author David H. DeWolf
+ *
* @since 1.1
*
*/
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultOptionalContainerServices.java Fri Mar 9 00:55:30 2007
@@ -28,8 +28,6 @@
/**
* Default Optional Container Services implementation.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @version 1.0
* @since Sep 18, 2004
*/
@@ -43,7 +41,7 @@
private PortalAdministrationService portalAdministrationService;
private UserInfoService userInfoService;
-
+
/**
* Constructs an instance using the default portlet preferences service
* implementation.
@@ -57,7 +55,7 @@
portalAdministrationService = new DefaultPortalAdministrationService();
userInfoService = new DefaultUserInfoService();
}
-
+
/**
* Constructs an instance using specified optional container services
* implementation. If the portlet preferences service is provided, it will
@@ -99,10 +97,10 @@
}
}
-
-
+
+
// OptionalContainerServices Impl ------------------------------------------
-
+
public PortletPreferencesService getPortletPreferencesService() {
return portletPreferencesService;
}
@@ -115,7 +113,7 @@
public PortletEnvironmentService getPortletEnvironmentService() {
return portletEnvironmentService;
}
-
+
public PortletInvokerService getPortletInvokerService() {
return portletInvokerService;
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletInvokerService.java Fri Mar 9 00:55:30 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.
@@ -42,8 +42,6 @@
* Used internally to invoke/dispatch requests from the container to
* the portlet application.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public class DefaultPortletInvokerService implements PortletInvokerService {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/DefaultPortletPreferencesService.java Fri Mar 9 00:55:30 2007
@@ -31,47 +31,46 @@
/**
* Default implementation of the portlet preferences service. The portlet
* preferences service is a singleton held by the pluto portlet container.
- *
+ *
* @see javax.portlet.PortletPreferences
* @see org.apache.pluto.internal.impl.PortletPreferencesImpl
* @see javax.portlet.PortletPreferences
- *
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ *
*/
public class DefaultPortletPreferencesService
implements PortletPreferencesService {
-
+
/** Logger. */
private static final Log LOG = LogFactory.getLog(
DefaultPortletPreferencesService.class);
-
-
+
+
// Private Member Variables ------------------------------------------------
-
+
/**
* The in-memory portlet preferences storage: key is the preference name as
* a string, value is an array of PortletPreference objects.
*/
private Map storage = new HashMap();
-
-
+
+
// Constructor -------------------------------------------------------------
-
+
/**
* Default no-arg constructor.
*/
public DefaultPortletPreferencesService() {
// Do nothing.
}
-
-
+
+
// PortletPreferencesService Impl ------------------------------------------
-
+
/**
* Returns the stored portlet preferences array. The preferences managed by
* this service should be protected from being directly accessed, so this
* method returns a cloned copy of the stored preferences.
- *
+ *
* @param portletWindow the portlet window.
* @param request the portlet request from which the remote user is retrieved.
* @return a copy of the stored portlet preferences array.
@@ -96,7 +95,7 @@
return clonePreferences(preferences);
}
}
-
+
/**
* Stores the portlet preferences to the in-memory storage. This method
* should be invoked after the portlet preferences are validated by the
@@ -106,7 +105,7 @@
* directly accessed, so this method clones the passed-in preferences array
* and saves it.
* </p>
- *
+ *
* @see javax.portlet.PortletPreferences#store()
*
* @param portletWindow the portlet window
@@ -124,10 +123,10 @@
LOG.debug("Portlet preferences stored for: " + key);
}
}
-
-
+
+
// Private Methods ---------------------------------------------------------
-
+
/**
* Formats the preference key for the portlet preference using specified
* portlet window and remote user.
@@ -141,13 +140,13 @@
buffer.append("portletName=").append(portletWindow.getPortletName());
return buffer.toString();
}
-
+
/**
* Clones a PortletPreference array. This method performs a deep clone on
* the passed-in portlet preferences array. Every PortletPreference object
* in the array are cloned (via the <code>PortletPreference.clone()</code>
* method) and injected into the new array.
- *
+ *
* @param preferences the portlet preferences array to clone.
* @return a deep-cloned copy of the portlet preferences array.
*/
@@ -167,7 +166,7 @@
}
return copy;
}
-
+
}
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=516335&r1=516334&r2=516335
==============================================================================
--- 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 Fri Mar 9 00:55:30 2007
@@ -51,9 +51,6 @@
/**
* Default Pluto Container implementation.
*
- * @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>
* @version 1.0
* @since Sep 18, 2004
*/
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=516335&r1=516334&r2=516335
==============================================================================
--- 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 Fri Mar 9 00:55:30 2007
@@ -50,8 +50,6 @@
* Manager used to cache the portlet configurations which have
* been previously parsed.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @version 1.0
* @since Sep 20, 2004
*/
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java Fri Mar 9 00:55:30 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.
@@ -46,8 +46,6 @@
* Portlet Invocation Servlet. This servlet recieves cross context requests from
* the the container and services the portlet request for the specified method.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @version 1.1
* @since 09/22/2004
*/
@@ -58,22 +56,22 @@
/**
* The portlet name as defined in the portlet app descriptor.
*/
- private String portletName = null;
+ private String portletName;
/**
* The portlet instance wrapped by this servlet.
*/
- private Portlet portlet = null;
+ private Portlet portlet;
/**
* The internal portlet context instance.
*/
- private InternalPortletContext portletContext = null;
+ private InternalPortletContext portletContext;
/**
* The internal portlet config instance.
*/
- private InternalPortletConfig portletConfig = null;
+ private InternalPortletConfig portletConfig;
// HttpServlet Impl --------------------------------------------------------
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/UserInfoAttribute.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/UserInfoAttribute.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/UserInfoAttribute.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/core/UserInfoAttribute.java Fri Mar 9 00:55:30 2007
@@ -19,8 +19,7 @@
/**
* Encapsulates a user information attribute as described in
* PLT.17 of the JSR-168 specification.
- *
- * @author <a href="cdoremus@apache.org">Craig Doremus</a>
+ *
*/
public interface UserInfoAttribute {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/Configuration.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/Configuration.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/Configuration.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/Configuration.java Fri Mar 9 00:55:30 2007
@@ -26,7 +26,6 @@
/**
* Central location for Configuration info.
*
- * @author ddewolf@apache.org
* @since Jul 2, 2005
*/
public class Configuration {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalActionRequest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalActionRequest.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalActionRequest.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalActionRequest.java Fri Mar 9 00:55:30 2007
@@ -21,10 +21,9 @@
/**
* The internal action request extends the internal portlet request and provides
* some action-specific methods (currently, no specific methods are declared).
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @since 2006-02-17
*/
public interface InternalActionRequest extends InternalPortletRequest, ActionRequest {
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalActionResponse.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalActionResponse.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalActionResponse.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalActionResponse.java Fri Mar 9 00:55:30 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.
@@ -25,7 +25,6 @@
/**
* The internal action response interface extends the internal portlet response
* interface and provides some action-specific methods.
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public interface InternalActionResponse extends InternalPortletResponse, ActionResponse {
@@ -56,7 +55,7 @@
public String encodeRedirectURL(String url);
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletPreference.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletPreference.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletPreference.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletPreference.java Fri Mar 9 00:55:30 2007
@@ -18,40 +18,38 @@
/**
* This class represents a portlet preference, which is a name-value pair.
- *
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ *
*/
public interface InternalPortletPreference {
-
+
/**
* Returns the name of this portlet preference.
* @return the name of this portlet preference.
*/
public String getName();
-
+
/**
* Returns the values of this portlet preference, which is a string array.
* @return the values of this portlet preference as a string array.
*/
public String[] getValues();
-
+
/**
* Sets values of this portlet preference.
* @param values values of this portlet preference to set.
*/
public void setValues(String[] values);
-
+
/**
* Returns true if this portlet preference is marked as read-only.
* @return true if this portlet preference is marked as read-only.
*/
public boolean isReadOnly();
-
+
/**
* Clone a copy of itself.
* @return a copy of itself.
*/
public Object clone();
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletRequest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletRequest.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletRequest.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletRequest.java Fri Mar 9 00:55:30 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.
@@ -25,9 +25,7 @@
/**
* The internal portlet request interface extends PortletRequest and adds
* some methods used by Pluto.
- *
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ *
*/
public interface InternalPortletRequest extends PortletRequest {
@@ -36,7 +34,7 @@
* This method ensures that the portlet utilizes resources from the
* <b>included</b> context, and not those from the intiating (portal)
* context.
- *
+ *
* @param context the target portlet context.
* @param request the servlet request.
*/
@@ -53,7 +51,7 @@
public PortletContainer getPortletContainer();
public HttpServletRequest getHttpServletRequest();
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletResponse.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletResponse.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletResponse.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletResponse.java Fri Mar 9 00:55:30 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,9 +21,7 @@
/**
* The internal portlet response interface extends PortletResponse and adds
* some methods used by Pluto.
- *
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ *
*/
public interface InternalPortletResponse extends PortletResponse {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletWindow.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletWindow.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletWindow.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalPortletWindow.java Fri Mar 9 00:55:30 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.
@@ -26,9 +26,7 @@
* as it can be shown only once on a single page. There is a one-to-one relation
* between portlet windows and portlet entities. Adding the same portlet e.g.
* twice on a page results in two different windows.
- *
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
+ *
* @since 1.1.0
*
*/
@@ -49,9 +47,9 @@
/**
* Retrieve the original portlet window with
* which the container was invoked.
- *
+ *
* @return the original portlet window.
*/
public PortletWindow getOriginalPortletWindow();
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalRenderRequest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalRenderRequest.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalRenderRequest.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalRenderRequest.java Fri Mar 9 00:55:30 2007
@@ -21,15 +21,14 @@
/**
* The internal render request interface extends the internal portlet request
* interface and provides some render-specific methods.
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @since 2006-02-17
*/
public interface InternalRenderRequest extends InternalPortletRequest, RenderRequest {
-
+
public void setIncluded(boolean included);
-
+
public boolean isIncluded();
-
+
public void setIncludedQueryString(String queryString);
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalRenderResponse.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalRenderResponse.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalRenderResponse.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/InternalRenderResponse.java Fri Mar 9 00:55:30 2007
@@ -21,11 +21,10 @@
/**
* The internal render response interface extends the internal portlet response
* interface and provides some render-specific methods.
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @since 2006-02-17
*/
public interface InternalRenderResponse extends InternalPortletResponse, RenderResponse {
-
+
public void setIncluded(boolean included);
public boolean isIncluded();
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletDescriptorRegistry.java Fri Mar 9 00:55:30 2007
@@ -37,30 +37,28 @@
* NOTE: This should only be used internally. Do not access it from embedding
* portals, instead, utilize the PortletRegistryService.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @version 1.0
* @since Nov 3, 2004
*/
public class PortletDescriptorRegistry {
-
+
/** Portlet deployment descriptor location. */
private static final String PORTLET_XML = "/WEB-INF/portlet.xml";
/** Exception Messages. */
private static final StringManager EXCEPTIONS = StringManager.getManager(
PortletDescriptorRegistry.class.getPackage().getName());
-
+
/** The static singleton registry instance. */
private static final PortletDescriptorRegistry REGISTRY =
new PortletDescriptorRegistry();
-
-
+
+
// Private Member Variables ------------------------------------------------
-
+
/** The portlet application descriptor service. */
- private PortletAppDescriptorService portletDDService = null;
-
+ private PortletAppDescriptorService portletDDService;
+
/**
* Cache of descriptors. WeakHashMap is used so that
* once the context is destroyed (kinda), the cache is eliminated.
@@ -70,9 +68,9 @@
*/
private Map cache = new WeakHashMap();
-
+
// Constructor -------------------------------------------------------------
-
+
/**
* Returns the singleton registry instance.
* @return the singleton registry instance.
@@ -105,10 +103,10 @@
"Unable to access class " + className, ex);
}
}
-
-
+
+
// Public Methods ----------------------------------------------------------
-
+
/**
* Retrieve the Portlet Application Deployment Descriptor for the given
* servlet context. Create it if it does not allready exist.
@@ -126,10 +124,10 @@
}
return portletAppDD;
}
-
-
+
+
// Private Methods ---------------------------------------------------------
-
+
/**
* Creates the portlet.xml deployment descriptor representation.
*
@@ -151,6 +149,6 @@
}
return portletAppDD;
}
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletEntity.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletEntity.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletEntity.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PortletEntity.java Fri Mar 9 00:55:30 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,31 +16,28 @@
*/
package org.apache.pluto.internal;
-import org.apache.pluto.internal.InternalPortletPreference;
-import org.apache.pluto.descriptors.portlet.PortletDD;
-import org.apache.pluto.descriptors.servlet.ServletDD;
-
import javax.portlet.PreferencesValidator;
import javax.portlet.ValidatorException;
+import org.apache.pluto.descriptors.portlet.PortletDD;
+import org.apache.pluto.descriptors.servlet.ServletDD;
+
/**
* The PortletEntity encapsulates all data pertaining to a single portlet
* instance. This instance may appear zero or more times per user. The
* 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:zheng@apache.org">ZHENG Zhong</a>
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
+ *
*/
public interface PortletEntity {
-
+
/**
* Returns the URI to the controller servlet that wraps this portlet.
* @return the URI to the controller servlet that wraps this portlet.
*/
public String getControllerServletUri();
-
+
/**
* Returns an array of default preferences of this portlet. The default
* preferences are retrieved from the portlet application descriptor.
@@ -60,7 +57,7 @@
* may be null.
* </p>
* @return the preference set
- *
+ *
* @see org.apache.pluto.descriptors.portlet.PortletPreferenceDD
*/
public InternalPortletPreference[] getDefaultPreferences();
@@ -70,7 +67,7 @@
* @return the portlet description.
*/
public PortletDD getPortletDefinition();
-
+
/**
* Returns the preferences validator instance for this portlet.
* One validator instance is created per portlet definition.
@@ -79,7 +76,7 @@
*/
public PreferencesValidator getPreferencesValidator()
throws ValidatorException;
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PreferencesValidatorRegistry.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PreferencesValidatorRegistry.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PreferencesValidatorRegistry.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/PreferencesValidatorRegistry.java Fri Mar 9 00:55:30 2007
@@ -30,45 +30,44 @@
* The portlet preferences validator registry. This class caches the portlet
* preferences validator instances for portlet definitions, and ensure that
* only one validator instance is created per portlet definition.
- *
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ *
* @since 2006-02-10
*/
public class PreferencesValidatorRegistry {
-
+
/** Logger. */
private static final Log LOG = LogFactory.getLog(PreferencesValidatorRegistry.class);
-
+
/** The static singleton registry instance. */
private static final PreferencesValidatorRegistry REGISTRY =
new PreferencesValidatorRegistry();
-
-
+
+
// Private Member Variables ------------------------------------------------
-
+
/**
* The preferences validator cache: key is the portlet definition, value is
* the portlet preferences validator instance.
*/
private Map cache = new HashMap();
-
-
+
+
// Constructor -------------------------------------------------------------
-
+
/**
* Private constructor that prevents external instantiation.
*/
private PreferencesValidatorRegistry() {
// Do nothing.
}
-
+
public static PreferencesValidatorRegistry getRegistry() {
return REGISTRY;
}
-
-
+
+
// Public Methods ----------------------------------------------------------
-
+
/**
* Returns the preferences validator instance for the given portlet
* definition. If no preferences validator class is defined for the portlet
@@ -77,18 +76,18 @@
* portlet definition.
* @param portletDD the portlet definition.
* @return the preferences validator if defined for the portlet definition.
- * @throw ValidatorException if fail to instantiate validator instance.
+ * @throw ValidatorException if fail to instantiate validator instance.
*/
public PreferencesValidator getPreferencesValidator(PortletDD portletDD)
throws ValidatorException {
-
+
// Try to retrieve the validator from cache.
PreferencesValidator validator = (PreferencesValidator)
cache.get(portletDD);
if (validator != null) {
return validator;
}
-
+
// Try to construct the validator instance for the portlet definition.
String className = portletDD.getPortletPreferences()
.getPreferencesValidator();
@@ -117,5 +116,5 @@
}
return validator;
}
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionRequestImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionRequestImpl.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionRequestImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/ActionRequestImpl.java Fri Mar 9 00:55:30 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.
@@ -32,24 +32,22 @@
/**
* Implementation of the <code>javax.portlet.ActionRequest</code> interface.
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
*/
public class ActionRequestImpl extends PortletRequestImpl
implements ActionRequest, InternalActionRequest {
-
+
/** Logger. */
private static final Log LOG = LogFactory.getLog(ActionRequestImpl.class);
-
-
+
+
// Private Member Variables ------------------------------------------------
-
+
/** FIXME: The portlet preferences. */
- private PortletPreferences portletPreferences = null;
-
-
+ private PortletPreferences portletPreferences;
+
+
// Constructor -------------------------------------------------------------
-
+
public ActionRequestImpl(PortletContainer container,
InternalPortletWindow internalPortletWindow,
HttpServletRequest servletRequest) {
@@ -60,7 +58,7 @@
}
// ActionRequest impl ------------------------------------------------------
-
+
/* (non-Javadoc)
* FIXME: should we set the bodyAccessed flag?
* @see org.apache.pluto.core.InternalActionResponse#getPortletInputStream()
@@ -83,9 +81,9 @@
}
// PortletRequestImpl impl -------------------------------------------------
-
+
/**
- * FIXME:
+ * FIXME:
*/
public PortletPreferences getPreferences() {
if (portletPreferences == null) {
@@ -97,5 +95,5 @@
}
return portletPreferences;
}
-
+
}
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/CombinedPortletResourceBundle.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/CombinedPortletResourceBundle.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/CombinedPortletResourceBundle.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/CombinedPortletResourceBundle.java Fri Mar 9 00:55:30 2007
@@ -25,7 +25,6 @@
/**
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>:
* @version 1.0
* @since Jan 9, 2006
*/
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/Environment.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/Environment.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/Environment.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/Environment.java Fri Mar 9 00:55:30 2007
@@ -21,7 +21,6 @@
/**
* Utility class used to retrieve environment information from the
* <code>environment.properties</code> file packaged with pluto.
- * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
*/
final class Environment {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InlinePortletResourceBundle.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InlinePortletResourceBundle.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InlinePortletResourceBundle.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InlinePortletResourceBundle.java Fri Mar 9 00:55:30 2007
@@ -26,7 +26,6 @@
* inline title, short-title, and keywords as properties from the
* bundle.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>:
* @version 1.0
* @since Jan 9, 2006
*/
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InternalImplConverter.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InternalImplConverter.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InternalImplConverter.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/InternalImplConverter.java Fri Mar 9 00:55:30 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.
@@ -28,23 +28,21 @@
* Static class that provides utility methods to convert a generic
* PortletRequest or PortletResponse object into an Internal respresentation
* of the same object.
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
*/
class InternalImplConverter {
-
+
/**
* Private constructor that prevents external instantiation.
*/
private InternalImplConverter() {
// Do nothing.
}
-
-
+
+
// Public Static Utility Methods -------------------------------------------
/**
- * The scary part about this is that there is not yet a
+ * The scary part about this is that there is not yet a
* PortletRequestWrapper defined by the spec. Because of this, there's a
* chance someone might implement their own wrapper and we won't be able to
* get the real internal one!
@@ -82,5 +80,5 @@
}
return (InternalPortletResponse) response;
}
-
+
}
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=516335&r1=516334&r2=516335
==============================================================================
--- 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 Fri Mar 9 00:55:30 2007
@@ -28,8 +28,6 @@
/**
* 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 {
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=516335&r1=516334&r2=516335
==============================================================================
--- 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 Fri Mar 9 00:55:30 2007
@@ -37,8 +37,6 @@
* <code>InternalPortletContext</code> which provides container specific
* information needed for processing.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @version 1.1
*/
public class PortletContextImpl
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=516335&r1=516334&r2=516335
==============================================================================
--- 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 Fri Mar 9 00:55:30 2007
@@ -44,8 +44,6 @@
* 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 {
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferenceImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferenceImpl.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferenceImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletPreferenceImpl.java Fri Mar 9 00:55:30 2007
@@ -20,33 +20,31 @@
/**
* TODO: javadoc
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
* @version 1.0
* @since Sep 20, 2004
*/
public class PortletPreferenceImpl implements InternalPortletPreference {
-
+
// Private Member Variables ------------------------------------------------
-
+
/** The preference name. */
- private String name = null;
-
+ private String name;
+
/** The preference values. */
- private String[] values = null;
-
+ private String[] values;
+
/** Flag indicating if this preference is read-only. */
private boolean readOnly = false;
-
-
+
+
// Constructors ------------------------------------------------------------
-
+
public PortletPreferenceImpl(String name, String[] values) {
this.name = name;
this.values = values;
this.readOnly = false;
}
-
+
public PortletPreferenceImpl(String name,
String[] values,
boolean readOnly) {
@@ -54,7 +52,7 @@
this.values = values;
this.readOnly = readOnly;
}
-
+
/**
* Private constructor that is used only within the <code>clone()</code>
* method.
@@ -63,10 +61,10 @@
private PortletPreferenceImpl() {
// Do nothing.
}
-
-
+
+
// PortletPreference Impl --------------------------------------------------
-
+
public String getName() {
return name;
}
@@ -90,7 +88,7 @@
public void setReadOnly(boolean readOnly) {
this.readOnly = readOnly;
}
-
+
public Object clone() {
PortletPreferenceImpl copy = new PortletPreferenceImpl();
copy.name = this.name;
@@ -100,10 +98,10 @@
copy.readOnly = this.readOnly;
return copy;
}
-
-
+
+
// Object Methods ----------------------------------------------------------
-
+
/**
* Override of toString() that prints out name and values of fields.
* @see java.lang.Object#toString()
@@ -123,6 +121,6 @@
buffer.append("readOnly=").append(readOnly).append("]");
return buffer.toString();
}
-
+
}
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=516335&r1=516334&r2=516335
==============================================================================
--- 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 Fri Mar 9 00:55:30 2007
@@ -49,8 +49,6 @@
* @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 {
@@ -64,17 +62,17 @@
// Private Member Variables ------------------------------------------------
/** The portlet preferences service provided by the portal. */
- private PortletPreferencesService preferencesService = null;
+ private PortletPreferencesService preferencesService;
- private InternalPortletWindow window = null;
+ private InternalPortletWindow window;
- private InternalPortletRequest request = null;
+ private InternalPortletRequest request;
/**
* Default portlet preferences retrieved from portlet.xml, and used for
* resetting portlet preferences.
*/
- private InternalPortletPreference[] defaultPreferences = null;
+ private InternalPortletPreference[] defaultPreferences;
/**
* Current portlet preferences: key is the preference name as a string,
@@ -83,7 +81,7 @@
private final Map preferences = new HashMap();
/** Current method used for managing these preferences. */
- private Integer methodId = null;
+ private Integer methodId;
// Constructor -------------------------------------------------------------
Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java?view=diff&rev=516335&r1=516334&r2=516335
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestDispatcherImpl.java Fri Mar 9 00:55:30 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.
@@ -37,26 +37,25 @@
* The portlet request dispatcher is used to dispatch <b>RenderRequest</b> and
* <b>RenderResponse</b> to a URI. Note that ActionRequest and ActionResponse
* can never be dispatched.
- *
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
+ *
*/
public class PortletRequestDispatcherImpl implements PortletRequestDispatcher {
-
+
/** Logger. */
private static final Log LOG = LogFactory.getLog(PortletRequestDispatcherImpl.class);
-
-
+
+
// Private Member Variables ------------------------------------------------
-
+
/** The nested servlet request dispatcher instance. */
- private RequestDispatcher requestDispatcher = null;
-
+ private RequestDispatcher requestDispatcher;
+
/** The included query string. */
- private String queryString = null;
-
-
+ private String queryString;
+
+
// Constructors ------------------------------------------------------------
-
+
/**
* Creates an instance. This constructor should be called to construct a
* named dispatcher.
@@ -69,7 +68,7 @@
LOG.debug("Named dispatcher created.");
}
}
-
+
/**
* Creates an instance. This constructor should be called to construct a
* portlet request dispatcher.
@@ -85,10 +84,10 @@
LOG.debug("Request dispatcher created.");
}
}
-
-
+
+
// PortletRequestDispatcher Impl -------------------------------------------
-
+
public void include(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
@@ -96,7 +95,7 @@
InternalImplConverter.getInternalRequest(request);
InternalRenderResponse internalResponse = (InternalRenderResponse)
InternalImplConverter.getInternalResponse(response);
-
+
boolean isIncluded = (internalRequest.isIncluded()
|| internalResponse.isIncluded());
try {
@@ -120,5 +119,5 @@
internalResponse.setIncluded(isIncluded);
}
}
-
+
}
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=516335&r1=516334&r2=516335
==============================================================================
--- 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 Fri Mar 9 00:55:30 2007
@@ -65,8 +65,6 @@
* Abstract <code>javax.portlet.PortletRequest</code> implementation.
* This class also implements InternalPortletRequest.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public abstract class PortletRequestImpl extends HttpServletRequestWrapper
implements PortletRequest, InternalPortletRequest {
@@ -84,33 +82,33 @@
/**
* The parent container within which this request was created.
*/
- private PortletContainer container = null;
+ private PortletContainer container;
/**
* The portlet window which is the target of this portlet request.
*/
- private InternalPortletWindow internalPortletWindow = null;
+ private InternalPortletWindow internalPortletWindow;
/**
* The PortletContext associated with this Request. This PortletContext must
* be initialized from within the <code>PortletServlet</code>.
*/
- private PortletContext portletContext = null;
+ private PortletContext portletContext;
/**
* The PortalContext within which this request is occuring.
*/
- private PortalContext portalContext = null;
+ private PortalContext portalContext;
/**
* The portlet session.
*/
- private PortletSession portletSession = null;
+ private PortletSession portletSession;
/**
* Response content types.
*/
- private Vector contentTypes = null;
+ private Vector contentTypes;
/**
* TODO: javadoc