Return-Path: <pierred@locus.apache.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 85521 invoked by uid 500); 24 Nov 2000 13:38:34 -0000
Delivered-To: apmail-jakarta-tomcat-4.0-cvs@apache.org
Received: (qmail 85517 invoked by uid 1003); 24 Nov 2000 13:38:34 -0000
Date: 24 Nov 2000 13:38:34 -0000
Message-ID: <20001124133834.85516.qmail@locus.apache.org>
From: pierred@locus.apache.org
To: jakarta-tomcat-4.0-cvs@apache.org
Subject: cvs commit:
 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler
 JikesJavaCompiler.java

pierred     00/11/24 05:38:33

  Modified:    jasper/src/share/org/apache/jasper/compiler
                        JikesJavaCompiler.java
  Log:
  Double quotes only in case of TC running under Windows.
  
  Submitted by:  "Schmitt, Christian" <Christian.Schmitt@Dresdner-Bank.com>
  
  Revision  Changes    Path
  1.3       +9 -7      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java
  
  Index: JikesJavaCompiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JikesJavaCompiler.java	2000/09/01 15:58:44	1.2
  +++ JikesJavaCompiler.java	2000/11/24 13:38:33	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java,v 1.2 2000/09/01 15:58:44 pierred Exp $
  - * $Revision: 1.2 $
  - * $Date: 2000/09/01 15:58:44 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JikesJavaCompiler.java,v 1.3 2000/11/24 13:38:33 pierred Exp $
  + * $Revision: 1.3 $
  + * $Date: 2000/11/24 13:38:33 $
    *
    * ====================================================================
    *
  @@ -134,12 +134,14 @@
       public boolean compile(String source) {
   	Process p;
   	int exitValue = -1;
  +	String quote = "";
   
           // Used to dynamically load classpath if using Microsoft 
           // virtual machine
           if (MicrosoftClasspath==null) {
               MicrosoftClasspath = new StringBuffer(200);
               if (System.getProperty("java.vendor").startsWith("Microsoft")) {
  +                quote = "\"";
                   //Get Microsoft classpath
                   String javaHome = System.getProperty("java.home") + 
                                     "\\Packages";
  @@ -152,12 +154,12 @@
           }
   
           String[] compilerCmd = new String[] {
  -          "\"" + compilerPath + "\"",
  +          quote + compilerPath + quote,
             //XXX - add encoding once Jikes supports it
  -          "-classpath", "\"" + classpath + MicrosoftClasspath + "\"",
  -          "-d", "\"" + outdir + "\"",
  +          "-classpath", quote + classpath + MicrosoftClasspath + quote,
  +          "-d", quote + outdir + quote,
             "-nowarn",
  -          "\"" + source + "\""
  +          quote + source + quote
           };
   
           ByteArrayOutputStream tmpErr = new ByteArrayOutputStream(OUTPUT_BUFFER_SIZE);