cvs commit: jahia/core/src/java/org/jahia/bin JahiaAdministration.java jahia/core/src/java/org/jahia/services/webapps_deployer JahiaTomcatWebAppsDeployerBaseService.java

[Serge Huber]

shuber      2004/08/17 15:59:33 CEST

  Modified files:
    core/src/java/org/jahia/bin JahiaAdministration.java 
    core/src/java/org/jahia/services/webapps_deployer 
                                                      
JahiaTomcatWebAppsDeployerBaseService.java 
  Log:
  Bugfix : when using application.xml to retrieve context name, we were not handling 
the / correctly.
  
  Revision  Changes    Path
  1.5       +0 -0      jahia/core/src/java/org/jahia/bin/JahiaAdministration.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/bin/JahiaAdministration.java.diff?r1=1.4&r2=1.5&f=h
  1.10      +4 -0      
jahia/core/src/java/org/jahia/services/webapps_deployer/JahiaTomcatWebAppsDeployerBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/webapps_deployer/JahiaTomcatWebAppsDeployerBaseService.java.diff?r1=1.9&r2=1.10&f=h
  
  
  
  Index: JahiaAdministration.java
  ===================================================================
  RCS file: /cvs/jahia/core/src/java/org/jahia/bin/JahiaAdministration.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JahiaAdministration.java  16 Aug 2004 15:03:32 -0000      1.4
  +++ JahiaAdministration.java  17 Aug 2004 13:59:32 -0000      1.5
  @@ -1,4 +1,4 @@
  -// $Id: JahiaAdministration.java,v 1.4 2004/08/16 15:03:32 shuber Exp $
  +// $Id: JahiaAdministration.java,v 1.5 2004/08/17 13:59:32 shuber Exp $
   //
   //                                   ____.
   //                       __/\ ______|    |__/\.     _______
  
  
  
  Index: JahiaTomcatWebAppsDeployerBaseService.java
  ===================================================================
  RCS file: 
/cvs/jahia/core/src/java/org/jahia/services/webapps_deployer/JahiaTomcatWebAppsDeployerBaseService.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JahiaTomcatWebAppsDeployerBaseService.java        16 Aug 2004 14:34:21 -0000     
 1.9
  +++ JahiaTomcatWebAppsDeployerBaseService.java        17 Aug 2004 13:59:33 -0000     
 1.10
  @@ -613,6 +613,10 @@
                       String deployContext = webComp.getContextRoot();
                       if (deployContext == null) {
                           deployContext = JahiaTools.removeFileExtension 
(warFile.getName (), ".war");
  +                    } else {
  +                        if (deployContext.startsWith("/")) {
  +                            deployContext = deployContext.substring(1);
  +                        }
                       }
   
                       if (!deployWarFile(site,