You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2005/04/04 15:57:49 UTC

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler JDTCompiler.java

remm        2005/04/04 06:57:49

  Modified:    jasper2/src/share/org/apache/jasper
                        EmbeddedServletOptions.java
               webapps/docs changelog.xml
               .        build.properties.default
               jasper2/src/share/org/apache/jasper/compiler
                        JDTCompiler.java
  Log:
  - Update to JDT 3.1 M6 (Java 5 feature complete, from what I have read).
  - Please test it (compilation on JDK 1.4 seems to work as usual) to see if this is ok or should be reverted.
  
  Revision  Changes    Path
  1.22      +153 -142  jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java
  
  Index: EmbeddedServletOptions.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/EmbeddedServletOptions.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- EmbeddedServletOptions.java	21 Mar 2005 15:38:12 -0000	1.21
  +++ EmbeddedServletOptions.java	4 Apr 2005 13:57:49 -0000	1.22
  @@ -38,37 +38,37 @@
    * @author Pierre Delisle
    */
   public final class EmbeddedServletOptions implements Options {
  -
  +    
       // Logger
       private Log log = LogFactory.getLog(EmbeddedServletOptions.class);
  -
  +    
       private Properties settings = new Properties();
       
       /**
        * Is Jasper being used in development mode?
        */
       private boolean development = true;
  -
  +    
       /**
        * Should Ant fork its java compiles of JSP pages.
        */
       public boolean fork = true;
  -
  +    
       /**
        * Do you want to keep the generated Java files around?
        */
       private boolean keepGenerated = true;
  -
  +    
       /**
        * Should white spaces between directives or actions be trimmed?
        */
       private boolean trimSpaces = false;
  -
  +    
       /**
        * Determines whether tag handler pooling is enabled.
        */
       private boolean isPoolingEnabled = true;
  -
  +    
       /**
        * Do you want support for "mapped" files? This will generate
        * servlet that has a print statement per line of the JSP file.
  @@ -82,34 +82,34 @@
        * error or a log file if the standard error is redirected. 
        */
       private boolean sendErrorToClient = false;
  -
  +    
       /**
        * Do we want to include debugging information in the class file?
        */
       private boolean classDebugInfo = true;
  -
  +    
       /**
        * Background compile thread check interval in seconds.
        */
       private int checkInterval = 0;
  -
  +    
       /**
        * Is the generation of SMAP info for JSR45 debuggin suppressed?
        */
       private boolean isSmapSuppressed = false;
  -
  +    
       /**
        * Should SMAP info for JSR45 debugging be dumped to a file?
        */
       private boolean isSmapDumped = false;
  -
  +    
       /**
        * Are Text strings to be generated as char arrays?
        */
       private boolean genStringAsCharArray = false;
  -
  +    
       private boolean errorOnUseBeanInvalidClassAttribute = true;
  -
  +    
       /**
        * I want to see my generated servlets. Which directory are they
        * in?
  @@ -122,7 +122,7 @@
        * to have a jsp initParam of type ieClassId="<value>"
        */
       private String ieClassId = "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93";
  -
  +    
       /**
        * What classpath should I use while compiling generated servlets?
        */
  @@ -132,38 +132,38 @@
        * Compiler to use.
        */
       private String compiler = null;
  -
  +    
       /**
        * Compiler target VM.
        */
  -    private String compilerTargetVM = "1.4";
  -
  +    private String compilerTargetVM = "1.5";
  +    
       /**
        * The compiler source VM.
        */
  -    private String compilerSourceVM = "1.4";
  -
  +    private String compilerSourceVM = "1.5";
  +    
       /**
        * Cache for the TLD locations
        */
       private TldLocationsCache tldLocationsCache = null;
  -
  +    
       /**
        * Jsp config information
        */
       private JspConfig jspConfig = null;
  -
  +    
       /**
        * TagPluginManager
        */
       private TagPluginManager tagPluginManager = null;
  -
  +    
       /**
        * Java platform encoding to generate the JSP
        * page servlet.
        */
       private String javaEncoding = "UTF8";
  -
  +    
       /**
        * Modification test interval.
        */
  @@ -173,11 +173,11 @@
        * Is generation of X-Powered-By response header enabled/disabled?
        */
       private boolean xpoweredBy;
  -
  +    
       public String getProperty(String name ) {
           return settings.getProperty( name );
       }
  -
  +    
       public void setProperty(String name, String value ) {
           if (name != null && value != null){ 
               settings.setProperty( name, value );
  @@ -199,9 +199,9 @@
       }
       
       public boolean isPoolingEnabled() {
  -	return isPoolingEnabled;
  +        return isPoolingEnabled;
       }
  -
  +    
       /**
        * Are we supporting HTML mapped servlets?
        */
  @@ -215,21 +215,21 @@
       public boolean getSendErrorToClient() {
           return sendErrorToClient;
       }
  - 
  +    
       /**
        * Should class files be compiled with debug information?
        */
       public boolean getClassDebugInfo() {
           return classDebugInfo;
       }
  -
  +    
       /**
        * Background JSP compile thread check intervall
        */
       public int getCheckInterval() {
           return checkInterval;
       }
  -
  +    
       /**
        * Modification test interval.
        */
  @@ -243,28 +243,28 @@
       public boolean getDevelopment() {
           return development;
       }
  -
  +    
       /**
        * Is the generation of SMAP info for JSR45 debuggin suppressed?
        */
       public boolean isSmapSuppressed() {
           return isSmapSuppressed;
       }
  -
  +    
       /**
        * Should SMAP info for JSR45 debugging be dumped to a file?
        */
       public boolean isSmapDumped() {
           return isSmapDumped;
       }
  -
  +    
       /**
        * Are Text strings to be generated as char arrays?
        */
       public boolean genStringAsCharArray() {
           return this.genStringAsCharArray;
       }
  -
  +    
       /**
        * Class ID for use in the plugin tag when the browser is IE. 
        */
  @@ -278,7 +278,7 @@
       public File getScratchDir() {
           return scratchDir;
       }
  -
  +    
       /**
        * What classpath should I use while compiling the servlets
        * generated from JSP files?
  @@ -286,81 +286,92 @@
       public String getClassPath() {
           return classpath;
       }
  -
  +    
       /**
        * Is generation of X-Powered-By response header enabled/disabled?
        */
       public boolean isXpoweredBy() {
           return xpoweredBy;
       }
  -
  +    
       /**
        * Compiler to use.
        */
       public String getCompiler() {
           return compiler;
       }
  -
  +    
       /**
        * @see Options#getCompilerTargetVM
        */
       public String getCompilerTargetVM() {
           return compilerTargetVM;
       }
  -
  +    
       /**
        * @see Options#getCompilerSourceVM
        */
       public String getCompilerSourceVM() {
           return compilerSourceVM;
       }
  -
  +    
       public boolean getErrorOnUseBeanInvalidClassAttribute() {
           return errorOnUseBeanInvalidClassAttribute;
       }
  -
  +    
       public void setErrorOnUseBeanInvalidClassAttribute(boolean b) {
           errorOnUseBeanInvalidClassAttribute = b;
       }
  -
  +    
       public TldLocationsCache getTldLocationsCache() {
  -	return tldLocationsCache;
  +        return tldLocationsCache;
       }
  -
  +    
       public void setTldLocationsCache( TldLocationsCache tldC ) {
           tldLocationsCache = tldC;
       }
  -
  +    
       public String getJavaEncoding() {
  -	return javaEncoding;
  +        return javaEncoding;
       }
  -
  +    
       public boolean getFork() {
           return fork;
       }
  -
  +    
       public JspConfig getJspConfig() {
  -	return jspConfig;
  +        return jspConfig;
       }
  -
  +    
       public TagPluginManager getTagPluginManager() {
  -	return tagPluginManager;
  +        return tagPluginManager;
       }
  -
  +    
       /**
        * Create an EmbeddedServletOptions object using data available from
        * ServletConfig and ServletContext. 
        */
       public EmbeddedServletOptions(ServletConfig config,
  -				 ServletContext context) {
  -
  +            ServletContext context) {
  +        
  +        // JVM version numbers
  +        try {
  +            if (Float.parseFloat(System.getProperty("java.specification.version")) >= 1.4) {
  +                compilerSourceVM = compilerTargetVM = "1.5";
  +            } else {
  +                compilerSourceVM = compilerTargetVM = "1.4";
  +            }
  +        } catch (NumberFormatException e) {
  +            // Ignore
  +        }
  +        
           Enumeration enumeration=config.getInitParameterNames();
           while( enumeration.hasMoreElements() ) {
               String k=(String)enumeration.nextElement();
               String v=config.getInitParameter( k );
               setProperty( k, v);
           }
  -
  +        
           // quick hack
           String validating=config.getInitParameter( "validating");
           if( "false".equals( validating )) ParserUtils.validating=false;
  @@ -372,13 +383,13 @@
               } else if (keepgen.equalsIgnoreCase("false")) {
                   this.keepGenerated = false;
               } else {
  -		if (log.isWarnEnabled()) {
  -		    log.warn(Localizer.getMessage("jsp.warning.keepgen"));
  -		}
  -	    }
  +                if (log.isWarnEnabled()) {
  +                    log.warn(Localizer.getMessage("jsp.warning.keepgen"));
  +                }
  +            }
           }
  -            
  -
  +        
  +        
           String trimsp = config.getInitParameter("trimSpaces"); 
           if (trimsp != null) {
               if (trimsp.equalsIgnoreCase("true")) {
  @@ -386,26 +397,26 @@
               } else if (trimsp.equalsIgnoreCase("false")) {
                   trimSpaces = false;
               } else {
  -		if (log.isWarnEnabled()) {
  -		    log.warn(Localizer.getMessage("jsp.warning.trimspaces"));
  -		}
  -	    }
  +                if (log.isWarnEnabled()) {
  +                    log.warn(Localizer.getMessage("jsp.warning.trimspaces"));
  +                }
  +            }
           }
  -	
  -	this.isPoolingEnabled = true;
  +        
  +        this.isPoolingEnabled = true;
           String poolingEnabledParam
  -	    = config.getInitParameter("enablePooling"); 
  +        = config.getInitParameter("enablePooling"); 
           if (poolingEnabledParam != null
  -  	        && !poolingEnabledParam.equalsIgnoreCase("true")) {
  +                && !poolingEnabledParam.equalsIgnoreCase("true")) {
               if (poolingEnabledParam.equalsIgnoreCase("false")) {
                   this.isPoolingEnabled = false;
               } else {
  -		if (log.isWarnEnabled()) {
  -		    log.warn(Localizer.getMessage("jsp.warning.enablePooling"));
  -		}		       	   
  -	    }
  +                if (log.isWarnEnabled()) {
  +                    log.warn(Localizer.getMessage("jsp.warning.enablePooling"));
  +                }		       	   
  +            }
           }
  -
  +        
           String mapFile = config.getInitParameter("mappedfile"); 
           if (mapFile != null) {
               if (mapFile.equalsIgnoreCase("true")) {
  @@ -413,12 +424,12 @@
               } else if (mapFile.equalsIgnoreCase("false")) {
                   this.mappedFile = false;
               } else {
  -		if (log.isWarnEnabled()) {
  -		    log.warn(Localizer.getMessage("jsp.warning.mappedFile"));
  -		}
  -	    }
  +                if (log.isWarnEnabled()) {
  +                    log.warn(Localizer.getMessage("jsp.warning.mappedFile"));
  +                }
  +            }
           }
  -	
  +        
           String senderr = config.getInitParameter("sendErrToClient");
           if (senderr != null) {
               if (senderr.equalsIgnoreCase("true")) {
  @@ -426,12 +437,12 @@
               } else if (senderr.equalsIgnoreCase("false")) {
                   this.sendErrorToClient = false;
               } else {
  -		if (log.isWarnEnabled()) {
  -		    log.warn(Localizer.getMessage("jsp.warning.sendErrToClient"));
  -		}
  -	    }
  +                if (log.isWarnEnabled()) {
  +                    log.warn(Localizer.getMessage("jsp.warning.sendErrToClient"));
  +                }
  +            }
           }
  -
  +        
           String debugInfo = config.getInitParameter("classdebuginfo");
           if (debugInfo != null) {
               if (debugInfo.equalsIgnoreCase("true")) {
  @@ -439,29 +450,29 @@
               } else if (debugInfo.equalsIgnoreCase("false")) {
                   this.classDebugInfo  = false;
               } else {
  -		if (log.isWarnEnabled()) {
  -		    log.warn(Localizer.getMessage("jsp.warning.classDebugInfo"));
  -		}
  -	    }
  +                if (log.isWarnEnabled()) {
  +                    log.warn(Localizer.getMessage("jsp.warning.classDebugInfo"));
  +                }
  +            }
           }
  -
  +        
           String checkInterval = config.getInitParameter("checkInterval");
           if (checkInterval != null) {
               try {
  -		this.checkInterval = Integer.parseInt(checkInterval);
  +                this.checkInterval = Integer.parseInt(checkInterval);
                   if (this.checkInterval == 0) {
                       this.checkInterval = 300;
  -		    if (log.isWarnEnabled()) {
  -			log.warn(Localizer.getMessage("jsp.warning.checkInterval"));
  -		    }
  +                    if (log.isWarnEnabled()) {
  +                        log.warn(Localizer.getMessage("jsp.warning.checkInterval"));
  +                    }
                   }
               } catch(NumberFormatException ex) {
  -		if (log.isWarnEnabled()) {
  -		    log.warn(Localizer.getMessage("jsp.warning.checkInterval"));
  -		}
  +                if (log.isWarnEnabled()) {
  +                    log.warn(Localizer.getMessage("jsp.warning.checkInterval"));
  +                }
               }
           }
  -
  +        
           String modificationTestInterval = config.getInitParameter("modificationTestInterval");
           if (modificationTestInterval != null) {
               try {
  @@ -472,7 +483,7 @@
                   }
               }
           }
  -
  +        
           String development = config.getInitParameter("development");
           if (development != null) {
               if (development.equalsIgnoreCase("true")) {
  @@ -480,16 +491,16 @@
               } else if (development.equalsIgnoreCase("false")) {
                   this.development = false;
               } else {
  -		if (log.isWarnEnabled()) {
  -		    log.warn(Localizer.getMessage("jsp.warning.development"));
  -		}
  -	    }
  +                if (log.isWarnEnabled()) {
  +                    log.warn(Localizer.getMessage("jsp.warning.development"));
  +                }
  +            }
           }
  -
  +        
           String suppressSmap = config.getInitParameter("suppressSmap");
           if (suppressSmap != null) {
               if (suppressSmap.equalsIgnoreCase("true")) {
  -		isSmapSuppressed = true;
  +                isSmapSuppressed = true;
               } else if (suppressSmap.equalsIgnoreCase("false")) {
                   isSmapSuppressed = false;
               } else {
  @@ -498,7 +509,7 @@
                   }
               }
           }
  -
  +        
           String dumpSmap = config.getInitParameter("dumpSmap");
           if (dumpSmap != null) {
               if (dumpSmap.equalsIgnoreCase("true")) {
  @@ -511,7 +522,7 @@
                   }
               }
           }
  -
  +        
           String genCharArray = config.getInitParameter("genStrAsCharArray");
           if (genCharArray != null) {
               if (genCharArray.equalsIgnoreCase("true")) {
  @@ -524,9 +535,9 @@
                   }
               }
           }
  -
  +        
           String errBeanClass =
  -	    config.getInitParameter("errorOnUseBeanInvalidClassAttribute");
  +            config.getInitParameter("errorOnUseBeanInvalidClassAttribute");
           if (errBeanClass != null) {
               if (errBeanClass.equalsIgnoreCase("true")) {
                   errorOnUseBeanInvalidClassAttribute = true;
  @@ -538,18 +549,18 @@
                   }
               }
           }
  -
  +        
           String ieClassId = config.getInitParameter("ieClassId");
           if (ieClassId != null)
               this.ieClassId = ieClassId;
  -
  +        
           String classpath = config.getInitParameter("classpath");
           if (classpath != null)
               this.classpath = classpath;
  -
  -	/*
  -	 * scratchdir
  -	 */
  +        
  +        /*
  +         * scratchdir
  +         */
           String dir = config.getInitParameter("scratchdir"); 
           if (dir != null) {
               scratchDir = new File(dir);
  @@ -568,29 +579,29 @@
               log.fatal(Localizer.getMessage("jsp.error.no.scratch.dir"));
               return;
           }
  -            
  +        
           if (!(scratchDir.exists() && scratchDir.canRead() &&
  -              scratchDir.canWrite() && scratchDir.isDirectory()))
  +                scratchDir.canWrite() && scratchDir.isDirectory()))
               log.fatal(Localizer.getMessage("jsp.error.bad.scratch.dir",
  -					   scratchDir.getAbsolutePath()));
  -                                  
  +                    scratchDir.getAbsolutePath()));
  +        
           this.compiler = config.getInitParameter("compiler");
           
           String compilerTargetVM = config.getInitParameter("compilerTargetVM");
           if(compilerTargetVM != null) {
               this.compilerTargetVM = compilerTargetVM;
           }
  -
  +        
           String compilerSourceVM = config.getInitParameter("compilerSourceVM");
           if(compilerSourceVM != null) {
               this.compilerSourceVM = compilerSourceVM;
           }
  -
  +        
           String javaEncoding = config.getInitParameter("javaEncoding");
           if (javaEncoding != null) {
               this.javaEncoding = javaEncoding;
           }
  -
  +        
           String fork = config.getInitParameter("fork");
           if (fork != null) {
               if (fork.equalsIgnoreCase("true")) {
  @@ -598,12 +609,12 @@
               } else if (fork.equalsIgnoreCase("false")) {
                   this.fork = false;
               } else {
  -		if (log.isWarnEnabled()) {
  -		    log.warn(Localizer.getMessage("jsp.warning.fork"));
  -		}
  -	    }
  +                if (log.isWarnEnabled()) {
  +                    log.warn(Localizer.getMessage("jsp.warning.fork"));
  +                }
  +            }
           }
  -
  +        
           String xpoweredBy = config.getInitParameter("xpoweredBy"); 
           if (xpoweredBy != null) {
               if (xpoweredBy.equalsIgnoreCase("true")) {
  @@ -611,22 +622,22 @@
               } else if (xpoweredBy.equalsIgnoreCase("false")) {
                   this.xpoweredBy = false;
               } else {
  -		if (log.isWarnEnabled()) {
  -		    log.warn(Localizer.getMessage("jsp.warning.xpoweredBy"));
  -		}
  -	    }
  +                if (log.isWarnEnabled()) {
  +                    log.warn(Localizer.getMessage("jsp.warning.xpoweredBy"));
  +                }
  +            }
           }
  -
  -	// Setup the global Tag Libraries location cache for this
  -	// web-application.
  -	tldLocationsCache = new TldLocationsCache(context);
  -
  -	// Setup the jsp config info for this web app.
  -	jspConfig = new JspConfig(context);
  -
  -	// Create a Tag plugin instance
  -	tagPluginManager = new TagPluginManager(context);
  +        
  +        // Setup the global Tag Libraries location cache for this
  +        // web-application.
  +        tldLocationsCache = new TldLocationsCache(context);
  +        
  +        // Setup the jsp config info for this web app.
  +        jspConfig = new JspConfig(context);
  +        
  +        // Create a Tag plugin instance
  +        tagPluginManager = new TagPluginManager(context);
       }
  -
  +    
   }
   
  
  
  
  1.282     +9 -0      jakarta-tomcat-catalina/webapps/docs/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
  retrieving revision 1.281
  retrieving revision 1.282
  diff -u -r1.281 -r1.282
  --- changelog.xml	4 Apr 2005 11:11:51 -0000	1.281
  +++ changelog.xml	4 Apr 2005 13:57:49 -0000	1.282
  @@ -39,6 +39,9 @@
         <update>
           <bug>34248</bug>: Update JavaMail download instructions to include JAF. (yoavs)
         </update>
  +      <update>
  +        Update to JDT from Eclipse 3.1M6, which is now feature complete (remm)
  +      </update>
       </changelog>
     </subsection>
     
  @@ -84,6 +87,12 @@
           <bug>34727</bug>: Allow specifying the Option class used by the Jasper engine,
           submitted by Scott Stark (remm)
         </add>
  +      <add>
  +        Support for Java 5.0 in JSPs (remm)
  +      </add>
  +      <update>
  +        Java 5 will be the source and target for JSPs when running on Java 5 (remm)
  +      </update>
       </changelog>
     </subsection>
     
  
  
  
  1.142     +3 -4      jakarta-tomcat-5/build.properties.default
  
  Index: build.properties.default
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
  retrieving revision 1.141
  retrieving revision 1.142
  diff -u -r1.141 -r1.142
  --- build.properties.default	24 Mar 2005 11:42:10 -0000	1.141
  +++ build.properties.default	4 Apr 2005 13:57:49 -0000	1.142
  @@ -138,11 +138,10 @@
   
   
   # ----- Eclipse JDT, version 3.0 or later -----
  -jdt.home=${base.path}/eclipse/plugins/org.eclipse.jdt.core_3.0.1
  +jdt.home=${base.path}/eclipse/plugins/org.eclipse.jdt.core_3.1.0
   jdt.lib=${jdt.home}
   jdt.jar=${jdt.lib}/jdtcore.jar
  -jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.0.1-200409161125/eclipse-JDT-3.0.1.zip
  -
  +jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/S-3.1M6-200504011645/eclipse-JDT-SDK-3.1M6.zip
   
   # --------------------------------------------------
   #              CORE OPTIONAL LIBRARIES
  
  
  
  1.9       +37 -25    jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JDTCompiler.java
  
  Index: JDTCompiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/JDTCompiler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JDTCompiler.java	17 Dec 2004 12:39:55 -0000	1.8
  +++ JDTCompiler.java	4 Apr 2005 13:57:49 -0000	1.9
  @@ -60,20 +60,6 @@
   public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
   
       
  -    static boolean target14;
  -    static boolean source14;
  -
  -    static {
  -        // Detect JDK version we are running under
  -        String version = System.getProperty("java.specification.version");
  -        try {
  -            source14 = target14 = Float.parseFloat(version) >= 1.4;
  -        } catch (NumberFormatException e) {
  -            source14 = target14 = false;
  -        }
  -    }
  -
  -
       /** 
        * Compile the servlet from .java file to .class file
        */
  @@ -191,7 +177,7 @@
                               ICompilationUnit compilationUnit = 
                                   new CompilationUnit(sourceFile, className);
                               return 
  -                                new NameEnvironmentAnswer(compilationUnit);
  +                                new NameEnvironmentAnswer(compilationUnit, null);
                           }
                           String resourceName = 
                               className.replace('.', '/') + ".class";
  @@ -212,7 +198,7 @@
                                   new ClassFileReader(classBytes, fileName, 
                                                       true);
                               return 
  -                                new NameEnvironmentAnswer(classFileReader);
  +                                new NameEnvironmentAnswer(classFileReader, null);
                           }
                       } catch (IOException exc) {
                           log.error("Compilation error", exc);
  @@ -286,17 +272,37 @@
               settings.put(CompilerOptions.OPTION_LocalVariableAttribute,
                            CompilerOptions.GENERATE);
           }
  -        if (source14) {
  -            settings.put(CompilerOptions.OPTION_Source,
  -                         CompilerOptions.VERSION_1_4);
  -        }
   
  -        /* Use target attribute from Options instead
  -        if (target14) {
  -            settings.put(CompilerOptions.OPTION_TargetPlatform,
  -                         CompilerOptions.VERSION_1_4);
  +        // Source JVM
  +        if(ctxt.getOptions().getCompilerSourceVM() != null) {
  +            String opt = ctxt.getOptions().getCompilerSourceVM();
  +            if(opt.equals("1.1")) {
  +                settings.put(CompilerOptions.OPTION_Source,
  +                             CompilerOptions.VERSION_1_1);
  +            } else if(opt.equals("1.2")) {
  +                settings.put(CompilerOptions.OPTION_Source,
  +                             CompilerOptions.VERSION_1_2);
  +            } else if(opt.equals("1.3")) { 
  +                settings.put(CompilerOptions.OPTION_Source,
  +                             CompilerOptions.VERSION_1_3);
  +            } else if(opt.equals("1.4")) {
  +                settings.put(CompilerOptions.OPTION_Source,
  +                             CompilerOptions.VERSION_1_4);
  +            } else if(opt.equals("1.5")) {
  +                settings.put(CompilerOptions.OPTION_Source,
  +                             CompilerOptions.VERSION_1_5);
  +            } else {
  +                log.warn("Unknown source VM " + opt + " ignored.");
  +                settings.put(CompilerOptions.OPTION_Source,
  +                        CompilerOptions.VERSION_1_5);
  +            }
  +        } else {
  +            // Default to 1.5
  +            settings.put(CompilerOptions.OPTION_Source,
  +                    CompilerOptions.VERSION_1_5);
           }
  -        */
  +        
  +        // Target JVM
           if(ctxt.getOptions().getCompilerTargetVM() != null) {
               String opt = ctxt.getOptions().getCompilerTargetVM();
               if(opt.equals("1.1")) {
  @@ -316,7 +322,13 @@
                                CompilerOptions.VERSION_1_5);
               } else {
                   log.warn("Unknown target VM " + opt + " ignored.");
  +                settings.put(CompilerOptions.OPTION_TargetPlatform,
  +                        CompilerOptions.VERSION_1_5);
               }
  +        } else {
  +            // Default to 1.5
  +            settings.put(CompilerOptions.OPTION_TargetPlatform,
  +                    CompilerOptions.VERSION_1_5);
           }
   
           final IProblemFactory problemFactory = 
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler JDTCompiler.java

