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 2017/03/11 08:14:01 UTC
incubator-freemarker git commit: Missing/incomplete copyright headers.
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3-gae 173abfe9b -> cbc449518
Missing/incomplete 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/cbc44951
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/cbc44951
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/cbc44951
Branch: refs/heads/2.3-gae
Commit: cbc449518039520a07020cd03810ec92256431d0
Parents: 173abfe
Author: ddekany <dd...@apache.org>
Authored: Sat Mar 11 09:13:54 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sat Mar 11 09:13:54 2017 +0100
----------------------------------------------------------------------
src/main/java/freemarker/core/_Java8Impl.java | 18 ++++++++++++++++++
src/main/misc/overloadedNumberRules/config.fmpp | 9 +++++++++
.../freemarker/ext/beans/unsafeMethods.properties | 9 +++++++++
src/main/resources/freemarker/version.properties | 9 +++++++++
src/manual/en_US/book.xml | 4 ++--
.../ext/beans/BeansWrapperJava8Test.java | 18 ++++++++++++++++++
.../GetPropertyNameFromReaderMethodNameTest.java | 18 ++++++++++++++++++
.../ext/beans/Java8DefaultMethodsBean.java | 18 ++++++++++++++++++
.../ext/beans/Java8DefaultMethodsBeanBase.java | 18 ++++++++++++++++++
.../ConfigureOutputFormatExamples1.properties | 9 +++++++++
.../ConfigureOutputFormatExamples2.properties | 9 +++++++++
.../TemplateConfigurationExamples1.properties | 9 +++++++++
.../TemplateConfigurationExamples2.properties | 9 +++++++++
.../TemplateConfigurationExamples3.properties | 9 +++++++++
.../models/BeansTestResources.properties | 9 +++++++++
15 files changed, 173 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/main/java/freemarker/core/_Java8Impl.java
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/_Java8Impl.java b/src/main/java/freemarker/core/_Java8Impl.java
index fe9bb07..40f0910 100644
--- a/src/main/java/freemarker/core/_Java8Impl.java
+++ b/src/main/java/freemarker/core/_Java8Impl.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 freemarker.core;
import java.lang.reflect.Method;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/main/misc/overloadedNumberRules/config.fmpp
----------------------------------------------------------------------
diff --git a/src/main/misc/overloadedNumberRules/config.fmpp b/src/main/misc/overloadedNumberRules/config.fmpp
index cf32e92..50aacbb 100644
--- a/src/main/misc/overloadedNumberRules/config.fmpp
+++ b/src/main/misc/overloadedNumberRules/config.fmpp
@@ -14,6 +14,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# 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.
sources: generator.ftl
outputFile: ../../../../build/overloadedNumberRules.java
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/ext/beans/unsafeMethods.properties b/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
index 05c1981..916d2f4 100644
--- a/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
+++ b/src/main/resources/freemarker/ext/beans/unsafeMethods.properties
@@ -14,6 +14,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# 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.
java.lang.Object.wait()
java.lang.Object.wait(long)
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index c9fcce2..05a3ac1 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@ -14,6 +14,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# 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.
# Version info for the builds.
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 3e06a7b..3e0814f 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -7,9 +7,9 @@
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
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/test/java/freemarker/ext/beans/BeansWrapperJava8Test.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/BeansWrapperJava8Test.java b/src/test/java/freemarker/ext/beans/BeansWrapperJava8Test.java
index 4312742..abdb0f5 100644
--- a/src/test/java/freemarker/ext/beans/BeansWrapperJava8Test.java
+++ b/src/test/java/freemarker/ext/beans/BeansWrapperJava8Test.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 freemarker.ext.beans;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/test/java/freemarker/ext/beans/GetPropertyNameFromReaderMethodNameTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/GetPropertyNameFromReaderMethodNameTest.java b/src/test/java/freemarker/ext/beans/GetPropertyNameFromReaderMethodNameTest.java
index ce95b99..d100b77 100644
--- a/src/test/java/freemarker/ext/beans/GetPropertyNameFromReaderMethodNameTest.java
+++ b/src/test/java/freemarker/ext/beans/GetPropertyNameFromReaderMethodNameTest.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 freemarker.ext.beans;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/test/java/freemarker/ext/beans/Java8DefaultMethodsBean.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/Java8DefaultMethodsBean.java b/src/test/java/freemarker/ext/beans/Java8DefaultMethodsBean.java
index 0687d84..5161dae 100644
--- a/src/test/java/freemarker/ext/beans/Java8DefaultMethodsBean.java
+++ b/src/test/java/freemarker/ext/beans/Java8DefaultMethodsBean.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 freemarker.ext.beans;
public class Java8DefaultMethodsBean implements Java8DefaultMethodsBeanBase {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/test/java/freemarker/ext/beans/Java8DefaultMethodsBeanBase.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/ext/beans/Java8DefaultMethodsBeanBase.java b/src/test/java/freemarker/ext/beans/Java8DefaultMethodsBeanBase.java
index c912ace..dd867d4 100644
--- a/src/test/java/freemarker/ext/beans/Java8DefaultMethodsBeanBase.java
+++ b/src/test/java/freemarker/ext/beans/Java8DefaultMethodsBeanBase.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 freemarker.ext.beans;
public interface Java8DefaultMethodsBeanBase {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
index 0df9e33..601ce15 100644
--- a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
+++ b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
@@ -14,6 +14,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# 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.
templateConfigurations = \
ConditionalTemplateConfigurationFactory( \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
index 5d2a738..0179466 100644
--- a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
+++ b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
@@ -14,6 +14,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# 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.
templateConfigurations = \
FirstMatchTemplateConfigurationFactory( \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties b/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
index cffadfb..24e9747 100644
--- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
+++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
@@ -14,6 +14,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# 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.
templateConfigurations = \
ConditionalTemplateConfigurationFactory( \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties b/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
index f879e70..b5619f0 100644
--- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
+++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
@@ -14,6 +14,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# 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.
templateConfigurations = \
ConditionalTemplateConfigurationFactory( \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties b/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
index cf4c5a4..1cd1b26 100644
--- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
+++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
@@ -14,6 +14,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# 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.
templateConfigurations = \
MergingTemplateConfigurationFactory( \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/cbc44951/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties b/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties
index 609e20b..32190a8 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties
+++ b/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties
@@ -14,6 +14,15 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+# 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.
message=Message
format={0,date,yyyy-MM-dd}
\ No newline at end of file