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 dd...@apache.org on 2005/03/10 06:51:45 UTC

svn commit: r156743 [2/2] - in portals/pluto/trunk: container/src/java/org/apache/pluto/ container/src/java/org/apache/pluto/core/ container/src/java/org/apache/pluto/core/impl/ container/src/java/org/apache/pluto/factory/ container/src/java/org/apache/pluto/factory/impl/ container/src/java/org/apache/pluto/invoker/impl/ container/src/java/org/apache/pluto/om/ container/src/java/org/apache/pluto/portlet/ container/src/java/org/apache/pluto/services/factory/ container/src/java/org/apache/pluto/services/property/ container/src/java/org/apache/pluto/tags/ deploy/src/java/org/apache/pluto/driver/deploy/ descriptors/src/java/org/apache/pluto/descriptors/portlet/ descriptors/src/java/org/apache/pluto/descriptors/services/impl/ descriptors/src/java/org/apache/pluto/descriptors/servlet/ descriptors/src/test/org/apache/pluto/descriptors/portlet/ descriptors/src/test/org/apache/pluto/descriptors/servlet/ portal/src/java/org/apache/commons/fileupload/ portal/src/java/org/apache/pluto/portalImpl/ portal/src/java/org/apache/pluto/portalImpl/aggregation/ portal/src/java/org/apache/pluto/portalImpl/core/ portal/src/java/org/apache/pluto/portalImpl/om/ portal/src/java/org/apache/pluto/portalImpl/om/common/ portal/src/java/org/apache/pluto/portalImpl/om/common/impl/ portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/ portal/src/java/org/apache/pluto/portalImpl/om/page/ portal/src/java/org/apache/pluto/portalImpl/om/portlet/impl/ portal/src/java/org/apache/pluto/portalImpl/om/window/impl/ portal/src/java/org/apache/pluto/portalImpl/services/ portal/src/java/org/apache/pluto/portalImpl/services/factorymanager/ portal/src/java/org/apache/pluto/portalImpl/services/log/ portal/src/java/org/apache/pluto/portalImpl/services/portletdefinitionregistry/ portal/src/java/org/apache/pluto/portalImpl/servlet/ portal/src/java/org/apache/pluto/portalImpl/util/ portal/src/java/org/apache/pluto/portlet/admin/controller/ portal/src/java/org/apache/pluto/portlet/admin/model/ portal/src/java/org/apache/pluto/portlet/admin/services/ portal/src/java/org/apache/pluto/portlet/admin/taglib/ portal/src/java/org/apache/pluto/portlet/admin/util/ testsuite/src/java/org/apache/pluto/core/impl/ testsuite/src/java/org/apache/pluto/portalImpl/portlet/ testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ testsuite/src/webapp/WEB-INF/ testsuite/src/webapp/jsp/

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageImpl.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageImpl.java Wed Mar  9 21:50:30 2005
@@ -19,10 +19,19 @@
 
 package org.apache.pluto.portalImpl.om.common.impl;
 
-import org.apache.pluto.om.common.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.ListResourceBundle;
+import java.util.Locale;
+import java.util.ResourceBundle;
+import java.util.StringTokenizer;
+
+import org.apache.pluto.om.common.Language;
 import org.apache.pluto.util.Enumerator;
 import org.apache.pluto.util.StringUtils;
