fixes after review

scalar-labs · Oct 16, 2015 · e03edaf · e03edaf
1 parent 21e8fc7
commit e03edaf
Show file tree

Hide file tree

Showing 47 changed files with 7 additions and 6 deletions.
diff --git a/btm-docs/README.md b/btm-docs/README.md
@@ -1,3 +1,3 @@
-The files contained in `src/main/doc` are [asciidoc](http://asciidoctor.org/) files. HTML / PDF can be generated out of them using the `asciidoc` tool, or by running `mvn generate-resources`. After Maven runs, you can read the HTML documentation by starting at `target/docs/index.html`.
+The files contained in `src/main/asciidoc` are [asciidoc](http://asciidoctor.org/) files. HTML / PDF can be generated out of them using the `asciidoc` tool, or by running `mvn generate-resources`. After Maven runs, you can read the HTML documentation by starting at `target/generated-docs/index.html`.
 
 The original content was lost when the code was moved from codehaus.org over to GitHib.  Thanks to web archive, it was possible to get the original content from e.g. [http://web.archive.org/web/20150520175151/https://docs.codehaus.org/display/BTM/Home](http://web.archive.org/web/20150520175151/https://docs.codehaus.org/display/BTM/Home).
diff --git a/btm-docs/pom.xml b/btm-docs/pom.xml
@@ -16,7 +16,6 @@
             <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
-                <version>1.5.2.1</version> 
                 <executions>
                     <execution>
                         <id>output-html</id> 
@@ -27,10 +26,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <sourceDirectory>src/main/doc</sourceDirectory>
-                    <outputDirectory>target/docs</outputDirectory>
                     <backend>html</backend>
-                    <doctype>book</doctype>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/btm-docs/src/main/doc/Build.txt → btm-docs/src/main/asciidoc/Build.adoc b/btm-docs/src/main/doc/Build.txt → btm-docs/src/main/asciidoc/Build.adoc
diff --git a/btm-docs/src/main/doc/Configuration2x.txt → ...cs/src/main/asciidoc/Configuration2x.adoc b/btm-docs/src/main/doc/Configuration2x.txt → ...cs/src/main/asciidoc/Configuration2x.adoc
diff --git a/...docs/src/main/doc/ConfiguringIntelliJ.txt → ...rc/main/asciidoc/ConfiguringIntelliJ.adoc b/...docs/src/main/doc/ConfiguringIntelliJ.txt → ...rc/main/asciidoc/ConfiguringIntelliJ.adoc
diff --git a/.../src/main/doc/CryptResourcePassword2x.txt → ...ain/asciidoc/CryptResourcePassword2x.adoc b/.../src/main/doc/CryptResourcePassword2x.txt → ...ain/asciidoc/CryptResourcePassword2x.adoc
diff --git a/btm-docs/src/main/doc/DebugLogging2x.txt → ...ocs/src/main/asciidoc/DebugLogging2x.adoc b/btm-docs/src/main/doc/DebugLogging2x.txt → ...ocs/src/main/asciidoc/DebugLogging2x.adoc
diff --git a/btm-docs/src/main/doc/FAQ.txt → btm-docs/src/main/asciidoc/FAQ.adoc b/btm-docs/src/main/doc/FAQ.txt → btm-docs/src/main/asciidoc/FAQ.adoc
diff --git a/btm-docs/src/main/doc/Hibernate2x.txt → btm-docs/src/main/asciidoc/Hibernate2x.adoc b/btm-docs/src/main/doc/Hibernate2x.txt → btm-docs/src/main/asciidoc/Hibernate2x.adoc
diff --git a/btm-docs/src/main/doc/IBatis2x.txt → btm-docs/src/main/asciidoc/IBatis2x.adoc b/btm-docs/src/main/doc/IBatis2x.txt → btm-docs/src/main/asciidoc/IBatis2x.adoc
diff --git a/...cs/src/main/doc/ImplementationDetails.txt → .../main/asciidoc/ImplementationDetails.adoc b/...cs/src/main/doc/ImplementationDetails.txt → .../main/asciidoc/ImplementationDetails.adoc
@@ -16,7 +16,7 @@ This page contains descriptions of those components and how they work internally
 * <<e,Recovery engine>>
 ** <<e1,currentNodeOnlyRecovery>>
 
-* [[a]]
+[[a]]
 == Bitronix implementation specifics
 
 [[a1]]

diff --git a/...docs/src/main/doc/JdbcConfiguration2x.txt → ...rc/main/asciidoc/JdbcConfiguration2x.adoc b/...docs/src/main/doc/JdbcConfiguration2x.txt → ...rc/main/asciidoc/JdbcConfiguration2x.adoc
diff --git a/.../src/main/doc/JdbcXaSupportEvaluation.txt → ...ain/asciidoc/JdbcXaSupportEvaluation.adoc b/.../src/main/doc/JdbcXaSupportEvaluation.txt → ...ain/asciidoc/JdbcXaSupportEvaluation.adoc
diff --git a/btm-docs/src/main/doc/Jetty2x.txt → btm-docs/src/main/asciidoc/Jetty2x.adoc b/btm-docs/src/main/doc/Jetty2x.txt → btm-docs/src/main/asciidoc/Jetty2x.adoc
diff --git a/btm-docs/src/main/doc/JmsConfiguration12.txt → ...src/main/asciidoc/JmsConfiguration12.adoc b/btm-docs/src/main/doc/JmsConfiguration12.txt → ...src/main/asciidoc/JmsConfiguration12.adoc
diff --git a/btm-docs/src/main/doc/JmsConfiguration2x.txt → ...src/main/asciidoc/JmsConfiguration2x.adoc b/btm-docs/src/main/doc/JmsConfiguration2x.txt → ...src/main/asciidoc/JmsConfiguration2x.adoc
diff --git a/...s/src/main/doc/JmsXaSupportEvaluation.txt → ...main/asciidoc/JmsXaSupportEvaluation.adoc b/...s/src/main/doc/JmsXaSupportEvaluation.txt → ...main/asciidoc/JmsXaSupportEvaluation.adoc
diff --git a/btm-docs/src/main/doc/Jndi2x.txt → btm-docs/src/main/asciidoc/Jndi2x.adoc b/btm-docs/src/main/doc/Jndi2x.txt → btm-docs/src/main/asciidoc/Jndi2x.adoc
diff --git a/...rc/main/doc/JndiXaConnectionFactory2x.txt → ...n/asciidoc/JndiXaConnectionFactory2x.adoc b/...rc/main/doc/JndiXaConnectionFactory2x.txt → ...n/asciidoc/JndiXaConnectionFactory2x.adoc
diff --git a/btm-docs/src/main/doc/JtaBestPractices.txt → ...s/src/main/asciidoc/JtaBestPractices.adoc b/btm-docs/src/main/doc/JtaBestPractices.txt → ...s/src/main/asciidoc/JtaBestPractices.adoc
diff --git a/...ocs/src/main/doc/LastResourceCommit2x.txt → ...c/main/asciidoc/LastResourceCommit2x.adoc b/...ocs/src/main/doc/LastResourceCommit2x.txt → ...c/main/asciidoc/LastResourceCommit2x.adoc
diff --git a/.../src/main/doc/LastResourceCommitJms2x.txt → ...ain/asciidoc/LastResourceCommitJms2x.adoc b/.../src/main/doc/LastResourceCommitJms2x.txt → ...ain/asciidoc/LastResourceCommitJms2x.adoc
diff --git a/btm-docs/src/main/doc/Maven2.txt → btm-docs/src/main/asciidoc/Maven2.adoc b/btm-docs/src/main/doc/Maven2.txt → btm-docs/src/main/asciidoc/Maven2.adoc
diff --git a/btm-docs/src/main/doc/NewUserGuide.txt → btm-docs/src/main/asciidoc/NewUserGuide.adoc b/btm-docs/src/main/doc/NewUserGuide.txt → btm-docs/src/main/asciidoc/NewUserGuide.adoc
diff --git a/btm-docs/src/main/doc/Overview.txt → btm-docs/src/main/asciidoc/Overview.adoc b/btm-docs/src/main/doc/Overview.txt → btm-docs/src/main/asciidoc/Overview.adoc
diff --git a/...docs/src/main/doc/RecommendedReadings.txt → ...rc/main/asciidoc/RecommendedReadings.adoc b/...docs/src/main/doc/RecommendedReadings.txt → ...rc/main/asciidoc/RecommendedReadings.adoc
diff --git a/btm-docs/src/main/doc/ReleaseProcedure.txt → ...s/src/main/asciidoc/ReleaseProcedure.adoc b/btm-docs/src/main/doc/ReleaseProcedure.txt → ...s/src/main/asciidoc/ReleaseProcedure.adoc
diff --git a/btm-docs/src/main/doc/ResourceLoader2x.txt → ...s/src/main/asciidoc/ResourceLoader2x.adoc b/btm-docs/src/main/doc/ResourceLoader2x.txt → ...s/src/main/asciidoc/ResourceLoader2x.adoc
diff --git a/btm-docs/src/main/doc/SpringFramework2x.txt → .../src/main/asciidoc/SpringFramework2x.adoc b/btm-docs/src/main/doc/SpringFramework2x.txt → .../src/main/asciidoc/SpringFramework2x.adoc
diff --git a/btm-docs/src/main/doc/Support.txt → btm-docs/src/main/asciidoc/Support.adoc b/btm-docs/src/main/doc/Support.txt → btm-docs/src/main/asciidoc/Support.adoc
diff --git a/btm-docs/src/main/doc/TomcatWithBtm2x.txt → ...cs/src/main/asciidoc/TomcatWithBtm2x.adoc b/btm-docs/src/main/doc/TomcatWithBtm2x.txt → ...cs/src/main/asciidoc/TomcatWithBtm2x.adoc
diff --git a/btm-docs/src/main/doc/WhatsNew2x.txt → btm-docs/src/main/asciidoc/WhatsNew2x.adoc b/btm-docs/src/main/doc/WhatsNew2x.txt → btm-docs/src/main/asciidoc/WhatsNew2x.adoc
diff --git a/btm-docs/src/main/doc/WhoUsesBTM.txt → btm-docs/src/main/asciidoc/WhoUsesBTM.adoc b/btm-docs/src/main/doc/WhoUsesBTM.txt → btm-docs/src/main/asciidoc/WhoUsesBTM.adoc
diff --git a/.../src/main/doc/currentNodeOnlyRecovery.png → ...ciidoc/images/currentNodeOnlyRecovery.png b/.../src/main/doc/currentNodeOnlyRecovery.png → ...ciidoc/images/currentNodeOnlyRecovery.png
diff --git a/btm-docs/src/main/doc/intellij01.png → ...s/src/main/asciidoc/images/intellij01.png b/btm-docs/src/main/doc/intellij01.png → ...s/src/main/asciidoc/images/intellij01.png
diff --git a/btm-docs/src/main/doc/intellij02.png → ...s/src/main/asciidoc/images/intellij02.png b/btm-docs/src/main/doc/intellij02.png → ...s/src/main/asciidoc/images/intellij02.png
diff --git a/btm-docs/src/main/doc/intellij03.png → ...s/src/main/asciidoc/images/intellij03.png b/btm-docs/src/main/doc/intellij03.png → ...s/src/main/asciidoc/images/intellij03.png
diff --git a/btm-docs/src/main/doc/intellij04.png → ...s/src/main/asciidoc/images/intellij04.png b/btm-docs/src/main/doc/intellij04.png → ...s/src/main/asciidoc/images/intellij04.png
diff --git a/btm-docs/src/main/doc/intellij05.png → ...s/src/main/asciidoc/images/intellij05.png b/btm-docs/src/main/doc/intellij05.png → ...s/src/main/asciidoc/images/intellij05.png
diff --git a/btm-docs/src/main/doc/intellij06.png → ...s/src/main/asciidoc/images/intellij06.png b/btm-docs/src/main/doc/intellij06.png → ...s/src/main/asciidoc/images/intellij06.png
diff --git a/btm-docs/src/main/doc/intellij07.png → ...s/src/main/asciidoc/images/intellij07.png b/btm-docs/src/main/doc/intellij07.png → ...s/src/main/asciidoc/images/intellij07.png
diff --git a/btm-docs/src/main/doc/intellij08.png → ...s/src/main/asciidoc/images/intellij08.png b/btm-docs/src/main/doc/intellij08.png → ...s/src/main/asciidoc/images/intellij08.png
diff --git a/btm-docs/src/main/doc/intellij09.png → ...s/src/main/asciidoc/images/intellij09.png b/btm-docs/src/main/doc/intellij09.png → ...s/src/main/asciidoc/images/intellij09.png
diff --git a/btm-docs/src/main/doc/intellij10.png → ...s/src/main/asciidoc/images/intellij10.png b/btm-docs/src/main/doc/intellij10.png → ...s/src/main/asciidoc/images/intellij10.png
diff --git a/btm-docs/src/main/doc/xid.png → btm-docs/src/main/asciidoc/images/xid.png b/btm-docs/src/main/doc/xid.png → btm-docs/src/main/asciidoc/images/xid.png
diff --git a/btm-docs/src/main/doc/index.txt → btm-docs/src/main/asciidoc/index.adoc b/btm-docs/src/main/doc/index.txt → btm-docs/src/main/asciidoc/index.adoc
diff --git a/pom.xml b/pom.xml
@@ -275,6 +275,11 @@
                         <arguments>-Pdist</arguments>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.asciidoctor</groupId>
+                    <artifactId>asciidoctor-maven-plugin</artifactId>
+                    <version>1.5.2.1</version> 
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
-Original file line number
+Diff line change
@@ Expand Up @@
     * <<e,Recovery engine>>
     ** <<e1,currentNodeOnlyRecovery>>
-    * [[a]]
+    [[a]]
     == Bitronix implementation specifics
     [[a1]]
@@ Expand Down @@