cvs commit: jahia/core/src/java/org/jahia/bin JahiaConfigurationWizard.java jahia/core/src/java/org/jahia/services/applications ServletIncludeRequestWrapper.java

[Serge Huber]

shuber      2005/10/28 12:08:03 CEST

  Modified files:
    core/src/java/org/jahia/bin JahiaConfigurationWizard.java 
    core/src/java/org/jahia/services/applications 
                                                  
ServletIncludeRequestWrapper.java 
  Log:
  - Remove tests in configuration wizard that posed problems when Jahia was 
installed in ROOT configuration
  - Bugfix for JAHIA-366 Remove JSessionID from getPathInfo() parameter.
  
  Revision  Changes    Path
  1.30      +6 -1      
jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java.diff?r1=1.29&r2=1.30&f=h
  1.7       +13 -11    
jahia/core/src/java/org/jahia/services/applications/ServletIncludeRequestWrapper.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/applications/ServletIncludeRequestWrapper.java.diff?r1=1.6&r2=1.7&f=h
  
  
  
  Index: JahiaConfigurationWizard.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/bin/JahiaConfigurationWizard.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- JahiaConfigurationWizard.java     10 Oct 2005 18:23:09 -0000      1.29
  +++ JahiaConfigurationWizard.java     28 Oct 2005 10:08:03 -0000      1.30
  @@ -1,4 +1,4 @@
  -// $Id: JahiaConfigurationWizard.java,v 1.29 2005/10/10 18:23:09 shuber Exp $
  +// $Id: JahiaConfigurationWizard.java,v 1.30 2005/10/28 10:08:03 shuber Exp $
   //
   //                                   ____.
   //                       __/\ ______|    |__/\.     _______
  @@ -848,6 +848,10 @@
   
               // try some operations which can return customs exceptions...
               try {
  +                /**
  +                 * Deactivated because :
  +                 *  - it's specific to Tomcat
  +                 *  - doesn't work when Jahia is installed in ROOT context.
                   if 
(serverInfos.get("type").equals(JahiaConstants.SERVER_TOMCAT)) {
                       // try the host url connection...
                       tryHostURL();
  @@ -855,6 +859,7 @@
                       // try the host url connection...
                       tryWebAppsDeployBaseURL();
                   }
  +                */
   
                   // try the path to jahia files (permissions, etc)...
                   tryJahiaFilesPath();
  
  
  
  Index: ServletIncludeRequestWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/applications/ServletIncludeRequestWrapper.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ServletIncludeRequestWrapper.java 5 Jul 2005 15:46:22 -0000       1.6
  +++ ServletIncludeRequestWrapper.java 28 Oct 2005 10:08:03 -0000      1.7
  @@ -340,16 +340,6 @@
                           
this.emulatedPathInfo.substring(this.emulatedServletPath.length());
                           }
   
  -                if ( this.emulatedPathInfo != null ){
  -                    // let's remove the session ID from the parameters if it 
was attached.
  -                    int sessionIDPos = 
this.emulatedPathInfo.lastIndexOf(";jsessionid=");
  -                    if ( sessionIDPos != -1 ){
  -                      this.emulatedPathInfo = 
this.emulatedPathInfo.substring(0,
  -                          sessionIDPos);
  -                      this.jSessionId = 
this.emulatedPathInfo.substring(sessionIDPos);
  -                      logger.debug("Removed session ID marker from end of 
path info");
  -                    }
  -                }
               } else if (servletMappingPattern.startsWith ("*.")) {
                   // extension mapping
                   int pathSepPos = path.lastIndexOf("/");
  @@ -400,6 +390,18 @@
               this.emulatedServletPath = "";
               this.emulatedPathInfo = "";
           }
  +
  +        if ( this.emulatedPathInfo != null ){
  +            // let's remove the session ID from the parameters if it was 
attached.
  +            int sessionIDPos = 
this.emulatedPathInfo.lastIndexOf(";jsessionid=");
  +            if ( sessionIDPos != -1 ){
  +                this.jSessionId = 
this.emulatedPathInfo.substring(sessionIDPos);
  +              this.emulatedPathInfo = this.emulatedPathInfo.substring(0,
  +                  sessionIDPos);
  +              logger.debug("Removed session ID marker from end of path 
info");
  +            }
  +        }
  +
           logger.debug ("url = [" + url + "]");
           logger.debug ("emulated servlet path = [" + this.emulatedServletPath 
+ "]");
           logger.debug ("emulated path info = [" + this.emulatedPathInfo + 
"]");
  @@ -900,7 +902,7 @@
                   }
                   requestURL += appRequest.getservletsrc ();
               }
  -            requestURL += this.jSessionId;
  +            // requestURL += this.jSessionId;
   
               logger.debug ("emulated requestURI = [" + requestURL + "]");
               //return getContextPath()+ "/" + appRequest.getServletName();