portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/customize CustomizePortlet.java
Date Mon, 02 Jul 2001 07:38:12 GMT
taylor      01/07/02 00:38:12

  Modified:    src/java/org/apache/jetspeed/portal/controls
                        VelocityPortletSetControl.java
               src/java/org/apache/jetspeed/portal/portlets/customize
                        CustomizePortlet.java
  Added:       src/java/org/apache/jetspeed/portal/portlets JspPortlet.java
  Log:
  - added new JspPortlet.java (it doesn't really work because of the Velocity/JSP conflict)
  
  Revision  Changes    Path
  1.3       +2 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletSetControl.java
  
  Index: VelocityPortletSetControl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletSetControl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VelocityPortletSetControl.java	2001/06/25 10:54:00	1.2
  +++ VelocityPortletSetControl.java	2001/07/02 07:38:09	1.3
  @@ -125,8 +125,8 @@
               if ((p instanceof PortletState) && (((PortletState)p).isClosed(rundata)))
               {
                   continue;
  -            }
  -            
  +            }            
  +
               PortletTab tab = new PortletTab();
               tab.setTitle( (p.getTitle()!=null)?p.getTitle():p.getName() );
                   
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/JspPortlet.java
  
  Index: JspPortlet.java
  ===================================================================
  /* ====================================================================
   * 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 apache@apache.org.
   *
   * 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/>.
   */
  
  package org.apache.jetspeed.portal.portlets;
  
  // Turbine util
  import org.apache.turbine.util.RunData;
  import org.apache.turbine.util.Log;
  
  // Jetspeed portal
  import org.apache.jetspeed.portal.Portlet;
  import org.apache.jetspeed.portal.portlets.AbstractPortlet;
  import org.apache.jetspeed.portal.PortletException;
  import org.apache.jetspeed.portal.PortletConfig;
  
  // Jetspeed util
  import org.apache.jetspeed.util.servlet.EcsServletElement;
  
  // Ecs 
  import org.apache.ecs.ConcreteElement;
  import org.apache.ecs.StringElement;
  
  
  /**
   * A JSP portlet example.
   * 
   * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
   */
  public class JspPortlet extends AbstractPortlet
  
  {
  
      /**
      By default the data is non cacheable
      */
      public void init() throws PortletException
      {
          setCacheable( false );
      }
  
      public ConcreteElement getContent( RunData rundata )
      {
  
          EcsServletElement element ;
          String template = "";
  
          try {
  
              // 
              // gets the jsp page from the xreg configuration
              // NOTE: wouldn't it be better to get the param from the PSML?
              //
              template = getPortletConfig().getInitParameter("template");
              element = new EcsServletElement(rundata, template);
              
          } catch (Exception e) {
              String message = "JspPortlet: Could not include the following JSP Page:  " +
template + " : " + e.getMessage();
              Log.error( message, e );
              return new StringElement( message );
          }
  
          //ElementContainer content = new ElementContainer();
          //content.addElement( jspEl );
          
          return element;
      }
  
  }
  
  
  
  1.16      +1 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/customize/CustomizePortlet.java
  
  Index: CustomizePortlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/customize/CustomizePortlet.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- CustomizePortlet.java	2001/06/09 15:42:46	1.15
  +++ CustomizePortlet.java	2001/07/02 07:38:11	1.16
  @@ -441,10 +441,9 @@
                   }
                   catch (Exception e)
                   {
  -                    String username = data.getUser().getUserName();
                       try
                       {
  -                        Profiler.createUserProfile( data, username, mime );
  +                        Profiler.createUserProfile( data, data.getUser(), mime );
                           profile = Profiler.getProfile( data, mime );
                       }
                       catch (Exception e2)
  
  
  

---------------------------------------------------------------------
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