freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker git commit: Added Rat to build. Added some missing copyright headers.
Date Fri, 09 Feb 2018 15:22:46 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/3 bc9edc0e9 -> a0019cfc6


Added Rat to build. Added some missing copyright headers.


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a0019cfc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a0019cfc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a0019cfc

Branch: refs/heads/3
Commit: a0019cfc6a74e1f106e4bd808f11e15c7469b55a
Parents: bc9edc0
Author: ddekany <ddekany@apache.org>
Authored: Fri Feb 9 15:53:47 2018 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Fri Feb 9 16:22:34 2018 +0100

----------------------------------------------------------------------
 .travis.yml                                     | 17 ++++
 build.gradle                                    | 25 +++++
 freemarker-core-test-java8/build.gradle         | 19 ++++
 .../freemarker/core/ConcatenatedHashTest.java   | 18 ++++
 .../freemarker/core/ListBreakContinueTest.java  | 18 ++++
 .../freemarker/core/model/ConstantsTest.java    | 18 ++++
 .../templatesuite/CoreTemplateTestSuite.java    | 18 ++++
 .../core/templatesuite/models/TestBean.java     | 18 ++++
 .../core/templatesuite/models/TestBoolean.java  | 18 ++++
 .../core/templatesuite/models/TestNode.java     | 18 ++++
 .../core/model/TemplateDirectiveModel.java      | 18 ++++
 .../core/model/TemplateFunctionModel.java       | 18 ++++
 freemarker-manual/build.gradle                  | 19 ++++
 .../servlet/WebAppTemplateLoaderTest.java       | 20 +++-
 .../WEB-INF/templates/test.ftl                  | 18 ++++
 .../SpringResourceTemplateLoaderTest.java       | 10 +-
 .../META-INF/templates/sub1/sub2/t.ftl          | 18 ++++
 .../example/mvc/users/UsersMessages.properties  | 17 ++++
 .../mvc/users/UsersTheme-default.properties     | 17 ++++
 .../org/apache/freemarker/test/TestUtils.java   | 18 ++++
 gradle.properties.sample                        | 17 ++++
 old-ant-build/.travis.yml                       | 17 ++++
 old-ant-build/README.txt                        |  1 +
 rat-excludes                                    | 99 ++++++++++++++++++++
 24 files changed, 486 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index b6256a5..d673ccd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 language: java
 #before_install:
 #  - sudo apt-get -qq update

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 9cc3c6a..c5951c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,6 +55,19 @@ ext.bannedLibraries = [
     "commons-logging:commons-logging"
 ] as Set
 
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+configurations {
+    rat
+}
+
+dependencies {
+    rat "org.apache.rat:apache-rat-tasks:0.12"
+}
+
 // Java boot-classpath setup:
 [7, 8].each { javaVersion ->
     // Name used in gradle.properties:
@@ -401,5 +414,17 @@ task aggregateJavadoc(type: Javadoc) {
     // source-s and classpath-s are added later, in the afterEvaluate of subprojects!
 }
 
+task rat {
+    doLast {
+        ant.taskdef(
+                name: 'ratReport', classname: 'org.apache.rat.anttasks.Report',
+                classpath: configurations.rat.asPath)
+        ant.ratReport(reportFile: "build/rat-report.txt") {
+            fileset(dir: "", excludesfile: "rat-excludes")
+        }
+        project.logger.lifecycle('Rat reports were written into build/rat-report.txt')
+    }
+}
+
 // TODO Build source distribution files
 // TODO Build binary distribution files (contains the binaries of all *published* modules)

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-core-test-java8/build.gradle
----------------------------------------------------------------------
diff --git a/freemarker-core-test-java8/build.gradle b/freemarker-core-test-java8/build.gradle
index f919f6d..a8a1aec 100644
--- a/freemarker-core-test-java8/build.gradle
+++ b/freemarker-core-test-java8/build.gradle
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 description = """\
 The unit tests of freemarker-core that need Java 8 features. These were moved to a separate
project to avoid \
 a project that contains java files that require varous Java versions.

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-core-test/src/test/java/org/apache/freemarker/core/ConcatenatedHashTest.java
----------------------------------------------------------------------
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/ConcatenatedHashTest.java
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/ConcatenatedHashTest.java
index dca1349..7474bad 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/ConcatenatedHashTest.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/ConcatenatedHashTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.freemarker.core;
 
 import static org.hamcrest.CoreMatchers.*;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-core-test/src/test/java/org/apache/freemarker/core/ListBreakContinueTest.java
----------------------------------------------------------------------
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/ListBreakContinueTest.java
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/ListBreakContinueTest.java
index ec485f1..ada4385 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/ListBreakContinueTest.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/ListBreakContinueTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.freemarker.core;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/org/apache/freemarker/core/model/ConstantsTest.java
----------------------------------------------------------------------
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/org/apache/freemarker/core/model/ConstantsTest.java
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/org/apache/freemarker/core/model/ConstantsTest.java
index 032adf1..e8ca214 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/org/apache/freemarker/core/model/ConstantsTest.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/model/impl/org/apache/freemarker/core/model/ConstantsTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.freemarker.core.model.impl.org.apache.freemarker.core.model;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/CoreTemplateTestSuite.java
----------------------------------------------------------------------
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/CoreTemplateTestSuite.java
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/CoreTemplateTestSuite.java
index 376e303..e680b84 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/CoreTemplateTestSuite.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/CoreTemplateTestSuite.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.freemarker.core.templatesuite;
 
 import java.math.BigDecimal;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestBean.java
----------------------------------------------------------------------
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestBean.java
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestBean.java
index b963bd7..bf74f2c 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestBean.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestBean.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.freemarker.core.templatesuite.models;
 
 public class TestBean {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestBoolean.java
----------------------------------------------------------------------
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestBoolean.java
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestBoolean.java
index d3ffcdb..8dd5727 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestBoolean.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestBoolean.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.freemarker.core.templatesuite.models;
 
 import org.apache.freemarker.core.model.TemplateBooleanModel;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestNode.java
----------------------------------------------------------------------
diff --git a/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestNode.java
b/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestNode.java
index dfc68c7..14bdb9f 100644
--- a/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestNode.java
+++ b/freemarker-core-test/src/test/java/org/apache/freemarker/core/templatesuite/models/TestNode.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.freemarker.core.templatesuite.models;
 
 import org.apache.freemarker.core.model.TemplateNodeModel;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java
----------------------------------------------------------------------
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java
index c30d737..2427706 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateDirectiveModel.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.freemarker.core.model;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateFunctionModel.java
----------------------------------------------------------------------
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateFunctionModel.java
b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateFunctionModel.java
index 3dcd10a..4a50c2f 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateFunctionModel.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/model/TemplateFunctionModel.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.freemarker.core.model;
 
 import java.io.Writer;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-manual/build.gradle
----------------------------------------------------------------------
diff --git a/freemarker-manual/build.gradle b/freemarker-manual/build.gradle
index 5ea49d3..842cad9 100644
--- a/freemarker-manual/build.gradle
+++ b/freemarker-manual/build.gradle
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 description = "FreeMarker Manual (i.e., the documention)"
 published = false
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/WebAppTemplateLoaderTest.java
----------------------------------------------------------------------
diff --git a/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/WebAppTemplateLoaderTest.java
b/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/WebAppTemplateLoaderTest.java
index f2b9a8a..ecf5049 100644
--- a/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/WebAppTemplateLoaderTest.java
+++ b/freemarker-servlet/src/test/java/org/apache/freemarker/servlet/WebAppTemplateLoaderTest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.freemarker.servlet;
 
 import static org.hamcrest.Matchers.*;
@@ -19,7 +37,7 @@ public class WebAppTemplateLoaderTest {
 
     @Test
     public void testTemplateFound() throws Exception {
-        assertEquals("foo", createConfiguration().getTemplate("test.ftl").toString());
+        assertThat(createConfiguration().getTemplate("test.ftl").toString(), endsWith("foo"));
     }
 
     @Test

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/webapptemplateloadertest/WEB-INF/templates/test.ftl
----------------------------------------------------------------------
diff --git a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/webapptemplateloadertest/WEB-INF/templates/test.ftl
b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/webapptemplateloadertest/WEB-INF/templates/test.ftl
index 1910281..06ebbcc 100644
--- a/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/webapptemplateloadertest/WEB-INF/templates/test.ftl
+++ b/freemarker-servlet/src/test/resources/org/apache/freemarker/servlet/webapptemplateloadertest/WEB-INF/templates/test.ftl
@@ -1 +1,19 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 foo
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-spring/src/test/java/org/apache/freemarker/spring/SpringResourceTemplateLoaderTest.java
----------------------------------------------------------------------
diff --git a/freemarker-spring/src/test/java/org/apache/freemarker/spring/SpringResourceTemplateLoaderTest.java
b/freemarker-spring/src/test/java/org/apache/freemarker/spring/SpringResourceTemplateLoaderTest.java
index 4fc59ee..87f9ded 100644
--- a/freemarker-spring/src/test/java/org/apache/freemarker/spring/SpringResourceTemplateLoaderTest.java
+++ b/freemarker-spring/src/test/java/org/apache/freemarker/spring/SpringResourceTemplateLoaderTest.java
@@ -18,17 +18,13 @@
  */
 package org.apache.freemarker.spring;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 
 import org.apache.freemarker.core.Configuration;
 import org.apache.freemarker.core.TemplateNotFoundException;
-import org.apache.freemarker.spring.SpringResourceTemplateLoader;
 import org.apache.freemarker.test.TestConfigurationBuilder;
 import org.junit.After;
 import org.junit.Before;
@@ -64,7 +60,7 @@ public class SpringResourceTemplateLoaderTest {
     @Test
     public void testSuccessful() throws Exception {
         for (int i = 0; i < 2; i++) {
-            assertEquals("foo", cfg.getTemplate("sub1/sub2/t.ftl").toString());
+            assertThat(cfg.getTemplate("sub1/sub2/t.ftl").toString(), endsWith("foo"));
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-spring/src/test/resources/META-INF/templates/sub1/sub2/t.ftl
----------------------------------------------------------------------
diff --git a/freemarker-spring/src/test/resources/META-INF/templates/sub1/sub2/t.ftl b/freemarker-spring/src/test/resources/META-INF/templates/sub1/sub2/t.ftl
index 1910281..06ebbcc 100644
--- a/freemarker-spring/src/test/resources/META-INF/templates/sub1/sub2/t.ftl
+++ b/freemarker-spring/src/test/resources/META-INF/templates/sub1/sub2/t.ftl
@@ -1 +1,19 @@
+<#--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
 foo
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-spring/src/test/resources/org/apache/freemarker/spring/example/mvc/users/UsersMessages.properties
----------------------------------------------------------------------
diff --git a/freemarker-spring/src/test/resources/org/apache/freemarker/spring/example/mvc/users/UsersMessages.properties
b/freemarker-spring/src/test/resources/org/apache/freemarker/spring/example/mvc/users/UsersMessages.properties
index aa12742..ff796bd 100644
--- a/freemarker-spring/src/test/resources/org/apache/freemarker/spring/example/mvc/users/UsersMessages.properties
+++ b/freemarker-spring/src/test/resources/org/apache/freemarker/spring/example/mvc/users/UsersMessages.properties
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 user.form.message=Edit info for {0} {1} <{2}>
 user.id=ID
 user.password=Password

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-spring/src/test/resources/org/apache/freemarker/spring/example/mvc/users/UsersTheme-default.properties
----------------------------------------------------------------------
diff --git a/freemarker-spring/src/test/resources/org/apache/freemarker/spring/example/mvc/users/UsersTheme-default.properties
b/freemarker-spring/src/test/resources/org/apache/freemarker/spring/example/mvc/users/UsersTheme-default.properties
index b89d3a0..3bb732b 100644
--- a/freemarker-spring/src/test/resources/org/apache/freemarker/spring/example/mvc/users/UsersTheme-default.properties
+++ b/freemarker-spring/src/test/resources/org/apache/freemarker/spring/example/mvc/users/UsersTheme-default.properties
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 styleSheet=/themes/style/default.css
 userClass=user-{0}

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/freemarker-test-utils/src/main/java/org/apache/freemarker/test/TestUtils.java
----------------------------------------------------------------------
diff --git a/freemarker-test-utils/src/main/java/org/apache/freemarker/test/TestUtils.java
b/freemarker-test-utils/src/main/java/org/apache/freemarker/test/TestUtils.java
index c199bb9..95584e0 100644
--- a/freemarker-test-utils/src/main/java/org/apache/freemarker/test/TestUtils.java
+++ b/freemarker-test-utils/src/main/java/org/apache/freemarker/test/TestUtils.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.freemarker.test;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/gradle.properties.sample
----------------------------------------------------------------------
diff --git a/gradle.properties.sample b/gradle.properties.sample
index ae19ee5..6f3df54 100644
--- a/gradle.properties.sample
+++ b/gradle.properties.sample
@@ -1,2 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 bootClasspathJava7=C:/Program Files/Java/jdk1.7.0_25/jre/lib/rt.jar
 bootClasspathJava8=C:/Program Files/Java/jdk1.8.0_66/jre/lib/rt.jar
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/old-ant-build/.travis.yml
----------------------------------------------------------------------
diff --git a/old-ant-build/.travis.yml b/old-ant-build/.travis.yml
index 5d914d9..722e1a5 100644
--- a/old-ant-build/.travis.yml
+++ b/old-ant-build/.travis.yml
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 language: java
 install: ant download-ivy
 jdk:

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/old-ant-build/README.txt
----------------------------------------------------------------------
diff --git a/old-ant-build/README.txt b/old-ant-build/README.txt
new file mode 100644
index 0000000..b550f16
--- /dev/null
+++ b/old-ant-build/README.txt
@@ -0,0 +1 @@
+This old Ant build is not used by anything, but was left here to help converting to Gradle.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a0019cfc/rat-excludes
----------------------------------------------------------------------
diff --git a/rat-excludes b/rat-excludes
new file mode 100644
index 0000000..be0a115
--- /dev/null
+++ b/rat-excludes
@@ -0,0 +1,99 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# In src/:
+# --------
+
+# Generated files basically; see details in the files:
+freemarker-manual/src/main/docgen/en_US/docgen-misc/googleAnalytics.html
+
+# Binaries/archives created in the FreeMarker project:
+freemarker-core/src/main/misc/overloadedNumberRules/prices.ods
+freemarker-manual/src/main/docgen/en_US/docgen-originals/figures/overview.odg
+freemarker-manual/src/main/docgen/en_US/docgen-originals/figures/overview.odg
+freemarker-manual/src/main/docgen/en_US/docgen-originals/figures/model2sketch_with_alpha.png
+freemarker-manual/src/main/docgen/en_US/docgen-originals/figures/tree_with_alpha.png
+freemarker-manual/src/main/docgen/en_US/favicon.png
+freemarker-manual/src/main/docgen/en_US/figures/model2sketch.png
+freemarker-manual/src/main/docgen/en_US/figures/overview.png
+freemarker-manual/src/main/docgen/en_US/figures/tree.png
+freemarker-manual/src/main/docgen/en_US/logo.png
+
+# Rat thinks it's a binary, but it's UTF-16 text:
+freemarker-core-test/src/test/resources/org/apache/freemarker/core/templatesuite/expected/output-encoding2.txt
+
+# Tooling/IDE generated files:
+# ----------------------------
+
+ide-dependencies/**
+.gradle/**
+gradle/**
+.git/**
+.bin/**
+bin/**
+build/**
+.build/**
+out/**
+.out/**
+target/**
+.settings/**
+.classpath
+.project
+.settings
+.idea/**
+*.iml
+*.iws
+*.ipr
+.idea_modules/**
+.out/**
+.DS_Store*
+.AppleDouble
+.LSOverride
+.directory
+.Trash*
+freemarker-*/ide-dependencies/**
+freemarker-*/.gradle/**
+freemarker-*/gradle/**
+freemarker-*/.git/**
+freemarker-*/.bin/**
+freemarker-*/bin/**
+freemarker-*/build/**
+freemarker-*/.build/**
+freemarker-*/out/**
+freemarker-*/.out/**
+freemarker-*/target/**
+freemarker-*/.settings/**
+freemarker-*/.classpath
+freemarker-*/.project
+freemarker-*/.settings
+freemarker-*/.idea/**
+freemarker-*/*.iml
+freemarker-*/*.iws
+freemarker-*/*.ipr
+freemarker-*/.idea_modules/**
+freemarker-*/.out/**
+freemarker-*/.DS_Store*
+freemarker-*/.AppleDouble
+freemarker-*/.LSOverride
+freemarker-*/.directory
+freemarker-*/.Trash*
+
+# Well known files that need no license note:
+# -------------------------------------------
+
+README.md
+gradlew.bat
\ No newline at end of file



Mime
View raw message