[pfc-cvs-commit] pfc-rt/src/java/portal/rt/servlet PortalHeartBeat.java, 1.3, 1.4 PortalProcess.java, 1.1, 1.2 JavaScriptServlet.java, 1.1, 1.2 StartPortalInstance.java, 1.1, 1.2 ProcessUtils.java, 1.3, 1.4 RenderPortal.java, 1.1, 1.2 ServletPortalContext.java, 1.2, 1.3 WARStylesheetProvider.java, 1.2, 1.3 PortalProcessException.java, 1.1, 1.2 StylesheetServlet.java, 1.1, 1.2 FileStylesheetProvider.java, 1.2, 1.3 BasePortalServlet.java, 1.3, 1.4 RequestParameters.java, 1.2, 1.3

[Bavo De R. <ba...@us...>]

Update of /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv11634/src/java/portal/rt/servlet

Modified Files:
	PortalHeartBeat.java PortalProcess.java JavaScriptServlet.java 
	StartPortalInstance.java ProcessUtils.java RenderPortal.java 
	ServletPortalContext.java WARStylesheetProvider.java 
	PortalProcessException.java StylesheetServlet.java 
	FileStylesheetProvider.java BasePortalServlet.java 
	RequestParameters.java 
Log Message:
Refactored to support generics.
Added a default serialization id for all serializable classes.

Index: StylesheetServlet.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/StylesheetServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StylesheetServlet.java	13 Sep 2005 11:28:01 -0000	1.1
--- StylesheetServlet.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 40,43 ****
--- 40,45 ----
  public class StylesheetServlet extends HttpServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(StylesheetServlet.class);
  

Index: JavaScriptServlet.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/JavaScriptServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JavaScriptServlet.java	13 Sep 2005 11:28:01 -0000	1.1
--- JavaScriptServlet.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 37,40 ****
--- 37,42 ----
  public class JavaScriptServlet extends HttpServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final int STREAM_BUFFER_SIZE = 1024;
  	private static final int EOF = -1;
***************
*** 49,53 ****
  			ServletContext context = getServletConfig().getServletContext();
  
! 			Set scripts = context.getResourcePaths(SCRIPT_RESOURCE_PATH);
  
  			prepareResponse(request, response);
--- 51,55 ----
  			ServletContext context = getServletConfig().getServletContext();
  
! 			Set<?> scripts = context.getResourcePaths(SCRIPT_RESOURCE_PATH);
  
  			prepareResponse(request, response);
***************
*** 69,73 ****
  	}
  
! 	private void sendResources(Set resources,
  			HttpServletRequest request,
  			HttpServletResponse response) throws ServletException, IOException
--- 71,75 ----
  	}
  
! 	private void sendResources(Set<?> resources,
  			HttpServletRequest request,
  			HttpServletResponse response) throws ServletException, IOException
***************
*** 75,79 ****
  		ServletContext context = getServletConfig().getServletContext();
  
! 		Iterator it = resources.iterator();
  
  		while (it.hasNext())
--- 77,81 ----
  		ServletContext context = getServletConfig().getServletContext();
  
! 		Iterator<?> it = resources.iterator();
  
  		while (it.hasNext())

Index: ServletPortalContext.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/ServletPortalContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ServletPortalContext.java	23 Sep 2005 05:57:17 -0000	1.2
--- ServletPortalContext.java	7 Aug 2010 11:06:58 -0000	1.3
***************
*** 24,28 ****
  
  import java.security.Principal;
! import java.util.Hashtable;
  
  import org.apache.commons.logging.Log;
--- 24,29 ----
  
  import java.security.Principal;
! import java.util.HashMap;
! import java.util.Map;
  
  import org.apache.commons.logging.Log;
***************
*** 48,52 ****
  	{
  		_browserDevice = pBrowserDevice;
! 		_initParams = new Hashtable();
  	}
  
--- 49,53 ----
  	{
  		_browserDevice = pBrowserDevice;
! 		_initParams = new HashMap<String,String>();
  	}
  
