jvanzyl     02/04/24 15:03:10

  Modified:    .        Tag: rundata_security_changes project.xml
               src/aspects/org/apache/turbine Tag: rundata_security_changes
                        Trace.java
               src/java/org/apache/turbine Tag: rundata_security_changes
                        Turbine.java TurbineConstants.java
               src/java/org/apache/turbine/modules Tag:
                        rundata_security_changes Module.java
                        ModuleLoader.java
               src/java/org/apache/turbine/pipeline Tag:
                        rundata_security_changes DefaultResolver.java
                        JspRenderer.java ModuleRunner.java
                        PipelineUtil.java RunModulesValve.java
  Added:       proposals/gonzalo Tag: rundata_security_changes
                        Authenticator.java Authorizer.java Credentials.java
                        Password.java Permission.java Scope.java
                        SecurityObject.java Subject.java
                        TurbineAuthenticator.java TurbineAuthorizer.java
                        TurbineCredentials.java TurbinePermission.java
                        TurbineScope.java TurbineSecurityManager.java
                        TurbineSecurityObject.java TurbineSubject.java
               proposals/jvz Tag: rundata_security_changes
                        AccessController.java DefaultACLCreationValve.java
                        DefaultLoginValve.java
                        DefaultSessionValidationValve.java
                        DefaultTurbineRunData.java FulcrumRunData.java
                        FulcrumSecurityManager.java LoginUser.java
                        LogoutUser.java NullSessionValidator.java
                        SecurityManager.java SessionBindingEventProxy.java
                        SessionValidator.java
                        TemplateSecureSessionValidator.java
                        TemplateSessionValidator.java TurbineSession.java
                        TurbineSessionBindingEvent.java
  Removed:     conf     Tag: rundata_security_changes build.xml
               conf/master Tag: rundata_security_changes Fulcrum.master
                        TurbineResources.master meta.properties
               src/java/org/apache/turbine Tag: rundata_security_changes
                        Log.java TemplateAction.java TemplateContext.java
                        TemplateScreen.java TemplateSecureAction.java
                        TemplateSecureScreen.java TurbineConfig.java
                        TurbineModule.java TurbineSecureModule.java
               src/java/org/apache/turbine/exception Tag:
                        rundata_security_changes
                        DefaultExceptionHandler.java
               src/java/org/apache/turbine/modules Tag:
                        rundata_security_changes ContextAdapter.java
                        DefaultTemplateContext.java Error.java
                        SecureModule.java
               src/java/org/apache/turbine/modules/actions Tag:
                        rundata_security_changes TemplateAction.java
                        TemplateSecureAction.java
               src/java/org/apache/turbine/modules/screens Tag:
                        rundata_security_changes Error.java
                        TemplateScreen.java TemplateSecureScreen.java
               src/java/org/apache/turbine/pipeline Tag:
                        rundata_security_changes ClassicPipeline.java
                        DefaultActionValve.java DefaultTargetValve.java
                        DirectClassicPipeline.java DirectRenderer.java
                        DirectTargetValve.java Renderer.java
               src/java/org/apache/turbine/security Tag:
                        rundata_security_changes SecurityManager.java
               src/java/org/apache/turbine/security/fulcrum Tag:
                        rundata_security_changes AccessController.java
                        DefaultACLCreationValve.java DefaultLoginValve.java
                        DefaultSessionValidationValve.java
                        DefaultTurbineRunData.java FulcrumRunData.java
                        FulcrumSecurityManager.java LoginUser.java
                        LogoutUser.java NullSessionValidator.java
                        SessionBindingEventProxy.java SessionValidator.java
                        TemplateSecureSessionValidator.java
                        TemplateSessionValidator.java TurbineSession.java
                        TurbineSessionBindingEvent.java
               src/java/org/apache/turbine/security/turbine Tag:
                        rundata_security_changes Authenticator.java
                        Authorizer.java Credentials.java Password.java
                        Permission.java Scope.java SecurityObject.java
                        Subject.java TurbineAuthenticator.java
                        TurbineAuthorizer.java TurbineCredentials.java
                        TurbinePermission.java TurbineScope.java
                        TurbineSecurityManager.java
                        TurbineSecurityObject.java TurbineSubject.java
               src/java/org/apache/turbine/services/pull Tag:
                        rundata_security_changes ApplicationTool.java
                        PullService.java TurbinePull.java
                        TurbinePullService.java
  Log:
  don't mind me :-)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.22.2.2  +0 -1      jakarta-turbine-3/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/project.xml,v
  retrieving revision 1.22.2.1
  retrieving revision 1.22.2.2
  diff -u -r1.22.2.1 -r1.22.2.2
  --- project.xml       24 Apr 2002 17:13:03 -0000      1.22.2.1
  +++ project.xml       24 Apr 2002 22:03:06 -0000      1.22.2.2
  @@ -276,7 +276,6 @@
     <build>
       <sourceDirectories>
         <sourceDirectory>src/java</sourceDirectory>
  -      <sourceDirectory>src/tool</sourceDirectory>
       </sourceDirectories>
     
       <aspectSourceDirectories/>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +72 -0     jakarta-turbine-3/proposals/gonzalo/Attic/Authenticator.java
  
  
  
  
  1.1.2.1   +69 -0     jakarta-turbine-3/proposals/gonzalo/Attic/Authorizer.java
  
  
  
  
  1.1.2.1   +66 -0     jakarta-turbine-3/proposals/gonzalo/Attic/Credentials.java
  
  
  
  
  1.1.2.1   +79 -0     jakarta-turbine-3/proposals/gonzalo/Attic/Password.java
  
  
  
  
  1.1.2.1   +67 -0     jakarta-turbine-3/proposals/gonzalo/Attic/Permission.java
  
  
  
  
  1.1.2.1   +67 -0     jakarta-turbine-3/proposals/gonzalo/Attic/Scope.java
  
  
  
  
  1.1.2.1   +68 -0     jakarta-turbine-3/proposals/gonzalo/Attic/SecurityObject.java
  
  
  
  
  1.1.2.1   +67 -0     jakarta-turbine-3/proposals/gonzalo/Attic/Subject.java
  
  
  
  
  1.1.2.1   +75 -0     
