You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2018/08/07 08:03:08 UTC
freemarker-online-tester git commit: Redirecting old domains to
https://try.freemarker.apache.org (also updated the URL in the README.md)
Repository: freemarker-online-tester
Updated Branches:
refs/heads/master 1b63a5ef8 -> f0a8c3f34
Redirecting old domains to https://try.freemarker.apache.org (also updated the URL in the README.md)
Project: http://git-wip-us.apache.org/repos/asf/freemarker-online-tester/repo
Commit: http://git-wip-us.apache.org/repos/asf/freemarker-online-tester/commit/f0a8c3f3
Tree: http://git-wip-us.apache.org/repos/asf/freemarker-online-tester/tree/f0a8c3f3
Diff: http://git-wip-us.apache.org/repos/asf/freemarker-online-tester/diff/f0a8c3f3
Branch: refs/heads/master
Commit: f0a8c3f34f6a17e84aee5e99d3ceb8daa5561765
Parents: 1b63a5e
Author: ddekany <dd...@apache.org>
Authored: Tue Aug 7 10:02:21 2018 +0200
Committer: ddekany <dd...@apache.org>
Committed: Tue Aug 7 10:02:45 2018 +0200
----------------------------------------------------------------------
README.md | 4 ++--
.../onlinetester/dropwizard/FreeMarkerOnlineTester.java | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/freemarker-online-tester/blob/f0a8c3f3/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 1e8c967..8bac5d1 100644
--- a/README.md
+++ b/README.md
@@ -19,11 +19,11 @@ What is FreeMarker Online Tester
It's a web page to quickly try template snippets, with some simple data-model. It's especially handy for learning the
template language.
-For a deployed version of this tool you can visit <http://freemarker-online.kenshoo.com/> (or soon
-<http://try.freemarker.org/>)
+For a deployed version of this tool you can visit <https://try.freemarker.apache.org/>.
Development Instructions
------------------------
+
* Clone the repository to a local directory
* Run `./gradlew build` from the cloned directory (use JDK 8)
* If you want to run it using IDEA run `./gradlew cleanidea idea`; this will generate the IDEA project for you.
http://git-wip-us.apache.org/repos/asf/freemarker-online-tester/blob/f0a8c3f3/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java b/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java
index 6327348..02ca90a 100644
--- a/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java
+++ b/src/main/java/org/apache/freemarker/onlinetester/dropwizard/FreeMarkerOnlineTester.java
@@ -72,8 +72,11 @@ public class FreeMarkerOnlineTester extends Application<FreeMarkerOnlineTesterCo
)));
bootstrap.addBundle(new RedirectBundle(
new UriRedirect(
- "http://freemarker-online.kenshoo.com([:/].*)$",
- "http://try.freemarker.org$1"),
+ "http://freemarker-online.kenshoo.com(?::\\d+)?(/.*)$",
+ "https://try.freemarker.apache.org$1"),
+ new UriRedirect(
+ "http://try.freemarker.org(?::\\d+)?(/.*)$",
+ "https://try.freemarker.apache.org$1"),
new UriRedirect(
"http://try.freemarker.apache.org((:\\d+)?/(?!\\.well-known/acme-challenge/).*)$",
"https://try.freemarker.apache.org$1")