***************
*** 110,113 ****
  	private BrowserDevice _browserDevice;
  	private Principal _userPrincipal;
! 	private Hashtable _initParams;
  }
\ No newline at end of file
--- 111,114 ----
  	private BrowserDevice _browserDevice;
  	private Principal _userPrincipal;
! 	private Map<String,String> _initParams;
  }
\ No newline at end of file

Index: ProcessUtils.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/ProcessUtils.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ProcessUtils.java	15 Feb 2006 20:47:04 -0000	1.3
--- ProcessUtils.java	7 Aug 2010 11:06:58 -0000	1.4
***************
*** 63,67 ****
  		pLog.debug("start request dump");
  
! 		Enumeration paramEnum = request.getParameterNames();
  
  		while (paramEnum.hasMoreElements())
--- 63,67 ----
  		pLog.debug("start request dump");
  
! 		Enumeration<?> paramEnum = request.getParameterNames();
  
  		while (paramEnum.hasMoreElements())

Index: StartPortalInstance.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/StartPortalInstance.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StartPortalInstance.java	13 Sep 2005 11:28:01 -0000	1.1
--- StartPortalInstance.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 30,33 ****
--- 30,35 ----
  public final class StartPortalInstance extends BasePortalServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(StartPortalInstance.class);
  

Index: WARStylesheetProvider.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/WARStylesheetProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WARStylesheetProvider.java	15 Feb 2006 20:47:04 -0000	1.2
--- WARStylesheetProvider.java	7 Aug 2010 11:06:58 -0000	1.3
***************
*** 67,71 ****
  			ServletContext context = getServletConfig().getServletContext();
  
! 			Set sheets = context.getResourcePaths(SHEET_RESOURCE_PATH);
  
  			_sheetsContents = fetchSheets(sheets).toString();
--- 67,71 ----
  			ServletContext context = getServletConfig().getServletContext();
  
! 			Set<?> sheets = context.getResourcePaths(SHEET_RESOURCE_PATH);
  
  			_sheetsContents = fetchSheets(sheets).toString();
***************
*** 84,88 ****
  	}
  
! 	private StringBuffer fetchSheets(Set resources) throws ServletException,
  			IOException
  	{
--- 84,88 ----
  	}
  
