commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tcu...@apache.org
Subject svn commit: r523064 - in /jakarta/commons/sandbox/jci/trunk: compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/ compilers/groovy/src/main/java/org/apache/commons/jci/compilers/ compilers/janino/src/main/java/org/apache/commons/jci/compil...
Date Tue, 27 Mar 2007 20:19:21 GMT
Author: tcurdt
Date: Tue Mar 27 13:19:19 2007
New Revision: 523064

URL: http://svn.apache.org/viewvc?view=rev&rev=523064
Log:
documentation,
configuration,
tweaks


Added:
    jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyJavaCompilerSettings.java   (with props)
    jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompilerSettings.java   (with props)
    jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompilerSettings.java   (with props)
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/main/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettings.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/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/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/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompiler.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/AbstractJavaCompiler.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompiler.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/package.html
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/FileChangeListener.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadNotificationListener.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/package.html
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/problems/CompilationProblem.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/problems/package.html
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/FileResourceReader.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/MemoryResourceReader.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/ResourceReader.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/package.html
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/MemoryResourceStore.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStore.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/Transactional.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/TransactionalResourceStore.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/package.html
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/ConversionUtils.java
    jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/package.html
    jakarta/commons/sandbox/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java
    jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java
    jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/package.html

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=523064&r1=523063&r2=523064
==============================================================================
--- 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 Tue Mar 27 13:19:19 2007
@@ -21,9 +21,9 @@
 import org.eclipse.jdt.core.compiler.IProblem;
 
 /**
+ * Wrapping an Eclipse compiler problem
  * 
  * @author tcurdt
- *
  */
 public final class EclipseCompilationProblem implements CompilationProblem {
 

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=523064&r1=523063&r2=523064
==============================================================================
--- 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 Tue Mar 27 13:19:19 2007
@@ -46,21 +46,26 @@
 import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;
 import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
 
+/**
+ * Eclipse compiler implemenation
+ * 
+ * @author tcurdt
+ */
 public final class EclipseJavaCompiler extends AbstractJavaCompiler {
 
     private final Log log = LogFactory.getLog(EclipseJavaCompiler.class);
-    private final Map settings;
+    private final EclipseJavaCompilerSettings defaultSettings;
 
     public EclipseJavaCompiler() {
         this(new EclipseJavaCompilerSettings());
     }
 
     public EclipseJavaCompiler(final Map pSettings) {
-        settings = pSettings;
+        defaultSettings = new EclipseJavaCompilerSettings(pSettings);
     }
 
     public EclipseJavaCompiler(final EclipseJavaCompilerSettings pSettings) {
-        settings = pSettings.getMap();
+        defaultSettings = pSettings;
     }
 
     final class CompilationUnit implements ICompilationUnit {
@@ -118,14 +123,16 @@
         }
     }
 
+    
     public org.apache.commons.jci.compilers.CompilationResult compile(
             final String[] pSourceFiles,
             final ResourceReader pReader,
             final ResourceStore pStore,
-            final ClassLoader pClassLoader
+            final ClassLoader pClassLoader,
+            final JavaCompilerSettings pSettings
             ) {
 
-        final Map settingsMap = settings;
+        final Map settingsMap = ((EclipseJavaCompilerSettings) defaultSettings).getMap();
         
         final Collection problems = new ArrayList();
         
@@ -366,6 +373,6 @@
     }
 
 	public JavaCompilerSettings createDefaultSettings() {
-		return new EclipseJavaCompilerSettings();
+		return defaultSettings;
 	}
 }

Modified: jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettings.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettings.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettings.java (original)
+++ jakarta/commons/sandbox/jci/trunk/compilers/eclipse/src/main/java/org/apache/commons/jci/compilers/EclipseJavaCompilerSettings.java Tue Mar 27 13:19:19 2007
@@ -1,12 +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 java.util.HashMap;
 import java.util.Map;
-import org.apache.commons.jci.compilers.JavaCompilerSettings;
-import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
 
