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 de...@apache.org on 2008/01/15 10:08:54 UTC

svn commit: r612049 - in /portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver: PortalDriverServlet.java services/portal/RenderConfig.java

Author: dettborn
Date: Tue Jan 15 01:08:54 2008
New Revision: 612049

URL: http://svn.apache.org/viewvc?rev=612049&view=rev
Log:
-change the api
-add not implemented functions
-cleanup the code and delete old fixme's
	-delete old todo(I save the patch so I update the jira issues)
	

Modified:
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java

Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java?rev=612049&r1=612048&r2=612049&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java Tue Jan 15 01:08:54 2008
@@ -117,7 +117,6 @@
         			setPublicRenderParameter(request, portalURL, portalURL.getActionWindow());
         		}
 			} catch (PortletContainerException e) {
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
             PortletWindowImpl portletWindow = new PortletWindowImpl(
@@ -141,9 +140,8 @@
         else if (resourceWindowConfig != null) {
         	try {
         		if (request.getParameterNames().hasMoreElements())
-				setPublicRenderParameter(request, portalURL, portalURL.getResourceWindow());
+        			setPublicRenderParameter(request, portalURL, portalURL.getResourceWindow());
 			} catch (PortletContainerException e) {
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
             PortletWindowImpl portletWindow = new PortletWindowImpl(
@@ -171,7 +169,6 @@
             PageConfig pageConfig = portalURL.getPageConfig(servletContext);
             if (pageConfig == null)
             {
-                // TODO Shouldn't we throw an exception here?
                 LOG.error("PageConfig for render path [" + portalURL.getRenderPath() + "] could not be found.");
             }
             

Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java?rev=612049&r1=612048&r2=612049&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/portal/RenderConfig.java Tue Jan 15 01:08:54 2008
@@ -86,14 +86,7 @@
                     defaultPageId);
             }
             pageId = defaultPageId;
-        }
-//        return (PageConfig) pages.get(pageId);
-         
-         // TODO: Make sure this is needed. 
-         //This is the PLUTO-251 fix submitted by Charles Severence. Thank you!!!
-         // Sometimes pages come with a prefix of a slash - if the page is not 
-         // found, and the first character of the pageId is a slash we attempt 
-         // to look up the page without the slash. 
+        } 
          
          PageConfig retval = (PageConfig) pages.get(pageId);