-import java.util.*;
 
 public class LanguageImpl implements Language, java.io.Serializable {
     // ResourceBundle creation part

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/ParameterSetImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/ParameterSetImpl.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/ParameterSetImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/ParameterSetImpl.java Wed Mar  9 21:50:30 2005
@@ -19,9 +19,13 @@
 
 package org.apache.pluto.portalImpl.om.common.impl;
 
-import org.apache.pluto.om.common.*;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import org.apache.pluto.om.common.Parameter;
+import org.apache.pluto.om.common.ParameterSet;
+import org.apache.pluto.om.common.ParameterSetCtrl;
 import org.apache.pluto.util.StringUtils;
-import java.util.*;
 
 public class ParameterSetImpl extends HashSet
 implements ParameterSet, ParameterSetCtrl, java.io.Serializable {

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/PreferenceSetImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/PreferenceSetImpl.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/PreferenceSetImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/PreferenceSetImpl.java Wed Mar  9 21:50:30 2005
@@ -29,9 +29,9 @@
 import org.apache.pluto.om.common.Preference;
 import org.apache.pluto.om.common.PreferenceSet;
 import org.apache.pluto.om.common.PreferenceSetCtrl;
-import org.apache.pluto.util.StringUtils;
 import org.apache.pluto.portalImpl.services.log.Log;
 import org.apache.pluto.services.log.Logger;
+import org.apache.pluto.util.StringUtils;
 
 public class PreferenceSetImpl extends HashSet
 implements PreferenceSet, PreferenceSetCtrl, java.io.Serializable {

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/PreferenceUtil.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/PreferenceUtil.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/PreferenceUtil.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/PreferenceUtil.java Wed Mar  9 21:50:30 2005
@@ -19,7 +19,9 @@
 
 package org.apache.pluto.portalImpl.om.common.impl;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
 
 import org.apache.pluto.om.common.Preference;
 

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/UnmodifiableSet.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/UnmodifiableSet.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/UnmodifiableSet.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/UnmodifiableSet.java Wed Mar  9 21:50:30 2005
@@ -19,8 +19,10 @@
 
 package org.apache.pluto.portalImpl.om.common.impl;
 
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
 
 public class UnmodifiableSet implements Set, Serializable {
 

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityListImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityListImpl.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityListImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityListImpl.java Wed Mar  9 21:50:30 2005
@@ -19,12 +19,15 @@
 
 package org.apache.pluto.portalImpl.om.entity.impl;
 
-import org.apache.pluto.om.common.ObjectID;
-import org.apache.pluto.om.entity.*;
-import org.apache.pluto.util.StringUtils;
-import java.util.*;
+import java.util.Iterator;
 
+import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.entity.PortletApplicationEntity;
+import org.apache.pluto.om.entity.PortletEntity;
+import org.apache.pluto.om.entity.PortletEntityList;
+import org.apache.pluto.om.entity.PortletEntityListCtrl;
 import org.apache.pluto.portalImpl.om.common.AbstractSupportSet;
+import org.apache.pluto.util.StringUtils;
 
 public class PortletEntityListImpl extends AbstractSupportSet
     implements PortletEntityList, PortletEntityListCtrl, java.io.Serializable {

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/page/Fragment.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/page/Fragment.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/page/Fragment.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/page/Fragment.java Wed Mar  9 21:50:30 2005
@@ -19,7 +19,7 @@
 
 package org.apache.pluto.portalImpl.om.page;
 
-import java.util.*;
+import java.util.Collection;
 
 /**
  * <P>

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/portlet/impl/PortletApplicationDefinitionListImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/portlet/impl/PortletApplicationDefinitionListImpl.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/portlet/impl/PortletApplicationDefinitionListImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/portlet/impl/PortletApplicationDefinitionListImpl.java Wed Mar  9 21:50:30 2005
@@ -19,10 +19,13 @@
 
 package org.apache.pluto.portalImpl.om.portlet.impl;
 
+import java.util.HashSet;
+import java.util.Iterator;
+
 import org.apache.pluto.om.common.ObjectID;
-import org.apache.pluto.om.portlet.*;
+import org.apache.pluto.om.portlet.PortletApplicationDefinition;
+import org.apache.pluto.om.portlet.PortletApplicationDefinitionList;
 import org.apache.pluto.util.StringUtils;
-import java.util.*;
 
 public class PortletApplicationDefinitionListImpl extends HashSet
 implements PortletApplicationDefinitionList, java.io.Serializable {

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowImpl.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowImpl.java Wed Mar  9 21:50:30 2005
@@ -19,9 +19,10 @@
 
 package org.apache.pluto.portalImpl.om.window.impl;
 
-import org.apache.pluto.om.window.*;
-import org.apache.pluto.om.entity.*;
 import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.entity.PortletEntity;
+import org.apache.pluto.om.window.PortletWindow;
+import org.apache.pluto.om.window.PortletWindowCtrl;
 
 public class PortletWindowImpl implements PortletWindow, PortletWindowCtrl {
         

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowListImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowListImpl.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowListImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/window/impl/PortletWindowListImpl.java Wed Mar  9 21:50:30 2005
@@ -19,9 +19,12 @@
 
 package org.apache.pluto.portalImpl.om.window.impl;
 
-import java.util.*;
-import org.apache.pluto.om.window.*;
+import java.util.HashMap;
+
 import org.apache.pluto.om.common.ObjectID;
+import org.apache.pluto.om.window.PortletWindow;
+import org.apache.pluto.om.window.PortletWindowList;
+import org.apache.pluto.om.window.PortletWindowListCtrl;
 
 public class PortletWindowListImpl implements PortletWindowList, PortletWindowListCtrl {
 

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/ServiceManager.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/ServiceManager.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/ServiceManager.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/ServiceManager.java Wed Mar  9 21:50:30 2005
@@ -19,14 +19,19 @@
 
 package org.apache.pluto.portalImpl.services;
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 
-import org.apache.pluto.util.StringUtils;
 import org.apache.pluto.portalImpl.util.Properties;
+import org.apache.pluto.util.StringUtils;
 
 /**
  * Manages the life-time of services registered during servlet startup.

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/factorymanager/FactoryManager.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/factorymanager/FactoryManager.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/factorymanager/FactoryManager.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/factorymanager/FactoryManager.java Wed Mar  9 21:50:30 2005
@@ -20,7 +20,6 @@
 package org.apache.pluto.portalImpl.services.factorymanager;
 
 import org.apache.pluto.factory.Factory;
-
 import org.apache.pluto.portalImpl.services.ServiceManager;
 
 /**

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/factorymanager/FactoryManagerService.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/factorymanager/FactoryManagerService.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/factorymanager/FactoryManagerService.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/factorymanager/FactoryManagerService.java Wed Mar  9 21:50:30 2005
@@ -20,7 +20,6 @@
 package org.apache.pluto.portalImpl.services.factorymanager;
 
 import org.apache.pluto.factory.Factory;
-
 import org.apache.pluto.portalImpl.services.Service;
 
 /**

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/log/LogServiceImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/log/LogServiceImpl.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/log/LogServiceImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/log/LogServiceImpl.java Wed Mar  9 21:50:30 2005
@@ -19,8 +19,8 @@
 
 package org.apache.pluto.portalImpl.services.log;
 
-import org.apache.pluto.services.log.Logger;
 import org.apache.commons.logging.LogFactory;
+import org.apache.pluto.services.log.Logger;
 
 /** LogService implementation which uses Commons Logging.
  *  The use of commons logging provides us with a simple yet

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/portletdefinitionregistry/PortletDefinitionRegistryServiceContextImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/portletdefinitionregistry/PortletDefinitionRegistryServiceContextImpl.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/portletdefinitionregistry/PortletDefinitionRegistryServiceContextImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/portletdefinitionregistry/PortletDefinitionRegistryServiceContextImpl.java Wed Mar  9 21:50:30 2005
@@ -26,17 +26,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Vector;
+
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.UnavailableException;
 
-import org.exolab.castor.mapping.Mapping;
-import org.exolab.castor.mapping.MappingException;
-import org.exolab.castor.xml.MarshalException;
-import org.exolab.castor.xml.Unmarshaller;
-import org.exolab.castor.xml.ValidationException;
-import org.xml.sax.InputSource;
-
 import org.apache.pluto.om.common.ObjectID;
 import org.apache.pluto.om.portlet.PortletApplicationDefinition;
 import org.apache.pluto.om.portlet.PortletApplicationDefinitionList;
@@ -47,6 +41,12 @@
 import org.apache.pluto.portalImpl.util.Properties;
 import org.apache.pluto.portalImpl.xml.Constants;
 import org.apache.pluto.portalImpl.xml.XmlParser.EntityResolver;
+import org.exolab.castor.mapping.Mapping;
+import org.exolab.castor.mapping.MappingException;
+import org.exolab.castor.xml.MarshalException;
+import org.exolab.castor.xml.Unmarshaller;
+import org.exolab.castor.xml.ValidationException;
+import org.xml.sax.InputSource;
 
 /**
  * A version of the registry service that obtains data from a ServletContext

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactory.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactory.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactory.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactory.java Wed Mar  9 21:50:30 2005
@@ -20,6 +20,7 @@
 package org.apache.pluto.portalImpl.servlet;
 
 import javax.servlet.http.HttpServletRequest;
+
 import org.apache.pluto.om.window.PortletWindow;
 
 public interface ServletRequestFactory extends org.apache.pluto.factory.Factory

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactoryImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactoryImpl.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactoryImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletRequestFactoryImpl.java Wed Mar  9 21:50:30 2005
@@ -20,6 +20,7 @@
 package org.apache.pluto.portalImpl.servlet;
 
 import javax.servlet.http.HttpServletRequest;
+
 import org.apache.pluto.om.window.PortletWindow;
 
 public class ServletRequestFactoryImpl implements ServletRequestFactory

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseImpl.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/ServletResponseImpl.java Wed Mar  9 21:50:30 2005
@@ -19,7 +19,7 @@
 
 package org.apache.pluto.portalImpl.servlet;
 
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletResponse;
 
 public class ServletResponseImpl extends javax.servlet.http.HttpServletResponseWrapper 
 {

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/StoredServletResponseImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/StoredServletResponseImpl.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/StoredServletResponseImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/servlet/StoredServletResponseImpl.java Wed Mar  9 21:50:30 2005
@@ -22,7 +22,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletResponse;
 
 public class StoredServletResponseImpl extends ServletResponseImpl 
 {

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java Wed Mar  9 21:50:30 2005
@@ -19,11 +19,11 @@
 
 package org.apache.pluto.portalImpl.util;
 
-import org.apache.pluto.util.StringUtils;
-
-import java.util.List;
-import java.util.LinkedList;
 import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.pluto.util.StringUtils;
 
 /**
  ** This class collects name/value pairs and provides

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java Wed Mar  9 21:50:30 2005
@@ -19,7 +19,9 @@
 
 package org.apache.pluto.portalImpl.util;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 
 /**
  ** Wraps around the internal Object IDs. By holding both

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Properties.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Properties.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Properties.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Properties.java Wed Mar  9 21:50:30 2005
@@ -19,11 +19,10 @@
 
 package org.apache.pluto.portalImpl.util;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.BufferedReader;
-
 import java.util.Iterator;
 
 /**

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/ControllerPortlet.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/ControllerPortlet.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/ControllerPortlet.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/ControllerPortlet.java Wed Mar  9 21:50:30 2005
@@ -20,13 +20,13 @@
 import java.util.Properties;
 
 import javax.portlet.GenericPortlet;
+import javax.portlet.PortletConfig;
 import javax.portlet.PortletContext;
 import javax.portlet.PortletException;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletRequestDispatcher;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletConfig;
 
 import org.apache.pluto.portlet.admin.PlutoAdminConstants;
 import org.apache.pluto.portlet.admin.util.PlutoAdminContext;

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/DeployWarPortlet.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/DeployWarPortlet.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/DeployWarPortlet.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/DeployWarPortlet.java Wed Mar  9 21:50:30 2005
@@ -19,11 +19,11 @@
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletMode;
 import javax.portlet.PortletSession;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.portlet.PortletException;
-import javax.portlet.PortletMode;
 
 import org.apache.pluto.portlet.admin.PlutoAdminConstants;
 import org.apache.pluto.portlet.admin.bean.PageTO;

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/PageRegistryPortlet.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/PageRegistryPortlet.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/PageRegistryPortlet.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/PageRegistryPortlet.java Wed Mar  9 21:50:30 2005
@@ -25,7 +25,6 @@
 
 import org.apache.pluto.portlet.admin.PlutoAdminConstants;
 import org.apache.pluto.portlet.admin.services.PageRegistryService;
-import org.apache.pluto.portlet.admin.controller.ControllerPortlet;
 
 /**
  * PageRegistryPortlet

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PageRegistryXao.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PageRegistryXao.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PageRegistryXao.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PageRegistryXao.java Wed Mar  9 21:50:30 2005
@@ -22,13 +22,12 @@
 
 import org.apache.pluto.portalImpl.om.page.impl.FragmentImpl;
 import org.apache.pluto.portalImpl.om.page.impl.PortalImpl;
-import org.exolab.castor.mapping.Mapping;
-import org.exolab.castor.xml.Marshaller;
-import org.exolab.castor.xml.Unmarshaller;
-
 import org.apache.pluto.portlet.admin.BaseAdminObject;
 import org.apache.pluto.portlet.admin.PlutoAdminException;
 import org.apache.pluto.portlet.admin.util.PlutoAdminContext;
+import org.exolab.castor.mapping.Mapping;
+import org.exolab.castor.xml.Marshaller;
+import org.exolab.castor.xml.Unmarshaller;
 
 /**
  *

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PortletEntityRegistryXao.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PortletEntityRegistryXao.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PortletEntityRegistryXao.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PortletEntityRegistryXao.java Wed Mar  9 21:50:30 2005
@@ -20,16 +20,17 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+
 import org.apache.pluto.portalImpl.om.entity.impl.PortletApplicationEntityImpl;
 import org.apache.pluto.portalImpl.om.entity.impl.PortletApplicationEntityListImpl;
 import org.apache.pluto.portalImpl.om.entity.impl.PortletEntityImpl;
-import org.exolab.castor.mapping.Mapping;
-import org.exolab.castor.xml.Marshaller;
-import org.exolab.castor.xml.Unmarshaller;
-import org.apache.pluto.portlet.admin.PlutoAdminException;
 import org.apache.pluto.portlet.admin.BaseAdminObject;
+import org.apache.pluto.portlet.admin.PlutoAdminException;
 import org.apache.pluto.portlet.admin.util.PlutoAdminContext;
 import org.apache.pluto.util.StringUtils;
+import org.exolab.castor.mapping.Mapping;
+import org.exolab.castor.xml.Marshaller;
+import org.exolab.castor.xml.Unmarshaller;
 
 /**
  * This class is used to access and store data in the portletentityregistry.xml file.

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/DeployWarService.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/DeployWarService.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/DeployWarService.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/DeployWarService.java Wed Mar  9 21:50:30 2005
@@ -139,7 +139,6 @@
 										ArrayList  argList = createDeploymentArgs(serverFileName, tempDir, request, appExists);
 										Map pmap = (HashMap) request.getPortletSession().getAttribute(PlutoAdminConstants.PORTLET_MAP_ATTR);
 										logDebug(METHOD_NAME, "pmap: " + mapToEntrySetString(pmap));
-										System.out.println("pmap: " + mapToEntrySetString(pmap));
 										String[] args = arrayListToStringArray(argList);
 										for (int i =0; i < args.length; i++) {
 											logDebug(METHOD_NAME, "args["+i+"]="+args[i]);

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PageRegistryService.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PageRegistryService.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PageRegistryService.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PageRegistryService.java Wed Mar  9 21:50:30 2005
@@ -25,8 +25,8 @@
 import javax.portlet.ActionRequest;
 import javax.portlet.RenderRequest;
 
-import org.apache.pluto.portalImpl.om.page.impl.PortalImpl;
 import org.apache.pluto.portalImpl.om.page.impl.FragmentImpl;
+import org.apache.pluto.portalImpl.om.page.impl.PortalImpl;
 import org.apache.pluto.portlet.admin.BaseAdminObject;
 import org.apache.pluto.portlet.admin.PlutoAdminConstants;
 import org.apache.pluto.portlet.admin.PlutoAdminException;

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PortletNameFinder.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PortletNameFinder.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PortletNameFinder.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PortletNameFinder.java Wed Mar  9 21:50:30 2005
@@ -15,19 +15,12 @@
  */
 package org.apache.pluto.portlet.admin.services;
 
-import java.io.InputStream;
 import java.io.IOException;
-import java.io.PrintWriter;
+import java.io.InputStream;
 import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 import java.util.ArrayList;
 
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.SAXException;
-
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -35,6 +28,11 @@
 import org.apache.pluto.portlet.admin.PlutoAdminConstants;
 import org.apache.pluto.portlet.admin.PlutoAdminException;
 import org.apache.pluto.portlet.admin.PlutoAdminLogger;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 /**
  *

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/taglib/PortletSelectTag.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/taglib/PortletSelectTag.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/taglib/PortletSelectTag.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/taglib/PortletSelectTag.java Wed Mar  9 21:50:30 2005
@@ -16,8 +16,8 @@
 package org.apache.pluto.portlet.admin.taglib;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/util/PlutoAdminContext.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/util/PlutoAdminContext.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/util/PlutoAdminContext.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/util/PlutoAdminContext.java Wed Mar  9 21:50:30 2005
@@ -21,9 +21,9 @@
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.pluto.portlet.admin.PlutoAdminConstants;
 import org.apache.pluto.portlet.admin.PlutoAdminException;
 import org.apache.pluto.portlet.admin.PlutoAdminLogger;
-import org.apache.pluto.portlet.admin.PlutoAdminConstants;
 
 /**
  * A singleton factory that holds methods to get various data on

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/core/impl/PreferencesValidatorImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/core/impl/PreferencesValidatorImpl.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/core/impl/PreferencesValidatorImpl.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/core/impl/PreferencesValidatorImpl.java Wed Mar  9 21:50:30 2005
@@ -19,8 +19,13 @@
 
 package org.apache.pluto.core.impl;
 
-import javax.portlet.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+
+import javax.portlet.PortletPreferences;
+import javax.portlet.PreferencesValidator;
+import javax.portlet.ValidatorException;
 
 public class PreferencesValidatorImpl implements PreferencesValidator
 {

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/TestConfig.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/TestConfig.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/TestConfig.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/TestConfig.java Wed Mar  9 21:50:30 2005
@@ -15,8 +15,8 @@
  */
 package org.apache.pluto.portalImpl.portlet;
 
-import java.util.Map;
 import java.util.Collections;
+import java.util.Map;
 
 /**
  * TestPortlet Configuration.

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/TestConfigFactory.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/TestConfigFactory.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/TestConfigFactory.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/TestConfigFactory.java Wed Mar  9 21:50:30 2005
@@ -15,8 +15,8 @@
  */
 package org.apache.pluto.portalImpl.portlet;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 
 import org.apache.commons.digester.Digester;

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/TestPortlet.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/TestPortlet.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/TestPortlet.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/TestPortlet.java Wed Mar  9 21:50:30 2005
@@ -19,18 +19,29 @@
 
 package org.apache.pluto.portalImpl.portlet;
 
-import javax.portlet.*;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Map;
-import java.util.List;
-import java.util.Iterator;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletSession;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
 
-import org.apache.pluto.portalImpl.portlet.test.PortletTest;
-import org.apache.pluto.portalImpl.portlet.test.TestResults;
 import org.apache.pluto.portalImpl.portlet.test.ActionTest;
 import org.apache.pluto.portalImpl.portlet.test.NoOpTest;
+import org.apache.pluto.portalImpl.portlet.test.PortletTest;
+import org.apache.pluto.portalImpl.portlet.test.TestResults;
 
 public class TestPortlet extends GenericPortlet {
 
@@ -139,9 +150,6 @@
                 TestConfig next = null;
                 TestConfig prev = null;
                 int index = configs.indexOf(test.getConfig());
-                System.out.println("Index: "+index);
-                System.out.println("test: "+test);
-                System.out.println("testConfig: "+test.getConfig());
                 if(index==0) {
                     prev = (TestConfig)configs.get(configs.size()-1);
                     next = (TestConfig)configs.get(index+1);

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/AbstractReflectivePortletTest.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/AbstractReflectivePortletTest.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/AbstractReflectivePortletTest.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/AbstractReflectivePortletTest.java Wed Mar  9 21:50:30 2005
@@ -15,15 +15,15 @@
  */
 package org.apache.pluto.portalImpl.portlet.test;
 
-import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Map;
 
+import javax.portlet.PortletConfig;
 import javax.portlet.PortletContext;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletResponse;
 import javax.portlet.PortletSession;
-import javax.portlet.PortletConfig;
 
 import org.apache.pluto.portalImpl.portlet.TestConfig;
 

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ComplexAttributeTest.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ComplexAttributeTest.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ComplexAttributeTest.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ComplexAttributeTest.java Wed Mar  9 21:50:30 2005
@@ -18,9 +18,9 @@
 
 import java.util.Map;
 
-import javax.portlet.PortletContext;
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
+import javax.portlet.PortletContext;
 import javax.portlet.PortletSession;
 
 /**

Added: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/DispatcherRenderParameterTest.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/DispatcherRenderParameterTest.java?view=auto&rev=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/DispatcherRenderParameterTest.java (added)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/DispatcherRenderParameterTest.java Wed Mar  9 21:50:30 2005
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.portalImpl.portlet.test;
+
+import java.io.IOException;
+
+import javax.portlet.PortletContext;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletResponse;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+/**
+ * <B>TODO</B>: Document
+ * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
+ * @version 1.0
+ * @since Mar 9, 2005
+ */
+public class DispatcherRenderParameterTest 
+    extends AbstractReflectivePortletTest  {
+
+    public static final String KEY_A = "includedTestKey";
+    public static final String VAL_A = "includedTestVal";
+    public static final String KEY_B = "bTestKey";
+    public static final String VAL_B = "bTestVal";
+    public static final String RESULT_KEY = "org.apache.pluto.testsuite.RESULTKEY";
+    
+
+    public DispatcherRenderParameterTest() {
+
+    }
+
+    public String getTestSuiteName() {
+        return "Dispatcher Render Parameter Test";
+    }
+    
+    protected TestResult checkIncludedParameterTest(PortletContext ctx,
+                                                    PortletRequest req,
+                                                    PortletResponse res)
+    throws IOException, PortletException {
+        PortletRequestDispatcher disp =
+            ctx.getRequestDispatcher("/tests/include?"+KEY_A+"="+VAL_A+"&"+KEY_B+"="+VAL_B);
+        
+        disp.include((RenderRequest)req, (RenderResponse)res);
+
+        TestResult result = new TestResult();
+        result.setName("Dispatcher Render Parameter Test");
+        result.setDesc("Ensure query parameters added during dispatching are attached to the request.");
+        if(req.getAttribute(RESULT_KEY)!=null && Boolean.TRUE.equals(req.getAttribute(RESULT_KEY))) {
+            result.setReturnCode(TestResult.PASSED);
+        }
+        else {
+            result.setReturnCode(TestResult.FAILED);
+            result.setResults("Unable to find expected parameter");
+        }
+        return result;
+    }
+    
+
+}
+

Added: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/DispatcherRenderParameterTestServlet.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/DispatcherRenderParameterTestServlet.java?view=auto&rev=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/DispatcherRenderParameterTestServlet.java (added)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/DispatcherRenderParameterTestServlet.java Wed Mar  9 21:50:30 2005
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.portalImpl.portlet.test;
+
+import java.io.IOException;
+
+import javax.servlet.GenericServlet;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+/**
+ * <B>TODO</B>: Document
+ * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
+ * @version 1.0
+ * @since Mar 9, 2005
+ */
+public class DispatcherRenderParameterTestServlet extends GenericServlet {
+
+    public DispatcherRenderParameterTestServlet() {
+
+    }
+
+    public void service(ServletRequest req, ServletResponse res)
+    throws ServletException, IOException {
+        String valA = req.getParameter(DispatcherRenderParameterTest.KEY_A);
+        String valB = req.getParameter(DispatcherRenderParameterTest.KEY_B);
+        if(DispatcherRenderParameterTest.VAL_A.equals(valA) && DispatcherRenderParameterTest.VAL_B.equals(valB)) {
+            req.setAttribute(DispatcherRenderParameterTest.RESULT_KEY, Boolean.TRUE);
+        }
+    }
+
+    public String getServletInfo() {
+        return "Dispather Render Parameter Include Servlet";
+    }
+
+}
+

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ExternalAppScopedAttributeTestCompanionServlet.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ExternalAppScopedAttributeTestCompanionServlet.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ExternalAppScopedAttributeTestCompanionServlet.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ExternalAppScopedAttributeTestCompanionServlet.java Wed Mar  9 21:50:30 2005
@@ -17,12 +17,12 @@
 
 import java.io.IOException;
 
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
 
 /**
  * @author <a href="ddewolf@apache.org">David H. DeWolf</a>

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/MiscTest.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/MiscTest.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/MiscTest.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/MiscTest.java Wed Mar  9 21:50:30 2005
@@ -15,13 +15,13 @@
  */
 package org.apache.pluto.portalImpl.portlet.test;
 
-import java.util.Properties;
 import java.util.Enumeration;
+import java.util.Properties;
 
-import javax.portlet.PortletRequest;
+import javax.portlet.PortletContext;
 import javax.portlet.PortletMode;
+import javax.portlet.PortletRequest;
 import javax.portlet.WindowState;
-import javax.portlet.PortletContext;
 
 import org.apache.pluto.testsuite.ExpectedResults;
 

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/NoOpTest.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/NoOpTest.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/NoOpTest.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/NoOpTest.java Wed Mar  9 21:50:30 2005
@@ -17,9 +17,9 @@
 
 import java.util.Map;
 
-import javax.portlet.PortletRequest;
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletContext;
+import javax.portlet.PortletRequest;
 import javax.portlet.PortletResponse;
 
 import org.apache.pluto.portalImpl.portlet.TestConfig;

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/PortletTest.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/PortletTest.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/PortletTest.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/PortletTest.java Wed Mar  9 21:50:30 2005
@@ -18,10 +18,10 @@
 
 import java.util.Map;
 
-import javax.portlet.PortletResponse;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletContext;
 import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
 
 import org.apache.pluto.portalImpl.portlet.TestConfig;
 

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ResourceBundleTest.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ResourceBundleTest.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ResourceBundleTest.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ResourceBundleTest.java Wed Mar  9 21:50:30 2005
@@ -15,19 +15,19 @@
  */
 package org.apache.pluto.portalImpl.portlet.test;
 
+import java.util.ArrayList;
 import java.util.Enumeration;
-import java.util.Map;
 import java.util.HashMap;
-import java.util.ResourceBundle;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Locale;
+import java.util.Map;
+import java.util.ResourceBundle;
 
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletContext;
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletRequest;
 
 /**
  * Tests basic attribute retrieval and storage functions within

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SecurityMappingTest.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SecurityMappingTest.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SecurityMappingTest.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SecurityMappingTest.java Wed Mar  9 21:50:30 2005
@@ -18,9 +18,9 @@
 import java.util.Map;
 import java.util.Properties;
 
-import javax.portlet.PortletContext;
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
+import javax.portlet.PortletContext;
 import javax.portlet.PortletRequest;
 
 import org.apache.pluto.testsuite.ExpectedResults;

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleActionParameterTest.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleActionParameterTest.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleActionParameterTest.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleActionParameterTest.java Wed Mar  9 21:50:30 2005
@@ -15,8 +15,8 @@
  */
 package org.apache.pluto.portalImpl.portlet.test;
 
-import java.util.Map;
 import java.util.Enumeration;
+import java.util.Map;
 
 import javax.portlet.PortletRequest;
 

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java Wed Mar  9 21:50:30 2005
@@ -16,14 +16,14 @@
 package org.apache.pluto.portalImpl.portlet.test;
 
 import java.util.Enumeration;
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-import javax.portlet.PortletContext;
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletSession;
 
 /**
  * Tests basic attribute retrieval and storage functions within

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java Wed Mar  9 21:50:30 2005
@@ -15,9 +15,9 @@
  */
 package org.apache.pluto.portalImpl.portlet.test;
 
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.portlet.PortletRequest;
 

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimplePreferenceTest.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimplePreferenceTest.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimplePreferenceTest.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimplePreferenceTest.java Wed Mar  9 21:50:30 2005
@@ -15,12 +15,12 @@
  */
 package org.apache.pluto.portalImpl.portlet.test;
 
-import java.util.Map;
-import java.util.Enumeration;
 import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Map;
 
-import javax.portlet.PortletRequest;
 import javax.portlet.PortletPreferences;
+import javax.portlet.PortletRequest;
 import javax.portlet.ReadOnlyException;
 import javax.portlet.ValidatorException;
 

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleRenderParameterTest.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleRenderParameterTest.java?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleRenderParameterTest.java (original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleRenderParameterTest.java Wed Mar  9 21:50:30 2005
@@ -15,9 +15,9 @@
  */
 package org.apache.pluto.portalImpl.portlet.test;
 
-import java.util.Map;
-import java.util.HashMap;
 import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.portlet.PortletRequest;
 

Modified: portals/pluto/trunk/testsuite/src/webapp/WEB-INF/testsuite-2-config.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/webapp/WEB-INF/testsuite-2-config.xml?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/webapp/WEB-INF/testsuite-2-config.xml (original)
+++ portals/pluto/trunk/testsuite/src/webapp/WEB-INF/testsuite-2-config.xml Wed Mar  9 21:50:30 2005
@@ -34,6 +34,12 @@
       <value>org.apache.pluto.testsuite.PARAM_TEST_VALUE</value>
     </action-param>
   </testsuite-config>
+    
+  <testsuite-config>
+    <name>Dispatcher Parameter Test</name>
+    <class>org.apache.pluto.portalImpl.portlet.test.DispatcherRenderParameterTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
 
   <testsuite-config>
     <name>Simple Attribute Test</name>

Modified: portals/pluto/trunk/testsuite/src/webapp/WEB-INF/testsuite-config.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/webapp/WEB-INF/testsuite-config.xml?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/webapp/WEB-INF/testsuite-config.xml (original)
+++ portals/pluto/trunk/testsuite/src/webapp/WEB-INF/testsuite-config.xml Wed Mar  9 21:50:30 2005
@@ -36,6 +36,12 @@
   </testsuite-config>
 
   <testsuite-config>
+    <name>Dispatcher Parameter Test</name>
+    <class>org.apache.pluto.portalImpl.portlet.test.DispatcherRenderParameterTest</class>
+    <display-uri>/jsp/test_results.jsp</display-uri>
+  </testsuite-config>
+
+  <testsuite-config>
     <name>Simple Attribute Test</name>
     <class>org.apache.pluto.portalImpl.portlet.test.SimpleAttributeTest</class>
     <display-uri>/jsp/test_results.jsp</display-uri>

Modified: portals/pluto/trunk/testsuite/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/webapp/WEB-INF/web.xml?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/webapp/WEB-INF/web.xml (original)
+++ portals/pluto/trunk/testsuite/src/webapp/WEB-INF/web.xml Wed Mar  9 21:50:30 2005
@@ -38,9 +38,19 @@
         <servlet-class>org.apache.pluto.portalImpl.portlet.test.ExternalAppScopedAttributeTestCompanionServlet</servlet-class>
     </servlet>
 
+    <servlet>
+        <servlet-name>includeTest</servlet-name>
+        <servlet-class>org.apache.pluto.portalImpl.portlet.test.DispatcherRenderParameterTestServlet</servlet-class>
+    </servlet>
+
     <servlet-mapping>
         <servlet-name>extAppScopedTest</servlet-name>
         <url-pattern>/test/extAppScopedTest</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+      <servlet-name>includeTest</servlet-name>
+      <url-pattern>/tests/include</url-pattern>
     </servlet-mapping>
 
     <security-role>

Modified: portals/pluto/trunk/testsuite/src/webapp/jsp/navigation.inc
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/webapp/jsp/navigation.inc?view=diff&r1=156742&r2=156743
==============================================================================
--- portals/pluto/trunk/testsuite/src/webapp/jsp/navigation.inc (original)
+++ portals/pluto/trunk/testsuite/src/webapp/jsp/navigation.inc Wed Mar  9 21:50:30 2005
@@ -28,8 +28,6 @@
 	<portlet:param name="nextTestId" value="<%=renderRequest.getParameter("testId") %>"/>
       <c:forEach var="param" items="${prevTest.actionParameters}">
         <% Map.Entry parm = ((Map.Entry)pageContext.findAttribute("param")); %>
-        <% System.out.println("parm.key: "+parm.getKey()); %>
-         <% System.out.println("parm.key: "+parm.getValue()); %>
         <portlet:param name="<%=parm.getKey().toString()%>" value="<%=parm.getValue().toString()%>"/>
       </c:forEach>
 </portlet:actionURL>