-public class EclipseJavaCompilerSettings extends JavaCompilerSettings {
+/**
+ * Native Eclipse compiler settings
+ * 
+ * @author tcurdt
+ */
+public final class EclipseJavaCompilerSettings extends JavaCompilerSettings {
 
     final private Map defaultEclipseSettings = new HashMap();
 
@@ -17,6 +38,10 @@
         defaultEclipseSettings.put(CompilerOptions.OPTION_LocalVariableAttribute, CompilerOptions.GENERATE);
     }
     
+    public EclipseJavaCompilerSettings( final Map pMap ) {
+    	defaultEclipseSettings.putAll(pMap);
+    }
+    
     Map getMap() {
         final Map map = new HashMap(defaultEclipseSettings);
     	
@@ -29,9 +54,6 @@
     }
     
     public String toString() {
-        final StringBuffer sb = new StringBuffer();
-        sb.append(defaultEclipseSettings.toString());
-        // FIXME
-        return sb.toString();
+        return defaultEclipseSettings.toString();
     }
 }

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=523064&r1=523063&r2=523064
==============================================================================
--- 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 Tue Mar 27 13:19:19 2007
@@ -25,10 +25,11 @@
 import org.codehaus.groovy.syntax.SyntaxException;
 
 /**
+ * Groovy version of a CompilationProblem
  * 
  * @author tcurdt
  */
