This is an automated email from the ASF dual-hosted git repository.
tilmannz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/db-jdo-site.git
commit 9809c53e30fe6f2c096819f310604294c80a4cda
Author: Tilmann <zo...@gmx.de>
AuthorDate: Mon Dec 9 22:23:28 2019 +0000
Releases and Footer fixes
Fixed releases pages and removed footer
---
src/main/asciidoc/annotations.adoc | 8 +-
src/main/asciidoc/attach_detach.adoc | 4 -
src/main/asciidoc/class_types.adoc | 4 -
src/main/asciidoc/dependencies.adoc | 4 -
src/main/asciidoc/downloads.adoc | 16 +-
src/main/asciidoc/enhancement.adoc | 4 -
src/main/asciidoc/exceptions.adoc | 4 -
src/main/asciidoc/extents.adoc | 4 -
src/main/asciidoc/faq.adoc | 4 -
src/main/asciidoc/fetchgroups.adoc | 4 -
src/main/asciidoc/field_types.adoc | 4 -
src/main/asciidoc/get-involved.adoc | 4 -
src/main/asciidoc/glossary.adoc | 4 -
.../maven-jdo.adoc => guides-maven-jdo.adoc} | 4 -
.../replication.adoc => guides-replication.adoc} | 4 -
src/main/asciidoc/guides.adoc | 4 -
src/main/asciidoc/impls.adoc | 4 -
src/main/asciidoc/index.adoc | 4 -
src/main/asciidoc/issuetracking.adoc | 4 -
src/main/asciidoc/javadoc.adoc | 4 -
src/main/asciidoc/jdo_3_0_overview.adoc | 4 -
src/main/asciidoc/jdo_dtd.adoc | 4 -
src/main/asciidoc/jdo_v_jpa.adoc | 4 -
src/main/asciidoc/jdo_v_jpa_api.adoc | 4 -
src/main/asciidoc/jdo_v_jpa_orm.adoc | 4 -
src/main/asciidoc/jdoconfig_dtd.adoc | 4 -
src/main/asciidoc/jdohelper.adoc | 4 -
src/main/asciidoc/jdoql.adoc | 4 -
src/main/asciidoc/jdoql_methods.adoc | 4 -
src/main/asciidoc/jdoql_result.adoc | 4 -
src/main/asciidoc/jdoquery_dtd.adoc | 4 -
src/main/asciidoc/mail-lists.adoc | 4 -
src/main/asciidoc/metadata.adoc | 4 -
src/main/asciidoc/newshistory.adoc | 4 -
src/main/asciidoc/object_retrieval.adoc | 4 -
src/main/asciidoc/orm_dtd.adoc | 4 -
src/main/asciidoc/pm.adoc | 4 -
src/main/asciidoc/pmf.adoc | 4 -
src/main/asciidoc/references.adoc | 4 -
.../release-3.0.1.cgi.adoc => release-3.0.1.adoc} | 22 +-
...lease-3.1-rc1.cgi.adoc => release-3.1-rc1.adoc} | 22 +-
src/main/asciidoc/release-3.1.adoc | 147 ++++++++++++
src/main/asciidoc/releases/release-3.1.cgi.adoc | 98 --------
src/main/asciidoc/roadmap.adoc | 4 -
src/main/asciidoc/specifications.adoc | 4 -
src/main/asciidoc/state_transition.adoc | 4 -
src/main/asciidoc/svn.adoc | 4 -
src/main/asciidoc/tck.adoc | 4 -
src/main/asciidoc/team-list.adoc | 4 -
src/main/asciidoc/transactions.adoc | 4 -
src/main/asciidoc/why_jdo.adoc | 4 -
src/main/java/ConvertHtml2Adoc.java | 262 +++++++++++++++++++++
src/main/template/document.html.erb | 4 +-
53 files changed, 445 insertions(+), 314 deletions(-)
diff --git a/src/main/asciidoc/annotations.adoc
b/src/main/asciidoc/annotations.adoc
index 1234db5..f25db4a 100644
--- a/src/main/asciidoc/annotations.adoc
+++ b/src/main/asciidoc/annotations.adoc
@@ -2,14 +2,14 @@
image:images/JDOx150.png[float="left"]
image:images/jdo_text.png[float="left"]
+'''''
+
:_basedir:
:_imagesdir: images/
:notoc:
:titlepage:
:grid: cols
-'''''
-
== JDO : Annotationsanchor:JDO_:_Annotations[]
One of the things that JDK 1.5 provides that can be of some use is
@@ -1917,7 +1917,3 @@ public class Person
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/attach_detach.adoc
b/src/main/asciidoc/attach_detach.adoc
index 04dc866..eb8a0af 100644
--- a/src/main/asciidoc/attach_detach.adoc
+++ b/src/main/asciidoc/attach_detach.adoc
@@ -258,7 +258,3 @@ class MyClass implements java.io.Serializable
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/class_types.adoc
b/src/main/asciidoc/class_types.adoc
index 3d1c228..75bc2d7 100644
--- a/src/main/asciidoc/class_types.adoc
+++ b/src/main/asciidoc/class_types.adoc
@@ -76,7 +76,3 @@ public class MyClass
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/dependencies.adoc
b/src/main/asciidoc/dependencies.adoc
index 186e137..cb6c96b 100644
--- a/src/main/asciidoc/dependencies.adoc
+++ b/src/main/asciidoc/dependencies.adoc
@@ -48,7 +48,3 @@ Other external dependencies of JDO are subproject-specific:
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/downloads.adoc b/src/main/asciidoc/downloads.adoc
index 97b802d..456eeeb 100644
--- a/src/main/asciidoc/downloads.adoc
+++ b/src/main/asciidoc/downloads.adoc
@@ -12,16 +12,16 @@ image:images/jdo_text.png[float="left"]
== Latest Official Releaseanchor:Latest_Official_Release[]
-link:releases/release-3.1.cgi[JDO 3.1] image:images/dot_clear.png[image]
-March 20, 2015
+link:release-3.1.html[JDO 3.1] image:images/dot_clear.png[image] March
+20, 2015
== Previous Official Releasesanchor:Previous_Official_Releases[]
-link:releases/release-3.1-rc1.cgi[JDO 3.1-rc1]
-image:images/dot_clear.png[image] September 22, 2013
+link:release-3.1-rc1.html[JDO 3.1-rc1] image:images/dot_clear.png[image]
+September 22, 2013
-link:releases/release-3.0.1.cgi[JDO 3.0.1]
-image:images/dot_clear.png[image] November 13, 2011
+link:release-3.0.1.html[JDO 3.0.1] image:images/dot_clear.png[image]
+November 13, 2011
== About JDO Releasesanchor:About_JDO_Releases[]
@@ -55,7 +55,3 @@ downloading the latest source code for all of the JDO
projects.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/enhancement.adoc
b/src/main/asciidoc/enhancement.adoc
index 06f6da7..8d3d134 100644
--- a/src/main/asciidoc/enhancement.adoc
+++ b/src/main/asciidoc/enhancement.adoc
@@ -563,7 +563,3 @@ public class A implements PersistenceCapable, Detachable
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/exceptions.adoc
b/src/main/asciidoc/exceptions.adoc
index b0afa88..c330e42 100644
--- a/src/main/asciidoc/exceptions.adoc
+++ b/src/main/asciidoc/exceptions.adoc
@@ -93,7 +93,3 @@ to the detached instance.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/extents.adoc b/src/main/asciidoc/extents.adoc
index 293ba4e..5de0790 100644
--- a/src/main/asciidoc/extents.adoc
+++ b/src/main/asciidoc/extents.adoc
@@ -32,7 +32,3 @@ a Query).
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/faq.adoc b/src/main/asciidoc/faq.adoc
index 03c1d2b..8d52f77 100644
--- a/src/main/asciidoc/faq.adoc
+++ b/src/main/asciidoc/faq.adoc
@@ -36,7 +36,3 @@ on the mailing list and provides additional information on
the project.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/fetchgroups.adoc
b/src/main/asciidoc/fetchgroups.adoc
index c958e45..37909db 100644
--- a/src/main/asciidoc/fetchgroups.adoc
+++ b/src/main/asciidoc/fetchgroups.adoc
@@ -303,7 +303,3 @@ immediately.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/field_types.adoc
b/src/main/asciidoc/field_types.adoc
index 459aebf..d338af3 100644
--- a/src/main/asciidoc/field_types.adoc
+++ b/src/main/asciidoc/field_types.adoc
@@ -598,7 +598,3 @@ image:images/icon_success_sml.png[image]
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/get-involved.adoc
b/src/main/asciidoc/get-involved.adoc
index 43e8068..264e741 100644
--- a/src/main/asciidoc/get-involved.adoc
+++ b/src/main/asciidoc/get-involved.adoc
@@ -52,7 +52,3 @@ account.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/glossary.adoc b/src/main/asciidoc/glossary.adoc
index 23294b0..5213c86 100644
--- a/src/main/asciidoc/glossary.adoc
+++ b/src/main/asciidoc/glossary.adoc
@@ -143,7 +143,3 @@ not persistent.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/guides/maven-jdo.adoc
b/src/main/asciidoc/guides-maven-jdo.adoc
similarity index 99%
rename from src/main/asciidoc/guides/maven-jdo.adoc
rename to src/main/asciidoc/guides-maven-jdo.adoc
index 96d17fb..e8df646 100644
--- a/src/main/asciidoc/guides/maven-jdo.adoc
+++ b/src/main/asciidoc/guides-maven-jdo.adoc
@@ -245,7 +245,3 @@ projects, primarily JPOX, and Apache JDO, and a member of
the JSR243
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/guides/replication.adoc
b/src/main/asciidoc/guides-replication.adoc
similarity index 98%
rename from src/main/asciidoc/guides/replication.adoc
rename to src/main/asciidoc/guides-replication.adoc
index 4992c54..d2cbc4c 100644
--- a/src/main/asciidoc/guides/replication.adoc
+++ b/src/main/asciidoc/guides-replication.adoc
@@ -158,7 +158,3 @@ extend this basic idea and replicate large amounts of data.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/guides.adoc b/src/main/asciidoc/guides.adoc
index f6d7ad2..db556bf 100644
--- a/src/main/asciidoc/guides.adoc
+++ b/src/main/asciidoc/guides.adoc
@@ -17,7 +17,3 @@ application.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/impls.adoc b/src/main/asciidoc/impls.adoc
index 0e90a9c..b851461 100644
--- a/src/main/asciidoc/impls.adoc
+++ b/src/main/asciidoc/impls.adoc
@@ -89,7 +89,3 @@ CRM,SFA...), components (EJB...).
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc
index 65c8a79..eee9dab 100644
--- a/src/main/asciidoc/index.adoc
+++ b/src/main/asciidoc/index.adoc
@@ -167,7 +167,3 @@ _Archived articles are
http://db.apache.org/jdo/newshistory.html[here]_.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/issuetracking.adoc
b/src/main/asciidoc/issuetracking.adoc
index bc6129f..e9f7de8 100644
--- a/src/main/asciidoc/issuetracking.adoc
+++ b/src/main/asciidoc/issuetracking.adoc
@@ -46,7 +46,3 @@ Notes for released versions]
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/javadoc.adoc b/src/main/asciidoc/javadoc.adoc
index 086d9ed..8b7b4a2 100644
--- a/src/main/asciidoc/javadoc.adoc
+++ b/src/main/asciidoc/javadoc.adoc
@@ -74,7 +74,3 @@ link:api11/apidocs.zip[Download JDO 1.1 javadoc]
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/jdo_3_0_overview.adoc
b/src/main/asciidoc/jdo_3_0_overview.adoc
index e3b4145..4971624 100644
--- a/src/main/asciidoc/jdo_3_0_overview.adoc
+++ b/src/main/asciidoc/jdo_3_0_overview.adoc
@@ -199,7 +199,3 @@ This concludes our simple overview of JDO3. We hope you
enjoy using it
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/jdo_dtd.adoc b/src/main/asciidoc/jdo_dtd.adoc
index 08c02ae..a779947 100644
--- a/src/main/asciidoc/jdo_dtd.adoc
+++ b/src/main/asciidoc/jdo_dtd.adoc
@@ -50,7 +50,3 @@ http://xmlns.jcp.org/xml/ns/jdo/jdo_3_0.xsd[XSD]
specification.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/jdo_v_jpa.adoc b/src/main/asciidoc/jdo_v_jpa.adoc
index 0e0ed0d..2baddc3 100644
--- a/src/main/asciidoc/jdo_v_jpa.adoc
+++ b/src/main/asciidoc/jdo_v_jpa.adoc
@@ -131,7 +131,3 @@ As an overall conclusion "JPA" is a subset of what is
available in
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/jdo_v_jpa_api.adoc
b/src/main/asciidoc/jdo_v_jpa_api.adoc
index 72ab0af..1dcdf10 100644
--- a/src/main/asciidoc/jdo_v_jpa_api.adoc
+++ b/src/main/asciidoc/jdo_v_jpa_api.adoc
@@ -35,7 +35,3 @@ pm.getExtent() |em.find()
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/jdo_v_jpa_orm.adoc
b/src/main/asciidoc/jdo_v_jpa_orm.adoc
index ec1f71f..6df341c 100644
--- a/src/main/asciidoc/jdo_v_jpa_orm.adoc
+++ b/src/main/asciidoc/jdo_v_jpa_orm.adoc
@@ -263,7 +263,3 @@ JoinTable Unidirectional Array]
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/jdoconfig_dtd.adoc
b/src/main/asciidoc/jdoconfig_dtd.adoc
index 51af92f..99413f5 100644
--- a/src/main/asciidoc/jdoconfig_dtd.adoc
+++ b/src/main/asciidoc/jdoconfig_dtd.adoc
@@ -51,7 +51,3 @@ http://xmlns.jcp.org/xml/ns/jdo/jdoconfig_3_0.xsd[XSD]
specification.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/jdohelper.adoc b/src/main/asciidoc/jdohelper.adoc
index e3fb6a8..22aa09b 100644
--- a/src/main/asciidoc/jdohelper.adoc
+++ b/src/main/asciidoc/jdohelper.adoc
@@ -87,7 +87,3 @@ detached
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/jdoql.adoc b/src/main/asciidoc/jdoql.adoc
index 27ef33f..a7622f7 100644
--- a/src/main/asciidoc/jdoql.adoc
+++ b/src/main/asciidoc/jdoql.adoc
@@ -251,7 +251,3 @@ List results = (List)query.execute();
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/jdoql_methods.adoc
b/src/main/asciidoc/jdoql_methods.adoc
index 019ed8c..e2e64f5 100644
--- a/src/main/asciidoc/jdoql_methods.adoc
+++ b/src/main/asciidoc/jdoql_methods.adoc
@@ -228,7 +228,3 @@ persistent object
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/jdoql_result.adoc
b/src/main/asciidoc/jdoql_result.adoc
index 223333f..2b7c79d 100644
--- a/src/main/asciidoc/jdoql_result.adoc
+++ b/src/main/asciidoc/jdoql_result.adoc
@@ -113,7 +113,3 @@ Double max_price = (Double)iter.next();
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/jdoquery_dtd.adoc
b/src/main/asciidoc/jdoquery_dtd.adoc
index 6139095..d3ddeff 100644
--- a/src/main/asciidoc/jdoquery_dtd.adoc
+++ b/src/main/asciidoc/jdoquery_dtd.adoc
@@ -51,7 +51,3 @@ http://xmlns.jcp.org/xml/ns/jdo/jdoquery_3_0.xsd[XSD]
specification.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/mail-lists.adoc
b/src/main/asciidoc/mail-lists.adoc
index cce42e8..43fe24d 100644
--- a/src/main/asciidoc/mail-lists.adoc
+++ b/src/main/asciidoc/mail-lists.adoc
@@ -40,7 +40,3 @@ list!
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/metadata.adoc b/src/main/asciidoc/metadata.adoc
index 7d395d6..cd9fa98 100644
--- a/src/main/asciidoc/metadata.adoc
+++ b/src/main/asciidoc/metadata.adoc
@@ -62,7 +62,3 @@ information.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/newshistory.adoc
b/src/main/asciidoc/newshistory.adoc
index 9723343..3f37363 100644
--- a/src/main/asciidoc/newshistory.adoc
+++ b/src/main/asciidoc/newshistory.adoc
@@ -24,7 +24,3 @@ Software Foundation and Sun Microsystems, Inc.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/object_retrieval.adoc
b/src/main/asciidoc/object_retrieval.adoc
index bce1fa7..58270d4 100644
--- a/src/main/asciidoc/object_retrieval.adoc
+++ b/src/main/asciidoc/object_retrieval.adoc
@@ -81,7 +81,3 @@ according to the Fetch Group.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/orm_dtd.adoc b/src/main/asciidoc/orm_dtd.adoc
index 0ed2180..f3d003e 100644
--- a/src/main/asciidoc/orm_dtd.adoc
+++ b/src/main/asciidoc/orm_dtd.adoc
@@ -51,7 +51,3 @@ http://xmlns.jcp.org/xml/ns/jdo/orm_3_0.xsd[XSD]
specification.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/pm.adoc b/src/main/asciidoc/pm.adoc
index 67c744a..81d69cf 100644
--- a/src/main/asciidoc/pm.adoc
+++ b/src/main/asciidoc/pm.adoc
@@ -229,7 +229,3 @@ catch (Exception e)
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/pmf.adoc b/src/main/asciidoc/pmf.adoc
index 8150947..1d92a63 100644
--- a/src/main/asciidoc/pmf.adoc
+++ b/src/main/asciidoc/pmf.adoc
@@ -393,7 +393,3 @@ serializable
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/references.adoc
b/src/main/asciidoc/references.adoc
index 618e190..ccc8021 100644
--- a/src/main/asciidoc/references.adoc
+++ b/src/main/asciidoc/references.adoc
@@ -56,7 +56,3 @@ Heiko Bobzin. Publisher: Prentice Hall
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/releases/release-3.0.1.cgi.adoc
b/src/main/asciidoc/release-3.0.1.adoc
similarity index 89%
rename from src/main/asciidoc/releases/release-3.0.1.cgi.adoc
rename to src/main/asciidoc/release-3.0.1.adoc
index ca72e64..fbcb49b 100644
--- a/src/main/asciidoc/releases/release-3.0.1.cgi.adoc
+++ b/src/main/asciidoc/release-3.0.1.adoc
@@ -13,9 +13,8 @@ image:images/jdo_text.png[float="left"]
== JDO 3.0.1 Distributionsanchor:JDO_3.0.1_Distributions[]
Use the links below to download Apache JDO from one of our mirrors. For
-more information about the projects see
-link:../downloads.html[Downloads]. For information on running the TCK,
-see link:../tck.html[TCK].
+more information about the projects see link:downloads.html[Downloads].
+For information on running the TCK, see link:tck.html[TCK].
It is good practice to xref:Verifying[verify the integrity] of the
distribution files.
@@ -26,8 +25,17 @@ mirrors are failing, there are backup mirrors at the end of
the list.
See http://www.apache.org/mirrors/[status] of mirrors.
Other mirrors:
-http://apache.mirror.anlx.net/http://apache.mirrors.nublue.co.uk/http://mirror.ox.ac.uk/sites/rsync.apache.org/http://mirror.vorboss.net/apache/http://mirrors.ukfast.co.uk/sites/ftp.apache.org/http://www.mirrorservice.org/sites/ftp.apache.org/ftp://ftp.mirrorservice.org/sites/ftp.apache.org/https://www-eu.apache.org/dist/
-(backup)https://www-us.apache.org/dist/ (backup)
+
+* http://apache.mirror.anlx.net/
+* http://apache.mirrors.nublue.co.uk/
+* http://mirror.ox.ac.uk/sites/rsync.apache.org/
+* http://mirror.vorboss.net/apache/
+* http://mirrors.ukfast.co.uk/sites/ftp.apache.org/
+* http://www.mirrorservice.org/sites/ftp.apache.org/
+* ftp://ftp.mirrorservice.org/sites/ftp.apache.org/
+* https://www-eu.apache.org/dist/ (backup)
+* https://www-us.apache.org/dist/ (backup)
+
{empty} +
@@ -114,7 +122,3 @@ We highly recommend verifying the PGP signature, though.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/releases/release-3.1-rc1.cgi.adoc
b/src/main/asciidoc/release-3.1-rc1.adoc
similarity index 86%
rename from src/main/asciidoc/releases/release-3.1-rc1.cgi.adoc
rename to src/main/asciidoc/release-3.1-rc1.adoc
index e81cbeb..06016e2 100644
--- a/src/main/asciidoc/releases/release-3.1-rc1.cgi.adoc
+++ b/src/main/asciidoc/release-3.1-rc1.adoc
@@ -13,9 +13,8 @@ image:images/jdo_text.png[float="left"]
== JDO 3.1-rc1 Distributionsanchor:JDO_3.1-rc1_Distributions[]
Use the links below to download Apache JDO from one of our mirrors. For
-more information about the projects see
-link:../downloads.html[Downloads]. For information on running the TCK,
-see link:../tck.html[TCK].
+more information about the projects see link:downloads.html[Downloads].
+For information on running the TCK, see link:tck.html[TCK].
It is good practice to xref:Verifying[verify the integrity] of the
distribution files.
@@ -27,8 +26,17 @@ failing, there are backup mirrors at the end of the list. See
http://www.apache.org/mirrors/[status] of mirrors.
Other mirrors:
-http://apache.mirror.anlx.net/http://apache.mirrors.nublue.co.uk/http://mirror.ox.ac.uk/sites/rsync.apache.org/http://mirror.vorboss.net/apache/http://mirrors.ukfast.co.uk/sites/ftp.apache.org/http://www.mirrorservice.org/sites/ftp.apache.org/ftp://ftp.mirrorservice.org/sites/ftp.apache.org/https://www-eu.apache.org/dist/
-(backup)https://www-us.apache.org/dist/ (backup)
+
+* http://apache.mirror.anlx.net/
+* http://apache.mirrors.nublue.co.uk/
+* http://mirror.ox.ac.uk/sites/rsync.apache.org/
+* http://mirror.vorboss.net/apache/
+* http://mirrors.ukfast.co.uk/sites/ftp.apache.org/
+* http://www.mirrorservice.org/sites/ftp.apache.org/
+* ftp://ftp.mirrorservice.org/sites/ftp.apache.org/
+* https://www-eu.apache.org/dist/ (backup)
+* https://www-us.apache.org/dist/ (backup)
+
{empty} +
@@ -93,7 +101,3 @@ directory], rather than from a mirror. Then verify the
signatures using
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/release-3.1.adoc
b/src/main/asciidoc/release-3.1.adoc
new file mode 100644
index 0000000..9079146
--- /dev/null
+++ b/src/main/asciidoc/release-3.1.adoc
@@ -0,0 +1,147 @@
+[[index]]
+image:images/JDOx150.png[float="left"]
+image:images/jdo_text.png[float="left"]
+
+'''''
+
+:_basedir:
+:_imagesdir: images/
+:notoc:
+:titlepage:
+:grid: cols
+
+== JDO 3.1 Distributionsanchor:JDO_3.1_Distributions[]
+
+Use the links below to download Apache JDO from one of our mirrors. For
+more information about the projects see link:downloads.html[Downloads].
+For information on running the TCK, see link:tck.html[TCK].
+
+It is good practice to xref:Verifying[verify the integrity] of the
+distribution files.
+
+You are currently using *http://apache.mirror.anlx.net/*. If you
+encounter a problem with this mirror, then please select another. If all
+mirrors are failing, there are backup mirrors at the end of the list.
+See http://www.apache.org/mirrors/[status] of mirrors.
+
+Other mirrors:
+
+* http://apache.mirror.anlx.net/
+* http://apache.mirrors.nublue.co.uk/
+* http://mirror.ox.ac.uk/sites/rsync.apache.org/
+* http://mirror.vorboss.net/apache/
+* http://mirrors.ukfast.co.uk/sites/ftp.apache.org/
+* http://www.mirrorservice.org/sites/ftp.apache.org/
+* ftp://ftp.mirrorservice.org/sites/ftp.apache.org/
+* https://www-eu.apache.org/dist/ (backup)
+* https://www-us.apache.org/dist/ (backup)
+
+
+{empty} +
+
+
+=== Release Notesanchor:Release_Notes[]
+
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12325878&styleName=Html&projectId=10630[View
+release notes for JDO 3.1]
+
+=== APIanchor:API[]
+
+The api project contains source to build jdo-api.jar, which defines the
+JDO API. The jar file is the only artifact needed for users who wish to
+compile their programs using the JDO API. It can be downloaded
+automatically by maven and placed into the local maven repository if you
+include the proper dependency in your maven project definition. Use
+groupId javax.jdo, artifactId jdo-api, version 3.1 and define your
+remote repository as http://www.ibiblio.org/maven. Alternatively, it can
+be downloaded manually and put into a location of your choice.
+
+
+* http://apache.mirror.anlx.net/
+* http://apache.mirrors.nublue.co.uk/
+* http://mirror.ox.ac.uk/sites/rsync.apache.org/
+* http://mirror.vorboss.net/apache/
+* http://mirrors.ukfast.co.uk/sites/ftp.apache.org/
+* http://www.mirrorservice.org/sites/ftp.apache.org/
+* ftp://ftp.mirrorservice.org/sites/ftp.apache.org/
+* https://www-eu.apache.org/dist/ (backup)
+* https://www-us.apache.org/dist/ (backup)
+
+
+
+* http://apache.mirror.anlx.net/
+* http://apache.mirrors.nublue.co.uk/
+* http://mirror.ox.ac.uk/sites/rsync.apache.org/
+* http://mirror.vorboss.net/apache/
+* http://mirrors.ukfast.co.uk/sites/ftp.apache.org/
+* http://www.mirrorservice.org/sites/ftp.apache.org/
+* ftp://ftp.mirrorservice.org/sites/ftp.apache.org/
+* https://www-eu.apache.org/dist/ (backup)
+* https://www-us.apache.org/dist/ (backup)
+
+
+
+* http://apache.mirror.anlx.net/
+* http://apache.mirrors.nublue.co.uk/
+* http://mirror.ox.ac.uk/sites/rsync.apache.org/
+* http://mirror.vorboss.net/apache/
+* http://mirrors.ukfast.co.uk/sites/ftp.apache.org/
+* http://www.mirrorservice.org/sites/ftp.apache.org/
+* ftp://ftp.mirrorservice.org/sites/ftp.apache.org/
+* https://www-eu.apache.org/dist/ (backup)
+* https://www-us.apache.org/dist/ (backup)
+
+
+=== TCKanchor:TCK[]
+
+This is a download for all implementors of JDO, and for those who want
+to check how well an implementation is compliant with the JDO
+specification. The tck project contains the JDO Technology Compatibility
+Kit. The source distribution is the only artifact needed to be
+downloaded by the user. The dependencies are automatically downloaded by
+maven as needed to run the TCK. Please refer to the README.html for
+further details.
+
+
+* http://apache.mirror.anlx.net/
+* http://apache.mirrors.nublue.co.uk/
+* http://mirror.ox.ac.uk/sites/rsync.apache.org/
+* http://mirror.vorboss.net/apache/
+* http://mirrors.ukfast.co.uk/sites/ftp.apache.org/
+* http://www.mirrorservice.org/sites/ftp.apache.org/
+* ftp://ftp.mirrorservice.org/sites/ftp.apache.org/
+* https://www-eu.apache.org/dist/ (backup)
+* https://www-us.apache.org/dist/ (backup)
+
+
+
+* http://apache.mirror.anlx.net/
+* http://apache.mirrors.nublue.co.uk/
+* http://mirror.ox.ac.uk/sites/rsync.apache.org/
+* http://mirror.vorboss.net/apache/
+* http://mirrors.ukfast.co.uk/sites/ftp.apache.org/
+* http://www.mirrorservice.org/sites/ftp.apache.org/
+* ftp://ftp.mirrorservice.org/sites/ftp.apache.org/
+* https://www-eu.apache.org/dist/ (backup)
+* https://www-us.apache.org/dist/ (backup)
+
+
+== Verifying Releasesanchor:Verifying_Releases[]
+
+anchor:Verifying[]
+
+It is essential that you verify the integrity of the downloaded files
+using the PGP signature.
+
+The PGP signatures can be verified using PGP or GPG. First download the
+http://www.apache.org/dist/db/jdo/KEYS[KEYS] as well as the `asc`
+signature file for the particular distribution. Make sure you get these
+files from the http://www.apache.org/dist/db/jdo/[main distribution
+directory], rather than from a mirror. Then verify the signatures using
+
+` % pgpk -a KEYS % pgpv release_name.tar.gz.asc` _or_ +
+` % pgp -ka KEYS % pgp release_name.tar.gz.asc` _or_ +
+` % gpg --import KEYS % gpg --verify release_name.tar.gz.asc`
+
+'''''
+
diff --git a/src/main/asciidoc/releases/release-3.1.cgi.adoc
b/src/main/asciidoc/releases/release-3.1.cgi.adoc
deleted file mode 100644
index 7bab0a4..0000000
--- a/src/main/asciidoc/releases/release-3.1.cgi.adoc
+++ /dev/null
@@ -1,98 +0,0 @@
-[[index]]
-image:images/JDOx150.png[float="left"]
-image:images/jdo_text.png[float="left"]
-
-'''''
-
-:_basedir:
-:_imagesdir: images/
-:notoc:
-:titlepage:
-:grid: cols
-
-== JDO 3.1 Distributionsanchor:JDO_3.1_Distributions[]
-
-Use the links below to download Apache JDO from one of our mirrors. For
-more information about the projects see
-link:../downloads.html[Downloads]. For information on running the TCK,
-see link:../tck.html[TCK].
-
-It is good practice to xref:Verifying[verify the integrity] of the
-distribution files.
-
-You are currently using *http://apache.mirror.anlx.net/*. If you
-encounter a problem with this mirror, then please select another. If all
-mirrors are failing, there are backup mirrors at the end of the list.
-See http://www.apache.org/mirrors/[status] of mirrors.
-
-Other mirrors:
-http://apache.mirror.anlx.net/http://apache.mirrors.nublue.co.uk/http://mirror.ox.ac.uk/sites/rsync.apache.org/http://mirror.vorboss.net/apache/http://mirrors.ukfast.co.uk/sites/ftp.apache.org/http://www.mirrorservice.org/sites/ftp.apache.org/ftp://ftp.mirrorservice.org/sites/ftp.apache.org/https://www-eu.apache.org/dist/
-(backup)https://www-us.apache.org/dist/ (backup)
-
-{empty} +
-
-
-=== Release Notesanchor:Release_Notes[]
-
-https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12325878&styleName=Html&projectId=10630[View
-release notes for JDO 3.1]
-
-=== APIanchor:API[]
-
-The api project contains source to build jdo-api.jar, which defines the
-JDO API. The jar file is the only artifact needed for users who wish to
-compile their programs using the JDO API. It can be downloaded
-automatically by maven and placed into the local maven repository if you
-include the proper dependency in your maven project definition. Use
-groupId javax.jdo, artifactId jdo-api, version 3.1 and define your
-remote repository as http://www.ibiblio.org/maven. Alternatively, it can
-be downloaded manually and put into a location of your choice.
-
-http://apache.mirror.anlx.net//db/jdo/3.1/jdo-api-3.1.jar[jdo-api-3.1.jar]
-[http://www.apache.org/dist/db/jdo/3.1/jdo-api-3.1.jar.asc[PGP]]
-
-http://apache.mirror.anlx.net//db/jdo/3.1/jdo-api-3.1.pom[jdo-api-3.1.pom]
-[http://www.apache.org/dist/db/jdo/3.1/jdo-api-3.1.pom.asc[PGP]]
-
-http://apache.mirror.anlx.net//db/jdo/3.1/jdo-api-3.1-sources.jar[jdo-api-3.1-sources.jar]
-[http://www.apache.org/dist/db/jdo/3.1/jdo-api-3.1-sources.jar.asc[PGP]]
-
-=== TCKanchor:TCK[]
-
-This is a download for all implementors of JDO, and for those who want
-to check how well an implementation is compliant with the JDO
-specification. The tck project contains the JDO Technology Compatibility
-Kit. The source distribution is the only artifact needed to be
-downloaded by the user. The dependencies are automatically downloaded by
-maven as needed to run the TCK. Please refer to the README.html for
-further details.
-
-http://apache.mirror.anlx.net//db/jdo/3.1/jdo-3.1-src.zip[jdo-3.1-src.zip]
-[http://www.apache.org/dist/db/jdo/3.1/jdo-3.1-src.zip.asc[PGP]]
-
-http://apache.mirror.anlx.net//db/jdo/3.1/jdo-3.1-src.tar.gz[jdo-3.1-src.tar.gz]
-[http://www.apache.org/dist/db/jdo/3.1/jdo-3.1-src.tar.gz.asc[PGP]]
-
-== Verifying Releasesanchor:Verifying_Releases[]
-
-anchor:Verifying[]
-
-It is essential that you verify the integrity of the downloaded files
-using the PGP signature.
-
-The PGP signatures can be verified using PGP or GPG. First download the
-http://www.apache.org/dist/db/jdo/KEYS[KEYS] as well as the `asc`
-signature file for the particular distribution. Make sure you get these
-files from the http://www.apache.org/dist/db/jdo/[main distribution
-directory], rather than from a mirror. Then verify the signatures using
-
-` % pgpk -a KEYS % pgpv release_name.tar.gz.asc` _or_ +
-` % pgp -ka KEYS % pgp release_name.tar.gz.asc` _or_ +
-` % gpg --import KEYS % gpg --verify release_name.tar.gz.asc`
-
-'''''
-
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/roadmap.adoc b/src/main/asciidoc/roadmap.adoc
index 1cec77b..72ba7ba 100644
--- a/src/main/asciidoc/roadmap.adoc
+++ b/src/main/asciidoc/roadmap.adoc
@@ -22,7 +22,3 @@ Idea]
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/specifications.adoc
b/src/main/asciidoc/specifications.adoc
index edb6ae2..ec92cdb 100644
--- a/src/main/asciidoc/specifications.adoc
+++ b/src/main/asciidoc/specifications.adoc
@@ -44,7 +44,3 @@ to jdo-dev@db.apache.org.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/state_transition.adoc
b/src/main/asciidoc/state_transition.adoc
index 0128744..eeb6724 100644
--- a/src/main/asciidoc/state_transition.adoc
+++ b/src/main/asciidoc/state_transition.adoc
@@ -197,7 +197,3 @@ image:images/state_transition.png[JDO State Transition] +
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/svn.adoc b/src/main/asciidoc/svn.adoc
index 2cc17fb..da6d3f3 100644
--- a/src/main/asciidoc/svn.adoc
+++ b/src/main/asciidoc/svn.adoc
@@ -241,7 +241,3 @@ checkout to a new directory.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/tck.adoc b/src/main/asciidoc/tck.adoc
index 6aac1af..a42a8f3 100644
--- a/src/main/asciidoc/tck.adoc
+++ b/src/main/asciidoc/tck.adoc
@@ -42,7 +42,3 @@ please see link:tck/final[http://db.apache.org/jdo/tck/final].
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/team-list.adoc b/src/main/asciidoc/team-list.adoc
index 0a78c40..07ef02a 100644
--- a/src/main/asciidoc/team-list.adoc
+++ b/src/main/asciidoc/team-list.adoc
@@ -55,7 +55,3 @@ link:get-involved.html[Get Involved].
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/transactions.adoc
b/src/main/asciidoc/transactions.adoc
index e43d5e0..5dc1e8e 100644
--- a/src/main/asciidoc/transactions.adoc
+++ b/src/main/asciidoc/transactions.adoc
@@ -58,7 +58,3 @@ pm.currentTransaction().setOptimistic(true);
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/asciidoc/why_jdo.adoc b/src/main/asciidoc/why_jdo.adoc
index 855216c..89e1c94 100644
--- a/src/main/asciidoc/why_jdo.adoc
+++ b/src/main/asciidoc/why_jdo.adoc
@@ -138,7 +138,3 @@ choosing a persistence layer for your application.
'''''
-[[footer]]
-Copyright © 2005-2015. All Rights Reserved.
-
-'''''
diff --git a/src/main/java/ConvertHtml2Adoc.java
b/src/main/java/ConvertHtml2Adoc.java
new file mode 100644
index 0000000..cb6ff83
--- /dev/null
+++ b/src/main/java/ConvertHtml2Adoc.java
@@ -0,0 +1,262 @@
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import club.caliope.udc.DocumentConverter;
+import club.caliope.udc.InputFormat;
+import club.caliope.udc.OutputFormat;
+
+
+/**
+ * This class converts the old generated HTML files to ASCIIDOC file.
+ * The paths are hardcoded and assume src and target to have the same base
folder.
+ * The html menu can be configured in template/document.html.erb
+ *
+ * Requirements:
+ * * Pandoc: https://pandoc.org/
+ *
+ * To create HTML from the generated ASCIIDOC:
+ * * mvn clean compile
+ * * Copy "target/site"to "docs".
+ *
+ * Link to view html locally in browser:
+ * file:///D:/projects/workspace-zoo/jdo.asciidoc/target/site/
+ *
+ * @author Tilmann Zäschke
+ */
+public class ConvertHtml2Adoc {
+
+ private static final String NL = "\n";
+ // Base folder for src and output files
+ private static final Path basePath =
Paths.get("C:\\work\\eclipse-workspace\\jdo.site");
+ // Input folder
+ private static final String input = "docs";
+ // Output folder
+ private static final String output = "adoc-out";
+
+ public static void main(String[] args) throws IOException {
+ Path srcPath = basePath.resolve(input);
+
+ String executionPath = System.getProperty("user.dir");
+ System.out.println(executionPath);
+
+ Files.find(srcPath, 10, (p, a) -> { return true; }).forEach(p
-> convert(p.toFile()));
+ }
+
+ private static void convert(File src) {
+ if (src.toString().contains("docs\\api")) {
+ // skip 'api' folders
+ return;
+ }
+ if (!src.toString().endsWith(".html")) {
+ // skip non-html: css, ...
+ return;
+ }
+
+ try {
+ String srcName = src.getName();
+ srcName = srcName.substring(0, srcName.lastIndexOf(".")
+ 1);
+ String dstName = srcName + "adoc";
+
+ Path srcPath = src.toPath();
+ Path relPath = basePath.relativize(srcPath);
+
+ int count = relPath.getNameCount();
+ Path fullOutPath;
+ if (count > 2) {
+ //System.out.println("re2: " +
relPath.subpath(1, count-1).toString());
+ fullOutPath = Paths.get(basePath.toString(),
output, relPath.subpath(1, count-1).toString(), dstName.toString());
+ } else {
+ fullOutPath = Paths.get(basePath.toString(),
output, dstName.toString());
+ }
+
+ if (!fullOutPath.getParent().toFile().exists()) {
+
Files.createDirectories(fullOutPath.getParent());
+ }
+
+ Files.deleteIfExists(fullOutPath);
+ File outFile = Files.createFile(fullOutPath).toFile();
+ new DocumentConverter()
+ .fromFile(src, InputFormat.HTML)
+ .toFile(outFile, OutputFormat.ASCIIDOC)
+ // .addOption("-s")
//optional
+ // .workingDirectory(new File("/tmp"))
//optional
+ .convert();
+ postConvert(outFile);
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+ }
+
+ private static void postConvert(File dst) {
+ BufferedReader br;
+ BufferedWriter bw;
+ String s;
+
+ File tempDst = Paths.get(dst.toString() + ".tmp").toFile();
+ dst.renameTo(tempDst);
+ try {
+ bw = new BufferedWriter(new FileWriter(dst, true));
+ try {
+ br = new BufferedReader(new
FileReader(tempDst));
+
+ // Write new header
+ bw.write(header());
+
+ // Skip old header
+ while((s = br.readLine()) != null) {
+ if (s.startsWith("[[contentBox]]")) {
+ break;
+ }
+ }
+
+ while((s = br.readLine()) != null) {
+ //
System.out.println("Checking: " + s);
+
+ if (s.contains("[[footer]]")) {
+ // skip footer and everything
after it.
+ break;
+ }
+
+ // Handle select/option in 'release'
files
+// if (s.contains("<select name=")) {
+// if (true) throw new
IllegalStateException();
+// s = s.substring(0,
s.indexOf("<select "));
+// bw.write(s + NL);
+// bw.write(NL);
+// s = br.readLine();
+// int pos;
+// while ((pos =
s.indexOf("<option ")) >= 0) {
+// pos = s.indexOf(">",
pos);
+// s = s.substring(pos +
1);
+// pos =
s.indexOf("</option>");
+// String w =
s.substring(0, pos);
+// bw.write("* " + w);
+// }
+// }
+ if
(s.startsWith("http://apache.mirror.anlx.net/";)) {
+ bw.write(selectForm() + NL);
+ //skip next line
+ br.readLine();
+ continue;
+ }
+
+
+ //Lines 1 and 2:
+ // TODO ? Replace Images:
+
//link:./[image:images/JDOx150.gif[Apache JDO]]
+
//link:./[image:images/jdo_text.gif[Apache JDO]]
+ //image:images/JDOx150.gif[Apache JDO]
+ //image:images/jdo_text.gif[Apache JDO]
+
+ // Fix external links, except for
actual javadoc html pages
+// if (!s.contains("-javadoc/index.html"))
{
+// s = s.replace(".html", ".adoc");
+// }
+ // Fix internal crossrefs
+ s = s.replace("link:#", "xref:");
+
+ // Fix GIF not supported:
+ s = s.replace(".gif", ".png");
+
+ // Fix empty lines
+ // see
https://github.com/asciidoctor/asciidoctor/wiki/How-to-insert-sequential-blank-lines
+ if (s.equals(" +")) {
+ s = "{empty} +\n";
+ bw.write(s + NL);
+ continue;
+ }
+
+ // Fix crossref targets/anchors
+ // INPUT:
+ //[#PersistenceCapable]##
+ //====
@PersistenceCapable[#aPersistenceCapable]####
+ // OUPUT:
+ //anchor:anchor-2[]
+ while (s.contains("[#")) {
+ int pos1 = s.indexOf("[#");
+ int pos2 = s.indexOf("]",
pos1+1);
+ String post = "[" +
s.substring(pos2);
+ if (pos1 > 0) {
+ s = s.substring(0,
pos1) + "anchor:" + s.substring(pos1+2, pos2) + post;
+ } else {
+ s = "anchor:" +
s.substring(2, pos2) + post;
+ }
+ }
+
+ // some more hacks:
+ s = s.endsWith("]##") ? s.substring(0,
s.lastIndexOf(']') + 1) : s;
+ s = s.endsWith("]####") ?
s.substring(0, s.lastIndexOf(']') + 1) : s;
+ // Fixes glossary.html
+ int pos = s.indexOf("]####");
+ if (pos >=0) {
+ s = s.substring(0, pos + 1) +
s.substring(pos + 5);
+ }
+
+ bw.write(s + NL);
+ }
+ br.close();
+ } catch(FileNotFoundException e) {
+ System.out.println("File was not found!");
+ } catch(IOException e) {
+ System.out.println("No file found!");
+ }
+ bw.close();
+ } catch(FileNotFoundException e) {
+ System.out.println("Error1!");
+ } catch(IOException e) {
+ System.out.println("Error2!");
+ }
+ tempDst.delete();
+ }
+
+ private static String header() {
+ StringBuilder s = new StringBuilder();
+ s.append("[[index]]").append(NL);
+
+// s.append("--").append(NL);
+ s.append("image:images/JDOx150.png[float=\"left\"]").append(NL);
+
s.append("image:images/jdo_text.png[float=\"left\"]").append(NL);
+// s.append("--").append(NL);
+
+ // Hide title
+ //s.append("= XYZ").append(NL);
+ //s.append(":notitle:").append(NL);
+ //s.append("== JDO TEST").append(NL);
+ //s.append("link:./[image:images/JDOx150.gif[Apache
JDO]]").append(NL);
+ //s.append("link:./[image:images/jdo_text.gif[Apache
JDO]]").append(NL);
+ s.append(NL);
+ s.append("'''''").append(NL);
+ s.append(NL);
+ s.append(":_basedir: ").append(NL);
+ s.append(":_imagesdir: images/").append(NL);
+ s.append(":notoc:").append(NL);
+ s.append(":titlepage:").append(NL);
+ s.append(":grid: cols").append(NL);
+ s.append(NL);
+ return s.toString();
+ }
+
+ private static String selectForm() {
+ StringBuilder s = new StringBuilder();
+ s.append(NL);
+ s.append("* http://apache.mirror.anlx.net/ ").append(NL);
+ s.append("* http://apache.mirrors.nublue.co.uk/ ").append(NL);
+ s.append("* http://mirror.ox.ac.uk/sites/rsync.apache.org/
").append(NL);
+ s.append("* http://mirror.vorboss.net/apache/ ").append(NL);
+ s.append("* http://mirrors.ukfast.co.uk/sites/ftp.apache.org/
").append(NL);
+ s.append("* http://www.mirrorservice.org/sites/ftp.apache.org/
").append(NL);
+ s.append("* ftp://ftp.mirrorservice.org/sites/ftp.apache.org/
").append(NL);
+ s.append("* https://www-eu.apache.org/dist/ (backup)
").append(NL);
+ s.append("* https://www-us.apache.org/dist/ (backup)
").append(NL);
+ return s.toString();
+ }
+}
diff --git a/src/main/template/document.html.erb
b/src/main/template/document.html.erb
index efcc17f..b7d2dfa 100644
--- a/src/main/template/document.html.erb
+++ b/src/main/template/document.html.erb
@@ -175,8 +175,8 @@
<li role="separator" class="divider"></li>
<li class="dropdown-header">Guides</li>
<li><a href="<%= (attr :_basedir)
%>guides.html">Guides</a></li>
- <li><a href="<%= (attr :_basedir)
%>guides/replication.html">Datastore Replication</a></li>
- <li><a href="<%= (attr :_basedir)
%>guides/maven-jdo.html">JDO and Maven1</a></li>
+ <li><a href="<%= (attr :_basedir)
%>guides-replication.html">Datastore Replication</a></li>
+ <li><a href="<%= (attr :_basedir)
%>guides-maven-jdo.html">JDO and Maven1</a></li>
<li role="separator" class="divider"></li>
<li><a href="<%= (attr :_basedir)
%>references.html">References</a></li>
<li><a href="<%= (attr :_basedir)
%>exceptions.html">Exceptions</a></li>
