commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tcu...@apache.org
Subject svn commit: r516768 - in /jakarta/commons/sandbox/jci/trunk/compilers: eclipse/src/main/java/org/apache/commons/jci/compilers/ eclipse/src/test/java/org/apache/commons/jci/compilers/ groovy/src/main/java/org/apache/commons/jci/compilers/ groovy/src/tes...
Date Sat, 10 Mar 2007 19:14:13 GMT
Author: tcurdt
Date: Sat Mar 10 11:14:11 2007
New Revision: 516768

URL: http://svn.apache.org/viewvc?view=rev&rev=516768
Log:
clean up,
docs


Modified:
    jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseCompilationProblem.java
    jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java
    jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerTestCase.java
    jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyCompilationProblem.java
    jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyJavaCompiler.java
    jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/test/java/org/apache/commons/jci/compilers/GroovyJavaCompilerTestCase.java
    jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
    jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
    jakarta/commons/sandbox/jci/trunk/compilers/janino/src/test/java/org/apache/commons/jci/compilers/JaninoJavaCompilerTestCase.java
    jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileInputStreamProxy.java
    jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileOutputStreamProxy.java
    jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java
    jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacCompilationProblem.java
    jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompiler.java
    jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettings.java
    jakarta/commons/sandbox/jci/trunk/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerTestCase.java
    jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoCompilationProblem.java
    jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompiler.java
    jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java

Modified: jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseCompilationProblem.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseCompilationProblem.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseCompilationProblem.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseCompilationProblem.java
Sat Mar 10 11:14:11 2007
@@ -14,12 +14,18 @@
  * 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;
 import org.eclipse.jdt.core.compiler.IProblem;
 
