Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: joist/java/org/joist/security UnsecureServlet.java

Project highlights: Architectural Overview

joist
Discussion topic

Back to topic list

CVS update: joist/java/org/joist/security UnsecureServlet.java

Author davidp
Full name David C. Pellegrini
Date 2000-09-12 05:30:39 PDT
Message User: davidp
  Date: 00/09/12 05:30:39

  Modified: java/org/joist/security UnsecureServlet.java
  Log:
  Removed brand-ness from the template path names.
  
  Revision Changes Path
  1.39 +10 -5 joist/java/org/joist​/security/UnsecureSe​rvlet.java
  
  Index: UnsecureServlet.java
  ====================​====================​====================​=======
  RCS file: /cvs/joist/java/org/​joist/security/Unsec​ureServlet.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- UnsecureServlet.java 2000/09/10 23:20:32 1.38
  +++ UnsecureServlet.java 2000/09/12 12:30:38 1.39
  @@ -70,7 +70,7 @@
    * loading to WebMacro servlets.
    *
    * @author David C. Pellegrini <A HREF="mailto:davidp@​dataweb-systems.com"​>davidp@dataweb-s​ystems.com</A>​
  - * @version $Revision: 1.38 $
  + * @version $Revision: 1.39 $
    *
    * Copyright (c) 1999 dataweb systems, inc.
    * Copyright (c) 1999, 2000 Collab.Net, Inc.
  @@ -188,6 +188,11 @@
                                    templateName);
           }
   
  + // This "parse" object eliminates the need to #parse in the
  + // templates.
  +// FUTURE: context.put("parser", new WMParse(context));
  +
  +
           // Process the template.
           execute(template, context);
           }
  @@ -395,9 +400,9 @@
           // When using cooked templates, specify the full path to the cooked
           // version of the servlet-specific template. This must be relative
           // to the TemplatePath specified in WebMacro.properties.
  - // Ex: .../site/templates/n​etbeans/org/helm/adm​in/ProjectList.wm
  + // Ex: .../site/templates/o​rg/helm/admin/Projec​tList.wm
           fullTemplate.append(​servletTemplateRoot)​.append('/');
  - fullTemplate.append(​brandName).append('/​');
  +//REM: fullTemplate.append(​brandName).append('/​');
           fullTemplate.append(​templateDirectory).a​ppend('/');
           fullTemplate.append(​servletTemplate);
       }
  @@ -411,8 +416,8 @@
           fullTemplate.append(​masterTemplateName);​
   
           // Make sure the current brand is appended to the template root.
  - context.put("SERVLET​_TEMPLATE_ROOT", servletTemplateRoot + '/' +
  - brandName);
  +//REM: context.put("SERVLET​_TEMPLATE_ROOT", servletTemplateRoot + '/' +
  +//REM: brandName);
       }
   
       context.put("servletTemplate",

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: joist/java/org/joist/security UnsecureServlet.java davidp David C. Pellegrini 2000-09-12 05:30:39 PDT
Messages per page: