(Copyright headers)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/0c518cd1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/0c518cd1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/0c518cd1 Branch: refs/heads/2.3 Commit: 0c518cd151149efb63e92a061a0faf61d1186ce1 Parents: a863373 Author: ddekany <[email protected]> Authored: Sun Mar 12 17:55:33 2017 +0100 Committer: ddekany <[email protected]> Committed: Sun Mar 12 17:55:33 2017 +0100 ---------------------------------------------------------------------- .../template/DefaultEnumerationAdapter.java | 18 ++++++++++++++++++ src/main/misc/overloadedNumberRules/config.fmpp | 9 +++++++++ .../freemarker/ext/beans/unsafeMethods.properties | 9 +++++++++ src/main/resources/freemarker/version.properties | 9 +++++++++ src/manual/en_US/book.xml | 4 ++-- .../ext/beans/BeansWrapperBridgeMethodsTest.java | 18 ++++++++++++++++++ .../freemarker/ext/beans/BridgeMethodsBean.java | 18 ++++++++++++++++++ .../ext/beans/BridgeMethodsBeanBase.java | 18 ++++++++++++++++++ .../beans/BridgeMethodsWithDefaultMethodBean.java | 18 ++++++++++++++++++ .../BridgeMethodsWithDefaultMethodBean2.java | 18 ++++++++++++++++++ .../BridgeMethodsWithDefaultMethodBeanBase.java | 18 ++++++++++++++++++ .../BridgeMethodsWithDefaultMethodBeanBase2.java | 18 ++++++++++++++++++ .../ConfigureOutputFormatExamples1.properties | 9 +++++++++ .../ConfigureOutputFormatExamples2.properties | 9 +++++++++ .../TemplateConfigurationExamples1.properties | 9 +++++++++ .../TemplateConfigurationExamples2.properties | 9 +++++++++ .../TemplateConfigurationExamples3.properties | 9 +++++++++ .../models/BeansTestResources.properties | 9 +++++++++ 18 files changed, 227 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/main/java/freemarker/template/DefaultEnumerationAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/freemarker/template/DefaultEnumerationAdapter.java b/src/main/java/freemarker/template/DefaultEnumerationAdapter.java index 74a58d4..59549b4 100644 --- a/src/main/java/freemarker/template/DefaultEnumerationAdapter.java +++ b/src/main/java/freemarker/template/DefaultEnumerationAdapter.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package freemarker.template; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/main/misc/overloadedNumberRules/config.fmpp ---------------------------------------------------------------------- diff --git a/src/main/misc/overloadedNumberRules/config.fmpp b/src/main/misc/overloadedNumberRules/config.fmpp index 50aacbb..f1a34ce 100644 --- a/src/main/misc/overloadedNumberRules/config.fmpp +++ b/src/main/misc/overloadedNumberRules/config.fmpp @@ -23,6 +23,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/0c518cd1/src/main/resources/freemarker/ext/beans/unsafeMethods.properties ---------------------------------------------------------------------- diff --git a/src/main/resources/freemarker/ext/beans/unsafeMethods.properties b/src/main/resources/freemarker/ext/beans/unsafeMethods.properties index 916d2f4..ff167fd 100644 --- a/src/main/resources/freemarker/ext/beans/unsafeMethods.properties +++ b/src/main/resources/freemarker/ext/beans/unsafeMethods.properties @@ -23,6 +23,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/0c518cd1/src/main/resources/freemarker/version.properties ---------------------------------------------------------------------- diff --git a/src/main/resources/freemarker/version.properties b/src/main/resources/freemarker/version.properties index 05a3ac1..adec5f4 100644 --- a/src/main/resources/freemarker/version.properties +++ b/src/main/resources/freemarker/version.properties @@ -23,6 +23,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/0c518cd1/src/manual/en_US/book.xml ---------------------------------------------------------------------- diff --git a/src/manual/en_US/book.xml b/src/manual/en_US/book.xml index 741c1a0..7ba4089 100644 --- a/src/manual/en_US/book.xml +++ b/src/manual/en_US/book.xml @@ -7,9 +7,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/java/freemarker/ext/beans/BeansWrapperBridgeMethodsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/ext/beans/BeansWrapperBridgeMethodsTest.java b/src/test/java/freemarker/ext/beans/BeansWrapperBridgeMethodsTest.java index 5f73d0e..634fae4 100644 --- a/src/test/java/freemarker/ext/beans/BeansWrapperBridgeMethodsTest.java +++ b/src/test/java/freemarker/ext/beans/BeansWrapperBridgeMethodsTest.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package freemarker.ext.beans; import static org.junit.Assert.*; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/java/freemarker/ext/beans/BridgeMethodsBean.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/ext/beans/BridgeMethodsBean.java b/src/test/java/freemarker/ext/beans/BridgeMethodsBean.java index a32853c..f0cc4ee 100644 --- a/src/test/java/freemarker/ext/beans/BridgeMethodsBean.java +++ b/src/test/java/freemarker/ext/beans/BridgeMethodsBean.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package freemarker.ext.beans; public class BridgeMethodsBean extends BridgeMethodsBeanBase<String> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/java/freemarker/ext/beans/BridgeMethodsBeanBase.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/ext/beans/BridgeMethodsBeanBase.java b/src/test/java/freemarker/ext/beans/BridgeMethodsBeanBase.java index 4823400..0dc6d5a 100644 --- a/src/test/java/freemarker/ext/beans/BridgeMethodsBeanBase.java +++ b/src/test/java/freemarker/ext/beans/BridgeMethodsBeanBase.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package freemarker.ext.beans; public abstract class BridgeMethodsBeanBase<T> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean.java b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean.java index 0c18991..25b67fe 100644 --- a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean.java +++ b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package freemarker.ext.beans; public class BridgeMethodsWithDefaultMethodBean implements BridgeMethodsWithDefaultMethodBeanBase<String> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean2.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean2.java b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean2.java index 85bc232..a2261c9 100644 --- a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean2.java +++ b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBean2.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package freemarker.ext.beans; public class BridgeMethodsWithDefaultMethodBean2 implements BridgeMethodsWithDefaultMethodBeanBase2 { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase.java b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase.java index 68960de..2dbd459 100644 --- a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase.java +++ b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package freemarker.ext.beans; public interface BridgeMethodsWithDefaultMethodBeanBase<T> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase2.java ---------------------------------------------------------------------- diff --git a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase2.java b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase2.java index be46d4f..2886d8f 100644 --- a/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase2.java +++ b/src/test/java/freemarker/ext/beans/BridgeMethodsWithDefaultMethodBeanBase2.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package freemarker.ext.beans; public interface BridgeMethodsWithDefaultMethodBeanBase2 extends BridgeMethodsWithDefaultMethodBeanBase<String> { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/0c518cd1/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 601ce15..5ba46d4 100644 --- a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties +++ b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples1.properties @@ -23,6 +23,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/0c518cd1/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 0179466..4415630 100644 --- a/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties +++ b/src/test/resources/freemarker/manual/ConfigureOutputFormatExamples2.properties @@ -23,6 +23,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/0c518cd1/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 24e9747..36e1da6 100644 --- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties +++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples1.properties @@ -23,6 +23,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/0c518cd1/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 b5619f0..d54d473 100644 --- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties +++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples2.properties @@ -23,6 +23,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/0c518cd1/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 1cd1b26..32aff8c 100644 --- a/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties +++ b/src/test/resources/freemarker/manual/TemplateConfigurationExamples3.properties @@ -23,6 +23,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/0c518cd1/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 32190a8..3850ec0 100644 --- a/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties +++ b/src/test/resources/freemarker/test/templatesuite/models/BeansTestResources.properties @@ -23,6 +23,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
