portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pau...@apache.org
Subject cvs commit: jakarta-jetspeed/docs/site portlet_config_Velocity.html changes.html
Date Tue, 23 Jul 2002 03:11:59 GMT
paulsp      2002/07/22 20:11:59

  Modified:    src/java/org/apache/jetspeed/portal/controls
                        VelocityPortletControl.java
               xdocs    portlet_config_Velocity.xml changes.xml
               docs/site portlet_config_Velocity.html changes.html
  Log:
  Add Velocity variable portlet_instance to VelocityPortletControl.  Updates to .vm file comming
  
  Revision  Changes    Path
  1.18      +7 -3      jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletControl.java
  
  Index: VelocityPortletControl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletControl.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- VelocityPortletControl.java	28 Jun 2002 05:37:32 -0000	1.17
  +++ VelocityPortletControl.java	23 Jul 2002 03:11:58 -0000	1.18
  @@ -67,6 +67,7 @@
   import org.apache.jetspeed.portal.PortletState;
   import org.apache.jetspeed.services.TemplateLocator;
   import org.apache.jetspeed.services.PortletFactory;
  +import org.apache.jetspeed.services.persistence.PersistenceManager;
   import org.apache.jetspeed.services.resources.JetspeedResources;
   import org.apache.jetspeed.services.rundata.JetspeedRunData;
   import org.apache.jetspeed.util.MimeType;
  @@ -83,6 +84,7 @@
   // Velocity Stuff
   import org.apache.velocity.context.Context;
   
  +// Java stuff
   import java.util.List;
   import java.util.Vector;
   import java.util.Iterator;
  @@ -99,6 +101,7 @@
    *     <meta-info>
    *       <title>TitleControl</title>
    *       <description>The standard Jetspeed boxed control</description>
  + *       <image>url of image (icon)</description>
    *     </meta-info>
    *     <media-type ref="html"/>
    *   </portlet-control-entry>
  @@ -132,7 +135,7 @@
           // application pull tools
           Context context = TurbineVelocity.getContext();
           
  -        context.put( "data", rundata );
  +        context.put("data", rundata );
           context.put("actions", buildActionList( rundata, portlet ) );
           context.put("config", getConfig() );
           context.put("skin", portlet.getPortletConfig().getPortletSkin() );
  @@ -148,6 +151,7 @@
           else
           {
               context.put("portlet", portlet );
  +            context.put("portlet_instance", PersistenceManager.getInstance(portlet, jdata)
);
           }
               
           // allow subclasses to add elements to the context
  @@ -336,7 +340,7 @@
           
           public void setLink(String link)
           {
  -            this.link=link;
  +            this.link = link;
           }
       }
   }
  
  
  
  1.3       +2 -1      jakarta-jetspeed/xdocs/portlet_config_Velocity.xml
  
  Index: portlet_config_Velocity.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/portlet_config_Velocity.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- portlet_config_Velocity.xml	17 Jul 2002 02:45:59 -0000	1.2
  +++ portlet_config_Velocity.xml	23 Jul 2002 03:11:58 -0000	1.3
  @@ -103,7 +103,8 @@
           <tr><td>jetspeed</td><td>org.apache.jetspeed.util.template.JetspeedTool</td><td></td></tr>
           <tr><td>jslink</td><td>org.apache.jetspeed.util.template.BaseJetspeedLink</td><td></td></tr>
           <tr><td>l10n</td><td>org.apache.turbine.services.localization.LocalizationTool</td><td>Language
specific text</td></tr>
  -        <tr><td>portlet</td><td>org.apache.jetspeed.portal.portlets.AbstractPortlet</td><td></td></tr>
  +        <tr><td>portlet</td><td>org.apache.jetspeed.portal.portlets.AbstractPortlet</td><td>Use
portlet_instance whenever possiable</td></tr>
  +        <tr><td>portlet_instance</td><td>org.apache.jetspeed.portal.PortletInstance</td><td></td></tr>
           <tr><td>skin</td><td>org.apache.jetspeed.portal.PortletSkin</td><td></td></tr>
           <tr><td>template</td><td>String</td><td>Name
of Velocity template</td></tr>
         </table>
  
  
  
  1.49      +4 -1      jakarta-jetspeed/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- changes.xml	23 Jul 2002 00:06:43 -0000	1.48
  +++ changes.xml	23 Jul 2002 03:11:58 -0000	1.49
  @@ -24,6 +24,9 @@
   -->
         </ul>
   <li>
  +  Add - 2002/07/22 - Context variable "portlet_instance" to VelocityPortletControl (PS)
  +</li>
  +<li>
     Update - 2002/07/22 - Updated Customizer to better support editing of any PSML page (DST)
   							 - Cleanup up invalid PSML pages in cvs
   </li>
  
  
  
  1.10      +17 -0     jakarta-jetspeed/docs/site/portlet_config_Velocity.html
  
  Index: portlet_config_Velocity.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/docs/site/portlet_config_Velocity.html,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- portlet_config_Velocity.html	17 Jul 2002 07:07:23 -0000	1.9
  +++ portlet_config_Velocity.html	23 Jul 2002 03:11:59 -0000	1.10
  @@ -428,6 +428,23 @@
   </td>
                                   <td bgcolor="#a0ddf0" colspan="1" rowspan="" valign="top"
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  +                Use portlet_instance whenever possiable
  +            </font>
  +</td>
  +            </tr>
  +                                <tr>
  +                        <td bgcolor="#a0ddf0" colspan="1" rowspan="" valign="top" align="left">
  +    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  +                portlet_instance
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="1" rowspan="" valign="top"
align="left">
  +    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  +                org.apache.jetspeed.portal.PortletInstance
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="1" rowspan="" valign="top"
align="left">
  +    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   &nbsp;
               </font>
   </td>
  
  
  
  1.29      +3 -0      jakarta-jetspeed/docs/site/changes.html
  
  Index: changes.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- changes.html	23 Jul 2002 00:07:08 -0000	1.28
  +++ changes.html	23 Jul 2002 03:11:59 -0000	1.29
  @@ -130,6 +130,9 @@
   -->
         </ul>
                                                   <li>
  +  Add - 2002/07/22 - Context variable "portlet_instance" to VelocityPortletControl (PS)
  +</li>
  +                                                <li>
     Update - 2002/07/22 - Updated Customizer to better support editing of any PSML page (DST)
   							 - Cleanup up invalid PSML pages in cvs
   </li>
  
  
  

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


Mime
View raw message