Repository: incubator-freemarker Updated Branches: refs/heads/3 079ff48a7 -> 6939fd075
(Fixed partial copyright headers in some 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/92ea6b51 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/92ea6b51 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/92ea6b51 Branch: refs/heads/3 Commit: 92ea6b51c8b4d9876c350a1dd856fd12e9626af2 Parents: 079ff48 Author: ddekany <[email protected]> Authored: Wed Mar 1 16:57:30 2017 +0100 Committer: ddekany <[email protected]> Committed: Wed Mar 1 16:57:30 2017 +0100 ---------------------------------------------------------------------- src/main/misc/overloadedNumberRules/config.fmpp | 9 +++++++++ .../freemarker/core/model/impl/unsafeMethods.properties | 9 +++++++++ .../resources/org/apache/freemarker/core/version.properties | 9 +++++++++ .../manualtest/ConfigureOutputFormatExamples1.properties | 9 +++++++++ .../manualtest/ConfigureOutputFormatExamples2.properties | 9 +++++++++ .../manualtest/TemplateConfigurationExamples1.properties | 9 +++++++++ .../manualtest/TemplateConfigurationExamples2.properties | 9 +++++++++ .../manualtest/TemplateConfigurationExamples3.properties | 9 +++++++++ .../test/templatesuite/models/BeansTestResources.properties | 9 +++++++++ 9 files changed, 81 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/92ea6b51/src/main/misc/overloadedNumberRules/config.fmpp ---------------------------------------------------------------------- diff --git a/src/main/misc/overloadedNumberRules/config.fmpp b/src/main/misc/overloadedNumberRules/config.fmpp index cf32e92..50aacbb 100644 --- a/src/main/misc/overloadedNumberRules/config.fmpp +++ b/src/main/misc/overloadedNumberRules/config.fmpp @@ -14,6 +14,15 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. sources: generator.ftl outputFile: ../../../../build/overloadedNumberRules.java http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/92ea6b51/src/main/resources/org/apache/freemarker/core/model/impl/unsafeMethods.properties ---------------------------------------------------------------------- diff --git a/src/main/resources/org/apache/freemarker/core/model/impl/unsafeMethods.properties b/src/main/resources/org/apache/freemarker/core/model/impl/unsafeMethods.properties index 05c1981..916d2f4 100644 --- a/src/main/resources/org/apache/freemarker/core/model/impl/unsafeMethods.properties +++ b/src/main/resources/org/apache/freemarker/core/model/impl/unsafeMethods.properties @@ -14,6 +14,15 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. java.lang.Object.wait() java.lang.Object.wait(long) http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/92ea6b51/src/main/resources/org/apache/freemarker/core/version.properties ---------------------------------------------------------------------- diff --git a/src/main/resources/org/apache/freemarker/core/version.properties b/src/main/resources/org/apache/freemarker/core/version.properties index 2edcf88..1122bd7 100644 --- a/src/main/resources/org/apache/freemarker/core/version.properties +++ b/src/main/resources/org/apache/freemarker/core/version.properties @@ -14,6 +14,15 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. # Version info for the builds. http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/92ea6b51/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties b/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties index 0df9e33..601ce15 100644 --- a/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties +++ b/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties @@ -14,6 +14,15 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. templateConfigurations = \ ConditionalTemplateConfigurationFactory( \ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/92ea6b51/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties b/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties index 5d2a738..0179466 100644 --- a/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties +++ b/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties @@ -14,6 +14,15 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. templateConfigurations = \ FirstMatchTemplateConfigurationFactory( \ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/92ea6b51/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples1.properties ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples1.properties b/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples1.properties index cffadfb..24e9747 100644 --- a/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples1.properties +++ b/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples1.properties @@ -14,6 +14,15 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. templateConfigurations = \ ConditionalTemplateConfigurationFactory( \ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/92ea6b51/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples2.properties ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples2.properties b/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples2.properties index f879e70..b5619f0 100644 --- a/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples2.properties +++ b/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples2.properties @@ -14,6 +14,15 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. templateConfigurations = \ ConditionalTemplateConfigurationFactory( \ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/92ea6b51/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples3.properties ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples3.properties b/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples3.properties index cf4c5a4..1cd1b26 100644 --- a/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples3.properties +++ b/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples3.properties @@ -14,6 +14,15 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. templateConfigurations = \ MergingTemplateConfigurationFactory( \ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/92ea6b51/src/test/resources/org/apache/freemarker/test/templatesuite/models/BeansTestResources.properties ---------------------------------------------------------------------- diff --git a/src/test/resources/org/apache/freemarker/test/templatesuite/models/BeansTestResources.properties b/src/test/resources/org/apache/freemarker/test/templatesuite/models/BeansTestResources.properties index 609e20b..32190a8 100644 --- a/src/test/resources/org/apache/freemarker/test/templatesuite/models/BeansTestResources.properties +++ b/src/test/resources/org/apache/freemarker/test/templatesuite/models/BeansTestResources.properties @@ -14,6 +14,15 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. message=Message format={0,date,yyyy-MM-dd} \ No newline at end of file