jakarta-turbine-3/proposals/gonzalo/Attic/TurbineAuthenticator.java
  
  
  
  
  1.1.2.1   +76 -0     jakarta-turbine-3/proposals/gonzalo/Attic/TurbineAuthorizer.java
  
  
  
  
  1.1.2.1   +69 -0     
jakarta-turbine-3/proposals/gonzalo/Attic/TurbineCredentials.java
  
  
  
  
  1.1.2.1   +73 -0     jakarta-turbine-3/proposals/gonzalo/Attic/TurbinePermission.java
  
  
  
  
  1.1.2.1   +73 -0     jakarta-turbine-3/proposals/gonzalo/Attic/TurbineScope.java
  
  
  
  
  1.1.2.1   +205 -0    
jakarta-turbine-3/proposals/gonzalo/Attic/TurbineSecurityManager.java
  
  
  
  
  1.1.2.1   +82 -0     
jakarta-turbine-3/proposals/gonzalo/Attic/TurbineSecurityObject.java
  
  
  
  
  1.1.2.1   +73 -0     jakarta-turbine-3/proposals/gonzalo/Attic/TurbineSubject.java
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +124 -0    jakarta-turbine-3/proposals/jvz/Attic/AccessController.java
  
  
  
  
  1.1.2.1   +131 -0    
jakarta-turbine-3/proposals/jvz/Attic/DefaultACLCreationValve.java
  
  
  
  
  1.1.2.1   +169 -0    jakarta-turbine-3/proposals/jvz/Attic/DefaultLoginValve.java
  
  
  
  
  1.1.2.1   +134 -0    
jakarta-turbine-3/proposals/jvz/Attic/DefaultSessionValidationValve.java
  
  
  
  
  1.1.2.1   +626 -0    jakarta-turbine-3/proposals/jvz/Attic/DefaultTurbineRunData.java
  
  
  
  
  1.1.2.1   +631 -0    jakarta-turbine-3/proposals/jvz/Attic/FulcrumRunData.java
  
  
  
  
  1.1.2.1   +69 -0     
