You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/08/05 18:12:18 UTC

cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/rundata DefaultTurbineRunData.java

jvanzyl     01/08/05 09:12:18

  Modified:    src/adapter/org/apache/turbine/util/template
                        TemplateInfo.java
               src/adapter/org/apache/turbine/util/velocity
                        VelocityEmail.java VelocityHtmlEmail.java
               src/java/org/apache/turbine/modules ContextAdapter.java
                        Module.java
               src/java/org/apache/turbine/modules/actions
                        TemplateAction.java
               src/java/org/apache/turbine/modules/screens
                        TemplateScreen.java
               src/java/org/apache/turbine/pipeline ClassicPipeline.java
                        Renderer.java Resolver.java
               src/java/org/apache/turbine/services/jsp JspService.java
                        TurbineJspService.java
               src/java/org/apache/turbine/services/pull PullService.java
                        TurbinePull.java TurbinePullService.java
               src/java/org/apache/turbine/services/rundata
                        DefaultTurbineRunData.java
  Log:
  - updating fulcrum jar
  - trying to contain all the interaction between fulcrum and turbine for
    template processing in a single location. right now this is in
    Module.java but maybe this isn't the best location.
  
    There is also another adapter ContextAdapter2 which will be fixed shortly.
    This adapter changes the turbine TemplateContext into a fulcrum
    TemplateContext. Within the turbine namespace all references should be
    to the turbine TemplateContext and have a single location where the adapting
    is done. That's the idea anyway, the layering idea: there's the turbine
    layer and the fulcrum layer for template processing and there should only
    be a single place where they interact so that it's maintainable.
  
  Revision  Changes    Path
  1.4       +2 -2      jakarta-turbine/src/adapter/org/apache/turbine/util/template/TemplateInfo.java
  
  Index: TemplateInfo.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/adapter/org/apache/turbine/util/template/TemplateInfo.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TemplateInfo.java	2001/08/01 15:44:21	1.3
  +++ TemplateInfo.java	2001/08/05 16:12:16	1.4
  @@ -56,7 +56,7 @@
   
   import java.util.Hashtable;
   import org.apache.turbine.RunData;
  -import org.apache.turbine.services.template.TurbineTemplate;
  +import org.apache.fulcrum.template.TurbineTemplate;
   
   /**
    * This is a wrapper for Template specific information.  It's part of
  @@ -65,7 +65,7 @@
    *
    * @author <a href="mailto:mbryson@mindspring.com">Dave Bryson</a>
    * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
  - * @version $Id: TemplateInfo.java,v 1.3 2001/08/01 15:44:21 jvanzyl Exp $
  + * @version $Id: TemplateInfo.java,v 1.4 2001/08/05 16:12:16 jvanzyl Exp $
    */
   public class TemplateInfo
   {
  
  
  
  1.4       +2 -1      jakarta-turbine/src/adapter/org/apache/turbine/util/velocity/VelocityEmail.java
  
  Index: VelocityEmail.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/adapter/org/apache/turbine/util/velocity/VelocityEmail.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- VelocityEmail.java	2001/08/01 15:44:21	1.3
  +++ VelocityEmail.java	2001/08/05 16:12:17	1.4
  @@ -54,6 +54,7 @@
    * <http://www.apache.org/>.
    */
   
  +import org.apache.turbine.modules.Module;
   import org.apache.turbine.util.Log;
   import org.apache.turbine.util.StringUtils;
   import org.apache.turbine.util.mail.Email;
  @@ -122,7 +123,7 @@
    *
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
    * @author <a href="mailto:gcoladonato@yahoo.com">Greg Coladonato</a>
  - * @version $Id: VelocityEmail.java,v 1.3 2001/08/01 15:44:21 jvanzyl Exp $
  + * @version $Id: VelocityEmail.java,v 1.4 2001/08/05 16:12:17 jvanzyl Exp $
    */
   public class VelocityEmail
   {
  
  
  
  1.5       +6 -7      jakarta-turbine/src/adapter/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
  
  Index: VelocityHtmlEmail.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/adapter/org/apache/turbine/util/velocity/VelocityHtmlEmail.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- VelocityHtmlEmail.java	2001/07/17 11:37:24	1.4
  +++ VelocityHtmlEmail.java	2001/08/05 16:12:17	1.5
  @@ -60,11 +60,10 @@
   import org.apache.turbine.Turbine;
   import org.apache.turbine.util.Log;
   import org.apache.turbine.RunData;
  +import org.apache.turbine.modules.Module;
  +import org.apache.turbine.TemplateContext;
   import org.apache.turbine.util.mail.HtmlEmail;
   import org.apache.turbine.util.mail.MultiPartEmail;
  -import org.apache.turbine.services.template.TurbineTemplate;
  -import org.apache.turbine.services.template.TemplateService;
  -import org.apache.turbine.services.template.TemplateContext;
   
   /**
    * This is a simple class for sending html email from within Velocity.
  @@ -100,7 +99,7 @@
    *
    * @author <a href="mailto:A.Schild@aarboard.ch">Andre Schild</a>
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
  - * @version $Id: VelocityHtmlEmail.java,v 1.4 2001/07/17 11:37:24 jvanzyl Exp $
  + * @version $Id: VelocityHtmlEmail.java,v 1.5 2001/08/05 16:12:17 jvanzyl Exp $
    */
   public class VelocityHtmlEmail
       extends HtmlEmail
  @@ -211,13 +210,13 @@
           {
               if(htmlTemplate != null)
               {
  -                htmlbody = TurbineTemplate.handleRequest(
  +                htmlbody = Module.handleRequest(
                       context, htmlTemplate);
               }
               
               if(textTemplate != null)
               {
  -                textbody = TurbineTemplate.handleRequest(
  +                textbody = Module.handleRequest(
                       context, textTemplate);
               }                    
           }
  @@ -301,7 +300,7 @@
           
           if (vc == null)
           {
  -            vc = TurbineTemplate.getTemplateContext(data);
  +            vc = Module.getTemplateContext(data);
               
               data.setTemp(Turbine.CONTEXT,vc);
           }
  
  
  
  1.4       +1 -1      jakarta-turbine/src/java/org/apache/turbine/modules/ContextAdapter.java
  
  Index: ContextAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/ContextAdapter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ContextAdapter.java	2001/07/17 11:37:27	1.3
  +++ ContextAdapter.java	2001/08/05 16:12:17	1.4
  @@ -1,6 +1,6 @@
   package org.apache.turbine.modules;
   
  -import org.apache.turbine.services.template.TemplateContext;
  +import org.apache.fulcrum.template.TemplateContext;
   
   public class ContextAdapter
        implements org.apache.turbine.TemplateContext
  
  
  
  1.7       +61 -3     jakarta-turbine/src/java/org/apache/turbine/modules/Module.java
  
  Index: Module.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/Module.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Module.java	2001/07/17 20:36:03	1.6
  +++ Module.java	2001/08/05 16:12:17	1.7
  @@ -54,10 +54,13 @@
    * <http://www.apache.org/>.
    */
   
  +import org.apache.fulcrum.template.TurbineTemplate;
  +import org.apache.fulcrum.ServiceException;
  +import org.apache.turbine.Turbine;
   import org.apache.turbine.RunData;
   import org.apache.turbine.TemplateContext;
  -import org.apache.turbine.services.template.TurbineTemplate;
   import org.apache.turbine.services.pull.ApplicationTool;
  +import org.apache.turbine.services.pull.TurbinePull;
   
   /**
    * This is an interface that defines what a Module is. All the
  @@ -65,10 +68,12 @@
    * future use is yet to be determined.
    *
    * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
  - * @version $Id: Module.java,v 1.6 2001/07/17 20:36:03 jmcnally Exp $
  + * @version $Id: Module.java,v 1.7 2001/08/05 16:12:17 jvanzyl Exp $
    */
   public class Module
   {
  +    private static boolean pullModelActive = true;
  +
       /**
        * A subclass must override this method to build itself.
        * Subclasses override this method to store the layout in RunData
  @@ -110,9 +115,62 @@
           doBuild(data);
       }
   
  +    public static TemplateContext getTemplateContext()
  +    {
  +        if (pullModelActive)
  +        {
  +            return new ContextAdapter(TurbinePull.getGlobalContext());
  +        }
  +        else
  +        {
  +            return new ContextAdapter(TurbineTemplate.getTemplateContext());
  +        }
  +    }
  +    
       public static TemplateContext getTemplateContext(RunData data)
  +    {   
  +        // Attempt to get it from the data first.  If it doesn't
  +        // exist, create it and then stuff it into the data.
  +        TemplateContext context =
  +            (TemplateContext) data.getTemp(Turbine.CONTEXT);
  +        
  +        if (context == null)
  +        {
  +            context = getTemplateContext();
  +            context.put ( "data", data );
  +
  +            if (pullModelActive)
  +            {
  +                // Populate the toolbox with request scope, session scope
  +                // and persistent scope tools (global tools are already in
  +                // the toolBoxContent which has been wrapped to construct
  +                // this request-specific context).
  +                TurbinePull.populateContext(new ContextAdapter2(context), data);
  +            }
  +            
  +            data.setTemp(Turbine.CONTEXT, context);
  +        }
  +        return context;
  +    }        
  +
  +    public static String handleRequest(TemplateContext context, String template)
  +        throws ServiceException
  +    {
  +        return TurbineTemplate.handleRequest(new ContextAdapter2(context), template);
  +    }
  +
  +    /**
  +     * Performs post-request actions (releases context
  +     * tools back to the object pool).
  +     *
  +     * @param context a Velocity Context
  +     */
  +    public static void requestFinished(TemplateContext context)
       {
  -        return new ContextAdapter(TurbineTemplate.getTemplateContext(data));
  +        if (pullModelActive)
  +        {
  +            TurbinePull.releaseTools(new ContextAdapter2(context));
  +        } 
       }
   
       /**
  
  
  
  1.9       +2 -2      jakarta-turbine/src/java/org/apache/turbine/modules/actions/TemplateAction.java
  
  Index: TemplateAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/TemplateAction.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TemplateAction.java	2001/07/17 11:37:28	1.8
  +++ TemplateAction.java	2001/08/05 16:12:17	1.9
  @@ -60,7 +60,7 @@
   import java.util.Enumeration;
   import org.apache.turbine.ParameterParser;
   import org.apache.turbine.modules.ActionEvent;
  -import org.apache.turbine.services.template.TurbineTemplate;
  +import org.apache.fulcrum.template.TurbineTemplate;
   
   /**
    * If you are using VelocitySite stuff, then your Action's should
  @@ -77,7 +77,7 @@
    *
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
    * @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
  - * @version $Id: TemplateAction.java,v 1.8 2001/07/17 11:37:28 jvanzyl Exp $
  + * @version $Id: TemplateAction.java,v 1.9 2001/08/05 16:12:17 jvanzyl Exp $
    */
   public abstract class TemplateAction 
       extends ActionEvent
  
  
  
  1.20      +2 -2      jakarta-turbine/src/java/org/apache/turbine/modules/screens/TemplateScreen.java
  
  Index: TemplateScreen.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/TemplateScreen.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- TemplateScreen.java	2001/08/01 15:44:23	1.19
  +++ TemplateScreen.java	2001/08/05 16:12:17	1.20
  @@ -58,7 +58,7 @@
   import org.apache.turbine.RunData;
   import org.apache.turbine.TemplateContext;
   import org.apache.turbine.modules.Module;
  -import org.apache.turbine.services.template.TurbineTemplate;
  +import org.apache.fulcrum.template.TurbineTemplate;
   
   /**
    * Template Screen.
  @@ -73,7 +73,7 @@
    * going on there (it is quite simple really).
    *
    * @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
  - * @version $Id: TemplateScreen.java,v 1.19 2001/08/01 15:44:23 jvanzyl Exp $
  + * @version $Id: TemplateScreen.java,v 1.20 2001/08/05 16:12:17 jvanzyl Exp $
    */
   public class TemplateScreen 
       extends Module
  
  
  
  1.11      +7 -8      jakarta-turbine/src/java/org/apache/turbine/pipeline/ClassicPipeline.java
  
  Index: ClassicPipeline.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/pipeline/ClassicPipeline.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ClassicPipeline.java	2001/08/01 15:44:24	1.10
  +++ ClassicPipeline.java	2001/08/05 16:12:17	1.11
  @@ -59,10 +59,10 @@
   import org.apache.turbine.TurbineConstants; // for convenience right now
   import org.apache.turbine.Pipeline;
   import org.apache.turbine.RunData;
  +import org.apache.turbine.TemplateContext;
   import org.apache.turbine.modules.Module;
   import org.apache.turbine.modules.ModuleLoader;
  -import org.apache.turbine.services.template.TemplateContext;
  -import org.apache.turbine.services.template.TurbineTemplate;
  +import org.apache.fulcrum.template.TurbineTemplate;
   import org.apache.turbine.util.Log;
   import org.apache.turbine.util.DynamicURI;
   import org.apache.turbine.modules.actions.sessionvalidator.SessionValidator;
  @@ -265,7 +265,7 @@
       public void preExecuteAction(RunData data)
           throws Exception
       {
  -        TemplateContext context = TurbineTemplate.getTemplateContext(data);
  +        TemplateContext context = Module.getTemplateContext(data);
           data.setTemp(Turbine.CONTEXT, context);
       }
   
  @@ -340,7 +340,7 @@
           // we use. Maybe you might want to change it if
           // you were branding ...
           Renderer r = new Renderer();        
  -        TemplateContext context = TurbineTemplate.getTemplateContext(data);
  +        TemplateContext context = Module.getTemplateContext(data);
           context.put("renderer", r);
           context.put("template", target);
           
  @@ -353,15 +353,14 @@
           // like /layouts/layouts/Default.vm which obviously doesn't
           // work.
           //data.getOut().print(r.render("layouts", data, layoutTemplate));
  -        data.getOut().print(TurbineTemplate.handleRequest(
  -            context, layoutTemplate));
  +        data.getOut().print(Module.handleRequest(context, layoutTemplate));
       }
       
       public void finished(RunData data)
           throws Exception
       {
  -        TemplateContext context = TurbineTemplate.getTemplateContext(data);
  -        TurbineTemplate.requestFinished(context);
  +        TemplateContext context = Module.getTemplateContext(data);
  +        Module.requestFinished(context);
               
           // If a module has set data.acl = null, remove acl from
           // the session.
  
  
  
  1.2       +4 -3      jakarta-turbine/src/java/org/apache/turbine/pipeline/Renderer.java
  
  Index: Renderer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/pipeline/Renderer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Renderer.java	2001/07/12 20:22:55	1.1
  +++ Renderer.java	2001/08/05 16:12:17	1.2
  @@ -56,8 +56,9 @@
   
   import org.apache.turbine.Turbine;
   import org.apache.turbine.RunData;
  +import org.apache.turbine.modules.Module;
   import org.apache.turbine.util.TurbineException;
  -import org.apache.turbine.services.template.TurbineTemplate;
  +import org.apache.fulcrum.template.TurbineTemplate;
   
   public class Renderer
   {
  @@ -72,7 +73,7 @@
           Turbine.getModuleLoader().getModule(moduleType, module).execute(data);
   
           //!! I shouldn't need that slash in there.
  -        return TurbineTemplate.handleRequest(
  -            TurbineTemplate.getTemplateContext(data), moduleType + "/" + template);
  +        return Module.handleRequest(Module.getTemplateContext(data), 
  +            moduleType + "/" + template);
       }
   }
  
  
  
  1.4       +1 -1      jakarta-turbine/src/java/org/apache/turbine/pipeline/Resolver.java
  
  Index: Resolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/pipeline/Resolver.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Resolver.java	2001/07/12 20:22:55	1.3
  +++ Resolver.java	2001/08/05 16:12:17	1.4
  @@ -63,7 +63,7 @@
   import java.util.Iterator;
   
   import org.apache.turbine.Turbine;
  -import org.apache.turbine.services.template.TurbineTemplate;
  +import org.apache.fulcrum.template.TurbineTemplate;
   
   // Given a target template
   
  
  
  
  1.9       +0 -1      jakarta-turbine/src/java/org/apache/turbine/services/jsp/JspService.java
  
  Index: JspService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/JspService.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JspService.java	2001/08/01 15:34:44	1.8
  +++ JspService.java	2001/08/05 16:12:17	1.9
  @@ -58,7 +58,6 @@
   import org.apache.turbine.RunData;
   import org.apache.fulcrum.ServiceException;
   
  -
   /**
    * Implementations of the JspService interface.
    *
  
  
  
  1.24      +3 -3      jakarta-turbine/src/java/org/apache/turbine/services/jsp/TurbineJspService.java
  
  Index: TurbineJspService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/jsp/TurbineJspService.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- TurbineJspService.java	2001/08/01 15:34:44	1.23
  +++ TurbineJspService.java	2001/08/05 16:12:17	1.24
  @@ -65,9 +65,9 @@
   import org.apache.fulcrum.ServiceException;
   //import org.apache.fulcrum.jsp.util.JspLink;
   import org.apache.fulcrum.InitializationException;
  -import org.apache.turbine.services.template.BaseTemplateEngineService;
  -import org.apache.turbine.services.template.TurbineTemplate;
  -import org.apache.turbine.services.template.TemplateContext;
  +import org.apache.fulcrum.template.BaseTemplateEngineService;
  +import org.apache.fulcrum.template.TurbineTemplate;
  +import org.apache.fulcrum.template.TemplateContext;
   
   /**
    * This is a Service that can process JSP templates from within a Turbine 
  
  
  
  1.12      +2 -2      jakarta-turbine/src/java/org/apache/turbine/services/pull/PullService.java
  
  Index: PullService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pull/PullService.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- PullService.java	2001/08/01 15:35:08	1.11
  +++ PullService.java	2001/08/05 16:12:17	1.12
  @@ -56,7 +56,7 @@
   
   import org.apache.turbine.RunData;
   import org.apache.fulcrum.Service;
  -import org.apache.turbine.services.template.TemplateContext;
  +import org.apache.fulcrum.template.TemplateContext;
   
   /**
    * The Pull Service manages the creation of application
  @@ -85,7 +85,7 @@
    * be specified as well.
    *
    * @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
  - * @version $Id: PullService.java,v 1.11 2001/08/01 15:35:08 jvanzyl Exp $
  + * @version $Id: PullService.java,v 1.12 2001/08/05 16:12:17 jvanzyl Exp $
    */
   public interface PullService extends Service
   {
  
  
  
  1.17      +2 -2      jakarta-turbine/src/java/org/apache/turbine/services/pull/TurbinePull.java
  
  Index: TurbinePull.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pull/TurbinePull.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- TurbinePull.java	2001/08/01 15:35:08	1.16
  +++ TurbinePull.java	2001/08/05 16:12:17	1.17
  @@ -55,7 +55,7 @@
    */
   
   import org.apache.turbine.RunData;
  -import org.apache.turbine.services.template.TemplateContext;
  +import org.apache.fulcrum.template.TemplateContext;
   import org.apache.fulcrum.TurbineServices;
   
   /**
  @@ -67,7 +67,7 @@
    *
    * @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: TurbinePull.java,v 1.16 2001/08/01 15:35:08 jvanzyl Exp $
  + * @version $Id: TurbinePull.java,v 1.17 2001/08/05 16:12:17 jvanzyl Exp $
    */
   public abstract class TurbinePull
   {
  
  
  
  1.35      +4 -4      jakarta-turbine/src/java/org/apache/turbine/services/pull/TurbinePullService.java
  
  Index: TurbinePullService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pull/TurbinePullService.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- TurbinePullService.java	2001/08/01 15:35:08	1.34
  +++ TurbinePullService.java	2001/08/05 16:12:17	1.35
  @@ -60,15 +60,15 @@
   import java.util.Vector;
   import java.util.HashMap;
   import org.apache.fulcrum.security.entity.User;
  -import org.apache.turbine.RunData;
   import org.apache.fulcrum.BaseService;
   import org.apache.fulcrum.InitializationException;
   import org.apache.fulcrum.TurbineServices;
   import org.apache.fulcrum.factory.FactoryService;
   import org.apache.fulcrum.pool.PoolService;
  +import org.apache.fulcrum.template.TemplateContext;
  +import org.apache.fulcrum.template.DefaultTemplateContext;
   import org.apache.turbine.services.pull.ApplicationTool;
  -import org.apache.turbine.services.template.TemplateContext;
  -import org.apache.turbine.services.template.DefaultTemplateContext;
  +import org.apache.turbine.RunData;
   
   //!! this has to go away. there should be an interface
   // for Configuration in the commons. i don't even like
  @@ -146,7 +146,7 @@
    *
    * @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
    * @author <a href="mailto:sean@informage.net">Sean Legassick</a>
  - * @version $Id: TurbinePullService.java,v 1.34 2001/08/01 15:35:08 jvanzyl Exp $
  + * @version $Id: TurbinePullService.java,v 1.35 2001/08/05 16:12:17 jvanzyl Exp $
    */
   public class TurbinePullService
       extends BaseService
  
  
  
  1.25      +2 -2      jakarta-turbine/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
  
  Index: DefaultTurbineRunData.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- DefaultTurbineRunData.java	2001/08/01 15:35:21	1.24
  +++ DefaultTurbineRunData.java	2001/08/05 16:12:18	1.25
  @@ -74,7 +74,7 @@
   import org.apache.fulcrum.pool.RecyclableSupport;
   import org.apache.fulcrum.mimetype.TurbineMimeTypes;
   import org.apache.fulcrum.security.entity.User;
  -import org.apache.turbine.services.template.TurbineTemplate;
  +import org.apache.fulcrum.template.TurbineTemplate;
   import org.apache.commons.collections.FastHashMap;
   
   /**
  @@ -96,7 +96,7 @@
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
    * @author <a href="mailto:bhoeneis@ee.ethz.ch">Bernie Hoeneisen</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: DefaultTurbineRunData.java,v 1.24 2001/08/01 15:35:21 jvanzyl Exp $
  + * @version $Id: DefaultTurbineRunData.java,v 1.25 2001/08/05 16:12:18 jvanzyl Exp $
    */
   public class DefaultTurbineRunData
       extends RecyclableSupport
  
  
  

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