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 17:33:03 UTC
[1/9] incubator-freemarker git commit: Added copyright comments to
some build related XML-s and the Manual XML
Repository: incubator-freemarker
Updated Branches:
refs/heads/2.3 71117cc29 -> ec24a4247
Added copyright comments to some build related XML-s and the Manual XML
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/e7ce04bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e7ce04bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e7ce04bd
Branch: refs/heads/2.3
Commit: e7ce04bdd3dbabd7fbf7d6e65a7d8c97e350e063
Parents: 559381f
Author: ddekany <dd...@apache.org>
Authored: Thu Dec 31 01:27:16 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Dec 31 01:27:16 2015 +0100
----------------------------------------------------------------------
build.xml | 18 ++++++++++++++++++
ivy.xml | 19 +++++++++++++++++++
ivysettings.xml | 19 +++++++++++++++++++
src/manual/en_US/book.xml | 18 ++++++++++++++++++
4 files changed, 74 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e7ce04bd/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index aa42db9..62e2156 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="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.
+-->
<project basedir="." default="jar" name="freemarker"
xmlns:ivy="antlib:org.apache.ivy.ant"
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e7ce04bd/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 1e40eb9..71f1de4 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -1,4 +1,23 @@
<!--
+ 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.
+-->
+
+<!--
AFTER CHANGING THIS FILE don't forget to issue: ant update-deps
-->
<!DOCTYPE ivy-module [
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e7ce04bd/ivysettings.xml
----------------------------------------------------------------------
diff --git a/ivysettings.xml b/ivysettings.xml
index 0eda602..3369274 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -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.
+-->
+
<ivysettings>
<!-- Prevent IvyDE error: -->
<property name="server.ivy.repo.root" value="${ivy.project.dir}/NOT_SET" override="false" />
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e7ce04bd/src/manual/en_US/book.xml
----------------------------------------------------------------------
diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml
index 665826f..26dd513 100644
--- a/src/manual/en_US/book.xml
+++ b/src/manual/en_US/book.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="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.
+-->
<book conformance="docgen" version="5.0" xml:lang="en"
xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
[6/9] incubator-freemarker git commit: Added copyright comment to
HTML files
Posted by dd...@apache.org.
Added copyright comment to HTML files
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/1334cd9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/1334cd9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/1334cd9b
Branch: refs/heads/2.3
Commit: 1334cd9bdf8997c9522ed3f5bdb861bf8c48e87e
Parents: 0cfd13d
Author: ddekany <dd...@apache.org>
Authored: Thu Dec 31 16:14:21 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Dec 31 16:14:21 2015 +0100
----------------------------------------------------------------------
src/dist/documentation/index.html | 18 ++++++++++++++++++
src/examples/struts-webapp/help.html | 18 ++++++++++++++++++
src/examples/webapp1/help.html | 18 ++++++++++++++++++
src/examples/webapp2/help.html | 18 ++++++++++++++++++
src/main/java/freemarker/cache/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/core/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/debug/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/ext/ant/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/ext/beans/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/ext/dom/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/ext/jdom/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/ext/jsp/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/ext/jython/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/ext/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/ext/rhino/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/ext/servlet/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/ext/util/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/ext/xml/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/log/package.html | 18 ++++++++++++++++++
src/main/java/freemarker/template/package.html | 18 ++++++++++++++++++
.../java/freemarker/template/utility/package.html | 18 ++++++++++++++++++
src/manual/en_US/docgen-misc/googleAnalytics.html | 5 +++++
src/test/java/freemarker/test/package.html | 18 ++++++++++++++++++
.../freemarker/test/templatesuite/package.html | 18 ++++++++++++++++++
24 files changed, 419 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/dist/documentation/index.html
----------------------------------------------------------------------
diff --git a/src/dist/documentation/index.html b/src/dist/documentation/index.html
index 24339bb..933b9c8 100644
--- a/src/dist/documentation/index.html
+++ b/src/dist/documentation/index.html
@@ -1,4 +1,22 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+ 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.
+-->
<html lang="hu">
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/examples/struts-webapp/help.html
----------------------------------------------------------------------
diff --git a/src/examples/struts-webapp/help.html b/src/examples/struts-webapp/help.html
index fe29769..740bee8 100644
--- a/src/examples/struts-webapp/help.html
+++ b/src/examples/struts-webapp/help.html
@@ -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.
+-->
<html>
<head>
<title>FreeMarker Struts Example - Help</title>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/examples/webapp1/help.html
----------------------------------------------------------------------
diff --git a/src/examples/webapp1/help.html b/src/examples/webapp1/help.html
index d82886e..2b777d2 100644
--- a/src/examples/webapp1/help.html
+++ b/src/examples/webapp1/help.html
@@ -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.
+-->
<html>
<head>
<title>FreeMarker Example Web Application 1 - Help</title>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/examples/webapp2/help.html
----------------------------------------------------------------------
diff --git a/src/examples/webapp2/help.html b/src/examples/webapp2/help.html
index a88236e..c8d8fed 100644
--- a/src/examples/webapp2/help.html
+++ b/src/examples/webapp2/help.html
@@ -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.
+-->
<html>
<head>
<title>FreeMarker Example Web Application 2 - Help</title>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/cache/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/cache/package.html b/src/main/java/freemarker/cache/package.html
index f8b3353..bf806df 100644
--- a/src/main/java/freemarker/cache/package.html
+++ b/src/main/java/freemarker/cache/package.html
@@ -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.
+-->
<html>
<head>
</head>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/core/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/core/package.html b/src/main/java/freemarker/core/package.html
index 0f6b825..15c389f 100644
--- a/src/main/java/freemarker/core/package.html
+++ b/src/main/java/freemarker/core/package.html
@@ -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.
+-->
<html>
<head>
</head>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/debug/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/debug/package.html b/src/main/java/freemarker/debug/package.html
index 11e5da7..bc8bb81 100644
--- a/src/main/java/freemarker/debug/package.html
+++ b/src/main/java/freemarker/debug/package.html
@@ -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.
+-->
<html>
<head>
</head>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/ext/ant/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/ant/package.html b/src/main/java/freemarker/ext/ant/package.html
index e4e0c57..16d3343 100644
--- a/src/main/java/freemarker/ext/ant/package.html
+++ b/src/main/java/freemarker/ext/ant/package.html
@@ -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.
+-->
<html>
<head>
</head>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/ext/beans/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/beans/package.html b/src/main/java/freemarker/ext/beans/package.html
index 263dabd..2032969 100644
--- a/src/main/java/freemarker/ext/beans/package.html
+++ b/src/main/java/freemarker/ext/beans/package.html
@@ -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.
+-->
<html>
<head>
<title></title>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/ext/dom/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/dom/package.html b/src/main/java/freemarker/ext/dom/package.html
index cf7dbb3..a3518ff 100644
--- a/src/main/java/freemarker/ext/dom/package.html
+++ b/src/main/java/freemarker/ext/dom/package.html
@@ -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.
+-->
<html>
<head>
<title></title>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/ext/jdom/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jdom/package.html b/src/main/java/freemarker/ext/jdom/package.html
index 97603e7..dba93d8 100644
--- a/src/main/java/freemarker/ext/jdom/package.html
+++ b/src/main/java/freemarker/ext/jdom/package.html
@@ -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.
+-->
<html>
<head>
<title></title>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/ext/jsp/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jsp/package.html b/src/main/java/freemarker/ext/jsp/package.html
index a2ec8d3..23a891b 100644
--- a/src/main/java/freemarker/ext/jsp/package.html
+++ b/src/main/java/freemarker/ext/jsp/package.html
@@ -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.
+-->
<html>
<head>
</head>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/ext/jython/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/jython/package.html b/src/main/java/freemarker/ext/jython/package.html
index 28a4914..b979552 100644
--- a/src/main/java/freemarker/ext/jython/package.html
+++ b/src/main/java/freemarker/ext/jython/package.html
@@ -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.
+-->
<html>
<head>
<title></title>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/ext/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/package.html b/src/main/java/freemarker/ext/package.html
index 5ff6bb1..0f45e3f 100644
--- a/src/main/java/freemarker/ext/package.html
+++ b/src/main/java/freemarker/ext/package.html
@@ -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.
+-->
<html>
<head>
</head>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/ext/rhino/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/rhino/package.html b/src/main/java/freemarker/ext/rhino/package.html
index db0eae7..ede49a8 100644
--- a/src/main/java/freemarker/ext/rhino/package.html
+++ b/src/main/java/freemarker/ext/rhino/package.html
@@ -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.
+-->
<html>
<head>
<title></title>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/ext/servlet/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/servlet/package.html b/src/main/java/freemarker/ext/servlet/package.html
index b6fbd65..08f5267 100644
--- a/src/main/java/freemarker/ext/servlet/package.html
+++ b/src/main/java/freemarker/ext/servlet/package.html
@@ -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.
+-->
<html>
<body>
<p>Servlet for legacy "Model 2" frameworks that allows using FreeMarker
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/ext/util/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/util/package.html b/src/main/java/freemarker/ext/util/package.html
index aa09423..31c6092 100644
--- a/src/main/java/freemarker/ext/util/package.html
+++ b/src/main/java/freemarker/ext/util/package.html
@@ -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.
+-->
<html>
<body>
<p>Various classes used by {@code freemarker.ext} but might be useful outside it too.</p>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/ext/xml/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/ext/xml/package.html b/src/main/java/freemarker/ext/xml/package.html
index bfd2b4a..0fd228b 100644
--- a/src/main/java/freemarker/ext/xml/package.html
+++ b/src/main/java/freemarker/ext/xml/package.html
@@ -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.
+-->
<html>
<head>
<title></title>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/log/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/log/package.html b/src/main/java/freemarker/log/package.html
index d6ed900..afc773c 100644
--- a/src/main/java/freemarker/log/package.html
+++ b/src/main/java/freemarker/log/package.html
@@ -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.
+-->
<html>
<head>
</head>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/template/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/package.html b/src/main/java/freemarker/template/package.html
index 567461d..e81035a 100644
--- a/src/main/java/freemarker/template/package.html
+++ b/src/main/java/freemarker/template/package.html
@@ -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.
+-->
<html>
<head>
</head>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/main/java/freemarker/template/utility/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/freemarker/template/utility/package.html b/src/main/java/freemarker/template/utility/package.html
index d5e2fac..03f8132 100644
--- a/src/main/java/freemarker/template/utility/package.html
+++ b/src/main/java/freemarker/template/utility/package.html
@@ -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.
+-->
<html>
<head>
</head>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/manual/en_US/docgen-misc/googleAnalytics.html
----------------------------------------------------------------------
diff --git a/src/manual/en_US/docgen-misc/googleAnalytics.html b/src/manual/en_US/docgen-misc/googleAnalytics.html
index bf440f2..759564e 100644
--- a/src/manual/en_US/docgen-misc/googleAnalytics.html
+++ b/src/manual/en_US/docgen-misc/googleAnalytics.html
@@ -1,3 +1,8 @@
+<!--
+ This snippet was generated by Google Analytics.
+ Thus, the standard FreeMarker copyright comment was intentionally omitted.
+ <#DO_NOT_UPDATE_COPYRIGHT>
+-->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/test/java/freemarker/test/package.html
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/package.html b/src/test/java/freemarker/test/package.html
index 109bb06..293c7b6 100644
--- a/src/test/java/freemarker/test/package.html
+++ b/src/test/java/freemarker/test/package.html
@@ -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.
+-->
<html>
<head>
</head>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/1334cd9b/src/test/java/freemarker/test/templatesuite/package.html
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/package.html b/src/test/java/freemarker/test/templatesuite/package.html
index f648929..80cb733 100644
--- a/src/test/java/freemarker/test/templatesuite/package.html
+++ b/src/test/java/freemarker/test/templatesuite/package.html
@@ -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.
+-->
<html>
<head>
</head>
[3/9] incubator-freemarker git commit: Added copyright comment to XML
files
Posted by dd...@apache.org.
Added copyright comment to XML files
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/2890b2ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/2890b2ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/2890b2ec
Branch: refs/heads/2.3
Commit: 2890b2ecdec65052bccbef0aaadfb11c7ece2a44
Parents: 0a8dcf1
Author: ddekany <dd...@apache.org>
Authored: Thu Dec 31 11:31:29 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Dec 31 11:31:29 2015 +0100
----------------------------------------------------------------------
src/examples/ant/build.xml | 18 ++++++++++++++++++
src/examples/ant/src/xml/faq.xml | 18 ++++++++++++++++++
.../struts-webapp/WEB-INF/struts-config.xml | 18 ++++++++++++++++++
.../struts-webapp/WEB-INF/struts-html.tld | 18 ++++++++++++++++++
src/examples/struts-webapp/WEB-INF/web.xml | 18 ++++++++++++++++++
src/examples/webapp1/WEB-INF/web.xml | 18 ++++++++++++++++++
src/examples/webapp2/WEB-INF/web.xml | 18 ++++++++++++++++++
src/test/java/freemarker/test/servlet/web.xml | 18 ++++++++++++++++++
.../test/templatesuite/TemplateTestCase.java | 1 +
src/test/resources/META-INF/malformed.tld | 18 ++++++++++++++++++
.../META-INF/tldDiscovery MetaInfTldSources-1.tld | 18 ++++++++++++++++++
.../ext/jsp/tldDiscovery-ClassPathTlds-1.tld | 18 ++++++++++++++++++
.../ext/jsp/tldDiscovery-ClassPathTlds-2.tld | 18 ++++++++++++++++++
.../jsp/webapps/basic/WEB-INF/el-functions.tld | 18 ++++++++++++++++++
.../ext/jsp/webapps/basic/WEB-INF/test.tld | 18 ++++++++++++++++++
.../ext/jsp/webapps/basic/WEB-INF/web.xml | 18 ++++++++++++++++++
.../ext/jsp/webapps/config/WEB-INF/web.xml | 18 ++++++++++++++++++
.../ext/jsp/webapps/errors/WEB-INF/web.xml | 18 ++++++++++++++++++
.../jsp/webapps/multipleLoaders/WEB-INF/web.xml | 18 ++++++++++++++++++
.../webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld | 18 ++++++++++++++++++
.../webapps/tldDiscovery/WEB-INF/fmtesttag4.tld | 18 ++++++++++++++++++
.../WEB-INF/subdir-with-tld/fmtesttag3.tld | 18 ++++++++++++++++++
.../ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml | 18 ++++++++++++++++++
.../tldDiscovery/not-auto-scanned/fmtesttag.tld | 18 ++++++++++++++++++
.../test/templatesuite/models/defaultxmlns1.xml | 18 ++++++++++++++++++
.../templatesuite/models/xml-ns_prefix-scope.xml | 18 ++++++++++++++++++
.../freemarker/test/templatesuite/models/xml.xml | 18 ++++++++++++++++++
.../test/templatesuite/models/xmlfragment.xml | 18 ++++++++++++++++++
.../test/templatesuite/models/xmlns.xml | 18 ++++++++++++++++++
.../test/templatesuite/models/xmlns2.xml | 18 ++++++++++++++++++
.../test/templatesuite/models/xmlns3.xml | 18 ++++++++++++++++++
.../freemarker/test/templatesuite/testcases.xml | 18 ++++++++++++++++++
src/test/resources/logback-test.xml | 18 ++++++++++++++++++
33 files changed, 577 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/examples/ant/build.xml
----------------------------------------------------------------------
diff --git a/src/examples/ant/build.xml b/src/examples/ant/build.xml
index cd7c43e..b60a2cb 100644
--- a/src/examples/ant/build.xml
+++ b/src/examples/ant/build.xml
@@ -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.
+-->
<project name="FreeMarker-FAQ" default="generate" basedir=".">
<taskdef
name="freemarker"
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/examples/ant/src/xml/faq.xml
----------------------------------------------------------------------
diff --git a/src/examples/ant/src/xml/faq.xml b/src/examples/ant/src/xml/faq.xml
index 880c1a6..d201a7f 100644
--- a/src/examples/ant/src/xml/faq.xml
+++ b/src/examples/ant/src/xml/faq.xml
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ 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.
+-->
<faq title="The Old FreeMarker FAQ" adminMailTo="run2000@users.sourceforge.net" adminName="Nicholas Cull">
<preface/>
<topicgroup name="Assembling template data models">
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/examples/struts-webapp/WEB-INF/struts-config.xml
----------------------------------------------------------------------
diff --git a/src/examples/struts-webapp/WEB-INF/struts-config.xml b/src/examples/struts-webapp/WEB-INF/struts-config.xml
index 7b7dbde..2a50399 100644
--- a/src/examples/struts-webapp/WEB-INF/struts-config.xml
+++ b/src/examples/struts-webapp/WEB-INF/struts-config.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ 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.
+-->
<!DOCTYPE struts-config PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/examples/struts-webapp/WEB-INF/struts-html.tld
----------------------------------------------------------------------
diff --git a/src/examples/struts-webapp/WEB-INF/struts-html.tld b/src/examples/struts-webapp/WEB-INF/struts-html.tld
index de26102..5586e4b 100644
--- a/src/examples/struts-webapp/WEB-INF/struts-html.tld
+++ b/src/examples/struts-webapp/WEB-INF/struts-html.tld
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="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.
+-->
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/examples/struts-webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/examples/struts-webapp/WEB-INF/web.xml b/src/examples/struts-webapp/WEB-INF/web.xml
index 85701d6..fa8e60b 100644
--- a/src/examples/struts-webapp/WEB-INF/web.xml
+++ b/src/examples/struts-webapp/WEB-INF/web.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/examples/webapp1/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/examples/webapp1/WEB-INF/web.xml b/src/examples/webapp1/WEB-INF/web.xml
index c4008e8..aaecc63 100644
--- a/src/examples/webapp1/WEB-INF/web.xml
+++ b/src/examples/webapp1/WEB-INF/web.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/examples/webapp2/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/examples/webapp2/WEB-INF/web.xml b/src/examples/webapp2/WEB-INF/web.xml
index fbf626f..91e8f3e 100644
--- a/src/examples/webapp2/WEB-INF/web.xml
+++ b/src/examples/webapp2/WEB-INF/web.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/java/freemarker/test/servlet/web.xml
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/servlet/web.xml b/src/test/java/freemarker/test/servlet/web.xml
index 7dea532..729979d 100644
--- a/src/test/java/freemarker/test/servlet/web.xml
+++ b/src/test/java/freemarker/test/servlet/web.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ 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.
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java b/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java
index b44cf61..9ccf93f 100644
--- a/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java
+++ b/src/test/java/freemarker/test/templatesuite/TemplateTestCase.java
@@ -345,6 +345,7 @@ public class TemplateTestCase extends FileTestCase {
f.setNamespaceAware(true);
DocumentBuilder db = f.newDocumentBuilder();
org.w3c.dom.Document doc = db.parse(new InputSource(getClass().getResourceAsStream("models/xmlfragment.xml")));
+ NodeModel.simplify(doc);
dataModel.put("node", NodeModel.wrap(doc.getDocumentElement().getFirstChild().getFirstChild()));
} else if (simpleTestName.equals("xmlns1")) {
InputSource is = new InputSource(getClass().getResourceAsStream("models/xmlns.xml"));
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/META-INF/malformed.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/META-INF/malformed.tld b/src/test/resources/META-INF/malformed.tld
index 99d1c0f..f30dac5 100644
--- a/src/test/resources/META-INF/malformed.tld
+++ b/src/test/resources/META-INF/malformed.tld
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="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.
+-->
<taglib xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
version="2.1">
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld b/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld
index 9f65d26..86c1682 100644
--- a/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld
+++ b/src/test/resources/META-INF/tldDiscovery MetaInfTldSources-1.tld
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="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.
+-->
<taglib xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
version="2.1">
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld b/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld
index 46032e7..4b30fd6 100644
--- a/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld
+++ b/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-1.tld
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="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.
+-->
<taglib xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
version="2.1">
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld b/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld
index 990710a..553d924 100644
--- a/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld
+++ b/src/test/resources/freemarker/ext/jsp/tldDiscovery-ClassPathTlds-2.tld
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="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.
+-->
<taglib xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
version="2.1">
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld
index fad043c..5fc4ec2 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/el-functions.tld
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ 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.
+-->
<taglib xmlns="http://java.sun.com/xml/ns/javaee" version="2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd">
<tlib-version>3.0</tlib-version>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld
index b7f01ea..034ccdc 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/test.tld
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ 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.
+-->
<taglib xmlns="http://java.sun.com/xml/ns/javaee" version="2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd">
<tlib-version>3.0</tlib-version>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml
index c8562a3..40a63ce 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/WEB-INF/web.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ 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.
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml
index 7c3e601..a8328b4 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/config/WEB-INF/web.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ 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.
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml b/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml
index ce78c3c..38f72ca 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/WEB-INF/web.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ 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.
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml b/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml
index 0a3bcff..006e13e 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/multipleLoaders/WEB-INF/web.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ 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.
+-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld
index 3f0eedc..62d5504 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag 2.tld
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ 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.
+-->
<!DOCTYPE taglib
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
"http://java.sun.com/j2ee/dtds/web-jsptaglib_1_1.dtd">
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld
index 3f0eedc..62d5504 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/fmtesttag4.tld
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ 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.
+-->
<!DOCTYPE taglib
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
"http://java.sun.com/j2ee/dtds/web-jsptaglib_1_1.dtd">
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld
index 3506554..a108fa5 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/subdir-with-tld/fmtesttag3.tld
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ 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.
+-->
<!DOCTYPE taglib
PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
"http://java.sun.com/j2ee/dtds/web-jsptaglib_1_1.dtd">
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml
index 82f7d34..0cb719e 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/WEB-INF/web.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="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.
+-->
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
"http://java.sun.com/j2ee/dtds/web-app_2.2.dtd"
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld
index e4425b2..d58a2d1 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld
+++ b/src/test/resources/freemarker/ext/jsp/webapps/tldDiscovery/not-auto-scanned/fmtesttag.tld
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ 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.
+-->
<taglib xmlns="http://java.sun.com/xml/ns/javaee" version="2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd">
<tlib-version>3.0</tlib-version>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/test/templatesuite/models/defaultxmlns1.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/defaultxmlns1.xml b/src/test/resources/freemarker/test/templatesuite/models/defaultxmlns1.xml
index ea318a1..f555e3e 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/defaultxmlns1.xml
+++ b/src/test/resources/freemarker/test/templatesuite/models/defaultxmlns1.xml
@@ -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.
+-->
<root xmlns:x="http://x.com" xmlns:y="http://y.com">
<t1>No NS</t1>
<x:t2>x NS</x:t2>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/test/templatesuite/models/xml-ns_prefix-scope.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/xml-ns_prefix-scope.xml b/src/test/resources/freemarker/test/templatesuite/models/xml-ns_prefix-scope.xml
index 6f3ca67..13cf78c 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/xml-ns_prefix-scope.xml
+++ b/src/test/resources/freemarker/test/templatesuite/models/xml-ns_prefix-scope.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="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.
+-->
<root xmlns="http://freemarker.org/test/namespace-test"
xmlns:foo="http://freemarker.org/test/foo"
xmlns:bar="http://freemarker.org/test/bar">
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/test/templatesuite/models/xml.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/xml.xml b/src/test/resources/freemarker/test/templatesuite/models/xml.xml
index 522e1e7..25a2893 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/xml.xml
+++ b/src/test/resources/freemarker/test/templatesuite/models/xml.xml
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ 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.
+-->
<?firstPi customKey="something"?>
<?secondPi secondPiData?>
<ns1:root xmlns:ns1="http://www.foo.com/ns1/">
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/test/templatesuite/models/xmlfragment.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/xmlfragment.xml b/src/test/resources/freemarker/test/templatesuite/models/xmlfragment.xml
index e897553..9a8e476 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/xmlfragment.xml
+++ b/src/test/resources/freemarker/test/templatesuite/models/xmlfragment.xml
@@ -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.
+-->
<root><a><b><c xmlns="http://x">C<>&"']]></c></b></a></root>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/test/templatesuite/models/xmlns.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/xmlns.xml b/src/test/resources/freemarker/test/templatesuite/models/xmlns.xml
index d2c6419..ca07080 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/xmlns.xml
+++ b/src/test/resources/freemarker/test/templatesuite/models/xmlns.xml
@@ -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.
+-->
<book xmlns="http://example.com/eBook">
<title>Test Book</title>
<chapter>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/test/templatesuite/models/xmlns2.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/xmlns2.xml b/src/test/resources/freemarker/test/templatesuite/models/xmlns2.xml
index ae984ac..6e177b4 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/xmlns2.xml
+++ b/src/test/resources/freemarker/test/templatesuite/models/xmlns2.xml
@@ -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.
+-->
<eb:book xmlns:eb="http://example.com/eBook">
<eb:title>Test Book</eb:title>
<eb:chapter>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/test/templatesuite/models/xmlns3.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/models/xmlns3.xml b/src/test/resources/freemarker/test/templatesuite/models/xmlns3.xml
index 9dd2f0b..1aaa8ca 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/xmlns3.xml
+++ b/src/test/resources/freemarker/test/templatesuite/models/xmlns3.xml
@@ -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.
+-->
<book xmlns:x="http://x" xmlns:y="http://y">
<x:title>Test Book</x:title>
<chapter>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/freemarker/test/templatesuite/testcases.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/test/templatesuite/testcases.xml b/src/test/resources/freemarker/test/templatesuite/testcases.xml
index 4a6e539..cc42796 100644
--- a/src/test/resources/freemarker/test/templatesuite/testcases.xml
+++ b/src/test/resources/freemarker/test/templatesuite/testcases.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" ?>
+<!--
+ 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.
+-->
<!DOCTYPE testcases [
<!ELEMENT testCases (setting?, testCase*)>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/2890b2ec/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
index 8904deb..243c3de 100644
--- a/src/test/resources/logback-test.xml
+++ b/src/test/resources/logback-test.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="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.
+-->
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
[7/9] incubator-freemarker git commit: (Test file name typo)
Posted by dd...@apache.org.
(Test file name typo)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/7d8792cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/7d8792cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/7d8792cb
Branch: refs/heads/2.3
Commit: 7d8792cb334a6bf271287f5b263f7274bb54f8be
Parents: 1334cd9
Author: ddekany <dd...@apache.org>
Authored: Thu Dec 31 16:37:19 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Dec 31 16:37:19 2015 +0100
----------------------------------------------------------------------
src/test/java/freemarker/core/ASTTest.java | 2 +-
.../freemarker/core/ast-whitesoacestripping.ast | 52 --------------------
.../freemarker/core/ast-whitesoacestripping.ftl | 40 ---------------
.../freemarker/core/ast-whitespacestripping.ast | 52 ++++++++++++++++++++
.../freemarker/core/ast-whitespacestripping.ftl | 40 +++++++++++++++
5 files changed, 93 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d8792cb/src/test/java/freemarker/core/ASTTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/freemarker/core/ASTTest.java b/src/test/java/freemarker/core/ASTTest.java
index 7124c64..1f2160a 100644
--- a/src/test/java/freemarker/core/ASTTest.java
+++ b/src/test/java/freemarker/core/ASTTest.java
@@ -54,7 +54,7 @@ public class ASTTest extends FileTestCase {
}
public void testWhitespaceStripping() throws Exception {
- testAST("ast-whitesoacestripping");
+ testAST("ast-whitespacestripping");
}
public void testMixedContentSimplifications() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d8792cb/src/test/resources/freemarker/core/ast-whitesoacestripping.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-whitesoacestripping.ast b/src/test/resources/freemarker/core/ast-whitesoacestripping.ast
deleted file mode 100644
index 7731fec..0000000
--- a/src/test/resources/freemarker/core/ast-whitesoacestripping.ast
+++ /dev/null
@@ -1,52 +0,0 @@
-#mixed_content // f.c.MixedContent
- #assign // f.c.Assignment
- - assignment target: "xs" // String
- - assignment operator: "=" // String
- - assignment source: [...] // f.c.ListLiteral
- - variable scope: "1" // Integer
- - namespace: null // Null
- #text // f.c.TextBlock
- - content: "\n" // String
- #list // f.c.IteratorBlock
- - list source: x // f.c.Identifier
- - target loop variable: "xs" // String
- #text // f.c.TextBlock
- - content: " " // String
- ${...} // f.c.DollarVariable
- - content: x // f.c.Identifier
- #text // f.c.TextBlock
- - content: "\n" // String
- #text // f.c.TextBlock
- - content: "\n" // String
- #assign // f.c.Assignment
- - assignment target: "a" // String
- - assignment operator: "=" // String
- - assignment source: 1 // f.c.NumberLiteral
- - variable scope: "1" // Integer
- - namespace: null // Null
- #assign // f.c.Assignment
- - assignment target: "b" // String
- - assignment operator: "=" // String
- - assignment source: 1 // f.c.NumberLiteral
- - variable scope: "1" // Integer
- - namespace: null // Null
- #text // f.c.TextBlock
- - content: "\n" // String
- @ // f.c.UnifiedCall
- - callee: b // f.c.Identifier
- #text // f.c.TextBlock
- - content: " x\n" // String
- #text // f.c.TextBlock
- - content: "\n" // String
- @ // f.c.UnifiedCall
- - callee: c // f.c.Identifier
- #text // f.c.TextBlock
- - content: "\n" // String
- @ // f.c.UnifiedCall
- - callee: d // f.c.Identifier
- #text // f.c.TextBlock
- - content: "\na\n" // String
- #--...-- // f.c.Comment
- - content: " comment " // String
- #text // f.c.TextBlock
- - content: "b" // String
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d8792cb/src/test/resources/freemarker/core/ast-whitesoacestripping.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-whitesoacestripping.ftl b/src/test/resources/freemarker/core/ast-whitesoacestripping.ftl
deleted file mode 100644
index af801fa..0000000
--- a/src/test/resources/freemarker/core/ast-whitesoacestripping.ftl
+++ /dev/null
@@ -1,40 +0,0 @@
-<#--
- 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.
--->
-
-
-<#assign xs = []>
-
-<#list x as xs>
- ${x}
-</#list>
-
-<#assign a = 1>
-<#assign b = 1>
-
-<@b>
- x
-</...@b>
-
-<@c />
-
-<@d...@d>
-
-a
-<#-- comment -->
-b
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d8792cb/src/test/resources/freemarker/core/ast-whitespacestripping.ast
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-whitespacestripping.ast b/src/test/resources/freemarker/core/ast-whitespacestripping.ast
new file mode 100644
index 0000000..7731fec
--- /dev/null
+++ b/src/test/resources/freemarker/core/ast-whitespacestripping.ast
@@ -0,0 +1,52 @@
+#mixed_content // f.c.MixedContent
+ #assign // f.c.Assignment
+ - assignment target: "xs" // String
+ - assignment operator: "=" // String
+ - assignment source: [...] // f.c.ListLiteral
+ - variable scope: "1" // Integer
+ - namespace: null // Null
+ #text // f.c.TextBlock
+ - content: "\n" // String
+ #list // f.c.IteratorBlock
+ - list source: x // f.c.Identifier
+ - target loop variable: "xs" // String
+ #text // f.c.TextBlock
+ - content: " " // String
+ ${...} // f.c.DollarVariable
+ - content: x // f.c.Identifier
+ #text // f.c.TextBlock
+ - content: "\n" // String
+ #text // f.c.TextBlock
+ - content: "\n" // String
+ #assign // f.c.Assignment
+ - assignment target: "a" // String
+ - assignment operator: "=" // String
+ - assignment source: 1 // f.c.NumberLiteral
+ - variable scope: "1" // Integer
+ - namespace: null // Null
+ #assign // f.c.Assignment
+ - assignment target: "b" // String
+ - assignment operator: "=" // String
+ - assignment source: 1 // f.c.NumberLiteral
+ - variable scope: "1" // Integer
+ - namespace: null // Null
+ #text // f.c.TextBlock
+ - content: "\n" // String
+ @ // f.c.UnifiedCall
+ - callee: b // f.c.Identifier
+ #text // f.c.TextBlock
+ - content: " x\n" // String
+ #text // f.c.TextBlock
+ - content: "\n" // String
+ @ // f.c.UnifiedCall
+ - callee: c // f.c.Identifier
+ #text // f.c.TextBlock
+ - content: "\n" // String
+ @ // f.c.UnifiedCall
+ - callee: d // f.c.Identifier
+ #text // f.c.TextBlock
+ - content: "\na\n" // String
+ #--...-- // f.c.Comment
+ - content: " comment " // String
+ #text // f.c.TextBlock
+ - content: "b" // String
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d8792cb/src/test/resources/freemarker/core/ast-whitespacestripping.ftl
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/core/ast-whitespacestripping.ftl b/src/test/resources/freemarker/core/ast-whitespacestripping.ftl
new file mode 100644
index 0000000..af801fa
--- /dev/null
+++ b/src/test/resources/freemarker/core/ast-whitespacestripping.ftl
@@ -0,0 +1,40 @@
+<#--
+ 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.
+-->
+
+
+<#assign xs = []>
+
+<#list x as xs>
+ ${x}
+</#list>
+
+<#assign a = 1>
+<#assign b = 1>
+
+<@b>
+ x
+</...@b>
+
+<@c />
+
+<@d...@d>
+
+a
+<#-- comment -->
+b
\ No newline at end of file
[9/9] incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3-gae' into 2.3
Posted by dd...@apache.org.
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/ec24a424
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/ec24a424
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/ec24a424
Branch: refs/heads/2.3
Commit: ec24a424734c5be4f74482c8fba54430f4bf686f
Parents: 71117cc 7d355e7
Author: ddekany <dd...@apache.org>
Authored: Thu Dec 31 17:23:13 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Dec 31 17:23:13 2015 +0100
----------------------------------------------------------------------
build.properties.sample | 17 +++++++
build.xml | 35 +++++++++++++
ivy.xml | 27 +++++++++-
ivysettings.xml | 19 +++++++
osgi.bnd | 17 +++++++
src/dist/documentation/index.html | 18 +++++++
src/examples/ant/build.xml | 18 +++++++
src/examples/ant/src/xml/faq.xml | 18 +++++++
.../example/ApplicationResources.properties | 17 +++++++
.../struts-webapp/WEB-INF/struts-config.xml | 18 +++++++
.../struts-webapp/WEB-INF/struts-html.tld | 18 +++++++
src/examples/struts-webapp/WEB-INF/web.xml | 18 +++++++
src/examples/struts-webapp/help.html | 18 +++++++
src/examples/webapp1/WEB-INF/web.xml | 18 +++++++
src/examples/webapp1/help.html | 18 +++++++
src/examples/webapp2/WEB-INF/web.xml | 18 +++++++
src/examples/webapp2/help.html | 18 +++++++
src/main/java/freemarker/cache/package.html | 18 +++++++
src/main/java/freemarker/core/package.html | 18 +++++++
src/main/java/freemarker/debug/package.html | 18 +++++++
src/main/java/freemarker/ext/ant/package.html | 18 +++++++
src/main/java/freemarker/ext/beans/package.html | 18 +++++++
src/main/java/freemarker/ext/dom/package.html | 18 +++++++
src/main/java/freemarker/ext/jdom/package.html | 18 +++++++
src/main/java/freemarker/ext/jsp/package.html | 18 +++++++
.../java/freemarker/ext/jython/package.html | 18 +++++++
src/main/java/freemarker/ext/package.html | 18 +++++++
src/main/java/freemarker/ext/rhino/package.html | 18 +++++++
.../java/freemarker/ext/servlet/package.html | 18 +++++++
src/main/java/freemarker/ext/util/package.html | 18 +++++++
src/main/java/freemarker/ext/xml/package.html | 18 +++++++
src/main/java/freemarker/log/package.html | 18 +++++++
src/main/java/freemarker/template/package.html | 18 +++++++
.../freemarker/template/utility/package.html | 18 +++++++
src/main/misc/overloadedNumberRules/config.fmpp | 17 +++++++
.../resources/freemarker/version.properties | 17 +++++++
src/manual/en_US/book.xml | 18 +++++++
.../en_US/docgen-misc/googleAnalytics.html | 5 ++
src/manual/en_US/docgen.cjson | 17 +++++++
src/test/java/freemarker/core/ASTTest.java | 2 +-
src/test/java/freemarker/test/package.html | 18 +++++++
src/test/java/freemarker/test/servlet/web.xml | 18 +++++++
.../test/templatesuite/TemplateTestCase.java | 1 +
.../freemarker/test/templatesuite/package.html | 18 +++++++
src/test/resources/META-INF/malformed.tld | 18 +++++++
.../tldDiscovery MetaInfTldSources-1.tld | 18 +++++++
.../freemarker/core/ast-whitesoacestripping.ast | 52 --------------------
.../freemarker/core/ast-whitesoacestripping.ftl | 40 ---------------
.../freemarker/core/ast-whitespacestripping.ast | 52 ++++++++++++++++++++
.../freemarker/core/ast-whitespacestripping.ftl | 40 +++++++++++++++
.../ext/jsp/tldDiscovery-ClassPathTlds-1.tld | 18 +++++++
.../ext/jsp/tldDiscovery-ClassPathTlds-2.tld | 18 +++++++
.../jsp/webapps/basic/WEB-INF/el-functions.tld | 18 +++++++
.../ext/jsp/webapps/basic/WEB-INF/test.tld | 18 +++++++
.../ext/jsp/webapps/basic/WEB-INF/web.xml | 18 +++++++
.../jsp/webapps/basic/customELFunctions1.jsp | 18 +++++++
.../ext/jsp/webapps/basic/trivial.jsp | 18 +++++++
.../ext/jsp/webapps/config/WEB-INF/web.xml | 18 +++++++
.../ext/jsp/webapps/errors/WEB-INF/web.xml | 18 +++++++
.../jsp/webapps/errors/failing-parsetime.ftlnv | 19 +++++++
.../jsp/webapps/errors/failing-parsetime.jsp | 18 +++++++
.../ext/jsp/webapps/errors/failing-runtime.jsp | 18 +++++++
.../jsp/webapps/multipleLoaders/WEB-INF/web.xml | 18 +++++++
.../tldDiscovery/WEB-INF/fmtesttag 2.tld | 18 +++++++
.../webapps/tldDiscovery/WEB-INF/fmtesttag4.tld | 18 +++++++
.../WEB-INF/subdir-with-tld/fmtesttag3.tld | 18 +++++++
.../jsp/webapps/tldDiscovery/WEB-INF/web.xml | 18 +++++++
.../tldDiscovery/not-auto-scanned/fmtesttag.tld | 18 +++++++
.../ConfigureOutputFormatExamples1.properties | 17 +++++++
.../ConfigureOutputFormatExamples2.properties | 17 +++++++
.../TemplateConfigurationExamples1.properties | 17 +++++++
.../TemplateConfigurationExamples2.properties | 17 +++++++
.../TemplateConfigurationExamples3.properties | 17 +++++++
.../models/BeansTestResources.properties | 17 +++++++
.../test/templatesuite/models/defaultxmlns1.xml | 18 +++++++
.../models/xml-ns_prefix-scope.xml | 18 +++++++
.../test/templatesuite/models/xml.xml | 18 +++++++
.../test/templatesuite/models/xmlfragment.xml | 18 +++++++
.../test/templatesuite/models/xmlns.xml | 18 +++++++
.../test/templatesuite/models/xmlns2.xml | 18 +++++++
.../test/templatesuite/models/xmlns3.xml | 18 +++++++
.../freemarker/test/templatesuite/testcases.xml | 18 +++++++
src/test/resources/logback-test.xml | 18 +++++++
83 files changed, 1482 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ec24a424/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/ec24a424/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
[4/9] incubator-freemarker git commit: Added copyright comment to
properties files
Posted by dd...@apache.org.
Added copyright comment to properties files
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/8a259d46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/8a259d46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/8a259d46
Branch: refs/heads/2.3
Commit: 8a259d463eabb26f4e50564ff1aa6dc24b8758ce
Parents: 2890b2e
Author: ddekany <dd...@apache.org>
Authored: Thu Dec 31 12:03:48 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Dec 31 12:03:48 2015 +0100
----------------------------------------------------------------------
build.properties.sample | 17 +++++++++++++++++
osgi.bnd | 17 +++++++++++++++++
.../example/ApplicationResources.properties | 17 +++++++++++++++++
src/main/resources/freemarker/version.properties | 17 +++++++++++++++++
.../ConfigureOutputFormatExamples1.properties | 17 +++++++++++++++++
.../ConfigureOutputFormatExamples2.properties | 17 +++++++++++++++++
.../TemplateConfigurationExamples1.properties | 17 +++++++++++++++++
.../TemplateConfigurationExamples2.properties | 17 +++++++++++++++++
.../TemplateConfigurationExamples3.properties | 17 +++++++++++++++++
.../models/BeansTestResources.properties | 17 +++++++++++++++++
10 files changed, 170 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a259d46/build.properties.sample
----------------------------------------------------------------------
diff --git a/build.properties.sample b/build.properties.sample
index 1a94745..fb1d632 100644
--- a/build.properties.sample
+++ b/build.properties.sample
@@ -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.
+
# Copy this file to "build.properties" before editing!
# These propeties should point to the rt.jar-s of the respective J2SE versions:
boot.classpath.j2se1.5=C:/Program Files (x86)/Java/jdk1.5.0_16/jre/lib/rt.jar
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a259d46/osgi.bnd
----------------------------------------------------------------------
diff --git a/osgi.bnd b/osgi.bnd
index a5ce816..6082429 100644
--- a/osgi.bnd
+++ b/osgi.bnd
@@ -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.
+
# This file is used for creating OSGi bundles with biz.aQute.bnd
#
# bnd is a tool that automatically discovers the possible exports and
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a259d46/src/examples/struts-webapp/WEB-INF/classes/example/ApplicationResources.properties
----------------------------------------------------------------------
diff --git a/src/examples/struts-webapp/WEB-INF/classes/example/ApplicationResources.properties b/src/examples/struts-webapp/WEB-INF/classes/example/ApplicationResources.properties
index 0dc9d86..7d6f5c8 100644
--- a/src/examples/struts-webapp/WEB-INF/classes/example/ApplicationResources.properties
+++ b/src/examples/struts-webapp/WEB-INF/classes/example/ApplicationResources.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.
+
errors.header=<p><font color=red>Please correct the following problems:</font><ul>
errors.prefix=<li><font color=red>
errors.suffix=</font>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a259d46/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties
index ba5c76d..1b7de72 100644
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.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.
+
# Version info for the builds.
# Version number
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a259d46/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 f21272a..e39a50e 100644
--- a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties
+++ b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.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.
+
templateConfigurations = \
ConditionalTemplateConfigurationFactory( \
PathGlobMatcher("mail/**"), \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a259d46/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 b01090b..904b851 100644
--- a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties
+++ b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.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.
+
templateConfigurations = \
FirstMatchTemplateConfigurationFactory( \
ConditionalTemplateConfigurationFactory( \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a259d46/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 b6edf1a..537efe2 100644
--- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties
+++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.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.
+
templateConfigurations = \
ConditionalTemplateConfigurationFactory( \
FileExtensionMatcher("xml"), \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a259d46/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 a39acca..c8740cf 100644
--- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties
+++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.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.
+
templateConfigurations = \
ConditionalTemplateConfigurationFactory( \
PathGlobMatcher("mail/**"), \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a259d46/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 424330b..126f674 100644
--- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties
+++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.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.
+
templateConfigurations = \
MergingTemplateConfigurationFactory( \
ConditionalTemplateConfigurationFactory( \
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8a259d46/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 92f713c..24b1e65 100644
--- a/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties
+++ b/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.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.
+
message=Message
format={0,date,yyyy-MM-dd}
\ No newline at end of file
[2/9] incubator-freemarker git commit: Added copyright comments to
JSP files
Posted by dd...@apache.org.
Added copyright comments to JSP files
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/0a8dcf1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/0a8dcf1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/0a8dcf1e
Branch: refs/heads/2.3
Commit: 0a8dcf1e7c3dfacc73dc51195f528b02e4f2bf5d
Parents: e7ce04b
Author: ddekany <dd...@apache.org>
Authored: Thu Dec 31 01:38:25 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Dec 31 01:38:25 2015 +0100
----------------------------------------------------------------------
.../ext/jsp/webapps/basic/customELFunctions1.jsp | 18 ++++++++++++++++++
.../freemarker/ext/jsp/webapps/basic/trivial.jsp | 18 ++++++++++++++++++
.../ext/jsp/webapps/errors/failing-parsetime.jsp | 18 ++++++++++++++++++
.../ext/jsp/webapps/errors/failing-runtime.jsp | 18 ++++++++++++++++++
4 files changed, 72 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0a8dcf1e/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp b/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp
index 243f2c0..59c9cee 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/customELFunctions1.jsp
@@ -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.
+--%>
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib prefix="ef" uri="http://freemarker.org/test/taglibs/el-functions" %>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0a8dcf1e/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp b/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp
index f499146..1f2a237 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp
+++ b/src/test/resources/freemarker/ext/jsp/webapps/basic/trivial.jsp
@@ -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.
+--%>
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0a8dcf1e/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp
index 97277ec..f0d8a76 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-parsetime.jsp
@@ -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.
+--%>
${
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0a8dcf1e/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp
----------------------------------------------------------------------
diff --git a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp
index 30f3118..52ed45b 100644
--- a/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp
+++ b/src/test/resources/freemarker/ext/jsp/webapps/errors/failing-runtime.jsp
@@ -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.
+--%>
<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
[8/9] incubator-freemarker git commit: Some more missing copyright
comments
Posted by dd...@apache.org.
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
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
[5/9] incubator-freemarker git commit: Added Rat task to build.xml
Posted by dd...@apache.org.
Added Rat task to build.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/0cfd13df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/0cfd13df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/0cfd13df
Branch: refs/heads/2.3
Commit: 0cfd13df3f8db1ba7ce4788486b2630a4552ee39
Parents: 8a259d4
Author: ddekany <dd...@apache.org>
Authored: Thu Dec 31 14:13:19 2015 +0100
Committer: ddekany <dd...@apache.org>
Committed: Thu Dec 31 14:13:19 2015 +0100
----------------------------------------------------------------------
build.xml | 17 +++++++++++++++++
ivy.xml | 8 +++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0cfd13df/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 62e2156..416225e 100644
--- a/build.xml
+++ b/build.xml
@@ -23,6 +23,7 @@
xmlns:javacc="http://javacc.dev.java.net/"
xmlns:docgen="http://freemarker.org/docgen"
xmlns:bnd="http://www.aqute.biz/bnd"
+ xmlns:rat="antlib:org.apache.rat.anttasks"
xmlns:u="http://freemarker.org/util"
>
@@ -1137,6 +1138,22 @@ Proceed? </input>
</ivy:publish>
<delete file="build/ivy.xml" /> <!-- ivy:publish makes this -->
</target>
+
+ <target name="rat">
+ <ivy:cachepath conf="rat" pathid="ivy.dep" />
+ <taskdef
+ uri="antlib:org.apache.rat.anttasks"
+ resource="org/apache/rat/anttasks/antlib.xml"
+ classpathref="ivy.dep"
+ />
+
+ <rat:report reportFile="build/rat-report.txt">
+ <fileset dir="src"/>
+ </rat:report>
+ <echo level="info"><!--
+ -->Rat report was written into build/rat-report.txt<!--
+ --></echo>
+ </target>
<target name="archive" depends=""
description='Archives project with Git repo into the "archive" directory.'
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0cfd13df/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 71f1de4..5aaf379 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -81,7 +81,9 @@
<conf name="parser" extends="default" description="for generating parser" />
<conf name="manual" description="for generating the manual with Docgen" />
-
+
+ <conf name="rat" description="for generating the Rat report" />
+
<conf name="bnd" description="for creating OSGi bundle" />
<conf name="example.servlet" description="servlet-based examples" />
@@ -176,7 +178,11 @@
<!-- bnd -->
<dependency org="biz.aQute" name="bnd" rev="1.50.0" conf="bnd->default" />
+
+ <!-- Rat -->
+ <dependency org="org.apache.rat" name="apache-rat-tasks" rev="0.11" conf="rat->default" />
+
<!-- As the tests *run* on Ant, so it's a provided dependency there. -->
<exclude org="ant" module="ant" conf="run.test" />