portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/pages JetspeedVelocityPage.java
Date Sun, 25 Nov 2001 20:53:37 GMT
nacho       01/11/25 12:53:37

  Modified:    webapp/WEB-INF/conf TurbineResources.properties
               src/java/org/apache/jetspeed/modules/pages
                        JetspeedVelocityPage.java
  Log:
  Adding tools, only left jnavigation to delete JetspeedVelocityTemplate.java
  
  Revision  Changes    Path
  1.40      +2 -0      jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties
  
  Index: TurbineResources.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- TurbineResources.properties	2001/11/23 22:56:58	1.39
  +++ TurbineResources.properties	2001/11/25 20:53:37	1.40
  @@ -1,5 +1,5 @@
   # -------------------------------------------------------------------
  -# $Id: TurbineResources.properties,v 1.39 2001/11/23 22:56:58 nacho Exp $
  +# $Id: TurbineResources.properties,v 1.40 2001/11/25 20:53:37 nacho Exp $
   #
   # This is the configuration file for Turbine.
   #
  @@ -563,6 +563,8 @@
   tool.request.jlink=org.apache.jetspeed.util.template.JetspeedTemplateLink
   tool.request.jetspeed=org.apache.jetspeed.util.template.JetspeedTool
   tool.request.l10n=org.apache.turbine.services.localization.LocalizationTool
  +#tool.request.jnavigation=org.apache.jetspeed.util.template.JetspeedTemplateNavigation
  +tool.request.config=org.apache.jetspeed.services.resources.JetspeedResources
   
   
   #tool.global.ui=org.apache.turbine.util.pull.UIManager
  
  
  
  1.4       +14 -3     jakarta-jetspeed/src/java/org/apache/jetspeed/modules/pages/JetspeedVelocityPage.java
  
  Index: JetspeedVelocityPage.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/pages/JetspeedVelocityPage.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JetspeedVelocityPage.java	2001/11/24 00:44:37	1.3
  +++ JetspeedVelocityPage.java	2001/11/25 20:53:37	1.4
  @@ -65,7 +65,7 @@
    * Extends JetspeedTemplatePage to set the Velocity template Context.
    *
    * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
  - * @version $Id: JetspeedVelocityPage.java,v 1.3 2001/11/24 00:44:37 nacho Exp $
  + * @version $Id: JetspeedVelocityPage.java,v 1.4 2001/11/25 20:53:37 nacho Exp $
    */
   public class JetspeedVelocityPage extends JetspeedTemplatePage
   {
  @@ -80,9 +80,17 @@
        */
       protected void doBuildBeforeAction(RunData data) throws Exception
       {
  +
           Context context = TurbineVelocity.getContext(data);
  +
           
  -        // the jetspeed application tool        
  +/* FIXME: this tools are now in TR.p file, as standard request tools instantiated by turbine.
  +        All tools but jnavigation are there, jnavigation need to be instantiated here
  +        because TemplateNavigation in which depends does have a no args constructor..and
  +        turbine need one to be able to instantiate such class as request tool
  +*/
  +/*        
  +       // the jetspeed application tool        
           context.put("jetspeed", new JetspeedTool(data));
           // utility class for building link to other jetspeed components
           context.put("jlink", new JetspeedTemplateLink(data));
  @@ -90,9 +98,12 @@
           context.put("clink", new ContentTemplateLink(data));
           // the jetspeed configuration elements
           context.put("config", new JetspeedResources());
  +*/        
           // New JetSpeed NAvigation Generator
  -        context.put("jnavigation", new JetspeedTemplateNavigation(data));
   
  +        context.put("jnavigation", new JetspeedTemplateNavigation(data));
           data.getTemplateInfo().setTemplateContext(VelocityService.CONTEXT, context);
  +        
  +
       }
   }
  
  
  

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