! 	private StringBuffer fetchSheets(Set<?> resources) throws ServletException,
  			IOException
  	{
***************
*** 91,95 ****
  		StringWriter stringWriter = new StringWriter();
  
! 		Iterator it = resources.iterator();
  
  		while (it.hasNext())
--- 91,95 ----
  		StringWriter stringWriter = new StringWriter();
  
! 		Iterator<?> it = resources.iterator();
  
  		while (it.hasNext())

Index: RequestParameters.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/RequestParameters.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RequestParameters.java	15 Feb 2006 20:47:04 -0000	1.2
--- RequestParameters.java	7 Aug 2010 11:06:58 -0000	1.3
***************
*** 64,72 ****
  	public boolean isFormField(String paramName)
  	{
! 		Iterator it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = (FileItem) it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
--- 64,72 ----
  	public boolean isFormField(String paramName)
  	{
! 		Iterator<FileItem> it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
***************
*** 82,90 ****
  	public FileItem getFile(String paramName)
  	{
! 		Iterator it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = (FileItem) it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
--- 82,90 ----
  	public FileItem getFile(String paramName)
  	{
! 		Iterator<FileItem> it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
***************
*** 112,122 ****
  	public String[] getParameterValues(String paramName)
  	{
! 		LinkedList result = new LinkedList();
  
! 		Iterator it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = (FileItem) it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
--- 112,122 ----
  	public String[] getParameterValues(String paramName)
  	{
! 		List<String> result = new LinkedList<String>();
  
! 		Iterator<FileItem> it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
***************
*** 139,147 ****
  	public String getParameter(String paramName)
  	{
! 		Iterator it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = (FileItem) it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
--- 139,147 ----
  	public String getParameter(String paramName)
  	{
! 		Iterator<FileItem> it = _items.iterator();
  
  		while (it.hasNext())
  		{
! 			FileItem fileItem = it.next();
  
  			if (fileItem.getFieldName().equals(paramName)
***************
*** 187,190 ****
  
  	private FileUpload _fileUpload;
! 	private List _items;
  }
\ No newline at end of file
--- 187,190 ----
  
  	private FileUpload _fileUpload;
! 	private List<FileItem> _items;
  }
\ No newline at end of file

Index: PortalProcessException.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/PortalProcessException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PortalProcessException.java	13 Sep 2005 11:28:01 -0000	1.1
--- PortalProcessException.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 25,28 ****
--- 25,30 ----
  public class PortalProcessException extends Exception
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	public PortalProcessException(String msg)
  	{

Index: PortalHeartBeat.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/PortalHeartBeat.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PortalHeartBeat.java	15 Feb 2006 20:47:04 -0000	1.3
--- PortalHeartBeat.java	7 Aug 2010 11:06:58 -0000	1.4
***************
*** 34,37 ****
--- 34,39 ----
  public class PortalHeartBeat extends BasePortalServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(PortalHeartBeat.class);
  

Index: RenderPortal.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/RenderPortal.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RenderPortal.java	13 Sep 2005 11:28:01 -0000	1.1
--- RenderPortal.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 36,39 ****
--- 36,41 ----
  public class RenderPortal extends BasePortalServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final int BYTE_PER_KB = 1024;
  

Index: BasePortalServlet.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/BasePortalServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BasePortalServlet.java	15 Feb 2006 20:47:04 -0000	1.3
--- BasePortalServlet.java	7 Aug 2010 11:06:58 -0000	1.4
***************
*** 38,41 ****
--- 38,43 ----
  public abstract class BasePortalServlet extends HttpServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(BasePortalServlet.class);
  

Index: PortalProcess.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/PortalProcess.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PortalProcess.java	13 Sep 2005 11:28:01 -0000	1.1
--- PortalProcess.java	7 Aug 2010 11:06:58 -0000	1.2
***************
*** 32,35 ****
--- 32,37 ----
  public class PortalProcess extends BasePortalServlet
  {
+ 	private static final long serialVersionUID = 1L;
+ 
  	private static final Log LOGGER = LogFactory.getLog(PortalProcess.class);
  

Index: FileStylesheetProvider.java
===================================================================
RCS file: /cvsroot/pfc/pfc-rt/src/java/portal/rt/servlet/FileStylesheetProvider.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FileStylesheetProvider.java	15 Feb 2006 20:47:04 -0000	1.2
--- FileStylesheetProvider.java	7 Aug 2010 11:06:58 -0000	1.3
***************
*** 28,31 ****
--- 28,32 ----
  import java.io.Reader;
  import java.util.ArrayList;
+ import java.util.List;
  
  import org.apache.commons.logging.Log;
***************
*** 55,61 ****
  	}
  
! 	private ArrayList getReaders() throws PortalException
  	{
! 		ArrayList readers = new ArrayList();
  
  		File sheetsFolder = new File(_path);
--- 56,62 ----
  	}
  
! 	private List<Reader> getReaders() throws PortalException
  	{
! 		List<Reader> readers = new ArrayList<Reader>();
  
  		File sheetsFolder = new File(_path);
***************
*** 91,95 ****
  	private class ChainReader extends Reader
  	{
! 		public ChainReader(ArrayList readers)
  		{
  			_readers = readers;
--- 92,96 ----
  	private class ChainReader extends Reader
  	{
! 		public ChainReader(List<Reader> readers)
  		{
  			_readers = readers;
***************
*** 169,173 ****
  
  		private int _currentReaderIndex;
! 		private ArrayList _readers;
  
  		private char[] _internalBuffer;
--- 170,174 ----
  
  		private int _currentReaderIndex;
! 		private List<Reader> _readers;
  
  		private char[] _internalBuffer;