File template loader, java support, multi-module maven support

circumflex-docco/src/main/scala/docco.scala

@@ -179,6 +179,9 @@ class DoccoBatch {
       .map(_.toString).getOrElse("/docco-batch-page.html.ftl")
   val indexTemplate: String = cx.get("docco.indexTemplate")
       .map(_.toString).getOrElse("/docco-index.html.ftl")
+  val indexFile: String = cx.get("docco.indexFile")
+    .map(_.toString).getOrElse("index.html")
+
   // Regex to filter sources
   val filenameRegex = cx.get("docco.filenameRegex").map(_.toString)
       .getOrElse(".*\\.scala$")
@@ -264,7 +267,7 @@ class DoccoBatch {
       (dirName -> filenames)
     }
     val dirs = indexMap.keys.toList.sortBy(_.toString)
-    val out = new FileWriter(new File(outputPath, "index.html"))
+    val out = new FileWriter(new File(outputPath, indexFile))
     try {
       var data = Map[String, Any]("dirs" -> dirs, "index" -> indexMap, "title" -> title)
       ftlConfig.getTemplate(indexTemplate).process(data, out)

circumflex-ftl/src/main/scala/config.scala

@@ -6,7 +6,7 @@ import markeven.BlockProcessor
 import _root_.freemarker.template._
 import _root_.freemarker.core.Environment
 import _root_.freemarker.cache._
-import java.io.StringWriter
+import java.io.{File, StringWriter}
 
 /*!# Default FreeMarker Configuration
 
@@ -53,7 +53,7 @@ class DefaultConfiguration extends Configuration {
       CX_LOG.warn("Not running in webapp context.")
   }
   addLoader(new ClassTemplateLoader(getClass, "/"))
-
+  addLoader(new FileTemplateLoader(new File("/")))
 }
 
 object MarkevenDirective extends TemplateDirectiveModel {

circumflex-maven-plugin/src/main/java/ru/circumflex/maven/AbstractCircumflexMojo.java

@@ -75,12 +75,18 @@ protected ClassLoader prepareClassLoader() throws MojoExecutionException {
 
   protected Properties collectProps() {
     Properties result = new Properties();
+    copyProps(getDefaultProperties(), result);
     copyProps(project.getProperties(), result);
     copyProps(System.getProperties(), result);
     return result;
   }
 
-  private void copyProps(Properties src, Properties dst) {
+    protected Properties getDefaultProperties()
+    {
+        return new Properties();
+    }
+
+    private void copyProps(Properties src, Properties dst) {
     for (Object key : src.keySet()) {
       String value = src.get(key).toString().trim();
       if (skipUnresolved && value.matches(".*\\$\\{.*\\}.*")) {

circumflex-maven-plugin/src/main/java/ru/circumflex/maven/DoccoMojo.java

@@ -4,6 +4,8 @@
 import org.apache.maven.plugin.MojoFailureException;
 import ru.circumflex.docco.DoccoBatch;
 import ru.circumflex.core.Circumflex;
+
+import java.io.File;
 import java.util.Properties;
 
 /**
@@ -16,9 +18,18 @@ public class DoccoMojo extends AbstractCircumflexMojo {
    */
   protected String[] customResources;
 
+  /**
+   * @parameter expression="${project.build.sourceDirectory}
+   */
+  protected File sourceDirectory;
+
+  /**
+   * @parameter expression="${project.build.directory}
+   */
+  protected File buildDirectory;
+
   public void execute() throws MojoExecutionException, MojoFailureException {
     Thread.currentThread().setContextClassLoader(prepareClassLoader());
-    if (!project.isExecutionRoot()) return;
     // Configure Circumflex
     Properties props = collectProps();
     for (Object k : props.keySet()) {
@@ -33,4 +44,13 @@ public void execute() throws MojoExecutionException, MojoFailureException {
     getLog().info("Generating docco in " + db.outputPath());
     db.generate();
   }
+
+  @Override
+  protected Properties getDefaultProperties() {
+    Properties props = new Properties();
+    props.setProperty("docco.basePath", sourceDirectory.getParentFile().getAbsolutePath());
+    props.setProperty("docco.outputPath", new File(buildDirectory, "docco").getAbsolutePath());
+    props.setProperty("docco.filenameRegex", ".*\\.(java|scala)$");
+    return props;
+  }
 }