Posted by Remy Maucherat <re...@apache.org>.
Jess Holle wrote:
> Despite advancements in speed, etc, the notion of Eclipse or Tomcat or 
> anything else using it until it is both faster *and* as robust as javac 
> is a bit strange.
> 
> The notion that Eclipse depends upon it to the point that it's Java 5 
> support is held up by JDT development is particularly strange to me.  
> javac is not a panacea but it support Java 5 quite nicely right now.  
> [I'm using NetBeans 4, so I'm unaffected by Eclipse's move -- it just 
> baffles me.]

Cool, a new type of rant: the rant which one cannot actually understand :)

At this point, I am still inverstigating what the issue is.

Rémy

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler JDTCompiler.java

Posted by Jess Holle <je...@ptc.com>.
Despite advancements in speed, etc, the notion of Eclipse or Tomcat or 
anything else using it until it is both faster *and* as robust as javac 
is a bit strange.

The notion that Eclipse depends upon it to the point that it's Java 5 
support is held up by JDT development is particularly strange to me.  
javac is not a panacea but it support Java 5 quite nicely right now.  
[I'm using NetBeans 4, so I'm unaffected by Eclipse's move -- it just 
baffles me.]

--
Jess Holle

Remy Maucherat wrote:

> Tim Funk wrote:
>
>> Is there a reason _jspx_dependants is a Vector - why not an 
>> ArrayList? This would remove the syncs inside of Vector.
>
>
> I don't know. It probably wouldn't hurt. It won't help me with my ECJ 
> bug, however ;)
>
> Rémy
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
>

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler JDTCompiler.java

