coliver 2003/02/27 13:27:55
Modified: src/java/org/apache/cocoon/components/language/programming/java JavaLanguage.java Added: src/java/org/apache/cocoon/components/language/programming/java EclipseJavaCompiler.java Log: Added support for eclipse JDT compiler Revision Changes Path 1.16 +7 -3 xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/JavaLanguage.java Index: JavaLanguage.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/JavaLanguage.java,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- JavaLanguage.java 17 Feb 2003 21:55:36 -0000 1.15 +++ JavaLanguage.java 27 Feb 2003 21:27:55 -0000 1.16 @@ -57,9 +57,11 @@ import org.apache.avalon.framework.parameters.ParameterException; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.thread.ThreadSafe; +import org.apache.avalon.framework.logger.LogEnabled; import org.apache.cocoon.components.classloader.ClassLoaderManager; import org.apache.cocoon.components.language.LanguageException; +import org.apache.cocoon.components.language.programming.LanguageCompiler; import org.apache.cocoon.components.language.markup.xsp.XSLTExtension; import org.apache.cocoon.components.language.programming.CompiledProgrammingLanguage; import org.apache.cocoon.components.language.programming.CompilerError; @@ -199,9 +201,11 @@ throws LanguageException { try { - AbstractJavaCompiler compiler = (AbstractJavaCompiler) this.compilerClass.newInstance(); + LanguageCompiler compiler = (LanguageCompiler) this.compilerClass.newInstance(); // AbstractJavaCompiler is LogEnabled - compiler.enableLogging(getLogger()); + if (compiler instanceof LogEnabled) { + ((LogEnabled)compiler).enableLogging(getLogger()); + } int pos = name.lastIndexOf(File.separatorChar); String filename = name.substring(pos + 1); 1.1 xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java Index: EclipseJavaCompiler.java =================================================================== /* ============================================================================ The Apache Software License, Version 1.1 ============================================================================ Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. Redistribution and use in source and binary forms, with or without modifica- tion, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by the Apache Software Foundation (http://www.apache.org/)." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear. 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact [EMAIL PROTECTED] 5. Products derived from this software may not be called "Apache", nor may "Apache" appear in their name, without prior written permission of the Apache Software Foundation. THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation and was originally created by Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache Software Foundation, please see <http://www.apache.org/>. */ package org.apache.cocoon.components.language.programming.java; import org.apache.avalon.framework.logger.AbstractLogEnabled; import org.apache.avalon.excalibur.pool.Recyclable; import org.apache.cocoon.components.language.programming.LanguageCompiler; import org.apache.cocoon.components.language.programming.CompilerError; import org.apache.cocoon.util.ClassUtils; import org.apache.avalon.framework.CascadingRuntimeException; import org.eclipse.jdt.core.compiler.IProblem; import org.eclipse.jdt.internal.compiler.env.INameEnvironment; import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer; import org.eclipse.jdt.internal.compiler.ClassFile; import org.eclipse.jdt.internal.compiler.Compiler; import org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies; import org.eclipse.jdt.internal.compiler.IErrorHandlingPolicy; import org.eclipse.jdt.internal.compiler.IProblemFactory; import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader; import org.eclipse.jdt.internal.compiler.env.ICompilationUnit; import org.eclipse.jdt.internal.compiler.ICompilerRequestor; import org.eclipse.jdt.internal.compiler.CompilationResult; import org.eclipse.jdt.internal.compiler.problem.DefaultProblem; import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory; import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.HashMap; import java.io.IOException; import java.io.Reader; import java.io.InputStream; import java.io.FileOutputStream; import java.io.ByteArrayInputStream; import java.io.OutputStream; import java.io.ByteArrayOutputStream; import java.io.BufferedOutputStream; import java.io.Reader; import java.io.FileReader; import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.util.Locale; import java.util.Iterator; import java.util.StringTokenizer; public class EclipseJavaCompiler implements LanguageCompiler, Recyclable { List errors = new LinkedList(); String sourceDir; String sourceFile; String destDir; String sourceEncoding; boolean debug = true; boolean source14 = true; boolean target14 = true; public void recycle() { sourceFile = null; sourceDir = null; destDir = null; sourceEncoding = null; source14 = true; target14 = true; errors.clear(); } public EclipseJavaCompiler() { } public void setFile(String file) { // This seems to be the absolute path to the file to be compiled this.sourceFile = file; } public void setSource(String source) { // This seems to simply be the directory the file to // be compiled resides in: not sure what this could be used for... // // Not used } public void setDestination(String destDir) { // This seems to indicate the "sourcepath" of the file to be // compiled (as well as the output directory) this.destDir = destDir; this.sourceDir = destDir; } public void setEncoding(String encoding) { this.sourceEncoding = encoding; } public void setClasspath(String cp) { // Not used } private String makeClassName(String fileName) throws IOException { File origFile = new File(fileName); String canonical = null; if (origFile.exists()) { canonical = origFile.getCanonicalPath().replace('\\', '/'); } String str = fileName; str = str.replace('\\', '/'); if (sourceDir != null) { String prefix = new File(sourceDir).getCanonicalPath().replace('\\', '/'); if (canonical != null) { if (canonical.startsWith(prefix)) { String result = canonical.substring(prefix.length() + 1, canonical.length() -5); result = result.replace('/', '.'); return result; } } else { File t = new File(sourceDir, fileName); if (t.exists()) { str = t.getCanonicalPath().replace('\\', '/'); String result = str.substring(prefix.length()+1, str.length() - 5).replace('/', '.'); return result; } } } if (fileName.endsWith(".java")) { fileName = fileName.substring(0, fileName.length() - 5); } fileName = fileName.replace('\\', '.'); return fileName.replace('/', '.'); } public boolean compile() throws IOException { System.out.println("!!******* Compiling: " + sourceFile); final String targetClassName = makeClassName(sourceFile); final ClassLoader classLoader = ClassUtils.getClassLoader(); String[] fileNames = new String[] {sourceFile}; String[] classNames = new String[] {targetClassName}; class CompilationUnit implements ICompilationUnit { String className; String sourceFile; CompilationUnit(String sourceFile, String className) { this.className = className; this.sourceFile = sourceFile; } public char[] getFileName() { return className.toCharArray(); } public char[] getContents() { char[] result = null; try { Reader reader = new BufferedReader(new FileReader(sourceFile)); if (reader != null) { char[] chars = new char[8192]; StringBuffer buf = new StringBuffer(); int count; while ((count = reader.read(chars, 0, chars.length)) > 0) { buf.append(chars, 0, count); } result = new char[buf.length()]; buf.getChars(0, result.length, result, 0); } } catch (IOException e) { handleError(className, -1, -1, e.getMessage()); //e.printStackTrace(); } return result; } public char[] getMainTypeName() { int dot = className.lastIndexOf('.'); if (dot > 0) { return className.substring(dot + 1).toCharArray(); } return className.toCharArray(); } public char[][] getPackageName() { StringTokenizer izer = new StringTokenizer(className, "."); char[][] result = new char[izer.countTokens()-1][]; for (int i = 0; i < result.length; i++) { String tok = izer.nextToken(); result[i] = tok.toCharArray(); } return result; } } final INameEnvironment env = new INameEnvironment() { public NameEnvironmentAnswer findType(char[][] compoundTypeName) { String result = ""; String sep = ""; for (int i = 0; i < compoundTypeName.length; i++) { result += sep; result += new String(compoundTypeName[i]); sep = "."; } return findType(result); } public NameEnvironmentAnswer findType(char[] typeName, char[][] packageName) { String result = ""; String sep = ""; for (int i = 0; i < packageName.length; i++) { result += sep; result += new String(packageName[i]); sep = "."; } result += sep; result += new String(typeName); return findType(result); } private NameEnvironmentAnswer findType(String className) { try { if (className.equals(targetClassName)) { ICompilationUnit compilationUnit = new CompilationUnit(sourceFile, className); return new NameEnvironmentAnswer(compilationUnit); } String resourceName = className.replace('.', '/') + ".class"; InputStream is = classLoader.getResourceAsStream(resourceName); if (is != null) { byte[] classBytes; byte[] buf = new byte[8192]; ByteArrayOutputStream baos = new ByteArrayOutputStream(buf.length); int count; while ((count = is.read(buf, 0, buf.length)) > 0) { baos.write(buf, 0, count); } baos.flush(); classBytes = baos.toByteArray(); char[] fileName = className.toCharArray(); ClassFileReader classFileReader = new ClassFileReader(classBytes, fileName, true); return new NameEnvironmentAnswer(classFileReader); } } catch (IOException exc) { handleError(className, -1, -1, exc.getMessage()); } catch (org.eclipse.jdt.internal.compiler.classfmt.ClassFormatException exc) { handleError(className, -1, -1, exc.getMessage()); } return null; } private boolean isPackage(String result) { if (result.equals(targetClassName)) { return false; } String resourceName = result.replace('.', '/') + ".class"; InputStream is = classLoader.getResourceAsStream(resourceName); return is == null; } public boolean isPackage(char[][] parentPackageName, char[] packageName) { String result = ""; String sep = ""; if (parentPackageName != null) { for (int i = 0; i < parentPackageName.length; i++) { result += sep; String str = new String(parentPackageName[i]); result += str; sep = "."; } } String str = new String(packageName); if (Character.isUpperCase(str.charAt(0))) { if (!isPackage(result)) { return false; } } result += sep; result += str; return isPackage(result); } public void cleanup() { } }; final IErrorHandlingPolicy policy = DefaultErrorHandlingPolicies.proceedWithAllProblems(); final Map settings = new HashMap(); settings.put(CompilerOptions.OPTION_LineNumberAttribute, CompilerOptions.GENERATE); settings.put(CompilerOptions.OPTION_SourceFileAttribute, CompilerOptions.GENERATE); settings.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.IGNORE); if (sourceEncoding != null) { settings.put(CompilerOptions.OPTION_Encoding, sourceEncoding); } if (debug) { settings.put(CompilerOptions.OPTION_LocalVariableAttribute, CompilerOptions.GENERATE); } if (source14) { settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4); } if (target14) { settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_4); } final IProblemFactory problemFactory = new DefaultProblemFactory(Locale.getDefault()); final ICompilerRequestor requestor = new ICompilerRequestor() { public void acceptResult(CompilationResult result) { try { if (result.hasProblems()) { IProblem[] problems = result.getProblems(); for (int i = 0; i < problems.length; i++) { IProblem problem = problems[i]; String name = new String(problems[i].getOriginatingFileName()); handleError(name, problem.getSourceLineNumber(), -1, problem.getMessage()); } } else { ClassFile[] classFiles = result.getClassFiles(); for (int i = 0; i < classFiles.length; i++) { ClassFile classFile = classFiles[i]; char[][] compoundName = classFile.getCompoundName(); String className = ""; String sep = ""; for (int j = 0; j < compoundName.length; j++) { className += sep; className += new String(compoundName[j]); sep = "."; } byte[] bytes = classFile.getBytes(); String outFile = destDir + "/" + className.replace('.', '/') + ".class"; System.out.println("****generating: " + outFile); FileOutputStream fout = new FileOutputStream(outFile); BufferedOutputStream bos = new BufferedOutputStream(fout); bos.write(bytes); bos.close(); } } } catch (IOException exc) { exc.printStackTrace(); } } }; ICompilationUnit[] compilationUnits = new ICompilationUnit[classNames.length]; for (int i = 0; i < compilationUnits.length; i++) { String className = classNames[i]; compilationUnits[i] = new CompilationUnit(fileNames[i], className); } Compiler compiler = new Compiler(env, policy, settings, requestor, problemFactory); compiler.compile(compilationUnits); return errors.size() == 0; } void handleError(String className, int line, int column, Object errorMessage) { String fileName = className.replace('.', File.separatorChar) + ".java"; if (column < 0) column = 0; errors.add(new CompilerError(fileName, true, line, column, line, column, errorMessage.toString())); } public List getErrors() throws IOException { return errors; } }