portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raph...@apache.org
Subject cvs commit: jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages p002.psml p001.psml
Date Wed, 31 Dec 2003 08:39:40 GMT
raphael     2003/12/31 00:39:40

  Modified:    portal/src/java/org/apache/jetspeed/aggregator/impl Tag:
                        aggregation_1-branch RenderingJob.java
               portal/src/java/org/apache/jetspeed/layout Tag:
                        aggregation_1-branch MultiColumnPortlet.java
               portal/src/webapp/WEB-INF Tag: aggregation_1-branch
                        portlet.xml
               portal/src/webapp/WEB-INF/pages Tag: aggregation_1-branch
                        p001.psml
  Added:       portal/src/java/org/apache/jetspeed/layout Tag:
                        aggregation_1-branch LayoutPortlet.java
               portal/src/webapp/WEB-INF/pages Tag: aggregation_1-branch
                        p002.psml
  Log:
  - Create a new abstract LayoutPortlet to simplify defintiion of Layout portlets
  - Expand portlet definitions in Jetspeed portlet.xml
  - Misc bug fixes/debug comment changes
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.4   +3 -2      jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/Attic/RenderingJob.java
  
  Index: RenderingJob.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/Attic/RenderingJob.java,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- RenderingJob.java	1 Dec 2003 22:57:14 -0000	1.1.2.3
  +++ RenderingJob.java	31 Dec 2003 08:39:40 -0000	1.1.2.4
  @@ -152,7 +152,8 @@
           }
           catch (Throwable t)
           {
  -            log.error("Error rendering portlet OID " + this.window.getId(),t);
  +            // this will happen is request is prematurely aborted
  +            log.error("Error rendering portlet OID " + this.window.getId());
           }
       }
   }
  
  
  
  No                   revision
  No                   revision
  1.1.2.3   +2 -19     jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/layout/Attic/MultiColumnPortlet.java
  
  Index: MultiColumnPortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/layout/Attic/MultiColumnPortlet.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- MultiColumnPortlet.java	8 Dec 2003 21:05:54 -0000	1.1.2.2
  +++ MultiColumnPortlet.java	31 Dec 2003 08:39:40 -0000	1.1.2.3
  @@ -77,7 +77,7 @@
   
   /**
    */
  -public class MultiColumnPortlet extends org.apache.jetspeed.portlet.ServletPortlet
  +public class MultiColumnPortlet extends LayoutPortlet
   {
       /** Commons logging */
       protected final static Log log = LogFactory.getLog(MultiColumnPortlet.class);
  @@ -103,31 +103,14 @@
       public void doView(RenderRequest request, RenderResponse response)
       throws PortletException, IOException
       {
  -        response.setContentType("text/html");
  -
  -        List[] columns = null;
  -
  -        // Very ugly and Pluto dependant but I don't see anything better right now
  -        ServletRequest innerRequest = ((HttpServletRequestWrapper)request).getRequest();
  -
  -        Page page = (Page)innerRequest.getAttribute("org.apache.jetspeed.Page");
  -        Fragment fragment = (Fragment)innerRequest.getAttribute("org.apache.jetspeed.Fragment");
  -        ContentDispatcher dispatcher = (ContentDispatcher)innerRequest.getAttribute("org.apache.jetspeed.ContentDispatcher");
  -
  -        columns = buildColumns(fragment, this.numColumns);
  +        List[] columns = buildColumns(getFragment(request), this.numColumns);
   
           request.setAttribute("columns", columns);
  -        request.setAttribute("page", page);
  -        request.setAttribute("fragment", fragment);
  -        request.setAttribute("dispatcher", dispatcher);
   
           // now invoke the JSP associated with this portlet
           super.doView(request,response);
   
           request.removeAttribute("columns");
  -        request.removeAttribute("page");
  -        request.removeAttribute("fragment");
  -        request.removeAttribute("dispatcher");
       }
   
       protected List[] buildColumns(Fragment f, int colNum)
  
  
  
  No                   revision
  
  Index: MultiColumnPortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/layout/Attic/MultiColumnPortlet.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- MultiColumnPortlet.java	8 Dec 2003 21:05:54 -0000	1.1.2.2
  +++ MultiColumnPortlet.java	31 Dec 2003 08:39:40 -0000	1.1.2.3
  @@ -77,7 +77,7 @@
   
   /**
    */
  -public class MultiColumnPortlet extends org.apache.jetspeed.portlet.ServletPortlet
  +public class MultiColumnPortlet extends LayoutPortlet
   {
       /** Commons logging */
       protected final static Log log = LogFactory.getLog(MultiColumnPortlet.class);
  @@ -103,31 +103,14 @@
       public void doView(RenderRequest request, RenderResponse response)
       throws PortletException, IOException
       {
  -        response.setContentType("text/html");
  -
  -        List[] columns = null;
  -
  -        // Very ugly and Pluto dependant but I don't see anything better right now
  -        ServletRequest innerRequest = ((HttpServletRequestWrapper)request).getRequest();
  -
  -        Page page = (Page)innerRequest.getAttribute("org.apache.jetspeed.Page");
  -        Fragment fragment = (Fragment)innerRequest.getAttribute("org.apache.jetspeed.Fragment");
  -        ContentDispatcher dispatcher = (ContentDispatcher)innerRequest.getAttribute("org.apache.jetspeed.ContentDispatcher");
  -
  -        columns = buildColumns(fragment, this.numColumns);
  +        List[] columns = buildColumns(getFragment(request), this.numColumns);
   
           request.setAttribute("columns", columns);
  -        request.setAttribute("page", page);
  -        request.setAttribute("fragment", fragment);
  -        request.setAttribute("dispatcher", dispatcher);
   
           // now invoke the JSP associated with this portlet
           super.doView(request,response);
   
           request.removeAttribute("columns");
  -        request.removeAttribute("page");
  -        request.removeAttribute("fragment");
  -        request.removeAttribute("dispatcher");
       }
   
       protected List[] buildColumns(Fragment f, int colNum)
  
  
  
  No                   revision
  
  Index: MultiColumnPortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/layout/Attic/MultiColumnPortlet.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- MultiColumnPortlet.java	8 Dec 2003 21:05:54 -0000	1.1.2.2
  +++ MultiColumnPortlet.java	31 Dec 2003 08:39:40 -0000	1.1.2.3
  @@ -77,7 +77,7 @@
   
   /**
    */
  -public class MultiColumnPortlet extends org.apache.jetspeed.portlet.ServletPortlet
  +public class MultiColumnPortlet extends LayoutPortlet
   {
       /** Commons logging */
       protected final static Log log = LogFactory.getLog(MultiColumnPortlet.class);
  @@ -103,31 +103,14 @@
       public void doView(RenderRequest request, RenderResponse response)
       throws PortletException, IOException
       {
  -        response.setContentType("text/html");
  -
  -        List[] columns = null;
  -
  -        // Very ugly and Pluto dependant but I don't see anything better right now
  -        ServletRequest innerRequest = ((HttpServletRequestWrapper)request).getRequest();
  -
  -        Page page = (Page)innerRequest.getAttribute("org.apache.jetspeed.Page");
  -        Fragment fragment = (Fragment)innerRequest.getAttribute("org.apache.jetspeed.Fragment");
  -        ContentDispatcher dispatcher = (ContentDispatcher)innerRequest.getAttribute("org.apache.jetspeed.ContentDispatcher");
  -
  -        columns = buildColumns(fragment, this.numColumns);
  +        List[] columns = buildColumns(getFragment(request), this.numColumns);
   
           request.setAttribute("columns", columns);
  -        request.setAttribute("page", page);
  -        request.setAttribute("fragment", fragment);
  -        request.setAttribute("dispatcher", dispatcher);
   
           // now invoke the JSP associated with this portlet
           super.doView(request,response);
   
           request.removeAttribute("columns");
  -        request.removeAttribute("page");
  -        request.removeAttribute("fragment");
  -        request.removeAttribute("dispatcher");
       }
   
       protected List[] buildColumns(Fragment f, int colNum)
  
  
  
  1.1.2.1   +135 -0    jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/layout/Attic/LayoutPortlet.java
  
  
  
  
  No                   revision
  No                   revision
  1.1.2.2   +135 -0    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/Attic/portlet.xml
  
  Index: portlet.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/Attic/portlet.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- portlet.xml	6 Dec 2003 23:22:18 -0000	1.1.2.1
  +++ portlet.xml	31 Dec 2003 08:39:40 -0000	1.1.2.2
  @@ -1,6 +1,33 @@
   <?xml version="1.0" encoding="UTF-8"?>
   <portlet-app id="jetspeed" version="1.0">
   
  +  <portlet id="OneColumn">
  +    <portlet-name>OneColumn</portlet-name>
  +    <display-name>OneColumn Layout</display-name>
  +    <init-param>
  +      <name>ViewPage</name>
  +      <value>/WEB-INF/layout/columns.jsp</value>
  +    </init-param>
  +    <init-param>
  +      <name>columns</name>
  +      <value>1</value>
  +    </init-param>
  +    <init-param>
  +      <name>sizes</name>
  +      <value>100%</value>
  +    </init-param>
  +    <portlet-class>org.apache.jetspeed.layout.MultiColumnPortlet</portlet-class>
  +    <expiration-cache>-1</expiration-cache>
  +    <supports>
  +      <mime-type>text/html</mime-type>
  +      <portlet-mode>VIEW</portlet-mode>
  +    </supports>
  +    <portlet-info>
  +      <title>OneColumn</title>
  +      <short-title>OneColumn</short-title>
  +    </portlet-info>
  +  </portlet>
  +
     <portlet id="TwoColumns">
       <portlet-name>TwoColumns</portlet-name>
       <display-name>Two Columns Layout</display-name>
  @@ -25,6 +52,114 @@
       <portlet-info>
         <title>TwoColumns</title>
         <short-title>TwoColumns</short-title>
  +    </portlet-info>
  +  </portlet>
  +
  +  <portlet id="TwoColumnsLeft">
  +    <portlet-name>TwoColumnsLeft</portlet-name>
  +    <display-name>Two Columns (75%,25%) Layout</display-name>
  +    <init-param>
  +      <name>ViewPage</name>
  +      <value>/WEB-INF/layout/columns.jsp</value>
  +    </init-param>
  +    <init-param>
  +      <name>columns</name>
  +      <value>2</value>
  +    </init-param>
  +    <init-param>
  +      <name>sizes</name>
  +      <value>75%,25%</value>
  +    </init-param>
  +    <portlet-class>org.apache.jetspeed.layout.MultiColumnPortlet</portlet-class>
  +    <expiration-cache>-1</expiration-cache>
  +    <supports>
  +      <mime-type>text/html</mime-type>
  +      <portlet-mode>VIEW</portlet-mode>
  +    </supports>
  +    <portlet-info>
  +      <title>TwoColumnsLeft</title>
  +      <short-title>TwoColumnsLeft</short-title>
  +    </portlet-info>
  +  </portlet>
  +
  +  <portlet id="TwoColumnsRight">
  +    <portlet-name>TwoColumnsRight</portlet-name>
  +    <display-name>Two Columns (25%,75%) Layout</display-name>
  +    <init-param>
  +      <name>ViewPage</name>
  +      <value>/WEB-INF/layout/columns.jsp</value>
  +    </init-param>
  +    <init-param>
  +      <name>columns</name>
  +      <value>2</value>
  +    </init-param>
  +    <init-param>
  +      <name>sizes</name>
  +      <value>25%,75%</value>
  +    </init-param>
  +    <portlet-class>org.apache.jetspeed.layout.MultiColumnPortlet</portlet-class>
  +    <expiration-cache>-1</expiration-cache>
  +    <supports>
  +      <mime-type>text/html</mime-type>
  +      <portlet-mode>VIEW</portlet-mode>
  +    </supports>
  +    <portlet-info>
  +      <title>TwoColumnsRight</title>
  +      <short-title>TwoColumnsRight</short-title>
  +    </portlet-info>
  +  </portlet>
  +
  +  <portlet id="ThreeColumns">
  +    <portlet-name>ThreeColumns</portlet-name>
  +    <display-name>Three Columns (33%;34%,33%) Layout</display-name>
  +    <init-param>
  +      <name>ViewPage</name>
  +      <value>/WEB-INF/layout/columns.jsp</value>
  +    </init-param>
  +    <init-param>
  +      <name>columns</name>
  +      <value>3</value>
  +    </init-param>
  +    <init-param>
  +      <name>sizes</name>
  +      <value>33%;34%,33%</value>
  +    </init-param>
  +    <portlet-class>org.apache.jetspeed.layout.MultiColumnPortlet</portlet-class>
  +    <expiration-cache>-1</expiration-cache>
  +    <supports>
  +      <mime-type>text/html</mime-type>
  +      <portlet-mode>VIEW</portlet-mode>
  +    </supports>
  +    <portlet-info>
  +      <title>ThreeColumns</title>
  +      <short-title>ThreeColumns</short-title>
  +    </portlet-info>
  +  </portlet>
  +
  +  <portlet id="ThreeColumnsCentral">
  +    <portlet-name>ThreeColumnsCentral</portlet-name>
  +    <display-name>Three Columns (25%;50%,25%) Layout</display-name>
  +    <init-param>
  +      <name>ViewPage</name>
  +      <value>/WEB-INF/layout/columns.jsp</value>
  +    </init-param>
  +    <init-param>
  +      <name>columns</name>
  +      <value>3</value>
  +    </init-param>
  +    <init-param>
  +      <name>sizes</name>
  +      <value>25%,50%,25%</value>
  +    </init-param>
  +    <portlet-class>org.apache.jetspeed.layout.MultiColumnPortlet</portlet-class>
  +    <expiration-cache>-1</expiration-cache>
  +    <supports>
  +      <mime-type>text/html</mime-type>
  +      <portlet-mode>VIEW</portlet-mode>
  +    </supports>
  +    <portlet-info>
  +      <title>ThreeColumnsCentral</title>
  +      <short-title>ThreeColumnsCentral</short-title>
       </portlet-info>
     </portlet>
   
  
  
  
  No                   revision
  No                   revision
  1.1.2.3   +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p001.psml
  
  Index: p001.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p001.psml,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- p001.psml	8 Dec 2003 21:05:55 -0000	1.1.2.2
  +++ p001.psml	31 Dec 2003 08:39:40 -0000	1.1.2.3
  @@ -19,7 +19,7 @@
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>
  -    <fragment id="pe004" type="portlet" name="CustomerInfo">
  +    <fragment id="pe004" type="portlet" name="CustomerList">
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>
  
  
  
  No                   revision
  
  Index: p001.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p001.psml,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- p001.psml	8 Dec 2003 21:05:55 -0000	1.1.2.2
  +++ p001.psml	31 Dec 2003 08:39:40 -0000	1.1.2.3
  @@ -19,7 +19,7 @@
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>
  -    <fragment id="pe004" type="portlet" name="CustomerInfo">
  +    <fragment id="pe004" type="portlet" name="CustomerList">
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>
  
  
  
  No                   revision
  
  Index: p001.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/p001.psml,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- p001.psml	8 Dec 2003 21:05:55 -0000	1.1.2.2
  +++ p001.psml	31 Dec 2003 08:39:40 -0000	1.1.2.3
  @@ -19,7 +19,7 @@
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>
  -    <fragment id="pe004" type="portlet" name="CustomerInfo">
  +    <fragment id="pe004" type="portlet" name="CustomerList">
         <property layout="TwoColumns" name="row" value="1" />
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>
  
  
  
  1.1.2.1   +19 -0     jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/Attic/p002.psml
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message