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 2015/12/31 16:47:09 UTC
[2/2] incubator-freemarker git commit: Some more missing copyright
comments
Some more missing copyright comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/7d355e7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/7d355e7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/7d355e7a
Branch: refs/heads/2.3-gae
Commit: 7d355e7a69ba6c334be64e439c319795a1a1f602
Parents: 7d8792c
Author: ddekany <dd...@apache.org>
Authored: Thu Dec 31 16:38:39 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Dec 31 16:46:52 2015 +0100
----------------------------------------------------------------------
src/main/misc/overloadedNumberRules/config.fmpp | 17 +++++++++++++++++
src/manual/en_US/docgen.cjson | 17 +++++++++++++++++
.../jsp/webapps/errors/failing-parsetime.ftlnv | 19 +++++++++++++++++++
3 files changed, 53 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d355e7a/src/main/misc/overloadedNumberRules/config.fmpp
----------------------------------------------------------------------
diff --git a/src/main/misc/overloadedNumberRules/config.fmpp b/src/main/misc/overloadedNumberRules/config.fmpp
index 1017c30..fdd71ef 100644
--- a/src/main/misc/overloadedNumberRules/config.fmpp
+++ b/src/main/misc/overloadedNumberRules/config.fmpp
@@ -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.
+
sources: generator.ftl
outputFile: ../../../../build/overloadedNumberRules.java
data: {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d355e7a/src/manual/en_US/docgen.cjson
----------------------------------------------------------------------
diff --git a/src/manual/en_US/docgen.cjson b/src/manual/en_US/docgen.cjson
index 221f349..786ec8c 100644
--- a/src/manual/en_US/docgen.cjson
+++ b/src/manual/en_US/docgen.cjson
@@ -1,5 +1,22 @@
//charset: UTF-8
+// 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.
+
deployUrl: "http://freemarker.org/docs/"
onlineTrackerHTML: "docgen-misc/googleAnalytics.html"
searchKey: "014728049242975963158:8awjt03uofm"
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d355e7a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.ftlnv
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.ftlnv b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.ftlnv
index 9f45506..a83c41c 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.ftlnv
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.ftlnv
@@ -1 +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.
+-->
+
${'x'?no_such_builtin}
\ No newline at end of file