JCI-73 Drop javac compiler; it only works on Java 1.5
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/jci/trunk@1516042 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/compilers/javac/pom.xml b/compilers/javac/pom.xml
deleted file mode 100644
index a920705..0000000
--- a/compilers/javac/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jci</artifactId>
- <version>1.1-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>commons-jci-javac</artifactId>
- <version>1.1-SNAPSHOT</version>
- <name>Apache Commons JCI compiler-javac</name>
- <description>
- Apache Commons JCI compiler implementation for the Javac compiler (up to JDK 1.5).
- </description>
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jci-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.vafer</groupId>
- <artifactId>dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jci-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <commons.componentid>jci-javac</commons.componentid>
- </properties>
-</project>
diff --git a/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileInputStreamProxy.java b/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileInputStreamProxy.java
deleted file mode 100644
index d606481..0000000
--- a/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileInputStreamProxy.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.jci.compilers;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.commons.jci.readers.ResourceReader;
-import org.apache.commons.jci.utils.ConversionUtils;
-
-/**
- *
- * @author tcurdt
- */
-public final class FileInputStreamProxy extends InputStream {
-
- private final static ThreadLocal<ResourceReader> readerThreadLocal = new ThreadLocal<ResourceReader>();
-
- private final InputStream in;
- private final String name;
-
- public static void setResourceReader( final ResourceReader pReader ) {
- readerThreadLocal.set(pReader);
- }
-
- public FileInputStreamProxy(File pFile) throws FileNotFoundException {
- this("" + pFile);
- }
-
- public FileInputStreamProxy(FileDescriptor fdObj) {
- throw new RuntimeException();
- }
-
- public FileInputStreamProxy(String pName) throws FileNotFoundException {
- name = ConversionUtils.getResourceNameFromFileName(pName);
-
- final ResourceReader reader = readerThreadLocal.get();
-
- if (reader == null) {
- throw new RuntimeException("forgot to set the ResourceReader for this thread?");
- }
-
- final byte[] bytes = reader.getBytes(name);
-
- if (bytes == null) {
- throw new FileNotFoundException(name);
- }
-
- in = new ByteArrayInputStream(bytes);
- }
-
- @Override
- public int read() throws IOException {
- return in.read();
- }
-
- @Override
- public int available() throws IOException {
- return in.available();
- }
-
- @Override
- public void close() throws IOException {
- in.close();
- }
-
- @Override
- public synchronized void mark(int readlimit) {
- in.mark(readlimit);
- }
-
- @Override
- public boolean markSupported() {
- return in.markSupported();
- }
-
- @Override
- public int read(byte[] b, int off, int len) throws IOException {
- return in.read(b, off, len);
- }
-
- @Override
- public int read(byte[] b) throws IOException {
- return in.read(b);
- }
-
- @Override
- public synchronized void reset() throws IOException {
- in.reset();
- }
-
- @Override
- public long skip(long n) throws IOException {
- return in.skip(n);
- }
-}
diff --git a/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileOutputStreamProxy.java b/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileOutputStreamProxy.java
deleted file mode 100644
index b5c58fd..0000000
--- a/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileOutputStreamProxy.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.jci.compilers;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.commons.jci.stores.ResourceStore;
-import org.apache.commons.jci.utils.ConversionUtils;
-
-/**
- *
- * @author tcurdt
- */
-public final class FileOutputStreamProxy extends OutputStream {
-
- private final static ThreadLocal<ResourceStore> storeThreadLocal = new ThreadLocal<ResourceStore>();
-
- private final ByteArrayOutputStream out = new ByteArrayOutputStream();
- private final String name;
-
-
- public static void setResourceStore( final ResourceStore pStore ) {
- storeThreadLocal.set(pStore);
- }
-
-
- public FileOutputStreamProxy(File pFile, boolean append) throws FileNotFoundException {
- this("" + pFile);
- }
-
- public FileOutputStreamProxy(File pFile) throws FileNotFoundException {
- this("" + pFile);
- }
-
- public FileOutputStreamProxy(FileDescriptor fdObj) {
- throw new RuntimeException();
- }
-
- public FileOutputStreamProxy(String pName, boolean append) throws FileNotFoundException {
- this(pName);
- }
-
- public FileOutputStreamProxy(String pName) throws FileNotFoundException {
- name = ConversionUtils.getResourceNameFromFileName(pName);
- }
-
- @Override
- public void write(int value) throws IOException {
- out.write(value);
- }
-
- @Override
- public void close() throws IOException {
- out.close();
-
- final ResourceStore store = storeThreadLocal.get();
-
- if (store == null) {
- throw new RuntimeException("forgot to set the ResourceStore for this thread?");
- }
-
- store.write(name, out.toByteArray());
- }
-
- @Override
- public void flush() throws IOException {
- out.flush();
- }
-
- @Override
- public void write(byte[] b, int off, int len) throws IOException {
- out.write(b, off, len);
- }
-
- @Override
- public void write(byte[] b) throws IOException {
- out.write(b);
- }
-}
diff --git a/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java b/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java
deleted file mode 100644
index 4463526..0000000
--- a/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.jci.compilers;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.StringBuilder;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.util.CheckClassAdapter;
-import org.vafer.dependency.asm.RenamingVisitor;
-import org.vafer.dependency.utils.ResourceRenamer;
-
-
-/**
- * This classloader injects the FileIn/OutputStream wrappers
- * into javac. Access to the store/reader is done via ThreadLocals.
- * It also tries to find the javac class on the system and expands
- * the classpath accordingly.
- *
- * @author tcurdt
- */
-public final class JavacClassLoader extends URLClassLoader {
-
- private final Map<String, Class<?>> loaded = new HashMap<String, Class<?>>();
-
- public JavacClassLoader( final ClassLoader pParent ) {
- super(getToolsJar(), pParent);
- }
-
- private static URL[] getToolsJar() {
- try {
- Class.forName("com.sun.tools.javac.Main");
-
- // found - no addtional classpath entry required
- return new URL[0];
-
- } catch (Exception e) {
- }
-
- // no compiler in current classpath, let's try to find the tools.jar
-
- String javaHome = System.getProperty("java.home");
- if (javaHome.toLowerCase(Locale.US).endsWith(File.separator + "jre")) {
- javaHome = javaHome.substring(0, javaHome.length()-4);
- }
-
- final File toolsJar = new File(javaHome + "/lib/tools.jar");
-
- if (toolsJar.exists()) {
- try {
- return new URL[] { toolsJar.toURL() };
- } catch (MalformedURLException e) {
- }
- }
-
- final StringBuilder sb = new StringBuilder();
- sb.append("Could not find javac compiler class (should be in the tools.jar/classes.jar in your JRE/JDK). ");
- sb.append("os.name").append('=').append(System.getProperty("os.name")).append(", ");
- sb.append("os.version").append('=').append(System.getProperty("os.version")).append(", ");
- sb.append("java.class.path").append('=').append(System.getProperty("java.class.path"));
-
- throw new RuntimeException(sb.toString());
- }
-
- @Override
- protected Class<?> findClass( final String name ) throws ClassNotFoundException {
-
- if (name.startsWith("java.")) {
- return super.findClass(name);
- }
-
- try {
-
- final Class<?> clazz = loaded.get(name);
- if (clazz != null) {
- return clazz;
- }
-
- final byte[] classBytes;
-
- if (name.startsWith("com.sun.tools.javac.")) {
- final InputStream classStream = getResourceAsStream(name.replace('.', '/') + ".class");
-
- final ClassWriter renamedCw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
- new ClassReader(classStream).accept(new RenamingVisitor(new CheckClassAdapter(renamedCw), new ResourceRenamer() {
- public String getNewNameFor(final String pOldName) {
- if (pOldName.startsWith(FileOutputStream.class.getName())) {
- return FileOutputStreamProxy.class.getName();
- }
- if (pOldName.startsWith(FileInputStream.class.getName())) {
- return FileInputStreamProxy.class.getName();
- }
- return pOldName;
- }
- }), 0); // We don't set ClassReader.SKIP_DEBUG
-
- classBytes = renamedCw.toByteArray();
-
- } else {
- return super.findClass(name);
- }
-
- final Class<?> newClazz = defineClass(name, classBytes, 0, classBytes.length);
- loaded.put(name, newClazz);
- return newClazz;
- } catch (IOException e) {
- throw new ClassNotFoundException("", e);
- }
- }
-
- @Override
- protected synchronized Class<?> loadClass( final String classname, final boolean resolve ) throws ClassNotFoundException {
-
- Class<?> theClass = findLoadedClass(classname);
- if (theClass != null) {
- return theClass;
- }
-
- try {
- theClass = findClass(classname);
- } catch (ClassNotFoundException cnfe) {
- theClass = getParent().loadClass(classname);
- }
-
- if (resolve) {
- resolveClass(theClass);
- }
-
- return theClass;
- }
-}
\ No newline at end of file
diff --git a/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacCompilationProblem.java b/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacCompilationProblem.java
deleted file mode 100644
index e6b1ba4..0000000
--- a/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacCompilationProblem.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.jci.compilers;
-
-import org.apache.commons.jci.problems.CompilationProblem;
-
-/**
- *
- * @author tcurdt
- */
-public class JavacCompilationProblem implements CompilationProblem {
-
- private final int endCoumn;
- private final int endLine;
- private final String fileName;
- private final String message;
- private final int startCoumn;
- private final int startLine;
- private final boolean isError;
-
- public JavacCompilationProblem(String message, boolean isError) {
- this.message = message;
- this.isError = isError;
- this.fileName = "";
- this.startLine = 0;
- this.startCoumn = 0;
- this.endCoumn = 0;
- this.endLine = 0;
- }
-
- public JavacCompilationProblem(String fileName, boolean isError, int startLine, int startCoumn, int endLine, int endCoumn, String message) {
- this.message = message;
- this.isError = isError;
- this.fileName = fileName;
- this.startCoumn = startCoumn;
- this.endCoumn = endCoumn;
- this.startLine = startLine;
- this.endLine = endLine;
- }
-
- public int getEndColumn() {
- return endCoumn;
- }
-
- public int getEndLine() {
- return endLine;
- }
-
- public String getFileName() {
- return fileName;
- }
-
- public String getMessage() {
- return message;
- }
-
- public int getStartColumn() {
- return startCoumn;
- }
-
- public int getStartLine() {
- return startLine;
- }
-
- public boolean isError() {
- return isError;
- }
-
- @Override
- public String toString() {
- final StringBuilder sb = new StringBuilder();
- sb.append(getFileName()).append(" (");
- sb.append(getStartLine());
- sb.append(":");
- sb.append(getStartColumn());
- sb.append(") : ");
- sb.append(getMessage());
- return sb.toString();
- }
-}
diff --git a/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompiler.java b/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompiler.java
deleted file mode 100644
index 083aed3..0000000
--- a/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompiler.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.jci.compilers;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
-
-import org.apache.commons.jci.problems.CompilationProblem;
-import org.apache.commons.jci.readers.ResourceReader;
-import org.apache.commons.jci.stores.ResourceStore;
-
-/**
- * Compiler leveraging the javac from tools.jar. Using byte code rewriting
- * it is tricked not to read/write from/to disk but use the ResourceReader and
- * ResourceStore provided instead.
- *
- * NOTE: (As of now) this compiler only works up until java5. Java6 comes with
- * a new API based on jsr199. So please use that jsr199 compiler instead.
- *
- * @author tcurdt
- * @todo classpath and settings support
- */
-public final class JavacJavaCompiler extends AbstractJavaCompiler {
-
- private static final String EOL = System.getProperty("line.separator");
- private static final String WARNING_PREFIX = "warning: ";
- private static final String NOTE_PREFIX = "Note: ";
- private static final String ERROR_PREFIX = "error: ";
-
- private final JavacJavaCompilerSettings defaultSettings;
-
- public JavacJavaCompiler() {
- defaultSettings = new JavacJavaCompilerSettings();
- }
-
- public JavacJavaCompiler( final JavacJavaCompilerSettings pSettings ) {
- defaultSettings = pSettings;
- }
-
- public CompilationResult compile( final String[] pSourcePaths, final ResourceReader pReader, ResourceStore pStore, final ClassLoader pClasspathClassLoader, final JavaCompilerSettings pSettings ) {
-
- try {
- final ClassLoader cl = new JavacClassLoader(pClasspathClassLoader);
- final Class<?> renamedClass = cl.loadClass("com.sun.tools.javac.Main");
-
- FileInputStreamProxy.setResourceReader(pReader);
- FileOutputStreamProxy.setResourceStore(pStore);
-
- final Method compile = renamedClass.getMethod("compile", new Class[] { String[].class, PrintWriter.class });
- final StringWriter out = new StringWriter();
-
- final String[] compilerArguments = buildCompilerArguments(new JavacJavaCompilerSettings(pSettings), pSourcePaths, pClasspathClassLoader);
-
- final Integer ok = (Integer) compile.invoke(null, new Object[] { compilerArguments, new PrintWriter(out) });
-
- final CompilationResult result = parseModernStream(new BufferedReader(new StringReader(out.toString())));
-
- if (result.getErrors().length == 0 && ok.intValue() != 0) {
- return new CompilationResult(new CompilationProblem[] {
- new JavacCompilationProblem("Failure executing javac, but could not parse the error: " + out.toString(), true) });
- }
-
- return result;
-
- } catch(Exception e) {
- return new CompilationResult(new CompilationProblem[] {
- new JavacCompilationProblem("Error while executing the compiler: " + e.toString(), true) });
- } finally {
- // help GC
- FileInputStreamProxy.setResourceReader(null);
- FileOutputStreamProxy.setResourceStore(null);
- }
- }
-
- private CompilationResult parseModernStream( final BufferedReader pReader ) throws IOException {
- final List<CompilationProblem> problems = new ArrayList<CompilationProblem>();
- String line;
-
- while (true) {
- // cleanup the buffer
- final StringBuilder buffer = new StringBuilder();
-
- // most errors terminate with the '^' char
- do {
- line = pReader.readLine();
- if (line == null) {
- return new CompilationResult(problems.toArray(new CompilationProblem[problems.size()]));
- }
-
- // TODO: there should be a better way to parse these
- if (buffer.length() == 0 && line.startsWith(ERROR_PREFIX)) {
- problems.add(new JavacCompilationProblem(line, true));
- }
- else if (buffer.length() == 0 && line.startsWith(NOTE_PREFIX)) {
- // skip this one - it is JDK 1.5 telling us that the
- // interface is deprecated.
- } else {
- buffer.append(line);
- buffer.append(EOL);
- }
- } while (!line.endsWith("^"));
-
- // add the error
- problems.add(parseModernError(buffer.toString()));
- }
- }
-
- private CompilationProblem parseModernError( final String pError ) {
- final StringTokenizer tokens = new StringTokenizer(pError, ":");
- boolean isError = true;
- try {
- String file = tokens.nextToken();
- // When will this happen?
- if (file.length() == 1) {
- file = new StringBuilder(file).append(":").append(
- tokens.nextToken()).toString();
- }
- final int line = Integer.parseInt(tokens.nextToken());
- final StringBuilder msgBuffer = new StringBuilder();
-
- String msg = tokens.nextToken(EOL).substring(2);
- isError = !msg.startsWith(WARNING_PREFIX);
-
- // Remove the 'warning: ' prefix
- if (!isError) {
- msg = msg.substring(WARNING_PREFIX.length());
- }
- msgBuffer.append(msg);
-
- String context = tokens.nextToken(EOL);
- String pointer = tokens.nextToken(EOL);
-
- if (tokens.hasMoreTokens()) {
- msgBuffer.append(EOL);
- msgBuffer.append(context); // 'symbol' line
- msgBuffer.append(EOL);
- msgBuffer.append(pointer); // 'location' line
- msgBuffer.append(EOL);
-
- context = tokens.nextToken(EOL);
-
- try {
- pointer = tokens.nextToken(EOL);
- } catch (NoSuchElementException e) {
- pointer = context;
- context = null;
- }
- }
- final String message = msgBuffer.toString();
- int startcolumn = pointer.indexOf("^");
- int endcolumn = context == null ? startcolumn : context.indexOf(" ", startcolumn);
- if (endcolumn == -1) {
- endcolumn = context.length();
- }
- return new JavacCompilationProblem(file, isError, line, startcolumn, line, endcolumn, message);
- }
- catch (NoSuchElementException e) {
- return new JavacCompilationProblem("no more tokens - could not parse error message: " + pError, isError);
- }
- catch (NumberFormatException e) {
- return new JavacCompilationProblem("could not parse error message: " + pError, isError);
- }
- catch (Exception e) {
- return new JavacCompilationProblem("could not parse error message: " + pError, isError);
- }
- }
-
- public JavaCompilerSettings createDefaultSettings() {
- return new JavacJavaCompilerSettings(defaultSettings);
- }
-
- private String[] buildCompilerArguments( final JavacJavaCompilerSettings pSettings, final String[] pResourcePaths, final ClassLoader pClassloader ) {
-
- // FIXME: build classpath from classloader information
- final String[] classpath = new String[0];
- final String[] resources = pResourcePaths;
- final String[] args = pSettings.toNativeSettings();
-
- final String[] result = new String[classpath.length + resources.length + args.length];
-
- System.arraycopy(classpath, 0, result, 0, classpath.length);
- System.arraycopy(resources, 0, result, classpath.length, resources.length);
- System.arraycopy(args, 0, result, classpath.length + resources.length, args.length);
-
- return result;
- }
-
-}
diff --git a/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettings.java b/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettings.java
deleted file mode 100644
index 9dcc813..0000000
--- a/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettings.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.jci.compilers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public final class JavacJavaCompilerSettings extends JavaCompilerSettings {
-
- private boolean optimize;
- private String memMax;
- private String memInitial;
- private String[] customArguments;
-
- public JavacJavaCompilerSettings() {
- }
-
- public JavacJavaCompilerSettings( final JavaCompilerSettings pSettings ) {
- super(pSettings);
- }
-
-
- public void setCustomArguments( final String[] pCustomArguments ) {
- customArguments = pCustomArguments;
- }
-
- public String[] getCustomArguments() {
- return customArguments;
- }
-
-
- public void setMaxMemory( final String pMemMax ) {
- memMax = pMemMax;
- }
-
- public String getMaxMemory() {
- return memMax;
- }
-
-
- public void setInitialMemory( final String pMemInitial ) {
- memInitial = pMemInitial;
- }
-
- public String getInitialMemory() {
- return memInitial;
- }
-
-
- public boolean isOptimize() {
- return optimize;
- }
-
- public void setOptimize( final boolean pOptimize ) {
- optimize = pOptimize;
- }
-
-
-
- /** @deprecated */
- @Deprecated
- public List<String> getCustomCompilerArguments() {
- final List<String> list = new ArrayList<String>();
- for (int i = 0; i < customArguments.length; i++) {
- list.add(customArguments[i]);
- }
- return list;
- }
-
- /** @deprecated */
- @Deprecated
- public void setCustomCompilerArguments(List<?> customCompilerArguments) {
- customArguments = customCompilerArguments.toArray(new String[customCompilerArguments.size()]);
- }
-
- /** @deprecated */
- @Deprecated
- public String getMaxmem() {
- return memMax;
- }
-
- /** @deprecated */
- @Deprecated
- public void setMaxmem(String maxmem) {
- this.memMax = maxmem;
- }
-
- /** @deprecated */
- @Deprecated
- public String getMeminitial() {
- return memInitial;
- }
-
- /** @deprecated */
- @Deprecated
- public void setMeminitial(String meminitial) {
- this.memInitial = meminitial;
- }
-
-
-
-
- String[] toNativeSettings() {
-
- final List<String> args = new ArrayList<String>();
-
- if (isOptimize()) {
- args.add("-O");
- }
-
- if (isDebug()) {
- args.add("-g");
- }
-
- if (isDeprecations()) {
- args.add("-deprecation");
- }
-
- if (!isWarnings() && !isDeprecations()) {
- args.add("-nowarn");
- }
-
- if (getMaxMemory() != null) {
- args.add("-J-Xmx" + getMaxMemory());
- }
-
- if (getInitialMemory() != null) {
- args.add("-J-Xms" + getInitialMemory());
- }
-
- args.add("-target");
- args.add(getTargetVersion());
-
- args.add("-source");
- args.add(getSourceVersion());
-
- args.add("-encoding");
- args.add(getSourceEncoding());
-
- if (customArguments != null) {
- for (int i = 0; i < customArguments.length; i++) {
- args.add(customArguments[i]);
- }
- }
-
- return args.toArray(new String[args.size()]);
- }
-}
diff --git a/compilers/javac/src/main/resources/LICENSE.txt b/compilers/javac/src/main/resources/LICENSE.txt
deleted file mode 100644
index 261eeb9..0000000
--- a/compilers/javac/src/main/resources/LICENSE.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/compilers/javac/src/main/resources/NOTICE.txt b/compilers/javac/src/main/resources/NOTICE.txt
deleted file mode 100644
index e8cab38..0000000
--- a/compilers/javac/src/main/resources/NOTICE.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Commons JCI - Javac Compiler Implementation
-Copyright 2004-2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettingsTestCase.java b/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettingsTestCase.java
deleted file mode 100644
index dbe1d7e..0000000
--- a/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettingsTestCase.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.jci.compilers;
-
-import junit.framework.TestCase;
-
-public final class JavacJavaCompilerSettingsTestCase extends TestCase {
-
- private static void assertEquals(String[] expected, String[] result) {
- assertEquals(expected.length, result.length);
-
- for (int i = 0; i < expected.length; i++) {
- assertEquals("Unexpected value at index " + i, expected[i], result[i]);
- }
- }
-
- public void testDefaultSettings() {
- final String[] expected = {
- "-nowarn",
- "-target", "1.4",
- "-source", "1.4",
- "-encoding", "UTF-8"
- };
-
- final String[] s = new JavacJavaCompilerSettings().toNativeSettings();
-
- assertEquals(expected, s);
- }
-
- public void testSourceVersion() {
- final JavacJavaCompilerSettings s = new JavacJavaCompilerSettings();
- s.setSourceVersion("1.1");
- assertEquals("1.1", s.toNativeSettings()[4]);
- s.setSourceVersion("1.2");
- assertEquals("1.2", s.toNativeSettings()[4]);
- s.setSourceVersion("1.3");
- assertEquals("1.3", s.toNativeSettings()[4]);
- s.setSourceVersion("1.4");
- assertEquals("1.4", s.toNativeSettings()[4]);
- s.setSourceVersion("1.5");
- assertEquals("1.5", s.toNativeSettings()[4]);
- s.setSourceVersion("1.6");
- assertEquals("1.6", s.toNativeSettings()[4]);
- s.setSourceVersion("1.7");
- assertEquals("1.7", s.toNativeSettings()[4]);
- }
-
- public void testTargetVersion() {
- final JavacJavaCompilerSettings s = new JavacJavaCompilerSettings();
- s.setTargetVersion("1.1");
- assertEquals("1.1", s.toNativeSettings()[2]);
- s.setTargetVersion("1.2");
- assertEquals("1.2", s.toNativeSettings()[2]);
- s.setTargetVersion("1.3");
- assertEquals("1.3", s.toNativeSettings()[2]);
- s.setTargetVersion("1.4");
- assertEquals("1.4", s.toNativeSettings()[2]);
- s.setTargetVersion("1.5");
- assertEquals("1.5", s.toNativeSettings()[2]);
- s.setTargetVersion("1.6");
- assertEquals("1.6", s.toNativeSettings()[2]);
- s.setTargetVersion("1.7");
- assertEquals("1.7", s.toNativeSettings()[2]);
- }
-
- public void testEncoding() {
- final JavacJavaCompilerSettings s = new JavacJavaCompilerSettings();
- s.setSourceEncoding("ASCII");
- assertEquals("ASCII", s.toNativeSettings()[6]);
- }
-
- public void testWarnings() {
- final JavacJavaCompilerSettings s = new JavacJavaCompilerSettings();
- s.setWarnings(true);
- assertFalse("-nowarn".equals(s.toNativeSettings()[0]));
- s.setWarnings(false);
- assertEquals("-nowarn", s.toNativeSettings()[0]);
-
- }
-
- public void testDeprecations() {
- final JavacJavaCompilerSettings s = new JavacJavaCompilerSettings();
- s.setDeprecations(true);
- assertEquals("-deprecation", s.toNativeSettings()[0]);
- s.setDeprecations(false);
- assertFalse("-deprecation".equals(s.toNativeSettings()[0]));
- }
-}
diff --git a/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerTestCase.java b/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerTestCase.java
deleted file mode 100644
index 163a0d4..0000000
--- a/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerTestCase.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.commons.jci.compilers;
-
-public class JavacJavaCompilerTestCase extends AbstractCompilerTestCase {
-
- @Override
- public JavaCompiler createJavaCompiler() {
- return new JavacJavaCompiler();
- }
-
- @Override
- public String getCompilerName() {
- return "javac";
- }
-
-}
diff --git a/compilers/javac/src/test/resources/simplelog.properties b/compilers/javac/src/test/resources/simplelog.properties
deleted file mode 100644
index 6bd0ec9..0000000
--- a/compilers/javac/src/test/resources/simplelog.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-org.apache.commons.logging.simplelog.defaultlog=debug
-org.apache.commons.logging.simplelog.showdatetime=true
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 16f76f7..5ae8d5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
Apache Commons JCI is a java compiler interface.
It can be used to compile Java itself, or any other language that can be compiled to Java classes (e.g. groovy or javascript).
It is well integrated with a FAM (FilesystemAlterationMonitor) that can be used with the JCI compiling/reloading classloader.
- All the currently supported compilers (even javac before java6) feature in-memory compilation.
+ All the currently supported compilers feature in-memory compilation.
</description>
<url>http://commons.apache.org/proper/commons-jci/</url>
<inceptionYear>2004</inceptionYear>
@@ -49,18 +49,11 @@
<module>compilers/groovy</module>
<module>compilers/rhino</module>
<!-- <module>compilers/jsr199</module> -->
- <!-- <module>compilers/javac</module> -->
</modules>
<!-- Optional profiles for currently disabled modules -->
<profiles>
<profile>
- <id>compiler-javac</id>
- <modules>
- <module>compilers/javac</module>
- </modules>
- </profile>
- <profile>
<!-- N.B. requires Java 1.6+ to compile -->
<id>compiler-jsr199</id>
<modules>
@@ -255,13 +248,6 @@
<artifactId>janino</artifactId>
<version>2.6.1</version>
</dependency>
- <!-- compiler-javac -->
- <dependency>
- <groupId>org.vafer</groupId>
- <artifactId>dependency</artifactId>
- <!-- 0.4 is latest, but does not contain org.vafer.dependency.utils.ResourceRenamer -->
- <version>0.2</version>
- </dependency>
<!-- compiler-rhino -->
<dependency>
<groupId>rhino</groupId>
@@ -288,7 +274,7 @@
<version>2.5</version>
</dependency>
<dependency>
- <!-- javac (compile); core(test) -->
+ <!-- core(test) -->
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>3.3.1</version>
