Gradle wrapper refactor, Travis fix and FreeMarker fix

jaguililla · Dec 16, 2014 · 6e90fba · 6e90fba
1 parent e632555
commit 6e90fba
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,3 @@
 language: java
 jdk: oraclejdk8
-after_success: ./gradlew clean check jacocoTestReport coveralls
+after_success: gradle/wrapper clean check jacocoTestReport coveralls
diff --git a/extra/src/main/java/sabina/view/FreeMarkerView.java b/extra/src/main/java/sabina/view/FreeMarkerView.java
@@ -26,7 +26,7 @@ public class FreeMarkerView {
 
     private static Configuration createFreemarkerConfiguration () {
         Configuration retVal = new Configuration ();
-        retVal.setClassForTemplateLoading (FreeMarkerView.class, "freemarker");
+        retVal.setClassForTemplateLoading (FreeMarkerView.class, "");
         return retVal;
     }
 

diff --git a/extra/src/test/java/sabina/examples/FreeMarkerExample.java b/extra/src/test/java/sabina/examples/FreeMarkerExample.java
@@ -27,8 +27,7 @@ public static void main (String args[]) {
                 Map<String, Object> attributes = new HashMap<> ();
                 attributes.put ("message", "Hello World");
 
-                // The hello.ftl file is located in directory:
-                // src/test/resources/sabina/examples/templateview/freemarker
+                // The hello.ftl file is located in directory: src/test/resources/sabina/view
                 return renderFreeMarker ("hello.ftl", attributes);
             })
         );

diff --git a/...xamples/templateview/freemarker/hello.ftl → .../src/test/resources/sabina/view/hello.ftl b/...xamples/templateview/freemarker/hello.ftl → .../src/test/resources/sabina/view/hello.ftl
diff --git a/gradle/gradlew → gradle/wrapper b/gradle/gradlew → gradle/wrapper
diff --git a/gradle/gradlew.bat → gradle/wrapper.bat b/gradle/gradlew.bat → gradle/wrapper.bat
diff --git a/gradle/wrapper.jar b/gradle/wrapper.jar
diff --git a/gradle/wrapper.properties b/gradle/wrapper.properties
@@ -1,4 +1,4 @@
-#Tue Dec 16 01:08:28 CET 2014
+#Tue Dec 16 20:35:24 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME