freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject incubator-freemarker git commit: (Fixed corrupted copyright headers in properties files. Also some HTML copyright headers formatted differently by IntelliJ)
Date Sun, 12 Mar 2017 17:25:23 GMT
Repository: incubator-freemarker
Updated Branches:
  refs/heads/3 88827c24d -> 6d9dbff74


(Fixed corrupted copyright headers in properties files. Also some HTML copyright headers formatted
differently by IntelliJ)


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/6d9dbff7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/6d9dbff7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/6d9dbff7

Branch: refs/heads/3
Commit: 6d9dbff742693ec010f356e20a7165f3b89a42ff
Parents: 88827c2
Author: ddekany <ddekany@apache.org>
Authored: Sun Mar 12 18:25:17 2017 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sun Mar 12 18:25:17 2017 +0100

----------------------------------------------------------------------
 .../org/apache/freemarker/core/arithmetic/impl/package.html | 2 +-
 .../java/org/apache/freemarker/core/arithmetic/package.html | 2 +-
 .../apache/freemarker/core/outputformat/impl/package.html   | 2 +-
 .../org/apache/freemarker/core/outputformat/package.html    | 2 +-
 .../freemarker/core/templateresolver/impl/package.html      | 2 +-
 .../apache/freemarker/core/valueformat/impl/package.html    | 2 +-
 .../org/apache/freemarker/core/valueformat/package.html     | 2 +-
 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 ---------
 16 files changed, 7 insertions(+), 88 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/6d9dbff7/src/main/java/org/apache/freemarker/core/arithmetic/impl/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/arithmetic/impl/package.html b/src/main/java/org/apache/freemarker/core/arithmetic/impl/package.html
index e093fd6..65688e2 100644
--- a/src/main/java/org/apache/freemarker/core/arithmetic/impl/package.html
+++ b/src/main/java/org/apache/freemarker/core/arithmetic/impl/package.html
@@ -15,7 +15,7 @@
   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/6d9dbff7/src/main/java/org/apache/freemarker/core/arithmetic/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/arithmetic/package.html b/src/main/java/org/apache/freemarker/core/arithmetic/package.html
index 18d2c7f..62566ea 100644
--- a/src/main/java/org/apache/freemarker/core/arithmetic/package.html
+++ b/src/main/java/org/apache/freemarker/core/arithmetic/package.html
@@ -15,7 +15,7 @@
   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/6d9dbff7/src/main/java/org/apache/freemarker/core/outputformat/impl/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/outputformat/impl/package.html b/src/main/java/org/apache/freemarker/core/outputformat/impl/package.html
index 2ff5d6d..6cb5c21 100644
--- a/src/main/java/org/apache/freemarker/core/outputformat/impl/package.html
+++ b/src/main/java/org/apache/freemarker/core/outputformat/impl/package.html
@@ -15,7 +15,7 @@
   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/6d9dbff7/src/main/java/org/apache/freemarker/core/outputformat/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/outputformat/package.html b/src/main/java/org/apache/freemarker/core/outputformat/package.html
index 47bebfe..b25de83 100644
--- a/src/main/java/org/apache/freemarker/core/outputformat/package.html
+++ b/src/main/java/org/apache/freemarker/core/outputformat/package.html
@@ -15,7 +15,7 @@
   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/6d9dbff7/src/main/java/org/apache/freemarker/core/templateresolver/impl/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/templateresolver/impl/package.html b/src/main/java/org/apache/freemarker/core/templateresolver/impl/package.html
index 8734174..c595bd8 100644
--- a/src/main/java/org/apache/freemarker/core/templateresolver/impl/package.html
+++ b/src/main/java/org/apache/freemarker/core/templateresolver/impl/package.html
@@ -15,7 +15,7 @@
   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/6d9dbff7/src/main/java/org/apache/freemarker/core/valueformat/impl/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/impl/package.html b/src/main/java/org/apache/freemarker/core/valueformat/impl/package.html
index b776668..ecfd725 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/impl/package.html
+++ b/src/main/java/org/apache/freemarker/core/valueformat/impl/package.html
@@ -15,7 +15,7 @@
   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/6d9dbff7/src/main/java/org/apache/freemarker/core/valueformat/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/valueformat/package.html b/src/main/java/org/apache/freemarker/core/valueformat/package.html
index bfb8183..21d4c1b 100644
--- a/src/main/java/org/apache/freemarker/core/valueformat/package.html
+++ b/src/main/java/org/apache/freemarker/core/valueformat/package.html
@@ -15,7 +15,7 @@
   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/6d9dbff7/src/main/misc/overloadedNumberRules/config.fmpp
----------------------------------------------------------------------
diff --git a/src/main/misc/overloadedNumberRules/config.fmpp b/src/main/misc/overloadedNumberRules/config.fmpp
index 50aacbb..cf32e92 100644
--- a/src/main/misc/overloadedNumberRules/config.fmpp
+++ b/src/main/misc/overloadedNumberRules/config.fmpp
@@ -14,15 +14,6 @@
 # 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/6d9dbff7/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 916d2f4..05c1981 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,15 +14,6 @@
 # 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/6d9dbff7/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 1122bd7..2edcf88 100644
--- a/src/main/resources/org/apache/freemarker/core/version.properties
+++ b/src/main/resources/org/apache/freemarker/core/version.properties
@@ -14,15 +14,6 @@
 # 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/6d9dbff7/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 601ce15..0df9e33 100644
--- a/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties
+++ b/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples1.properties
@@ -14,15 +14,6 @@
 # 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/6d9dbff7/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 0179466..5d2a738 100644
--- a/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties
+++ b/src/test/resources/org/apache/freemarker/manualtest/ConfigureOutputFormatExamples2.properties
@@ -14,15 +14,6 @@
 # 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/6d9dbff7/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 24e9747..cffadfb 100644
--- a/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples1.properties
+++ b/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples1.properties
@@ -14,15 +14,6 @@
 # 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/6d9dbff7/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 b5619f0..f879e70 100644
--- a/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples2.properties
+++ b/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples2.properties
@@ -14,15 +14,6 @@
 # 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/6d9dbff7/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 1cd1b26..cf4c5a4 100644
--- a/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples3.properties
+++ b/src/test/resources/org/apache/freemarker/manualtest/TemplateConfigurationExamples3.properties
@@ -14,15 +14,6 @@
 # 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/6d9dbff7/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 32190a8..609e20b 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,15 +14,6 @@
 # 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


Mime
View raw message