jakarta-turbine-3/proposals/jvz/Attic/FulcrumSecurityManager.java
  
  
  
  
  1.1.2.1   +154 -0    jakarta-turbine-3/proposals/jvz/Attic/LoginUser.java
  
  
  
  
  1.1.2.1   +142 -0    jakarta-turbine-3/proposals/jvz/Attic/LogoutUser.java
  
  
  
  
  1.1.2.1   +82 -0     jakarta-turbine-3/proposals/jvz/Attic/NullSessionValidator.java
  
  
  
  
  1.1.2.1   +66 -0     jakarta-turbine-3/proposals/jvz/Attic/SecurityManager.java
  
  
  
  
  1.1.2.1   +94 -0     
jakarta-turbine-3/proposals/jvz/Attic/SessionBindingEventProxy.java
  
  
  
  
  1.1.2.1   +85 -0     jakarta-turbine-3/proposals/jvz/Attic/SessionValidator.java
  
  
  
  
  1.1.2.1   +139 -0    
jakarta-turbine-3/proposals/jvz/Attic/TemplateSecureSessionValidator.java
  
  
  
  
  1.1.2.1   +154 -0    
jakarta-turbine-3/proposals/jvz/Attic/TemplateSessionValidator.java
  
  
  
  
  1.1.2.1   +76 -0     jakarta-turbine-3/proposals/jvz/Attic/TurbineSession.java
  
  
  
  
  1.1.2.1   +90 -0     
jakarta-turbine-3/proposals/jvz/Attic/TurbineSessionBindingEvent.java
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +2 -2      jakarta-turbine-3/src/aspects/org/apache/turbine/Trace.java
  
  Index: Trace.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/src/aspects/org/apache/turbine/Trace.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- Trace.java        23 Jan 2002 04:35:48 -0000      1.2
  +++ Trace.java        24 Apr 2002 22:03:08 -0000      1.2.2.1
  @@ -13,7 +13,7 @@
    * into any application classes.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
  - * @version $Id: Trace.java,v 1.2 2002/01/23 04:35:48 jvanzyl Exp $
  + * @version $Id: Trace.java,v 1.2.2.1 2002/04/24 22:03:08 jvanzyl Exp $
    */
   abstract aspect Trace 
   {
  @@ -39,7 +39,7 @@
       protected static int callDepth = 0;
       
       /**
  -     * Log4j category used for tracing.
  +     * //Log4j category used for tracing.
        */
       private static Category log = Category.getInstance("trace");
       
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.24.2.6  +2 -2      jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java
  
  Index: Turbine.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java,v
  retrieving revision 1.24.2.5
  retrieving revision 1.24.2.6
  diff -u -r1.24.2.5 -r1.24.2.6
  --- Turbine.java      24 Apr 2002 17:13:03 -0000      1.24.2.5
  +++ Turbine.java      24 Apr 2002 22:03:08 -0000      1.24.2.6
  @@ -124,7 +124,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
  - * @version $Id: Turbine.java,v 1.24.2.5 2002/04/24 17:13:03 jvanzyl Exp $
  + * @version $Id: Turbine.java,v 1.24.2.6 2002/04/24 22:03:08 jvanzyl Exp $
    */
   public class Turbine
       extends HttpServlet
  @@ -185,7 +185,7 @@
                   ServletContext context = config.getServletContext();
                   String trProps =
                       findInitParameter(context, config,
  -                                      TurbineConfig.PROPERTIES_KEY,
  +                                      TurbineConstants.PROPERTIES_KEY,
                                         "TurbineResources.properties");
                   configure(config, context, trProps);
               }
  
  
  
  1.12.2.3  +6 -4      