-public class GroovyCompilationProblem implements CompilationProblem {
+public final class GroovyCompilationProblem implements CompilationProblem {
 
     private final String fileName;
     private final String message;

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=523064&r1=523063&r2=523064
==============================================================================
--- 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 Tue Mar 27 13:19:19 2007
@@ -42,20 +42,28 @@
 import org.codehaus.groovy.tools.GroovyClass;
 
 /**
+ * Groovy implementation of the JavaCompiler interface
  * 
  * @author tcurdt
  */
 public final class GroovyJavaCompiler extends AbstractJavaCompiler {
 
     private final Log log = LogFactory.getLog(GroovyJavaCompiler.class);
+    private final GroovyJavaCompilerSettings defaultSettings;
     
+    public GroovyJavaCompiler() {
+    	defaultSettings = new GroovyJavaCompilerSettings(new CompilerConfiguration());
+    }
+        
     public CompilationResult compile(
             final String[] pResourceNames,
             final ResourceReader pReader,
             final ResourceStore pStore,
-            final ClassLoader pClassLoader
+            final ClassLoader pClassLoader,
+            final JavaCompilerSettings pSettings
             ) {
-        final CompilerConfiguration configuration = new CompilerConfiguration();
+
+    	final CompilerConfiguration configuration = ((GroovyJavaCompilerSettings) pSettings).getCompilerConfiguration();
         final ErrorCollector collector = new ErrorCollector(configuration);
         final GroovyClassLoader groovyClassLoader = new GroovyClassLoader(pClassLoader);
         final CompilationUnit unit = new CompilationUnit(configuration, null, groovyClassLoader);
@@ -119,7 +127,6 @@
     }
 
 	public JavaCompilerSettings createDefaultSettings() {
-		// FIXME
-		return null;
+		return defaultSettings;
 	}
 }

Added: jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyJavaCompilerSettings.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyJavaCompilerSettings.java?view=auto&rev=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyJavaCompilerSettings.java (added)
+++ jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyJavaCompilerSettings.java Tue Mar 27 13:19:19 2007
@@ -0,0 +1,39 @@
+/*
+ * 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.codehaus.groovy.control.CompilerConfiguration;
+
+/**
+ * Native configuration for the Groovy compiler
+ * 
+ * @author tcurdt
+ */
+public final class GroovyJavaCompilerSettings extends JavaCompilerSettings {
+
+	private final CompilerConfiguration settings;
+	
+	public GroovyJavaCompilerSettings( final CompilerConfiguration pSettings ) {
+		settings = pSettings;
+	}
+	
+	public CompilerConfiguration getCompilerConfiguration() {
+		return settings;
+	}
+	
+}

Propchange: jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyJavaCompilerSettings.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyJavaCompilerSettings.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: jakarta/commons/sandbox/jci/trunk/compilers/groovy/src/main/java/org/apache/commons/jci/compilers/GroovyJavaCompilerSettings.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=523064&r1=523063&r2=523064
==============================================================================
--- 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 Tue Mar 27 13:19:19 2007
@@ -22,10 +22,11 @@
 import org.codehaus.janino.Scanner.LocatedException;
 
 /**
+ * Janino version of a CompilationProblem
  * 
  * @author tcurdt
  */
-public class JaninoCompilationProblem implements CompilationProblem {
+public final class JaninoCompilationProblem implements CompilationProblem {
 
     private final Location location;
     private final String fileName;

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=523064&r1=523063&r2=523064
==============================================================================
--- 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 Tue Mar 27 13:19:19 2007
@@ -141,14 +141,14 @@
         }
     }
 
-    public CompilationResult compile( final String[] pClasses, final ResourceReader pResourceReader, final ResourceStore pStore, final ClassLoader classLoader ) {
+    public CompilationResult compile( final String[] pSourceNames, final ResourceReader pResourceReader, final ResourceStore pStore, final ClassLoader pClassLoader, final JavaCompilerSettings pSettings ) {
 
     	final Map classFilesByName = new HashMap();       
         
-        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(ConversionUtils.convertResourceToClassName(pClasses[i])));
+        final CompilingIClassLoader icl = new CompilingIClassLoader(pResourceReader, classFilesByName, pClassLoader);
+        for (int i = 0; i < pSourceNames.length; i++) {
+            log.debug("compiling " + pSourceNames[i]);
+            icl.loadIClass(Descriptor.fromClassName(ConversionUtils.convertResourceToClassName(pSourceNames[i])));
         }
         
         // Store all fully compiled classes

Added: jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompilerSettings.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompilerSettings.java?view=auto&rev=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompilerSettings.java (added)
+++ jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompilerSettings.java Tue Mar 27 13:19:19 2007
@@ -0,0 +1,22 @@
+/*
+ * 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 JaninoJavaCompilerSettings extends JavaCompilerSettings {
+	// TODO: implement the native janino compiler settings
+}

Propchange: jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompilerSettings.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompilerSettings.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: jakarta/commons/sandbox/jci/trunk/compilers/janino/src/main/java/org/apache/commons/jci/compilers/JaninoJavaCompilerSettings.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

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=523064&r1=523063&r2=523064
==============================================================================
--- 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 Tue Mar 27 13:19:19 2007
@@ -41,6 +41,7 @@
  * 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 {
 
@@ -49,17 +50,17 @@
 	private static final String NOTE_PREFIX = "Note: ";
 	private static final String ERROR_PREFIX = "error: ";
 
-//	private final JavacJavaCompilerSettings settings;
+	private final JavacJavaCompilerSettings settings;
 
 	public JavacJavaCompiler() {
-//		settings = null;
+		settings = new JavacJavaCompilerSettings();
 	}
 
 	public JavacJavaCompiler( final JavacJavaCompilerSettings pSettings ) {
-//		settings = pSettings;
+		settings = pSettings;
 	}
 
-	public CompilationResult compile( final String[] pSourcePaths, final ResourceReader pReader, ResourceStore pStore, final ClassLoader pClasspathClassLoader) {
+	public CompilationResult compile( final String[] pSourcePaths, final ResourceReader pReader, ResourceStore pStore, final ClassLoader pClasspathClassLoader, final JavaCompilerSettings pSettings ) {
 
 		try {
 			final ClassLoader cl = new JavacClassLoader(pClasspathClassLoader);
@@ -185,8 +186,7 @@
 	}
 
 	public JavaCompilerSettings createDefaultSettings() {
-		// FIXME
-		return null;
+		return settings;
 	}
 
 	private String[] buildCompilerArguments( final String[] resourcePaths, final ClassLoader classloader ) {

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=523064&r1=523063&r2=523064
==============================================================================
--- 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 Tue Mar 27 13:19:19 2007
@@ -19,18 +19,11 @@
 
 import java.util.List;
 
-public class JavacJavaCompilerSettings extends JavaCompilerSettings {
+public final class JavacJavaCompilerSettings extends JavaCompilerSettings {
 
 	private boolean optimize;
-	private boolean debug;
-	private boolean verbose;
-	private boolean showDeprecation;
 	private String maxmem;
 	private String meminitial;
-	private boolean showWarnings;
-	private String targetVersion;
-	private String sourceVersion;
-	private String sourceEncoding;
 
 	private List customCompilerArguments;
 
@@ -42,22 +35,6 @@
 		this.customCompilerArguments = customCompilerArguments;
 	}
 
-	public boolean isDebug() {
-		return debug;
-	}
-
-	public void setDebug(boolean debug) {
-		this.debug = debug;
-	}
-
-	public boolean isShowDeprecation() {
-		return showDeprecation;
-	}
-
-	public void setShowDeprecation(boolean deprecation) {
-		this.showDeprecation = deprecation;
-	}
-
 	public String getMaxmem() {
 		return maxmem;
 	}
@@ -82,43 +59,4 @@
 		this.optimize = optimize;
 	}
 
-	public boolean isShowWarnings() {
-		return showWarnings;
-	}
-
-	public void setShowWarnings(boolean showWarnings) {
-		this.showWarnings = showWarnings;
-	}
-
-	public String getSourceEncoding() {
-		return sourceEncoding;
-	}
-
-	public void setSourceEncoding(String sourceEncoding) {
-		this.sourceEncoding = sourceEncoding;
-	}
-
-	public String getSourceVersion() {
-		return sourceVersion;
-	}
-
-	public void setSourceVersion(String sourceVersion) {
-		this.sourceVersion = sourceVersion;
-	}
-
-	public String getTargetVersion() {
-		return targetVersion;
-	}
-
-	public void setTargetVersion(String targetVersion) {
-		this.targetVersion = targetVersion;
-	}
-
-	public boolean isVerbose() {
-		return verbose;
-	}
-
-	public void setVerbose(boolean verbose) {
-		this.verbose = verbose;
-	}
 }

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=523064&r1=523063&r2=523064
==============================================================================
--- 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 Tue Mar 27 13:19:19 2007
@@ -50,6 +50,13 @@
 
     private final Log log = LogFactory.getLog(RhinoJavaCompiler.class);
 
+    private final JavaCompilerSettings defaultSettings;
+    
+    
+    public RhinoJavaCompiler() {
+    	defaultSettings = new RhinoJavaCompilerSettings();
+    }
+    
     /**
      * based on code from dev.helma.org
      * http://dev.helma.org/source/file/helma/branches/rhinoloader/src/org/helma/javascript/RhinoLoader.java/?revision=95
@@ -244,9 +251,9 @@
     }
     
     
-	public CompilationResult compile( final String[] pResourcePaths, final ResourceReader pReader, final ResourceStore pStore, final ClassLoader classLoader) {
+	public CompilationResult compile( final String[] pResourcePaths, final ResourceReader pReader, final ResourceStore pStore, final ClassLoader pClassLoader, final JavaCompilerSettings pSettings ) {
 
-		final RhinoCompilingClassLoader cl = new RhinoCompilingClassLoader(pReader, pStore, classLoader);
+		final RhinoCompilingClassLoader cl = new RhinoCompilingClassLoader(pReader, pStore, pClassLoader);
 		
 		for (int i = 0; i < pResourcePaths.length; i++) {
             log.debug("compiling " + pResourcePaths[i]);
@@ -266,8 +273,7 @@
 
 
 	public JavaCompilerSettings createDefaultSettings() {
-		// FIXME
-		return null;
+		return defaultSettings;
 	}
 	
 }

Added: jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompilerSettings.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompilerSettings.java?view=auto&rev=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompilerSettings.java (added)
+++ jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompilerSettings.java Tue Mar 27 13:19:19 2007
@@ -0,0 +1,27 @@
+/*
+ * 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
+ * @todo implement rhino settings
+ */
+public final class RhinoJavaCompilerSettings extends JavaCompilerSettings {
+
+}

Propchange: jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompilerSettings.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompilerSettings.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: jakarta/commons/sandbox/jci/trunk/compilers/rhino/src/main/java/org/apache/commons/jci/compilers/RhinoJavaCompilerSettings.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/AbstractJavaCompiler.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/AbstractJavaCompiler.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/AbstractJavaCompiler.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/AbstractJavaCompiler.java Tue Mar 27 13:19:19 2007
@@ -44,7 +44,11 @@
 			classLoader = this.getClass().getClassLoader();
 		}
 
-		return compile(pClazzNames, pReader, pStore, classLoader);
+		return compile(pClazzNames, pReader, pStore, classLoader, createDefaultSettings());
+	}
+
+	public CompilationResult compile( final String[] pClazzNames, final ResourceReader pReader, final ResourceStore pStore, final ClassLoader pClassLoader ) {
+		return compile(pClazzNames, pReader, pStore, pClassLoader, createDefaultSettings());
 	}
 
 }

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompiler.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompiler.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompiler.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/JavaCompiler.java Tue Mar 27 13:19:19 2007
@@ -48,9 +48,22 @@
 	 */
     void setCompilationProblemHandler( final CompilationProblemHandler pHandler );
 
