tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gl...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler Compiler.java
Date Thu, 08 Feb 2001 13:37:45 GMT
glenn       01/02/08 05:37:45

  Modified:    jasper/src/share/org/apache/jasper/compiler Compiler.java
  Log:
  Put runtime jsp page servlets in a package
  
  Revision  Changes    Path
  1.9       +6 -24     jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java
  
  Index: Compiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Compiler.java	2001/02/04 01:04:52	1.8
  +++ Compiler.java	2001/02/08 13:37:45	1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
1.8 2001/02/04 01:04:52 glenn Exp $
  - * $Revision: 1.8 $
  - * $Date: 2001/02/04 01:04:52 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/Compiler.java,v
1.9 2001/02/08 13:37:45 glenn Exp $
  + * $Revision: 1.9 $
  + * $Date: 2001/02/08 13:37:45 $
    *
    * ====================================================================
    * 
  @@ -227,8 +227,7 @@
               "-encoding",
               javaEncoding,
               "-classpath",
  -            System.getProperty("java.class.path")+ sep + classpath 
  -            + sep + ctxt.getOutputDir(),
  +            System.getProperty("java.class.path")+ sep + classpath,
               "-d", ctxt.getOutputDir(),
               javaFileName
           };
  @@ -259,9 +258,8 @@
            * Configure the compiler object
            */
           javac.setEncoding(javaEncoding);
  -        javac.setClasspath( System.getProperty("java.class.path")+ sep + 
  -                            classpath + sep + ctxt.getOutputDir());
  -        javac.setOutputDir(ctxt.getOutputDir());
  +        javac.setClasspath( System.getProperty("java.class.path")+ sep + classpath);
  +        javac.setOutputDir(ctxt.getJavacOutputDir());
           javac.setMsgOutput(out);
   
           /**
  @@ -278,22 +276,6 @@
               String msg = out.toString ();
               throw new JasperException(Constants.getString("jsp.error.unable.compile")
                                         + msg);
  -        }
  -
  -        String classFile = ctxt.getOutputDir() + File.separatorChar;
  -        classFile = classFile + className + ".class";
  -
  -        if (!classFile.equals(classFileName)) {
  -            File classFileObject = new File(classFile);
  -            File myClassFileObject = new File(classFileName);
  -            if (myClassFileObject.exists())
  -                myClassFileObject.delete();
  -            if (classFileObject.renameTo(myClassFileObject) == false)
  -                throw new JasperException(Constants.getString("jsp.error.unable.rename",
  -                                                              new Object[] { 
  -                                                                  classFileObject, 
  -                                                                  myClassFileObject
  -                                                              }));
           }
   
           return true;
  
  
  

Mime
View raw message