Merged: Change links to https for freemarker website. Also for other sites.
Merge commit 'refs/pull/38/head' of https://github.com/apache/incubator-freemarker into 2.3-gae
diff --git a/README b/README
index ab0e59c..c2cf987 100644
--- a/README
+++ b/README
@@ -20,13 +20,13 @@
Apache FreeMarker Site
----------------------
-This is the project with which we generate the freemarker.org home page.
+This is the project with which we generate the freemarker.apache.org home page.
Note that most of the work is done by Apache FreeMarker Docgen, which is
a dependency of this project.
To publish the built site, commit the output into the "asf-site" branch.
Note that as of this writing, the "docgen" dependency is get from the Ivy
-repo on the published homepage (http://freemarker.org/repos/ivy/). Those
+repo on the published homepage (https://freemarker.apache.org/repos/ivy/). Those
modifying docgen should upload the fresh docgen jar there. Then you need to
run `ant update-deps` here to grab the latest version.
diff --git a/build.xml b/build.xml
index b892dd5..e00b4a3 100644
--- a/build.xml
+++ b/build.xml
@@ -95,7 +95,7 @@
>
<echo>Getting dependencies...</echo>
<echo>-------------------------------------------------------</echo>
- <ivy:settings id="remote" url="http://freemarker.org/repos/ivy/ivysettings-remote.xml" />
+ <ivy:settings id="remote" url="https://freemarker.apache.org/repos/ivy/ivysettings-remote.xml" />
<!-- Build an own repository that will serve us even offline: -->
<ivy:retrieve settingsRef="remote" sync="true"
ivypattern=".ivy.part/repo/[organisation]/[module]/ivy-[revision].xml"
@@ -174,7 +174,7 @@
<!--
This meant to be called on the Continuous Integration server, so the
- integration builds appear in the freemarker.org public Ivy repository.
+ integration builds appear in the freemarker.apache.org public Ivy repository.
The artifacts must be already built.
-->
<target name="server-publish-last-build"
diff --git a/src/main/docgen/book.xml b/src/main/docgen/book.xml
index 46e338a..575c5cd 100644
--- a/src/main/docgen/book.xml
+++ b/src/main/docgen/book.xml
@@ -164,11 +164,11 @@
downloading from a mirror please check the checksum and verify the OpenPGP
compatible signature specified next to the download link (MD5, SHA256 and
ASC files, all must come from the <link
- xlink:href="http://www.apache.org/">www.apache.org</link> domain). The
+ xlink:href="https://www.apache.org/">www.apache.org</link> domain). The
public keys used for signing are here: <link
- xlink:href="http://www.apache.org/dist/incubator/freemarker/KEYS">KEYS</link>
+ xlink:href="https://www.apache.org/dist/incubator/freemarker/KEYS">KEYS</link>
(also must come from www.apache.org). <link
- xlink:href="http://www.apache.org/dyn/closer.cgi#verify">More about how to
+ xlink:href="https://www.apache.org/dyn/closer.cgi#verify">More about how to
verify releases...</link> Note that such verification is only possible
since 2.3.24.</para>
@@ -186,7 +186,7 @@
site</link>.</para>
<para><link
- xlink:href="http://freemarker.org/docs/versions_2_3_27.html">See what's
+ xlink:href="https://freemarker.apache.org/docs/versions_2_3_27.html">See what's
new...</link></para>
<para>Downloads:</para>
@@ -194,7 +194,7 @@
<itemizedlist>
<listitem>
<para><link
- xlink:href="http://www.apache.org/dyn/closer.cgi/incubator/freemarker/engine/2.3.27-incubating/binaries/apache-freemarker-2.3.27-incubating-bin.tar.gz">Binary
+ xlink:href="https://www.apache.org/dyn/closer.cgi/incubator/freemarker/engine/2.3.27-incubating/binaries/apache-freemarker-2.3.27-incubating-bin.tar.gz">Binary
release (tar.gz)</link> (includes <literal>freemarker.jar</literal>
and documentation) [<link
xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.27-incubating/binaries/apache-freemarker-2.3.27-incubating-bin.tar.gz.md5">MD5</link>]
@@ -206,7 +206,7 @@
<listitem>
<para><link
- xlink:href="http://www.apache.org/dyn/closer.cgi/incubator/freemarker/engine/2.3.27-incubating/source/apache-freemarker-2.3.27-incubating-src.tar.gz">Source
+ xlink:href="https://www.apache.org/dyn/closer.cgi/incubator/freemarker/engine/2.3.27-incubating/source/apache-freemarker-2.3.27-incubating-src.tar.gz">Source
release (tar.gz)</link> [<link
xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.27-incubating/source/apache-freemarker-2.3.27-incubating-src.tar.gz.md5">MD5</link>]
[<link
@@ -244,7 +244,7 @@
<para>There's also a separate Google App Engine compatible
(<quote>gae</quote>) variation. Download: <link
- xlink:href="http://www.apache.org/dyn/closer.cgi/incubator/freemarker/engine/2.3.27-incubating/binaries/apache-freemarker-gae-2.3.27-incubating-bin.tar.gz">binary</link>
+ xlink:href="https://www.apache.org/dyn/closer.cgi/incubator/freemarker/engine/2.3.27-incubating/binaries/apache-freemarker-gae-2.3.27-incubating-bin.tar.gz">binary</link>
[<link
xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.27-incubating/binaries/apache-freemarker-gae-2.3.27-incubating-bin.tar.gz.md5">MD5</link>]
[<link
@@ -252,7 +252,7 @@
[<link
xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.27-incubating/binaries/apache-freemarker-gae-2.3.27-incubating-bin.tar.gz.asc">ASC</link>],
<link
- xlink:href="http://www.apache.org/dyn/closer.cgi/incubator/freemarker/engine/2.3.27-incubating/source/apache-freemarker-gae-2.3.27-incubating-src.tar.gz">source</link>
+ xlink:href="https://www.apache.org/dyn/closer.cgi/incubator/freemarker/engine/2.3.27-incubating/source/apache-freemarker-gae-2.3.27-incubating-src.tar.gz">source</link>
[<link
xlink:href="https://www.apache.org/dist/incubator/freemarker/engine/2.3.27-incubating/source/apache-freemarker-gae-2.3.27-incubating-src.tar.gz.md5">MD5</link>]
[<link
@@ -275,7 +275,7 @@
2.2 series. Requires J2SE 1.2 or higher.</para>
<para><link
- xlink:href="http://prdownloads.sourceforge.net/freemarker/freemarker-2.2.8.tar.gz">Download
+ xlink:href="https://prdownloads.sourceforge.net/freemarker/freemarker-2.2.8.tar.gz">Download
freemarker-2.2.8.tar.gz</link> (1.4 MB)</para>
</simplesect>
@@ -286,7 +286,7 @@
2.1 series. Requires J2SE 1.3 or higher.</para>
<para><link
- xlink:href="http://prdownloads.sourceforge.net/freemarker/freemarker-2.1.5.tar.gz">Download
+ xlink:href="https://prdownloads.sourceforge.net/freemarker/freemarker-2.1.5.tar.gz">Download
freemarker-2.1.5.tar.gz</link> (909 KB)</para>
</simplesect>
@@ -297,7 +297,7 @@
series. Requires J2SE 1.2 or higher.</para>
<para><link
- xlink:href="http://prdownloads.sourceforge.net/freemarker/freemarker2_03.tar.gz">Download
+ xlink:href="https://prdownloads.sourceforge.net/freemarker/freemarker2_03.tar.gz">Download
freemarker2_03.tar.gz</link> (617 KB)</para>
</simplesect>
@@ -315,7 +315,7 @@
<para>Outdated versions starting from 2.3.24 RC01 are available from the
Apache archive: <link
- xlink:href="http://archive.apache.org/dist/incubator/freemarker/engine/">http://archive.apache.org/dist/incubator/freemarker/engine/</link>.
+ xlink:href="https://archive.apache.org/dist/incubator/freemarker/engine/">https://archive.apache.org/dist/incubator/freemarker/engine/</link>.
Even older releases are available from the <link
xlink:href="https://sourceforge.net/projects/freemarker/files/freemarker/">SourceForge
download page</link>.</para>
@@ -1076,7 +1076,7 @@
<tr valign="top">
<td><link
- xlink:href="http://freemarker.org">freemarker.org</link></td>
+ xlink:href="https://freemarker.apache.org">freemarker.apache.org</link></td>
<td>Not surprisingly, the pages you view right now are generated
using FreeMarker.</td>
@@ -1163,13 +1163,13 @@
still iterate over it until it becomes good enough for merging.</para>
<para>Note that you will need an <link
- xlink:href="http://www.apache.org/dev/new-committers-guide.html#cla">Individual
+ xlink:href="https://www.apache.org/dev/new-committers-guide.html#cla">Individual
Contributor License Agreement (ICLA) or Corporate CLA at the Apache
Software Foundation</link>, or else we can't merge in your
contribution.</para>
<para>For more generic guidelines, see <link
- xlink:href="http://www.apache.org/foundation/getinvolved.html">how to
+ xlink:href="https://www.apache.org/foundation/getinvolved.html">how to
contribute to Apache projects</link>.</para>
</section>
@@ -1449,7 +1449,7 @@
and should update this page where they has to deviate from it.</para>
<para>For general info about making releases, please read <link
- xlink:href="http://www.apache.org/legal/release-policy#archived">http://www.apache.org/legal/release-policy</link>
+ xlink:href="https://www.apache.org/legal/release-policy#archived">https://www.apache.org/legal/release-policy</link>
and <link
xlink:href="http://incubator.apache.org/guides/releasemanagement.html">http://incubator.apache.org/guides/releasemanagement.html</link>.
The FreeMarker-specific additions to those are:</para>
@@ -1471,7 +1471,7 @@
<listitem>
<para>RC documentation (Manual + JavaDoc) is only published
under
- http://freemarker.org/builds/<replaceable>X.X.X</replaceable>-rc<replaceable>X</replaceable>/</para>
+ https://freemarker.apache.org/builds/<replaceable>X.X.X</replaceable>-rc<replaceable>X</replaceable>/</para>
</listitem>
</itemizedlist>
</listitem>
@@ -1598,7 +1598,7 @@
<listitem>
<para>Upload the content of <literal>documentation/_html</literal>
- from the binary release to http://freemarker.org/<emphasis
+ from the binary release to https://freemarker.apache.org/<emphasis
role="bold">builds/<replaceable>X.X.X</replaceable>-voting</emphasis>/documentation/
(by committing it into the <quote>asf-site</quote> branch of
https://git-wip-us.apache.org/repos/asf/incubator-freemarker-site.git).
@@ -1676,7 +1676,7 @@
<listitem>
<para>Link the change log (page under
- http://freemarker.org/builds/<replaceable>X.X.X</replaceable>/)</para>
+ https://freemarker.apache.org/builds/<replaceable>X.X.X</replaceable>/)</para>
</listitem>
<listitem>
@@ -1723,7 +1723,7 @@
role="bold">release</emphasis>/incubator/freemarker and commit
them. (Of course get rid of any voting attempt numbers in the
directory names.) Now they should appear under <link
- xlink:href="http://www.apache.org/dist/incubator/freemarker/">http://www.apache.org/dist/incubator/freemarker/</link>.</para>
+ xlink:href="https://www.apache.org/dist/incubator/freemarker/">https://www.apache.org/dist/incubator/freemarker/</link>.</para>
</listitem>
<listitem>
@@ -1739,7 +1739,7 @@
<listitem>
<para>Wait 24 hours so that the mirrors get synced. Check <link
- xlink:href="http://www.apache.org/dist/incubator/freemarker/">http://www.apache.org/dist/incubator/freemarker/</link>
+ xlink:href="https://www.apache.org/dist/incubator/freemarker/">https://www.apache.org/dist/incubator/freemarker/</link>
and <link
xlink:href="http://archive.apache.org/dist/">http://archive.apache.org/dist/</link>.
Check Maven Central repository too (in the case of non-RC
@@ -1748,7 +1748,7 @@
<listitem>
<para>Delete the non-latest release of each maintained branch from
- http://www.apache.org/dist/incubator/freemarker/ (Old ones are
+ https://www.apache.org/dist/incubator/freemarker/ (Old ones are
automatically available on http://archive.apache.org/dist/)</para>
</listitem>
@@ -1759,7 +1759,7 @@
</listitem>
<listitem>
- <para>Update http://freemarker.org:</para>
+ <para>Update https://freemarker.apache.org:</para>
<itemizedlist>
<listitem>
@@ -1938,7 +1938,7 @@
<para>Docgen is not published to the Maven Central Repository, as it's
only used as an internal build dependency. Currently, it's published
manually to the internal Ivy repository of the project, which is under
- http://freemarker.org/repos/ivy/. If you modify Docgen, don't forget
+ https://freemarker.apache.org/repos/ivy/. If you modify Docgen, don't forget
to publish there, or else the next site update or FreeMarker release
will use an outdated version. For that:</para>
@@ -1950,8 +1950,8 @@
<listitem>
<para>Upload the content of the resulting
<literal>build\dummy-server-ivy-repo</literal> directory to
- <literal>http://freemarker.org/repos/ivy/</literal>. See how to
- update the contents of freemarker.org <link
+ <literal>https://freemarker.apache.org/repos/ivy/</literal>. See how to
+ update the contents of freemarker.apache.org <link
linkend="updating-homepage">here...</link></para>
</listitem>
@@ -2046,7 +2046,7 @@
</listitem>
<listitem>
- <para><literal>freemarker-site</literal>: Web site (freemarker.org)
+ <para><literal>freemarker-site</literal>: Web site (freemarker.apache.org)
contents. URL: <olink targetdoc="gitSite"/>. GitHub mirror: <olink
targetdoc="githubMirrorSite"/>. Relevant branches:
<literal>master</literal></para>
diff --git a/src/main/docgen/docgen.cjson b/src/main/docgen/docgen.cjson
index 9c80282..c0a2d07 100644
--- a/src/main/docgen/docgen.cjson
+++ b/src/main/docgen/docgen.cjson
@@ -17,7 +17,7 @@
// specific language governing permissions and limitations
// under the License.
-deployUrl: "http://freemarker.apache.org/"
+deployUrl: "https://freemarker.apache.org/"
onlineTrackerHTML: "docgen-misc/googleAnalytics.html"
offline: false
simpleNavigationMode
@@ -44,7 +44,7 @@
}
logo: {
- href: "http://freemarker.apache.org/"
+ href: "https://freemarker.apache.org/"
src: logo.png
alt: "FreeMarker"
}
diff --git a/src/main/docgen/sitemap-index.xml b/src/main/docgen/sitemap-index.xml
index 68fef2f..afb902f 100644
--- a/src/main/docgen/sitemap-index.xml
+++ b/src/main/docgen/sitemap-index.xml
@@ -19,11 +19,11 @@
-->
<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<sitemap>
- <loc>http://www.freemarker.org/sitemap.xml</loc>
- <lastmod>2015-07-20</lastmod>
+ <loc>https://freemarker.apache.org/sitemap.xml</loc>
+ <lastmod>2017-11-11</lastmod>
</sitemap>
<sitemap>
- <loc>http://www.freemarker.org/docs/sitemap.xml</loc>
- <lastmod>2015-07-20</lastmod>
+ <loc>https://freemarker.apache.org/docs/sitemap.xml</loc>
+ <lastmod>2017-11-11</lastmod>
</sitemap>
</sitemapindex>