Posted by Remy Maucherat <re...@apache.org>.
Tim Funk wrote:
> Is there a reason _jspx_dependants is a Vector - why not an ArrayList? 
> This would remove the syncs inside of Vector.

I don't know. It probably wouldn't hurt. It won't help me with my ECJ 
bug, however ;)

Rémy

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler JDTCompiler.java

Posted by Tim Funk <fu...@joedog.org>.
Is there a reason _jspx_dependants is a Vector - why not an ArrayList? This 
would remove the syncs inside of Vector.

-Tim

Remy Maucherat wrote:

> remm@apache.org wrote:
> 
>> remm        2005/04/04 06:57:49
>>
>>   Modified:    jasper2/src/share/org/apache/jasper
>>                         EmbeddedServletOptions.java
>>                webapps/docs changelog.xml
>>                .        build.properties.default
>>                jasper2/src/share/org/apache/jasper/compiler
>>                         JDTCompiler.java
>>   Log:
>>   - Update to JDT 3.1 M6 (Java 5 feature complete, from what I have 
>> read).
>>   - Please test it (compilation on JDK 1.4 seems to work as usual) to 
>> see if this is ok or should be reverted.
> 
> 
> Cool, another one of my great ideas ;) At least there aren't any major 
> regressions in JDK 1.4 mode.
> 
> public final class test_jsp extends org.apache.jasper.runtime.HttpJspBase
>     implements org.apache.jasper.runtime.JspSourceDependent {
> 
>   private static java.util.Vector _jspx_dependants;
> 
>   public java.util.List getDependants() {
>     return _jspx_dependants;
>   }
> 
> In JDK 1.5 mode, ECJ apparently doesn't like casting Vector -> List. 
> This should be allowed, I think (javac works, from what I can tell).
> 
> Can anyone confirm this problem ?
>  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Re: cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler JDTCompiler.java

Posted by Remy Maucherat <re...@apache.org>.
remm@apache.org wrote:
> remm        2005/04/04 06:57:49
> 
>   Modified:    jasper2/src/share/org/apache/jasper
>                         EmbeddedServletOptions.java
>                webapps/docs changelog.xml
>                .        build.properties.default
>                jasper2/src/share/org/apache/jasper/compiler
>                         JDTCompiler.java
>   Log:
>   - Update to JDT 3.1 M6 (Java 5 feature complete, from what I have read).
>   - Please test it (compilation on JDK 1.4 seems to work as usual) to see if this is ok or should be reverted.

Cool, another one of my great ideas ;) At least there aren't any major 
regressions in JDK 1.4 mode.

public final class test_jsp extends org.apache.jasper.runtime.HttpJspBase
     implements org.apache.jasper.runtime.JspSourceDependent {

   private static java.util.Vector _jspx_dependants;

   public java.util.List getDependants() {
     return _jspx_dependants;
   }

In JDK 1.5 mode, ECJ apparently doesn't like casting Vector -> List. 
This should be allowed, I think (javac works, from what I can tell).

Can anyone confirm this problem ?

Rémy

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org