From ecaa2262e119849f7a634942c971d278c8683a5c Mon Sep 17 00:00:00 2001 From: Daniel Worthington-Bodart Date: Wed, 30 Mar 2016 06:38:29 +0100 Subject: [PATCH] Updated TL --- build/optional.dependencies | 2 +- build/runtime.dependencies | 2 +- src/com/googlecode/utterlyidle/profiling/ProfilingHandler.java | 2 +- .../utterlyidle/profiling/{profile.st => profile.html} | 0 src/com/googlecode/utterlyidle/rendering/{ANY.st => ANY.html} | 0 .../googlecode/utterlyidle/rendering/{DELETE.st => DELETE.html} | 0 src/com/googlecode/utterlyidle/rendering/{GET.st => GET.html} | 0 .../googlecode/utterlyidle/rendering/MatchFailureRenderer.java | 2 +- .../utterlyidle/rendering/{OPTIONS.st => OPTIONS.html} | 0 .../googlecode/utterlyidle/rendering/{PATCH.st => PATCH.html} | 0 src/com/googlecode/utterlyidle/rendering/{POST.st => POST.html} | 0 src/com/googlecode/utterlyidle/rendering/{PUT.st => PUT.html} | 0 src/com/googlecode/utterlyidle/rendering/SeeOtherRenderer.java | 2 +- .../utterlyidle/rendering/exceptions/LastExceptionsModule.java | 2 +- .../exceptions/{lastExceptions.st => lastExceptions.html} | 0 .../rendering/{matchFailure.st => matchFailure.html} | 0 .../utterlyidle/rendering/{seeOther.st => seeOther.html} | 0 .../utterlyidle/sitemesh/StringTemplateDecorators.java | 2 +- 18 files changed, 7 insertions(+), 7 deletions(-) rename src/com/googlecode/utterlyidle/profiling/{profile.st => profile.html} (100%) rename src/com/googlecode/utterlyidle/rendering/{ANY.st => ANY.html} (100%) rename src/com/googlecode/utterlyidle/rendering/{DELETE.st => DELETE.html} (100%) rename src/com/googlecode/utterlyidle/rendering/{GET.st => GET.html} (100%) rename src/com/googlecode/utterlyidle/rendering/{OPTIONS.st => OPTIONS.html} (100%) rename src/com/googlecode/utterlyidle/rendering/{PATCH.st => PATCH.html} (100%) rename src/com/googlecode/utterlyidle/rendering/{POST.st => POST.html} (100%) rename src/com/googlecode/utterlyidle/rendering/{PUT.st => PUT.html} (100%) rename src/com/googlecode/utterlyidle/rendering/exceptions/{lastExceptions.st => lastExceptions.html} (100%) rename src/com/googlecode/utterlyidle/rendering/{matchFailure.st => matchFailure.html} (100%) rename src/com/googlecode/utterlyidle/rendering/{seeOther.st => seeOther.html} (100%) diff --git a/build/optional.dependencies b/build/optional.dependencies index 86f5c193..e6ac0b17 100644 --- a/build/optional.dependencies +++ b/build/optional.dependencies @@ -29,4 +29,4 @@ mvn:javax.servlet:javax.servlet-api:jar|sources:3.1.0 mvn:org.ccil.cowan.tagsoup:tagsoup:jar:1.2 -mvn://repo.bodar.com/com.googlecode.lazyrecords:lazyrecords:pack|sources:2.30 +mvn://repo.bodar.com/com.googlecode.lazyrecords:lazyrecords:pack|sources:2.32 diff --git a/build/runtime.dependencies b/build/runtime.dependencies index 0bc8ab94..838939b8 100644 --- a/build/runtime.dependencies +++ b/build/runtime.dependencies @@ -1,2 +1,2 @@ -mvn://repo.bodar.com/com.googlecode.totallylazy:totallylazy:pack|sources:2.238 +mvn://repo.bodar.com/com.googlecode.totallylazy:totallylazy:pack|sources:2.241 mvn://repo.bodar.com/com.googlecode.yadic:yadic:pack|sources:2.45 diff --git a/src/com/googlecode/utterlyidle/profiling/ProfilingHandler.java b/src/com/googlecode/utterlyidle/profiling/ProfilingHandler.java index 5d26b8c3..7bd90c17 100644 --- a/src/com/googlecode/utterlyidle/profiling/ProfilingHandler.java +++ b/src/com/googlecode/utterlyidle/profiling/ProfilingHandler.java @@ -37,7 +37,7 @@ public static boolean shouldProfile(Request request) { private Response decorate(Response response) throws IOException { PropertyMap html = new PropertyMapParser().parse(response.entity().toString()); - Templates group = Templates.defaultTemplates(getClass()); + Templates group = Templates.templates(getClass()).addDefault().extension("html"); return response.entity(group.get("profile").render(Maps.map( "response", html, "requests", profilingData.requests(), diff --git a/src/com/googlecode/utterlyidle/profiling/profile.st b/src/com/googlecode/utterlyidle/profiling/profile.html similarity index 100% rename from src/com/googlecode/utterlyidle/profiling/profile.st rename to src/com/googlecode/utterlyidle/profiling/profile.html diff --git a/src/com/googlecode/utterlyidle/rendering/ANY.st b/src/com/googlecode/utterlyidle/rendering/ANY.html similarity index 100% rename from src/com/googlecode/utterlyidle/rendering/ANY.st rename to src/com/googlecode/utterlyidle/rendering/ANY.html diff --git a/src/com/googlecode/utterlyidle/rendering/DELETE.st b/src/com/googlecode/utterlyidle/rendering/DELETE.html similarity index 100% rename from src/com/googlecode/utterlyidle/rendering/DELETE.st rename to src/com/googlecode/utterlyidle/rendering/DELETE.html diff --git a/src/com/googlecode/utterlyidle/rendering/GET.st b/src/com/googlecode/utterlyidle/rendering/GET.html similarity index 100% rename from src/com/googlecode/utterlyidle/rendering/GET.st rename to src/com/googlecode/utterlyidle/rendering/GET.html diff --git a/src/com/googlecode/utterlyidle/rendering/MatchFailureRenderer.java b/src/com/googlecode/utterlyidle/rendering/MatchFailureRenderer.java index c7dff9b4..7cdf44fa 100644 --- a/src/com/googlecode/utterlyidle/rendering/MatchFailureRenderer.java +++ b/src/com/googlecode/utterlyidle/rendering/MatchFailureRenderer.java @@ -28,7 +28,7 @@ public MatchFailureRenderer(BasePath basePath, final Redirector redirector) { } public String render(MatchFailure value) throws IOException { - Templates group = Templates.defaultTemplates(getClass()); + Templates group = Templates.templates(getClass()).addDefault().extension("html"); Map model = new HashMap<>(); model.put("base", basePath); model.put("status", value.status()); diff --git a/src/com/googlecode/utterlyidle/rendering/OPTIONS.st b/src/com/googlecode/utterlyidle/rendering/OPTIONS.html similarity index 100% rename from src/com/googlecode/utterlyidle/rendering/OPTIONS.st rename to src/com/googlecode/utterlyidle/rendering/OPTIONS.html diff --git a/src/com/googlecode/utterlyidle/rendering/PATCH.st b/src/com/googlecode/utterlyidle/rendering/PATCH.html similarity index 100% rename from src/com/googlecode/utterlyidle/rendering/PATCH.st rename to src/com/googlecode/utterlyidle/rendering/PATCH.html diff --git a/src/com/googlecode/utterlyidle/rendering/POST.st b/src/com/googlecode/utterlyidle/rendering/POST.html similarity index 100% rename from src/com/googlecode/utterlyidle/rendering/POST.st rename to src/com/googlecode/utterlyidle/rendering/POST.html diff --git a/src/com/googlecode/utterlyidle/rendering/PUT.st b/src/com/googlecode/utterlyidle/rendering/PUT.html similarity index 100% rename from src/com/googlecode/utterlyidle/rendering/PUT.st rename to src/com/googlecode/utterlyidle/rendering/PUT.html diff --git a/src/com/googlecode/utterlyidle/rendering/SeeOtherRenderer.java b/src/com/googlecode/utterlyidle/rendering/SeeOtherRenderer.java index ff716318..48708b6c 100644 --- a/src/com/googlecode/utterlyidle/rendering/SeeOtherRenderer.java +++ b/src/com/googlecode/utterlyidle/rendering/SeeOtherRenderer.java @@ -15,7 +15,7 @@ public SeeOtherRenderer(BasePath basePath) { @Override public String render(String value) throws Exception { - return Templates.defaultTemplates(getClass()).get("seeOther"). + return Templates.templates(getClass()).addDefault().extension("html").get("seeOther"). render(Maps.map("base", basePath, "location", value)); } } diff --git a/src/com/googlecode/utterlyidle/rendering/exceptions/LastExceptionsModule.java b/src/com/googlecode/utterlyidle/rendering/exceptions/LastExceptionsModule.java index a1526d79..798c4bfb 100644 --- a/src/com/googlecode/utterlyidle/rendering/exceptions/LastExceptionsModule.java +++ b/src/com/googlecode/utterlyidle/rendering/exceptions/LastExceptionsModule.java @@ -46,7 +46,7 @@ public ResponseHandlers addResponseHandlers(ResponseHandlers handlers) throws Ex private Renderer> lastExceptionsRenderer() { return model -> { - Templates group = Templates.defaultTemplates(LastExceptionsResource.class); + Templates group = Templates.templates(LastExceptionsResource.class).addDefault().extension("html"); return group.get("lastExceptions").render(model); }; } diff --git a/src/com/googlecode/utterlyidle/rendering/exceptions/lastExceptions.st b/src/com/googlecode/utterlyidle/rendering/exceptions/lastExceptions.html similarity index 100% rename from src/com/googlecode/utterlyidle/rendering/exceptions/lastExceptions.st rename to src/com/googlecode/utterlyidle/rendering/exceptions/lastExceptions.html diff --git a/src/com/googlecode/utterlyidle/rendering/matchFailure.st b/src/com/googlecode/utterlyidle/rendering/matchFailure.html similarity index 100% rename from src/com/googlecode/utterlyidle/rendering/matchFailure.st rename to src/com/googlecode/utterlyidle/rendering/matchFailure.html diff --git a/src/com/googlecode/utterlyidle/rendering/seeOther.st b/src/com/googlecode/utterlyidle/rendering/seeOther.html similarity index 100% rename from src/com/googlecode/utterlyidle/rendering/seeOther.st rename to src/com/googlecode/utterlyidle/rendering/seeOther.html diff --git a/src/com/googlecode/utterlyidle/sitemesh/StringTemplateDecorators.java b/src/com/googlecode/utterlyidle/sitemesh/StringTemplateDecorators.java index e362fd00..557b4b3e 100644 --- a/src/com/googlecode/utterlyidle/sitemesh/StringTemplateDecorators.java +++ b/src/com/googlecode/utterlyidle/sitemesh/StringTemplateDecorators.java @@ -26,7 +26,7 @@ public StringTemplateDecorators(final Templates group, final Resolver resolver) } public StringTemplateDecorators(final URL templatesUrl, final Resolver resolver) { - this(Templates.defaultTemplates(uri(templatesUrl)), resolver); + this(Templates.templates(uri(templatesUrl)).addDefault().extension("st"), resolver); } public Decorator get(TemplateName templateName, Request request) {