cvs commit: cocoon-2.2/src/java/org/apache/cocoon/bean OldCocoonWrapper.java CocoonWrapper.java

[cziegeler]

cziegeler    2003/10/19 10:20:23

  Modified:    src/java/org/apache/cocoon/servlet CocoonServlet.java
               src/java/org/apache/cocoon Constants.java
               src/java/org/apache/cocoon/bean OldCocoonWrapper.java
                        CocoonWrapper.java
  Log:
  Adding context root url
  
  Revision  Changes    Path
  1.17      +3 -2      
cocoon-2.2/src/java/org/apache/cocoon/servlet/CocoonServlet.java
  
  Index: CocoonServlet.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/servlet/CocoonServlet.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- CocoonServlet.java        16 Sep 2003 01:51:05 -0000      1.16
  +++ CocoonServlet.java        19 Oct 2003 17:20:23 -0000      1.17
  @@ -370,7 +370,8 @@
           if (getLogger().isDebugEnabled()) {
               getLogger().debug("URL for Root: " + this.servletContextURL);
           }
  -
  +        this.appContext.put(Constants.CONTEXT_ROOT_URL, 
this.servletContextURL);
  +        
           this.forceLoadParameter = getInitParameter("load-class", null);
   
           this.forceSystemProperty = getInitParameter("force-property", null);
  
  
  
  1.10      +4 -1      cocoon-2.2/src/java/org/apache/cocoon/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/Constants.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Constants.java    17 Oct 2003 20:58:08 -0000      1.9
  +++ Constants.java    19 Oct 2003 17:20:23 -0000      1.10
  @@ -301,6 +301,9 @@
        */
       public static final String CONTEXT_CONFIG_URL = "config-url";
   
  +    /** Application root directory @since 2.2 */
  +    public static final String CONTEXT_ROOT_URL = "root-url";
  +    
       /**
        * Should descriptors be reloaded?
        *
  
  
  
  1.2       +2 -1      
cocoon-2.2/src/java/org/apache/cocoon/bean/OldCocoonWrapper.java
  
  Index: OldCocoonWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/bean/OldCocoonWrapper.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OldCocoonWrapper.java     17 Oct 2003 17:49:24 -0000      1.1
  +++ OldCocoonWrapper.java     19 Oct 2003 17:20:23 -0000      1.2
  @@ -175,6 +175,7 @@
               File cacheDir = getDir(workDir + File.separator + "cache-dir", 
"cache");
               appContext.put(Constants.CONTEXT_CACHE_DIR, cacheDir);
               appContext.put(Constants.CONTEXT_CONFIG_URL, conf.toURL());
  +            appContext.put(Constants.CONTEXT_ROOT_URL, this.contextDir);
   
               loadClasses(classList);
   
  
  
  
  1.9       +3 -2      
cocoon-2.2/src/java/org/apache/cocoon/bean/CocoonWrapper.java
  
  Index: CocoonWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/bean/CocoonWrapper.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CocoonWrapper.java        19 Sep 2003 10:10:12 -0000      1.8
  +++ CocoonWrapper.java        19 Oct 2003 17:20:23 -0000      1.9
  @@ -175,7 +175,8 @@
               File cacheDir = getDir(workDir + File.separator + "cache-dir", 
"cache");
               appContext.put(Constants.CONTEXT_CACHE_DIR, cacheDir);
               appContext.put(Constants.CONTEXT_CONFIG_URL, conf.toURL());
  -
  +            appContext.put(Constants.CONTEXT_ROOT_URL, this.contextDir);
  +            
               loadClasses(classList);
   
               cocoon = new Cocoon();