jakarta-turbine-3/src/java/org/apache/turbine/TurbineConstants.java
  
  Index: TurbineConstants.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/TurbineConstants.java,v
  retrieving revision 1.12.2.2
  retrieving revision 1.12.2.3
  diff -u -r1.12.2.2 -r1.12.2.3
  --- TurbineConstants.java     24 Apr 2002 17:13:03 -0000      1.12.2.2
  +++ TurbineConstants.java     24 Apr 2002 22:03:08 -0000      1.12.2.3
  @@ -159,12 +159,12 @@
       public static final String TEMPLATE_HOMEPAGE = "template.homepage";
   
       /**
  -     * Login template.
  +     * //Login template.
        */
       public static final String TEMPLATE_LOGIN = "template.login";
   
       /**
  -     * Login error template.
  +     * //Login error template.
        */
       public static final String TEMPLATE_ERROR = "template.error";
   
  @@ -174,12 +174,12 @@
       public static final String SCREEN_HOMEPAGE = "screen.homepage";
   
       /**
  -     * Login screen.
  +     * //Login screen.
        */
       public static final String SCREEN_LOGIN = "screen.login";
   
       /**
  -     * Login error screen.
  +     * //Login error screen.
        */
       public static final String SCREEN_ERROR = "screen.error";
       public static final String SCREEN_INVALID_STATE = "screen.invalidstate";
  @@ -340,4 +340,6 @@
        * standalone is assumed.
        */
       public static final String INTEGRATED = "integrated";
  +
  +    public static final String PROPERTIES_KEY = "TurbineResources.properties";
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.2   +1 -120    
jakarta-turbine-3/src/java/org/apache/turbine/modules/Module.java
  
  Index: Module.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/Module.java,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -r1.7.2.1 -r1.7.2.2
  --- Module.java       8 Feb 2002 01:54:39 -0000       1.7.2.1
  +++ Module.java       24 Apr 2002 22:03:08 -0000      1.7.2.2
  @@ -55,13 +55,9 @@
    */
   
   import java.io.Writer;
  -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.pull.ApplicationTool;
  -import org.apache.turbine.services.pull.TurbinePull;
   
   /**
    * <p>Responsible for populating contexts (can be thought of as "context
  @@ -76,7 +72,7 @@
    * the classic pattern.</p>
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
  - * @version $Id: Module.java,v 1.7.2.1 2002/02/08 01:54:39 dobbs Exp $
  + * @version $Id: Module.java,v 1.7.2.2 2002/04/24 22:03:08 jvanzyl Exp $
    */
   public class Module
   {
  @@ -92,7 +88,6 @@
       protected String doBuild( RunData data )
           throws Exception
       {
  -        doBuildTemplate(data);
           return "";
       }
   
  @@ -120,119 +115,5 @@
           throws Exception
       {
           doBuild(data);
  -    }
  -
  -    /**
  -     * This method should be overidden by subclasses that wish to add
  -     * specific business logic.
  -     *
  -     * @param data Turbine information.
  -     * @exception Exception, a generic exception.
  -     */
  -    protected void doBuildTemplate( RunData data, TemplateContext context)
  -        throws Exception
  -    {
  -    }
  -
  -    protected void doBuildTemplate( RunData data )
  -        throws Exception
  -    {
  -        doBuildTemplate(data, getTemplateContext(data));
  -    }
  -
  -    /**
  -     * Populates the TemplateContext with Pull Tools and the
  -     * RunData object.
  -     *
  -     * @param data Turbine information.
  -     */
  -    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 = TurbinePull.getRuntimeContext(data);
  -            context.put ( "data", data );
  -            data.setTemp(Turbine.CONTEXT, context);
  -        }
  -        return context;
  -    }
  -
  -    public static String handleRequest(TemplateContext context, String template)
  -        throws ServiceException
  -    {
  -        return TurbineTemplate.handleRequest(new ContextAdapter(context), template);
  -    }
  -
  -    public static void handleRequest(TemplateContext context, 
  -                                       String template, Writer writer)
  -        throws ServiceException
  -    {
  -        TurbineTemplate.handleRequest(new ContextAdapter(context), 
  -                                      template, writer);
  -    }
  -
  -    public static boolean templateExists(String template)
  -    {
  -        return TurbineTemplate.templateExists(template);
  -    }
  -
  -    /**
  -     * Performs post-request actions (releases context
  -     * tools back to the object pool).
  -     *
  -     * @param context a Velocity Context
  -     */
  -    public static void requestFinished(TemplateContext context)
  -    {
  -        TurbinePull.releaseTools(context);
  -    }
  -
  -    /**
  -     * Helper method that allows you to easily get a tool
  -     * from a Context. Essentially, it just does the cast
  -     * to an Application tool for you.
  -     *
  -     * @param context a Velocity Context to get tools from
  -     * @param name the name of the tool to get
  -     * @return ApplicationTool null if no tool could be found
  -     */
  -    public static ApplicationTool getTool(TemplateContext context,
  -                                          String name)
  -    {
  -        try
  -        {
  -            return (ApplicationTool) context.get(name);
  -        }
  -        catch (Exception e)
  -        {
  -            return null;
  -        }
  -    }
  -
  -    /**
  -     * This method is used when you want to short circuit a Screen and
  -     * change the template that will be executed next. <b>Note that the current
  -     * context will be applied to the next template that is executed.
  -     * If you want to have the context executed for the next screen,
  -     * to be the same one as the next screen, then you should use the
  -     * TemplateScreen.doRedirect() method.</b>
  -     *
  -     * @param data Turbine information.
  -     * @param template The name of the next template.
  -     * @param deprecated use setTarget(data,template)
  -     */
  -    public static void setTemplate(RunData data, String template)
  -    {
  -        setTarget(data,template);
  -    }
  -
  -    public static void setTarget(RunData data, String template)
  -    {
  -        data.setTarget(template);
       }
   }
  
  
  
  1.7.2.3   +4 -4      
jakarta-turbine-3/src/java/org/apache/turbine/modules/ModuleLoader.java
  
  Index: ModuleLoader.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/ModuleLoader.java,v
  retrieving revision 1.7.2.2
  retrieving revision 1.7.2.3
  diff -u -r1.7.2.2 -r1.7.2.3
  --- ModuleLoader.java 24 Apr 2002 17:13:04 -0000      1.7.2.2
  +++ ModuleLoader.java 24 Apr 2002 22:03:08 -0000      1.7.2.3
  @@ -66,7 +66,7 @@
   import org.apache.turbine.Resolver;
   import org.apache.commons.collections.FastArrayList;
   import org.apache.commons.collections.FastHashMap;
  -import org.apache.turbine.Log;
  +//import org.apache.turbine.//Log;
   
   import org.apache.turbine.pipeline.PipelineUtil;
   
  @@ -75,7 +75,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
  - * @version $Id: ModuleLoader.java,v 1.7.2.2 2002/04/24 17:13:04 jvanzyl Exp $
  + * @version $Id: ModuleLoader.java,v 1.7.2.3 2002/04/24 22:03:08 jvanzyl Exp $
    */
   public class ModuleLoader
   {
  @@ -218,9 +218,9 @@
   
               try
               {
  -                Log.debug("[ModuleLoader] Looking for " + moduleClass);
  +                //Log.debug("[ModuleLoader] Looking for " + moduleClass);
                   module = (Module) Class.forName(moduleClass).newInstance();
  -                Log.debug("[ModuleLoader] " + name + " => " + moduleClass);
  +                //Log.debug("[ModuleLoader] " + name + " => " + moduleClass);
                   break;
               }
               catch (Exception ignored)
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.12.2.1  +9 -3      
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultResolver.java
  
  Index: DefaultResolver.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultResolver.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- DefaultResolver.java      19 Jan 2002 03:23:26 -0000      1.12
  +++ DefaultResolver.java      24 Apr 2002 22:03:09 -0000      1.12.2.1
  @@ -134,7 +134,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Mike Haberman</a>
  - * @version $Id: DefaultResolver.java,v 1.12 2002/01/19 03:23:26 jvanzyl Exp $
  + * @version $Id: DefaultResolver.java,v 1.12.2.1 2002/04/24 22:03:09 jvanzyl Exp $
    */
   public class DefaultResolver
       implements Resolver, TurbineConstants
  @@ -198,7 +198,8 @@
           while (j.hasNext())
           {
               String template = moduleType + "/" + (String) j.next();
  -            if (Module.templateExists(template))
  +            
  +            if (templateExists(template))
               {
                   return template;
               }
  @@ -208,7 +209,12 @@
           // each corresponding module and a default extension.
           return moduleType + defaultTemplate;
       }
  -    
  +
  +    private boolean templateExists(String template)
  +    {
  +        return false;
  +    }
  +
       /**
        * Get the parsed module name for the specified template.
        *
  
  
  
  1.1.2.2   +2 -2      
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/JspRenderer.java
  
  Index: JspRenderer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/JspRenderer.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- JspRenderer.java  24 Apr 2002 17:13:04 -0000      1.1.2.1
  +++ JspRenderer.java  24 Apr 2002 22:03:09 -0000      1.1.2.2
  @@ -62,7 +62,7 @@
   import javax.servlet.RequestDispatcher;
   import javax.servlet.http.HttpServletRequest;
   
  -import org.apache.turbine.Log;
  +//import org.apache.turbine.//Log;
   import org.apache.turbine.RunData;
   import org.apache.turbine.Turbine;
   import org.apache.turbine.TurbineException;
  @@ -74,7 +74,7 @@
    * Valve to call the JspRenderer.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
  - * @version $Id: JspRenderer.java,v 1.1.2.1 2002/04/24 17:13:04 jvanzyl Exp $
  + * @version $Id: JspRenderer.java,v 1.1.2.2 2002/04/24 22:03:09 jvanzyl Exp $
    */
   public class JspRenderer
   {
  
  
  
  1.2.2.1   +4 -5      
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/ModuleRunner.java
  
  Index: ModuleRunner.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/ModuleRunner.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- ModuleRunner.java 13 Nov 2001 21:35:44 -0000      1.2
  +++ ModuleRunner.java 24 Apr 2002 22:03:09 -0000      1.2.2.1
  @@ -58,14 +58,13 @@
   import org.apache.turbine.RunData;
   import org.apache.turbine.modules.Module;
   import org.apache.turbine.TurbineException;
  -import org.apache.turbine.Log;
  -import org.apache.turbine.TemplateContext;
  +//import org.apache.turbine.//Log;
   
   /**
    * This class is used execute the module chain.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Mike Haberman</a>
  - * @version $Id: ModuleRunner.java,v 1.2 2001/11/13 21:35:44 mikeh Exp $
  + * @version $Id: ModuleRunner.java,v 1.2.2.1 2002/04/24 22:03:09 jvanzyl Exp $
    */
   public class ModuleRunner
   {
  @@ -79,8 +78,8 @@
           target = getTarget(data); 
           while(! oldTarget.equals(target)) 
           {
  -           Log.debug("[ClassicPipeline] module to run => " + 
  -                      moduleType + ":" + target);
  +           //Log.debug("[ClassicPipeline] module to run => " + 
  +                      //moduleType + ":" + target);
   
              module = Turbine.getResolver().getModule(moduleType, target);
              module.execute(data);
  
  
  
  1.1.2.1   +1 -9      
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/PipelineUtil.java
  
  Index: PipelineUtil.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/PipelineUtil.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- PipelineUtil.java 13 Nov 2001 21:35:45 -0000      1.1
  +++ PipelineUtil.java 24 Apr 2002 22:03:09 -0000      1.1.2.1
  @@ -54,18 +54,10 @@
    * <http://www.apache.org/>.
    */
   
  - /* 
  -   perhaps this code should go someplace else.
  -   The following classes use it:
  -     + DefaultResolver 
  -     + ModuleRunner
  -     + modules/ModuleLoader 
  -*/
  -
   /**
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Mike Haberman</a>
  - * @version $Id: PipelineUtil.java,v 1.1 2001/11/13 21:35:45 mikeh Exp $
  + * @version $Id: PipelineUtil.java,v 1.1.2.1 2002/04/24 22:03:09 jvanzyl Exp $
    */
   
   public class PipelineUtil
  
  
  
  1.4.2.1   +2 -2      
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/RunModulesValve.java
  
  Index: RunModulesValve.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/RunModulesValve.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- RunModulesValve.java      24 Jan 2002 03:55:26 -0000      1.4
  +++ RunModulesValve.java      24 Apr 2002 22:03:09 -0000      1.4.2.1
  @@ -74,13 +74,13 @@
    * release 2 
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
  - * @version $Id: RunModulesValve.java,v 1.4 2002/01/24 03:55:26 jvanzyl Exp $
  + * @version $Id: RunModulesValve.java,v 1.4.2.1 2002/04/24 22:03:09 jvanzyl Exp $
    */
   public class RunModulesValve 
       extends AbstractValve
   {
       /**
  -     * Log4j category used for logging.
  +     * //Log4j category used for logging.
        */
       private static final Category log = 
           Category.getInstance( RunModulesValve.class );
  
  
  

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

Reply via email to