+    /**
+     * factory method to create the underlying default settings
+     */
     JavaCompilerSettings createDefaultSettings();
     
     /**
+     * uses the default compiler settings and the current classloader
+     */
+    CompilationResult compile( final String[] pResourcePaths, final ResourceReader pReader, final ResourceStore pStore );
+
+    /**
+     * uses the default compiler settings
+     */
+    CompilationResult compile( final String[] pResourcePaths, final ResourceReader pReader, final ResourceStore pStore, final ClassLoader pClassLoader );
+
+    /**
      * Compiles the java resources "some/path/to/MyJava.java"
      * read through the ResourceReader and then stores the resulting
      * classes in the ResourceStore under "some/path/to/MyJava.class".
@@ -65,13 +78,10 @@
      * @param pResourcePaths
      * @param pReader
      * @param pStore
+     * @param pClassLoader
+     * @param pSettings
      * @return always a CompilationResult
      */
-    CompilationResult compile( final String[] pResourcePaths, final ResourceReader pReader, final ResourceStore pStore );
+    CompilationResult compile( final String[] pResourcePaths, final ResourceReader pReader, final ResourceStore pStore, final ClassLoader pClassLoader, final JavaCompilerSettings pSettings );
 
-    /**
-     * As the usual compiler but you can provide the classloader
-     * and therefor the classpath you are compiling with.
-     */
-    CompilationResult compile( final String[] pResourcePaths, final ResourceReader pReader, final ResourceStore pStore, final ClassLoader classLoader );
 }

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/package.html
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/package.html?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/package.html (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/compilers/package.html Tue Mar 27 13:19:19 2007
@@ -1 +1,3 @@
-<html><body></body></html>
+<html><body>
+Interfaces and abstract classes for the compiler abstraction itself.
+</body></html>

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java Tue Mar 27 13:19:19 2007
@@ -37,6 +37,8 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
+ * A CompilingListener is an improved version of the ReloadingListener.
+ * It even compiles the classes from source before doing the reloading.
  * 
  * @author tcurdt
  */

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/FileChangeListener.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/FileChangeListener.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/FileChangeListener.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/FileChangeListener.java Tue Mar 27 13:19:19 2007
@@ -22,6 +22,7 @@
 import org.apache.commons.jci.monitor.FilesystemAlterationObserver;
 
 /**
+ * The most simple implemenation of an FilesystemAlterationListener.
  * 
  * @author tcurdt
  */

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadNotificationListener.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadNotificationListener.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadNotificationListener.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadNotificationListener.java Tue Mar 27 13:19:19 2007
@@ -18,6 +18,7 @@
 package org.apache.commons.jci.listeners;
 
 /**
+ * Classes implementing this interface can get notified by ReloadingListeners
  * 
  * @author tcurdt
  */

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/ReloadingListener.java Tue Mar 27 13:19:19 2007
@@ -35,6 +35,8 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
+ * This Listener waits for FAM events to trigger a reload of classes
+ * or resources.
  * 
  * @author tcurdt
  */

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/package.html
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/package.html?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/package.html (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/package.html Tue Mar 27 13:19:19 2007
@@ -1 +1,3 @@
-<html><body></body></html>
+<html><body>
+Special FAM listeners for just collecting FAM statistics, to compilation or class reloading.
+</body></html>

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/problems/CompilationProblem.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/problems/CompilationProblem.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/problems/CompilationProblem.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/problems/CompilationProblem.java Tue Mar 27 13:19:19 2007
@@ -18,21 +18,48 @@
 package org.apache.commons.jci.problems;
 
 /**
+ * An abstract definition of a compilation problem
  * 
  * @author tcurdt
  */
 public interface CompilationProblem {
 
-  boolean isError();
+	/**
+	 * is the problem an error and compilation cannot continue
+	 * or just a warning and compilation can proceed
+	 * 
+	 * @return
+	 */
+	boolean isError();
 
-  String getFileName();
+	/**
+	 * name of the file where the problem occurred
+	 * 
+	 * @return
+	 */
+	String getFileName();
 
-  int getStartLine();
-  int getStartColumn();
+	/**
+	 * position of where the problem starts in the source code
+	 * 
+	 * @return
+	 */
+	int getStartLine();
+	int getStartColumn();
 
-  int getEndLine();
-  int getEndColumn();
+	/**
+	 * position of where the problem stops in the source code
+	 * 
+	 * @return
+	 */
+	int getEndLine();
+	int getEndColumn();
 
-  String getMessage();
+	/**
+	 * the description of the problem
+	 * 
+	 * @return
+	 */
+	String getMessage();
 
 }

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/problems/package.html
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/problems/package.html?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/problems/package.html (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/problems/package.html Tue Mar 27 13:19:19 2007
@@ -1 +1,3 @@
-<html><body></body></html>
+<html><body>
+Compilation problems and related.
+</body></html>

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/FileResourceReader.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/FileResourceReader.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/FileResourceReader.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/FileResourceReader.java Tue Mar 27 13:19:19 2007
@@ -24,6 +24,8 @@
 import org.apache.commons.io.FileUtils;
 
 /**
+ * A simple file system based Reader implementation
+ * 
  * @author tcurdt
  */
 public final class FileResourceReader implements ResourceReader {

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/MemoryResourceReader.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/MemoryResourceReader.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/MemoryResourceReader.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/MemoryResourceReader.java Tue Mar 27 13:19:19 2007
@@ -21,6 +21,7 @@
 import java.util.HashMap;
 
 /**
+ * A memory based reader to compile from memory
  * 
  * @author tcurdt
  */

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/ResourceReader.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/ResourceReader.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/ResourceReader.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/ResourceReader.java Tue Mar 27 13:19:19 2007
@@ -18,6 +18,8 @@
 package org.apache.commons.jci.readers;
 
 /**
+ * A ResourceReader provide acces to resource like e.g. source code
+ * 
  * @author tcurdt
  */
 public interface ResourceReader {

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/package.html
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/package.html?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/package.html (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/readers/package.html Tue Mar 27 13:19:19 2007
@@ -1 +1,3 @@
-<html><body></body></html>
+<html><body>
+Readers to read resources from.
+</body></html>

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/FileResourceStore.java Tue Mar 27 13:19:19 2007
@@ -30,6 +30,8 @@
 
 
 /**
+ * Stores the results on disk
+ * 
  * @author tcurdt
  */
 public final class FileResourceStore implements ResourceStore {

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/MemoryResourceStore.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/MemoryResourceStore.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/MemoryResourceStore.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/MemoryResourceStore.java Tue Mar 27 13:19:19 2007
@@ -27,6 +27,8 @@
 
 
 /**
+ * Store just in memory
+ * 
  * @author tcurdt
  */
 public final class MemoryResourceStore implements ResourceStore {

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStore.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStore.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStore.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStore.java Tue Mar 27 13:19:19 2007
@@ -17,6 +17,8 @@
 package org.apache.commons.jci.stores;
 
 /**
+ * A Store is where the compilers are storing the results
+ * 
  * @author tcurdt
  */
 public interface ResourceStore {

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/ResourceStoreClassLoader.java Tue Mar 27 13:19:19 2007
@@ -22,6 +22,8 @@
 
 
 /**
+ * A ClassLoader backed by an array of ResourceStores
+ * 
  * @author tcurdt
  */
 public final class ResourceStoreClassLoader extends ClassLoader {

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/Transactional.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/Transactional.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/Transactional.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/Transactional.java Tue Mar 27 13:19:19 2007
@@ -17,6 +17,11 @@
 
 package org.apache.commons.jci.stores;
 
+/**
+ * Receive start/stop events
+ * 
+ * @author tcurdt
+ */
 public interface Transactional {
 
     void onStart();

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/TransactionalResourceStore.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/TransactionalResourceStore.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/TransactionalResourceStore.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/TransactionalResourceStore.java Tue Mar 27 13:19:19 2007
@@ -19,6 +19,9 @@
 
 
 /**
+ * A TransactionalResourceStore get signals of the compilation process as a whole.
+ * When it started and when the compiler finished.
+ * 
  * @author tcurdt
  */
 public class TransactionalResourceStore implements ResourceStore, Transactional {

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/package.html
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/package.html?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/package.html (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/stores/package.html Tue Mar 27 13:19:19 2007
@@ -1 +1,3 @@
-<html><body></body></html>
+<html><body>
+Stores to store the compilation results in.
+</body></html>

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/ConversionUtils.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/ConversionUtils.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/ConversionUtils.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/ConversionUtils.java Tue Mar 27 13:19:19 2007
@@ -20,6 +20,7 @@
 import java.io.File;
 
 /**
+ * Mainly common path manipultation helper methods
  * 
  * @author tcurdt
  */

Modified: jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/package.html
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/package.html?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/package.html (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/utils/package.html Tue Mar 27 13:19:19 2007
@@ -1 +1,3 @@
-<html><body></body></html>
+<html><body>
+Utilities
+</body></html>

Modified: jakarta/commons/sandbox/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java (original)
+++ jakarta/commons/sandbox/jci/trunk/core/src/test/java/org/apache/commons/jci/CompilingClassLoaderTestCase.java Tue Mar 27 13:19:19 2007
@@ -51,7 +51,7 @@
 
         private final Log log = LogFactory.getLog(MockJavaCompiler.class);
 
-		public CompilationResult compile(String[] pResourcePaths, ResourceReader pReader, ResourceStore pStore, ClassLoader classLoader) {
+		public CompilationResult compile(String[] pResourcePaths, ResourceReader pReader, ResourceStore pStore, ClassLoader pClassLoader, JavaCompilerSettings pSettings ) {
 			
 			for (int i = 0; i < pResourcePaths.length; i++) {
 				final String resourcePath = pResourcePaths[i];				
@@ -90,6 +90,10 @@
 			return new CompilationResult(new CompilationProblem[0]);
 		}
 
+		public CompilationResult compile(String[] pResourcePaths, ResourceReader pReader, ResourceStore pStore, ClassLoader pClassLoader) {
+			return compile(pResourcePaths, pReader, pStore, pClassLoader, null);
+		}
+    	
 		public CompilationResult compile(String[] pResourcePaths, ResourceReader pReader, ResourceStore pStore) {
 			return compile(pResourcePaths, pReader, pStore, null);
 		}
@@ -100,7 +104,7 @@
 		public JavaCompilerSettings createDefaultSettings() {
 			return null;
 		}
-    	
+
     }
     
     protected void setUp() throws Exception {

Modified: jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java (original)
+++ jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/listeners/AbstractFilesystemAlterationListener.java Tue Mar 27 13:19:19 2007
@@ -26,7 +26,8 @@
 import org.apache.commons.logging.LogFactory;
 
 /**
- * 
+ * AbstractFilesystemAlterationListener provides some convenience methods helping to
+ * implement a FilesystemAlterationListener.
  * @author tcurdt
  */
 public abstract class AbstractFilesystemAlterationListener implements FilesystemAlterationListener {
@@ -142,12 +143,12 @@
         }
     }
     
-    /*
-     * we don't reset the signal
-     * so if there was a check it is
-     * already true and exit immediatly
-     * otherwise it will behave just
+    /**
+     * we don't reset the signal so if there was a check it is
+     * already true and exit immediatly otherwise it will behave just
      * like waitForCheck()
+     * 
+     * @throws Exception in case of a timeout
      */
     public void waitForFirstCheck() throws Exception {
         log.debug("waiting for first check");
@@ -156,6 +157,11 @@
         }        
     }
 
+    /**
+     * wait for the next filesystem check to happen
+     * 
+     * @throws Exception in case of a timeout
+     */
     public void waitForCheck() throws Exception {
         synchronized(checkSignal) {
             checkSignal.triggered = false;

Modified: jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/package.html
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/package.html?view=diff&rev=523064&r1=523063&r2=523064
==============================================================================
--- jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/package.html (original)
+++ jakarta/commons/sandbox/jci/trunk/fam/src/main/java/org/apache/commons/jci/monitor/package.html Tue Mar 27 13:19:19 2007
@@ -1 +1,3 @@
-<html><body></body></html>
+<html><body>
+Monitor to keep track of changes on the local filesystem.
+</body></html>



---------------------------------------------------------------------
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