From 94d497742f080fff0e5b6eefe633ec526a9283d6 Mon Sep 17 00:00:00 2001 From: Anders Nawroth Date: Tue, 18 Oct 2011 02:29:05 +0200 Subject: [PATCH] Avoid writing files into src/. --- pom.xml | 66 ++++++++++++++----- .../data/test/DocumentingTestBase.java | 8 +-- 2 files changed, 53 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 05c1a7163..e2264d10c 100644 --- a/pom.xml +++ b/pom.xml @@ -140,6 +140,9 @@ s3 access key s3 secret key --> + ${basedir}/src/docbkx + ${basedir}/spring-data-neo4j/target/docbkx + ${basedir}/target/classes @@ -263,7 +266,33 @@ 3.1.0.RELEASE - + + + ${docbook.srcDir} + false + + + ${docbook.snippetsDir} + false + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + ${project.build.sourceEncoding} + + + + generate-sources + + resources + + + + com.agilejava.docbkx docbkx-maven-plugin @@ -275,8 +304,9 @@ generate-html + ${docbook.generatedDir} true - ${basedir}/src/docbkx/resources/xsl/html.xsl + ${docbook.generatedDir}/resources/xsl/html.xsl 1 1 @@ -285,8 +315,8 @@ file="${basedir}/target/docbkx/html/index.html"/> - - + + @@ -294,7 +324,7 @@ - + @@ -311,9 +341,9 @@ generate-rtf - ${basedir}/src/docbkx/ - ${basedir}/src/docbkx/resources/images/ - ${basedir}/src/docbkx/ + ${docbook.generatedDir}/ + ${docbook.generatedDir}/resources/images/ + ${docbook.generatedDir}/ 0 0 0 @@ -333,9 +363,10 @@ generate-pdf - ${basedir}/src/docbkx/ - ${basedir}/src/docbkx/resources/images/ - ${basedir}/src/docbkx/resources/xsl/fopdf.xsl + ${docbook.generatedDir} + ${docbook.generatedDir}/ + ${docbook.generatedDir}/resources/images/ + ${docbook.generatedDir}/resources/xsl/fopdf.xsl 1 1 @@ -353,9 +384,10 @@ generate-html + ${docbook.generatedDir} true true - ${basedir}/src/docbkx/resources/xsl/html_chunk.xsl + ${docbook.generatedDir}/resources/xsl/html_chunk.xsl 1 1 @@ -367,15 +399,15 @@ - + - - + + @@ -405,8 +437,8 @@ false css/html.css - ${basedir}/src/docbkx/ - + ${docbook.generatedDir}/ + true diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBase.java b/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBase.java index 11aa382af..72afd6cea 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBase.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/test/DocumentingTestBase.java @@ -25,7 +25,7 @@ import static org.junit.Assert.fail; public abstract class DocumentingTestBase { - private static final String DOCBOOK_DIR = "src/docbkx"; + private static final String DOCBOOK_DIR = "target/docbkx"; private static final String SRC_TEST_JAVA = "src/test/java"; protected String title; protected String snippetTitle; @@ -52,7 +52,7 @@ public abstract class DocumentingTestBase { } private File docbookDirectory() { - return new File(determineRoot(),DOCBOOK_DIR); + return new File (new File(determineRoot(),module()), DOCBOOK_DIR); } protected File getSnippetFileName(File directory, String name) { @@ -130,9 +130,9 @@ public abstract class DocumentingTestBase { protected File determineRoot() { File currentDirectory = currentDirectory(); - if (new File(currentDirectory,DOCBOOK_DIR).exists()) return currentDirectory; + if (new File(currentDirectory,module()).exists()) return currentDirectory; currentDirectory = currentDirectory.getParentFile(); - if (new File(currentDirectory,DOCBOOK_DIR).exists()) return currentDirectory; + if (new File(currentDirectory,module()).exists()) return currentDirectory; throw new IllegalStateException("Can't determine root directory, started at "+currentDirectory()); } }