-public class EclipseCompilationProblem implements CompilationProblem {
+/**
+ * 
+ * @author tcurdt
+ *
+ */
+public final class EclipseCompilationProblem implements CompilationProblem {
 
     private final IProblem problem;
 

Modified: jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompiler.java
Sat Mar 10 11:14:11 2007
@@ -28,7 +28,7 @@
 import org.apache.commons.jci.problems.CompilationProblem;
 import org.apache.commons.jci.readers.ResourceReader;
 import org.apache.commons.jci.stores.ResourceStore;
-import org.apache.commons.jci.utils.ClassUtils;
+import org.apache.commons.jci.utils.ConversionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.jdt.core.compiler.IProblem;
@@ -73,7 +73,7 @@
 
         CompilationUnit( final ResourceReader pReader, final String pSourceFile ) {
             reader = pReader;
-            clazzName = ClassUtils.convertResourceToClassName(pSourceFile);
+            clazzName = ConversionUtils.convertResourceToClassName(pSourceFile);
             fileName = pSourceFile;
             int dot = clazzName.lastIndexOf('.');
             if (dot > 0) {
@@ -119,12 +119,10 @@
             ) {
 
         final Map settingsMap = settings;
-//        final Set sourceFileIndex = new HashSet();
         final ICompilationUnit[] compilationUnits = new ICompilationUnit[pSourceFiles.length];
         for (int i = 0; i < compilationUnits.length; i++) {
             final String sourceFile = pSourceFiles[i];
             compilationUnits[i] = new CompilationUnit(pReader, sourceFile);
-//            sourceFileIndex.add(sourceFile);
             log.debug("compiling " + sourceFile);
         }
 
@@ -167,7 +165,7 @@
             	
             	log.debug("finding " + pClazzName);
             	
-            	final String resourceName = ClassUtils.convertClassToResourcePath(pClazzName);
+            	final String resourceName = ConversionUtils.convertClassToResourcePath(pClazzName);
             	
                 final byte[] clazzBytes = pStore.read(pClazzName);
                 if (clazzBytes != null) {
@@ -230,7 +228,7 @@
 
             private boolean isPackage( final String pClazzName ) {
             	
-            	final InputStream is = pClassLoader.getResourceAsStream(ClassUtils.convertClassToResourcePath(pClazzName));
+            	final InputStream is = pClassLoader.getResourceAsStream(ConversionUtils.convertClassToResourcePath(pClazzName));
             	if (is != null) {
                 	log.debug("found the class for " + pClazzName + "- no package");
             		return false;

Modified: jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerTestCase.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerTestCase.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/test/java/org/apache/commons/jci/compilers/EclipseJavaCompilerTestCase.java
Sat Mar 10 11:14:11 2007
@@ -1,3 +1,20 @@
+/*
+ * 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 final class EclipseJavaCompilerTestCase extends AbstractCompilerTestCase {

Modified: jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyCompilationProblem.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyCompilationProblem.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyCompilationProblem.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyCompilationProblem.java
Sat Mar 10 11:14:11 2007
@@ -14,6 +14,7 @@
  * 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;
@@ -23,6 +24,10 @@
 import org.codehaus.groovy.control.messages.SyntaxErrorMessage;
 import org.codehaus.groovy.syntax.SyntaxException;
 
+/**
+ * 
+ * @author tcurdt
+ */
 public class GroovyCompilationProblem implements CompilationProblem {
 
     private final String fileName;

Modified: jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyJavaCompiler.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyJavaCompiler.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyJavaCompiler.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyJavaCompiler.java
Sat Mar 10 11:14:11 2007
@@ -1,16 +1,33 @@
+/*
+ * 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 groovy.lang.GroovyClassLoader;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import org.apache.commons.jci.compilers.AbstractJavaCompiler;
-import org.apache.commons.jci.compilers.CompilationResult;
+
 import org.apache.commons.jci.problems.CompilationProblem;
 import org.apache.commons.jci.readers.ResourceReader;
 import org.apache.commons.jci.stores.ResourceStore;
-import org.apache.commons.jci.utils.ClassUtils;
+import org.apache.commons.jci.utils.ConversionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codehaus.groovy.control.CompilationFailedException;
@@ -24,6 +41,10 @@
 import org.codehaus.groovy.control.messages.WarningMessage;
 import org.codehaus.groovy.tools.GroovyClass;
 
+/**
+ * 
+ * @author tcurdt
+ */
 public final class GroovyJavaCompiler extends AbstractJavaCompiler {
 
     private final Log log = LogFactory.getLog(GroovyJavaCompiler.class);
@@ -42,7 +63,7 @@
         for (int i = 0; i < source.length; i++) {
             final String resourceName = pResourceNames[i];
             source[i] = new SourceUnit(
-                    ClassUtils.convertResourceToClassName(resourceName),
+                    ConversionUtils.convertResourceToClassName(resourceName),
                     new String(pReader.getBytes(resourceName)), // FIXME delay the read
                     configuration,
                     groovyClassLoader,
@@ -61,7 +82,7 @@
             for (final Iterator it = classes.iterator(); it.hasNext();) {
                 final GroovyClass clazz = (GroovyClass) it.next();
                 final byte[] bytes = clazz.getBytes();
-                pStore.write(ClassUtils.convertClassToResourcePath(clazz.getName()), bytes);
+                pStore.write(ConversionUtils.convertClassToResourcePath(clazz.getName()),
bytes);
             }
         } catch (final MultipleCompilationErrorsException e) {
             final ErrorCollector col = e.getErrorCollector();

Modified: jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/test/java/org/apache/commons/jci/compilers/GroovyJavaCompilerTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/test/java/org/apache/commons/jci/compilers/GroovyJavaCompilerTestCase.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/test/java/org/apache/commons/jci/compilers/GroovyJavaCompilerTestCase.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/test/java/org/apache/commons/jci/compilers/GroovyJavaCompilerTestCase.java
Sat Mar 10 11:14:11 2007
@@ -1,6 +1,26 @@
-package org.apache.commons.jci.compilers;
+/*
+ * 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;
 
+/**
+ * 
+ * @author tcurdt
+ */
 public final class GroovyJavaCompilerTestCase extends AbstractCompilerTestCase {
 
 	public String getCompilerName() {
@@ -14,6 +34,5 @@
 	public void testInternalClassCompile() throws Exception {
 		// FIXME: inner classes not supported in groovy?
 	}
-
 	
 }

Modified: jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoCompilationProblem.java
Sat Mar 10 11:14:11 2007
@@ -14,12 +14,17 @@
  * 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;
 import org.codehaus.janino.Location;
 import org.codehaus.janino.Scanner.LocatedException;
 
+/**
+ * 
+ * @author tcurdt
+ */
 public class JaninoCompilationProblem implements CompilationProblem {
 
     private final Location location;

Modified: jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompiler.java
Sat Mar 10 11:14:11 2007
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.commons.jci.compilers;
 
 import java.io.BufferedReader;
@@ -29,7 +30,7 @@
 import org.apache.commons.jci.problems.CompilationProblem;
 import org.apache.commons.jci.readers.ResourceReader;
 import org.apache.commons.jci.stores.ResourceStore;
-import org.apache.commons.jci.utils.ClassUtils;
+import org.apache.commons.jci.utils.ConversionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.codehaus.janino.ClassLoaderIClassLoader;
@@ -145,14 +146,14 @@
         final CompilingIClassLoader icl = new CompilingIClassLoader(pResourceReader, classFilesByName,
classLoader);
         for (int i = 0; i < pClasses.length; i++) {
             log.debug("compiling " + pClasses[i]);
-            icl.loadIClass(Descriptor.fromClassName(ClassUtils.convertResourceToClassName(pClasses[i])));
+            icl.loadIClass(Descriptor.fromClassName(ConversionUtils.convertResourceToClassName(pClasses[i])));
         }
         
         // Store all fully compiled classes
         for (Iterator i = classFilesByName.entrySet().iterator(); i.hasNext();) {
             final Map.Entry entry = (Map.Entry)i.next();
             final String clazzName = (String)entry.getKey(); 
-            pStore.write(ClassUtils.convertClassToResourcePath(clazzName), (byte[])entry.getValue());
+            pStore.write(ConversionUtils.convertClassToResourcePath(clazzName), (byte[])entry.getValue());
         }
         
         final Collection problems = icl.getProblems();

Modified: jakarta/commons/sandbox/jci/trunk/compilers/janino/src/test/java/org/apache/commons/jci/compilers/JaninoJavaCompilerTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/janino/src/test/java/org/apache/commons/jci/compilers/JaninoJavaCompilerTestCase.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/janino/src/test/java/org/apache/commons/jci/compilers/JaninoJavaCompilerTestCase.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/janino/src/test/java/org/apache/commons/jci/compilers/JaninoJavaCompilerTestCase.java
Sat Mar 10 11:14:11 2007
@@ -1,5 +1,26 @@
+/*
+ * 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;
 
+/**
+ * 
+ * @author tcurdt
+ */
 public final class JaninoJavaCompilerTestCase extends AbstractCompilerTestCase {
 
 	public String getCompilerName() {

Modified: jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileInputStreamProxy.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileInputStreamProxy.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileInputStreamProxy.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileInputStreamProxy.java
Sat Mar 10 11:14:11 2007
@@ -1,3 +1,20 @@
+/*
+ * 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;
@@ -8,8 +25,12 @@
 import java.io.InputStream;
 
 import org.apache.commons.jci.readers.ResourceReader;
-import org.apache.commons.jci.utils.ClassUtils;
+import org.apache.commons.jci.utils.ConversionUtils;
 
+/**
+ * 
+ * @author tcurdt
+ */
 public final class FileInputStreamProxy extends InputStream {
 	
 	private final static ThreadLocal readerThreadLocal = new ThreadLocal();
@@ -30,7 +51,7 @@
 	}
 
 	public FileInputStreamProxy(String pName) throws FileNotFoundException {
-		name = ClassUtils.getResourceNameFromFileName(pName);
+		name = ConversionUtils.getResourceNameFromFileName(pName);
 
 		final ResourceReader reader = (ResourceReader) readerThreadLocal.get();
 

Modified: jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileOutputStreamProxy.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileOutputStreamProxy.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileOutputStreamProxy.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/FileOutputStreamProxy.java
Sat Mar 10 11:14:11 2007
@@ -1,3 +1,20 @@
+/*
+ * 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;
@@ -8,8 +25,12 @@
 import java.io.OutputStream;
 
 import org.apache.commons.jci.stores.ResourceStore;
-import org.apache.commons.jci.utils.ClassUtils;
+import org.apache.commons.jci.utils.ConversionUtils;
 
+/**
+ * 
+ * @author tcurdt
+ */
 public final class FileOutputStreamProxy extends OutputStream {
 	
 	private final static ThreadLocal storeThreadLocal = new ThreadLocal();
@@ -40,7 +61,7 @@
 	}
 
 	public FileOutputStreamProxy(String pName) throws FileNotFoundException {
-		name = ClassUtils.getResourceNameFromFileName(pName);
+		name = ConversionUtils.getResourceNameFromFileName(pName);
 	}
 	
 	public void write(int value) throws IOException {

Modified: jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacClassLoader.java
Sat Mar 10 11:14:11 2007
@@ -1,3 +1,20 @@
+/*
+ * 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;

Modified: jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacCompilationProblem.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacCompilationProblem.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacCompilationProblem.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacCompilationProblem.java
Sat Mar 10 11:14:11 2007
@@ -1,8 +1,30 @@
+/*
+ * 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 int endCoumn;
 	private int endLine;
 	private String fileName;

Modified: jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompiler.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompiler.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompiler.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompiler.java
Sat Mar 10 11:14:11 2007
@@ -1,3 +1,20 @@
+/*
+ * 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;

Modified: jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettings.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettings.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettings.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/javac/src/main/java/org/apache/commons/jci/compilers/JavacJavaCompilerSettings.java
Sat Mar 10 11:14:11 2007
@@ -1,3 +1,20 @@
+/*
+ * 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.List;

Modified: jakarta/commons/sandbox/jci/trunk/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerTestCase.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerTestCase.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/javac/src/test/java/org/apache/commons/jci/compilers/JavacJavaCompilerTestCase.java
Sat Mar 10 11:14:11 2007
@@ -1,3 +1,20 @@
+/*
+ * 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 {

Modified: jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoCompilationProblem.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoCompilationProblem.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoCompilationProblem.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoCompilationProblem.java
Sat Mar 10 11:14:11 2007
@@ -14,16 +14,20 @@
  * 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 final class RhinoCompilationProblem implements CompilationProblem {
 
 	private final String message;
 	private final String fileName;
 	private final int line;
-//	private final String script;
 	private final int column;
 	private final boolean error;
 	
@@ -31,7 +35,6 @@
 		message = pMessage;
 		fileName = pFileName;
 		line = pLine;
-//		script = pScript;
 		column = pColumn;
 		error = pError;
 	}

Modified: jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompiler.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompiler.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompiler.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompiler.java
Sat Mar 10 11:14:11 2007
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.commons.jci.compilers;
 
 import java.io.ByteArrayInputStream;
@@ -27,7 +28,7 @@
 import org.apache.commons.jci.problems.CompilationProblem;
 import org.apache.commons.jci.readers.ResourceReader;
 import org.apache.commons.jci.stores.ResourceStore;
-import org.apache.commons.jci.utils.ClassUtils;
+import org.apache.commons.jci.utils.ConversionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.mozilla.javascript.CompilerEnvirons;
@@ -250,7 +251,7 @@
 		for (int i = 0; i < pResourcePaths.length; i++) {
             log.debug("compiling " + pResourcePaths[i]);
             
-            final String clazzName = ClassUtils.convertResourceToClassName(pResourcePaths[i]);
+            final String clazzName = ConversionUtils.convertResourceToClassName(pResourcePaths[i]);
             try {
 				cl.loadClass(clazzName);
 			} catch (ClassNotFoundException e) {

Modified: jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java?view=diff&rev=516768&r1=516767&r2=516768
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java
(original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/test/java/org/apache/commons/jci/compilers/RhinoJavaCompilerTestCase.java
Sat Mar 10 11:14:11 2007
@@ -1,3 +1,20 @@
+/*
+ * 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.HashMap;
@@ -6,6 +23,10 @@
 import org.apache.commons.jci.readers.ResourceReader;
 import org.apache.commons.jci.stores.MemoryResourceStore;
 
+/**
+ * 
+ * @author tcurdt
+ */
 public final class RhinoJavaCompilerTestCase extends AbstractCompilerTestCase {
 
 	public JavaCompiler createJavaCompiler() {
@@ -20,12 +41,14 @@
 		final JavaCompiler compiler = createJavaCompiler(); 
 		
 		final ResourceReader reader = new ResourceReader() {
-			final private Map sources = new HashMap() {{
-				put("jci/Simple.js", (
-					" var i = 0;\n" +
-					"\n"
+			final private Map sources = new HashMap() {
+				private static final long serialVersionUID = 1L;
+				{
+					put("jci/Simple.js", (
+							" var i = 0;\n" +
+							"\n"
 					).getBytes());
-			}};
+				}};
 			
 			public byte[] getBytes( final String pResourceName ) {
 				return (byte[]) sources.get(pResourceName);
@@ -61,12 +84,14 @@
 		final JavaCompiler compiler = createJavaCompiler(); 
 		
 		final ResourceReader reader = new ResourceReader() {
-			final private Map sources = new HashMap() {{
-				put("Jci/Simple.js", (
-					" var i = 0;\n" +
-					"\n"
+			final private Map sources = new HashMap() {
+				private static final long serialVersionUID = 1L;
+				{
+					put("Jci/Simple.js", (
+							" var i = 0;\n" +
+							"\n"
 					).getBytes());
-			}};
+				}};
 			
 			public byte[] getBytes( final String pResourceName ) {
 				return (byte[]) sources.get(pResourceName);



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


Mime
View raw message