morciuch    2002/11/20 09:01:47

  Modified:    docs/site changes.html
               src/java/org/apache/jetspeed/util/template
                        BaseJetspeedLink.java JetspeedLink.java
               webapp/WEB-INF/templates/jsp/portlets/html
                        JSP1_1andJetspeedTagLib.jsp
               webapp/WEB-INF/templates/jsp/tld template.tld
               webapp/WEB-INF/templates/vm/portlets/html
                        Tool_jslink_examples.vm
               webapp/WEB-INF/templates/vm/screens/html Home.vm
               xdocs    changes.xml
  Added:       src/java/org/apache/jetspeed/services/jsp/tags
                        JetspeedPortletLinkTag.java
  Log:
  Added functionality in BaseJetspeedLink to generate link to an existing portlet. 
This link will display portlet in specified mode (maximized, print friendly, etc). The 
portlet to link to may be identified via its js_peid or portlet name. If portlet name 
is used, its js_peid is derived from the first portlet with matching name.
  
  In Velocity, use $jslink tool. In JSP, use portletlink tag which leverages of off 
JetspeedLink.
  
  Updated "JSLINK Examples" and "JSP1_1andJetspeedTagLib" portlets with examples of 
this functionality.
  
  Revision  Changes    Path
  1.73      +3 -1      jakarta-jetspeed/docs/site/changes.html
  
  Index: changes.html
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- changes.html      17 Nov 2002 13:59:11 -0000      1.72
  +++ changes.html      20 Nov 2002 17:01:46 -0000      1.73
  @@ -5,7 +5,6 @@
           
   <!-- start the processing -->
       <!-- ====================================================================== -->
  -    <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
       <!-- Main Page Section -->
       <!-- ====================================================================== -->
       <html>
  @@ -133,6 +132,9 @@
     action (add/remove/update/fix) - [Bug # xxx -] date - description (committer's 
initials) [Thanks to developer_name]
   </li>
   -->
  +<li>
  +  Add - 2002/11/20 - Added JetspeedPortletLinkTag and matching functionality in 
JetspeedLink for usage in Velocity (MO)
  +</li>
   <li>
     Add - Bug # 13252 - 2002/11/15 - Allow to customize control for each portlet in 
layout customizer (MO)
   </li>
  
  
  
  1.1                  
jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/JetspeedPortletLinkTag.java
  
  Index: JetspeedPortletLinkTag.java
  ===================================================================
  package org.apache.jetspeed.services.jsp.tags;
  
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", nor may "Apache" appear in their name, without
   *    prior written permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  // Servlet API
  import javax.servlet.jsp.JspException;
  import javax.servlet.jsp.PageContext;
  import javax.servlet.jsp.tagext.TagSupport;
  
  // Turbine Classes
  import org.apache.turbine.util.Log;
  import org.apache.turbine.util.DynamicURI;
  import org.apache.turbine.services.jsp.JspService;
  
  // ECS support
  import org.apache.ecs.ConcreteElement;
  import org.apache.ecs.StringElement;
  
  // Jetspeed support
  import org.apache.jetspeed.services.rundata.JetspeedRunData;
  import org.apache.jetspeed.om.profile.Entry;
  import org.apache.jetspeed.om.profile.ProfileLocator;
  import org.apache.jetspeed.om.profile.Profile;
  import org.apache.jetspeed.services.Profiler;
  import org.apache.jetspeed.util.template.JetspeedLink;
  import org.apache.jetspeed.util.template.JetspeedLinkFactory;
  
  /**
   * Supporting class for the portlet link tag.
   * Builds a link to displaying a portlet in specified view and insert it within the
   * current JSP page. If js_peid is specified it is used as is. Otherwise, the js_peid
   * is derived from the first portlet in profile matching specified portlet name.
   *
   * @author <a href="mailto:[EMAIL PROTECTED]";>Mark Orciuch</a>
   * @version $Id: JetspeedPortletLinkTag.java,v 1.1 2002/11/20 17:01:46 morciuch Exp $
   */
  public class JetspeedPortletLinkTag extends TagSupport
  {
      private String name = null;
      private String jspeid = null;
      private String psml = null;
      private String action = null;
  
      public void setName(String name)
      {
          this.name = name;
      }
  
      public String getName()
      {
          return this.name;
      }
  
      public void setPsml(String psml)
      {
          this.psml = psml;
      }
  
      public String getPsml()
      {
          return this.psml;
      }
  
      public void setJspeid(String value)
      {
          this.jspeid = value;
      }
  
      public String getJspeid()
      {
          return this.jspeid;
      }
  
      public void setAction(String value)
      {
          this.action = value;
      }
  
      public String getAction()
      {
          return this.action;
      }
  
      /**
       * Method called when the tag is encountered to send attributes to the
       * output stream
       *
       * @return SKIP_BODY, as it is intended to be a single tag.
       */
      public int doStartTag() throws JspException
      {
          JetspeedRunData data = (JetspeedRunData) 
pageContext.getAttribute(JspService.RUNDATA, PageContext.REQUEST_SCOPE);
          
          try
          {
              ConcreteElement result = null;
              Profile baseProfile = null;
              ProfileLocator baseLocator = Profiler.createLocator();
              int rootType = JetspeedLink.DEFAULT;
              String rootValue = null;
              int elementType = JetspeedLink.DEFAULT;
              String elementValue = null;
  
              // Create locator to retrieve profile settings
              if (this.psml != null)
              {
                 baseLocator.createFromPath(this.psml);
                 if (baseLocator.getUser() != null)
                 {
                     rootType = JetspeedLink.USER;
                     rootValue = baseLocator.getUserName();
                 } 
                 else if (baseLocator.getRole() != null)
                 {
                     rootType = JetspeedLink.ROLE;
                     rootValue = baseLocator.getRoleName();
                 }
                 else if (baseLocator.getGroup() != null)
                 {
                     rootType = JetspeedLink.GROUP;
                     rootValue = baseLocator.getGroupName();
                 }
              }
              else
              {
                 rootType = JetspeedLink.CURRENT;
                 rootValue = "";
                 baseProfile = data.getProfile();
                 baseLocator.createFromPath(baseProfile.getPath());
              }
  
              //  Determine search method
              if (baseLocator != null)
              {                
                  // search by portlet name
                  if (this.name != null)
                  {
                      elementType = JetspeedLink.PORTLET_ID_QUERY;
                      elementValue = this.name;
                  }
                  else if (this.jspeid != null)
                  {
                      elementType = JetspeedLink.PORTLET_ID;
                      elementValue = this.jspeid;
                  }
                  // Build the link
                  JetspeedLink link = JetspeedLinkFactory.getInstance(data);
                  DynamicURI uri = link.getLink(rootType,
                                                rootValue,
                                                baseLocator.getName(),
                                                elementType,
                                                elementValue,
                                                this.action == null ? 
"controls.Maximize" : this.action,
                                                null,
                                                baseLocator.getMediaType(),
                                                baseLocator.getLanguage(),
                                                baseLocator.getCountry());
                  result = new StringElement(uri.toString());
                  JetspeedLinkFactory.putInstance(link);
              }
  
              // Output the result
              if (result != null) 
              {
                  pageContext.getOut().print(result);
              }
  
          }
          catch (Exception e)
          {
              String message = "Error processing name '" + name + "'.";
              Log.error(message, e);
              try
              {
                  data.getOut().print("Error processing portlet '" + name + "'. See 
log for more information.");
              }
              catch (java.io.IOException ioe) 
              {
              }
          }
          return EVAL_BODY_INCLUDE;
      }
  }
  
  
  
  1.18      +103 -24   
jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java
  
  Index: BaseJetspeedLink.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- BaseJetspeedLink.java     8 Nov 2002 23:21:52 -0000       1.17
  +++ BaseJetspeedLink.java     20 Nov 2002 17:01:46 -0000      1.18
  @@ -65,6 +65,7 @@
   import org.apache.jetspeed.services.resources.JetspeedResources;
   import org.apache.jetspeed.services.rundata.JetspeedRunData;
   import org.apache.jetspeed.util.template.JetspeedLink;
  +import org.apache.jetspeed.om.profile.Entry;
   
   // Turbine
   import org.apache.turbine.util.RunData;
  @@ -475,31 +476,35 @@
       /**
        * Return a link to a desired page.  This is allows the inclusion of a 
Group/Role/User,
        * page, template, action, media type, language, and country.
  -     *
  -     * @param rootType Type of root PSML docuument.  The should be one of the 
following:
  -     *                <dl>
  -     *                  <dt>JetspeedLink.CURRENT</dt><dd>The link will retain the 
current Group/Role/User referance. rootValue is not used</dd>
  -     *                  <dt>JetspeedLink.DEFAULT</dt><dd>Default Group, Role, or 
User. rootValue is not used</dd>
  -     *                  <dt>JetspeedLink.GROUP</dt><dd>Link will be to a Group 
PSML.  rootValue is a Group Name</dd>
  -     *                  <dt>JetspeedLink.ROLE</dt><dd>Link will be to a Role PSML.  
rootValue is a Role Name</dd>
  -     *                  <dt>JetspeedLink.USER</dt><dd>Link will be to a User PSML.  
rootValue is a User Name</dd>
  -     *                </dl>
  +     * 
  +     * @param rootType   Type of root PSML docuument.  The should be one of the 
following:
  +     *                   <dl>
  +     *                   <dt>JetspeedLink.CURRENT</dt><dd>The link will retain the 
current Group/Role/User referance. rootValue is not used</dd>
  +     *                   <dt>JetspeedLink.DEFAULT</dt><dd>Default Group, Role, or 
User. rootValue is not used</dd>
  +     *                   <dt>JetspeedLink.GROUP</dt><dd>Link will be to a Group 
PSML.  rootValue is a Group Name</dd>
  +     *                   <dt>JetspeedLink.ROLE</dt><dd>Link will be to a Role PSML. 
 rootValue is a Role Name</dd>
  +     *                   <dt>JetspeedLink.USER</dt><dd>Link will be to a User PSML. 
 rootValue is a User Name</dd>
  +     *                   </dl>
        * @param rootValue  See description of rootType
  -     * @param pageName  Name of page. null = default page
  -     * @param elementType <dl>
  -     *                  <dt>JetspeedLink.CURRENT</dt><dd>The link will retain the 
current Pane/Portlet referance. elementValue is not used</dd>
  -     *                  <dt>JetspeedLink.DEFAULT</dt><dd>The link will NOT 
referance a pane or portlet. elementValue is not used</dd>
  -     *                  <dt>JetspeedLink.PANE_ID</dt><dd>Link will be to a Pane 
using it's ID.  elementValue is a Pane's ID</dd>
  -     *                  <dt>JetspeedLink.PANE_NAME</dt><dd>Link will be to a Pane 
using it's Name.  elementValue is a Pane's Name</dd>
  -     *                  <dt>JetspeedLink.PORTLET_ID</dt><dd>Link will be to a 
Portlet using it's ID.  elementValue is a Portlet's ID</dd>
  -     *                  <dt>JetspeedLink.PORTLET_NAME</dt><dd>Link will be to a 
Portlet using it's Name.  elementValue is a Portlet's Name</dd>
  -     *                </dl>
  -     * @param elementValue  See description of elementType
  +     * @param pageName   Name of page. null = default page
  +     * @param elementType
  +     *                   <dl>
  +     *                   <dt>JetspeedLink.CURRENT</dt><dd>The link will retain the 
current Pane/Portlet referance. elementValue is not used</dd>
  +     *                   <dt>JetspeedLink.DEFAULT</dt><dd>The link will NOT 
referance a pane or portlet. elementValue is not used</dd>
  +     *                   <dt>JetspeedLink.PANE_ID</dt><dd>Link will be to a Pane 
using it's ID.  elementValue is a Pane's ID</dd>
  +     *                   <dt>JetspeedLink.PANE_NAME</dt><dd>Link will be to a Pane 
using it's Name.  elementValue is a Pane's Name</dd>
  +     *                   <dt>JetspeedLink.PORTLET_ID</dt><dd>Link will be to a 
Portlet using it's ID.  elementValue is a Portlet's ID</dd>
  +     *                   <dt>JetspeedLink.PORTLET_NAME</dt><dd>Link will be to a 
Portlet using it's Name.  elementValue is a Portlet's Name</dd>
  +     *                   <dt>JetspeedLink.PORTLET_ID_QUERY</dt><dd>Link will be to 
a Portlet using it's ID based on portlet name provided.  elementValue is a Portlet's 
name. ID is for the first portlet with matching name</dd>
  +     *                   </dl>
  +     * @param elementValue
  +     *                   See description of elementType
        * @param actionName Name of action. If no action is desired use 
JetspeedLink.NO_ACTION.
  -     * @param templateName Name of template. If no template is desired use 
JetspeedLink.NO_TEMPLATE.
  -     * @param mediaType Desired media type. null = default media type
  -     * @param language Desired language. null = default language
  -     * @param country Desired country.  null = default language
  +     * @param templateName
  +     *                   Name of template. If no template is desired use 
JetspeedLink.NO_TEMPLATE.
  +     * @param mediaType  Desired media type. null = default media type
  +     * @param language   Desired language. null = default language
  +     * @param country    Desired country.  null = default language
        * @return URI to specific portlet
        */
       public DynamicURI getLink(int rootType, String rootValue, String pageName, int 
elementType, String elementValue, String actionName, String templateName, String 
mediaType, String language, String country)
  @@ -565,6 +570,80 @@
                       break;
                   case JetspeedLink.PORTLET_NAME:
                       uriPathElement = JetspeedResources.PATH_PORTLET_KEY;
  +                    break;
  +                case JetspeedLink.PORTLET_ID_QUERY:
  +                    Log.debug("BaseJetspeedLink: elementValue = " + elementValue);
  +                    uriPathElement = JetspeedResources.PATH_PORTLETID_KEY;
  +                    ProfileLocator baseLocator = Profiler.createLocator();
  +                    Profile baseProfile = null;
  +                    switch (rootType)
  +                    {
  +                        case JetspeedLink.DEFAULT:
  +                            break;
  +                        case JetspeedLink.CURRENT:
  +                            baseProfile = rundata.getProfile();
  +                            break;
  +                        case JetspeedLink.GROUP:
  +                            baseLocator.setGroupByName(rootValue);
  +                            break;
  +                        case JetspeedLink.ROLE:
  +                            baseLocator.setRoleByName(rootValue);
  +                            break;
  +                        case JetspeedLink.USER:
  +                            try 
  +                            {
  +                                Log.debug("BaseJetspeedLink: rootValue user = " + 
rootValue);
  +                                
baseLocator.setUser(org.apache.jetspeed.services.JetspeedSecurity.getUser(rootValue));
  +                            }
  +                            catch (Exception se)
  +                            {
  +                                Log.error(se);
  +                                return null;
  +                            }
  +                            break;
  +                    }
  +                    
  +                    if (rootType != JetspeedLink.CURRENT && rootType != 
JetspeedLink.DEFAULT)
  +                    {
  +                        if (mediaType != null && mediaType.length() > 0)
  +                        {
  +                            baseLocator.setMediaType(mediaType);
  +                        }
  +                        if (language != null && language.length() > 0)
  +                        {
  +                            baseLocator.setLanguage(language);
  +                        }
  +                        if (country != null && country.length() > 0)
  +                        {
  +                            baseLocator.setCountry(country);
  +                        }
  +                        if (pageName != null && pageName.length() > 0)
  +                        {
  +                            baseLocator.setName(pageName);
  +                        }
  +                        baseProfile = Profiler.getProfile(baseLocator);
  +                    }
  +                    Log.debug("BaseJetspeedLink: baseLocator = " + 
baseLocator.getPath());
  +
  +                    if (baseProfile != null && elementValue != null)
  +                    {                
  +                        Log.debug("BaseJetspeedLink: baseProfile = " + 
baseProfile.toString());
  +                        if (baseProfile.getDocument() != null)
  +                        {
  +                            Log.debug("BaseJetspeedLink: baseProfile.getDocment() = 
" + baseProfile.getDocument());
  +                            Entry entry = 
baseProfile.getDocument().getEntry(elementValue);
  +                            if (entry != null)
  +                            {
  +                                Log.debug("BaseJetspeedLink: entry id = " + 
entry.getId());
  +                                elementValue = entry.getId();
  +                            }
  +                            else 
  +                            {
  +                                elementValue = null;
  +                            }
  +                        }
  +                    }
  +
                       break;
               }
   
  
  
  
  1.13      +2 -1      
jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedLink.java
  
  Index: JetspeedLink.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedLink.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- JetspeedLink.java 17 Oct 2002 15:07:33 -0000      1.12
  +++ JetspeedLink.java 20 Nov 2002 17:01:46 -0000      1.13
  @@ -86,6 +86,7 @@
       public static int PANE_NAME = 302;
       public static int PORTLET_ID = 303;
       public static int PORTLET_NAME = 304;
  +    public static int PORTLET_ID_QUERY = 305;
       
       
       /**
  
  
  
  1.4       +22 -0     
jakarta-jetspeed/webapp/WEB-INF/templates/jsp/portlets/html/JSP1_1andJetspeedTagLib.jsp
  
  Index: JSP1_1andJetspeedTagLib.jsp
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/portlets/html/JSP1_1andJetspeedTagLib.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JSP1_1andJetspeedTagLib.jsp       30 Oct 2002 22:56:13 -0000      1.3
  +++ JSP1_1andJetspeedTagLib.jsp       20 Nov 2002 17:01:46 -0000      1.4
  @@ -131,6 +131,28 @@
         </tr>      
       </table>
   
  +    <center><h2>jetspeed:portletlink</h2></center>
  +    <table>
  +      <tr>
  +        <th>name</th>
  +        <th>psml</th>        
  +        <th>action</th>                        
  +        <th>Returned Value</th>
  +      </tr>
  +      <tr>
  +        <td>HelloVelocity</td>
  +        <td>user/turbine/media-type/html/page/default.psml</td>        
  +        <td>controls.Print</td>                
  +        <td><a href="<jetspeed:portletlink name="HelloVelocity" 
psml="user/turbine/media-type/html/page/default.psml" 
action="controls.Print"/>"><jetspeed:portletlink name="HelloVelocity" 
psml="user/turbine/media-type/html/page/default.psml" 
action="controls.Print"/></A></td>
  +      </tr>
  +      <tr>
  +        <td>DatabaseBrowserTest</td>
  +        <td></td>        
  +        <td></td>                
  +        <td><a href="<jetspeed:portletlink name="DatabaseBrowserTest" 
/>"><jetspeed:portletlink name="DatabaseBrowserTest" /></A></td>
  +      </tr>
  +    </table>
  +
       <hr/>
       <center><h1>HTTP Request Header</h1></center>
       <table>
  
  
  
  1.11      +25 -0     jakarta-jetspeed/webapp/WEB-INF/templates/jsp/tld/template.tld
  
  Index: template.tld
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/tld/template.tld,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- template.tld      30 Oct 2002 22:56:13 -0000      1.10
  +++ template.tld      20 Nov 2002 17:01:47 -0000      1.11
  @@ -110,4 +110,29 @@
         <required>false</required>
       </attribute>
     </tag>
  +  <tag>   
  +    <name>portletlink</name>
  +    
<tagclass>org.apache.jetspeed.services.jsp.tags.JetspeedPortletLinkTag</tagclass>
  +    <bodycontent>JSP</bodycontent>
  +    <attribute>
  +      <name>name</name>
  +      <required>false</required>
  +      <rtexprvalue>true</rtexprvalue>
  +    </attribute>
  +    <attribute>
  +      <name>jspeid</name>
  +      <required>false</required>
  +      <rtexprvalue>true</rtexprvalue>
  +    </attribute>
  +    <attribute>
  +      <name>psml</name>
  +      <required>false</required>
  +      <rtexprvalue>true</rtexprvalue>
  +    </attribute>
  +    <attribute>
  +      <name>action</name>
  +      <required>false</required>
  +      <rtexprvalue>true</rtexprvalue>
  +    </attribute>
  +  </tag>  
   </taglib>
  
  
  
  1.6       +18 -1     
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/Tool_jslink_examples.vm
  
  Index: Tool_jslink_examples.vm
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/Tool_jslink_examples.vm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Tool_jslink_examples.vm   12 Nov 2002 00:34:57 -0000      1.5
  +++ Tool_jslink_examples.vm   20 Nov 2002 17:01:47 -0000      1.6
  @@ -183,7 +183,7 @@
       </tr>
   
       <tr>
  -      <td colspan="2">$jslink.getLink(\$jslink.CURRENT,"abc", \$jslink.PageName, 
\$jslink.PANE_ID,"123","myAction","myTemplate","html","en","US")</td>
  +      <td colspan="2">\$jslink.getLink(\$jslink.CURRENT,"abc", \$jslink.PageName, 
\$jslink.PANE_ID,"123","myAction","myTemplate","html","en","US")</td>
       </tr>
       <tr>
         <td width="10%">&nbsp;</td>
  @@ -245,6 +245,23 @@
         <td width="5%"></td>
         
<td>$jslink.getLink($jslink.GROUP,"apache","news",301,"1234","Template","Action")</td>
       </tr>
  +
  +    <tr>
  +      <td 
colspan="2">\$jslink.getLink(\$jslink.USER,"turbine","default.psml",305,"HelloVelocity","controls.Maximize","","html")</td>
  +    </tr>
  +    <tr>
  +      <td width="5%"></td>
  +      
<td>$jslink.getLink($jslink.USER,"turbine","default.psml",305,"HelloVelocity","controls.Maximize","","html")</td>
  +    </tr>
  +
  +    <tr>
  +      <td 
colspan="2">\$jslink.getLink(\$jslink.CURRENT,"","default.psml",305,"DatabaseBrowserTest","controls.Print","","html")</td>
  +    </tr>
  +    <tr>
  +      <td width="5%"></td>
  +      
<td>$jslink.getLink($jslink.CURRENT,"","default.psml",305,"DatabaseBrowserTest","controls.Print","","html")</td>
  +    </tr>
  +    
     </table>
   
   </div>
  
  
  
  1.4       +1 -0      
jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/Home.vm
  
  Index: Home.vm
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/screens/html/Home.vm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Home.vm   7 May 2002 15:16:07 -0000       1.3
  +++ Home.vm   20 Nov 2002 17:01:47 -0000      1.4
  @@ -2,6 +2,7 @@
   #if (($data.User) && ($data.User.getTemp("js_peid")))
       $data.setMode("maximize")
       $jetspeed.getPortletById($data.User.getTemp("js_peid"))
  +    #set ($null = $data.User.removeTemp("js_peid"))
   ## process as a regular page request
   #else
       $data.setMode("default")
  
  
  
  1.93      +4 -1      jakarta-jetspeed/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- changes.xml       15 Nov 2002 17:27:18 -0000      1.92
  +++ changes.xml       20 Nov 2002 17:01:47 -0000      1.93
  @@ -23,6 +23,9 @@
   </li>
   -->
   <li>
  +  Add - 2002/11/20 - Added JetspeedPortletLinkTag and matching functionality in 
JetspeedLink for usage in Velocity (MO)
  +</li>
  +<li>
     Add - Bug # 13252 - 2002/11/15 - Allow to customize control for each portlet in 
layout customizer (MO)
   </li>
   <li>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to