You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by vl...@apache.org on 2019/05/27 09:43:53 UTC
svn commit: r1860115 - in /jmeter/trunk: ./ bin/testfiles/
bin/testfiles/HTMLParserTestFile_2_files/ src/protocol/mail/META-INF/
Author: vladimirsitnikov
Date: Mon May 27 09:43:53 2019
New Revision: 1860115
URL: http://svn.apache.org/viewvc?rev=1860115&view=rev
Log:
Add gitattributes, normalize line endings
Added:
jmeter/trunk/.gitattributes
jmeter/trunk/bin/testfiles/.gitattributes
jmeter/trunk/bin/testfiles/HTMLParserTestFile_2_files/.gitattributes
Modified:
jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.all
jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.set
jmeter/trunk/src/protocol/mail/META-INF/javamail.providers
Added: jmeter/trunk/.gitattributes
URL: http://svn.apache.org/viewvc/jmeter/trunk/.gitattributes?rev=1860115&view=auto
==============================================================================
--- jmeter/trunk/.gitattributes (added)
+++ jmeter/trunk/.gitattributes Mon May 27 09:43:53 2019
@@ -0,0 +1,14 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+*.java text
+*.html text
+*.css text
+*.js text
+*.sql text
+*.q text
+
+*.sh text eol=lf
+
+*.bat text eol=crlf
+*.cmd text eol=crlf
Added: jmeter/trunk/bin/testfiles/.gitattributes
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/.gitattributes?rev=1860115&view=auto
==============================================================================
--- jmeter/trunk/bin/testfiles/.gitattributes (added)
+++ jmeter/trunk/bin/testfiles/.gitattributes Mon May 27 09:43:53 2019
@@ -0,0 +1,2 @@
+# JMeter hard-codes resource sizes, so we should stick to single end-of-line setting
+HTMLParserTestFile_2.html text=auto eol=crlf
Modified: jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.all
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.all?rev=1860115&r1=1860114&r2=1860115&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.all (original)
+++ jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.all Mon May 27 09:43:53 2019
@@ -1,8 +1,8 @@
-file:HTMLParserTestFile_2_files/style.css
-file:HTMLParserTestFile_2_files/halfbanner.htm
-file:HTMLParserTestFile_2_files/jakarta-logo.gif
-file:HTMLParserTestFile_2_files/logo.jpg
-file:HTMLParserTestFile_2_files/http-config-example.png
-file:HTMLParserTestFile_2_files/scoping1.png
-file:HTMLParserTestFile_2_files/scoping2.png
-file:HTMLParserTestFile_2_files/scoping3.png
+file:HTMLParserTestFile_2_files/style.css
+file:HTMLParserTestFile_2_files/halfbanner.htm
+file:HTMLParserTestFile_2_files/jakarta-logo.gif
+file:HTMLParserTestFile_2_files/logo.jpg
+file:HTMLParserTestFile_2_files/http-config-example.png
+file:HTMLParserTestFile_2_files/scoping1.png
+file:HTMLParserTestFile_2_files/scoping2.png
+file:HTMLParserTestFile_2_files/scoping3.png
Modified: jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.set
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.set?rev=1860115&r1=1860114&r2=1860115&view=diff
==============================================================================
--- jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.set (original)
+++ jmeter/trunk/bin/testfiles/HTMLParserTestFile_2.set Mon May 27 09:43:53 2019
@@ -1,8 +1,8 @@
-file:HTMLParserTestFile_2_files/halfbanner.htm
-file:HTMLParserTestFile_2_files/jakarta-logo.gif
-file:HTMLParserTestFile_2_files/logo.jpg
-file:HTMLParserTestFile_2_files/style.css
-file:HTMLParserTestFile_2_files/http-config-example.png
-file:HTMLParserTestFile_2_files/scoping1.png
-file:HTMLParserTestFile_2_files/scoping2.png
-file:HTMLParserTestFile_2_files/scoping3.png
+file:HTMLParserTestFile_2_files/halfbanner.htm
+file:HTMLParserTestFile_2_files/jakarta-logo.gif
+file:HTMLParserTestFile_2_files/logo.jpg
+file:HTMLParserTestFile_2_files/style.css
+file:HTMLParserTestFile_2_files/http-config-example.png
+file:HTMLParserTestFile_2_files/scoping1.png
+file:HTMLParserTestFile_2_files/scoping2.png
+file:HTMLParserTestFile_2_files/scoping3.png
Added: jmeter/trunk/bin/testfiles/HTMLParserTestFile_2_files/.gitattributes
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/testfiles/HTMLParserTestFile_2_files/.gitattributes?rev=1860115&view=auto
==============================================================================
--- jmeter/trunk/bin/testfiles/HTMLParserTestFile_2_files/.gitattributes (added)
+++ jmeter/trunk/bin/testfiles/HTMLParserTestFile_2_files/.gitattributes Mon May 27 09:43:53 2019
@@ -0,0 +1,3 @@
+# JMeter hard-codes resource sizes, so we should stick to single end-of-line setting
+*.htm text=auto eol=crlf
+*.css text=auto eol=crlf
Modified: jmeter/trunk/src/protocol/mail/META-INF/javamail.providers
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/mail/META-INF/javamail.providers?rev=1860115&r1=1860114&r2=1860115&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/mail/META-INF/javamail.providers (original)
+++ jmeter/trunk/src/protocol/mail/META-INF/javamail.providers Mon May 27 09:43:53 2019
@@ -1,16 +1,16 @@
-# 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.
-#
+# 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.
+#
protocol=file; type=store; class=org.apache.jmeter.protocol.mail.sampler.MailFileStore; vendor=ASF
\ No newline at end of file