Author: kkolinko
Date: Fri May 30 22:40:48 2014
New Revision: 1598763
URL: http://svn.apache.org/r1598763
Log:
Followup to r1598483:
1. svn:eol-style
2. Add *.json to text.files patternset in build.xml
3. Add json file to rat-excludes.txt
Per RFC7159 I see no way to add license comment to a JSON file. It is a data
file.
Modified:
tomcat/trunk/build.xml
tomcat/trunk/res/rat/rat-excludes.txt
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.java
(props changed)
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoStreamAnnotation.java
(props changed)
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/servers.json
(props changed)
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1598763&r1=1598762&r2=1598763&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri May 30 22:40:48 2014
@@ -253,6 +253,7 @@
<include name="**/*.ini"/>
<include name="**/*.java"/>
<include name="**/*.jjt"/>
+ <include name="**/*.json"/>
<include name="**/*.jsp"/>
<include name="**/*.jspf"/>
<include name="**/*.jspx"/>
Modified: tomcat/trunk/res/rat/rat-excludes.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/rat/rat-excludes.txt?rev=1598763&r1=1598762&r2=1598763&view=diff
==============================================================================
--- tomcat/trunk/res/rat/rat-excludes.txt (original)
+++ tomcat/trunk/res/rat/rat-excludes.txt Fri May 30 22:40:48 2014
@@ -20,12 +20,18 @@
The following files are excluded:
- *.html files in documentation are generated from XML sources
+
- *.md5 files are generated and cannot contain license
+
- *.manifest JAR manifest files cannot contain license
+
- package-list files in API documentation (javadoc) are generated
+
- other trivial test files, such as textual files containing only "OK'
string,
are also excluded.
+ - JSON files (RFC7159) are data and cannot contain comments
+
output/build/webapps/docs/*.html
output/build/webapps/docs/appdev/*.html
output/build/webapps/docs/architecture/*.html
@@ -39,19 +45,27 @@ output/dist/webapps/docs/architecture/*.
output/dist/webapps/docs/config/*.html
output/dist/webapps/docs/funcspecs/*.html
output/dist/webapps/docs/tribes/*.html
+
output/embed/*.md5
output/extras/*.md5
+
modules/jdbc-pool/resources/MANIFEST.MF
output/dist/src/modules/jdbc-pool/resources/MANIFEST.MF
output/dist/src/res/META-INF/*.manifest
output/jdbc-pool/resources/MANIFEST.MF
output/manifests/*.manifest
res/META-INF/*.manifest
+
output/dist/webapps/docs/api/package-list
output/dist/webapps/docs/elapi/package-list
output/dist/webapps/docs/jspapi/package-list
output/dist/webapps/docs/servletapi/package-list
+
output/dist/src/test/webapp/bug53257/*.txt
output/dist/src/test/webapp-fragments/WEB-INF/classes/*.txt
test/webapp/bug53257/*.txt
test/webapp-fragments/WEB-INF/classes/*.txt
+
+webapps/examples/WEB-INF/classes/websocket/echo/servers.json
+output/build/webapps/examples/WEB-INF/classes/websocket/echo/servers.json
+output/dist/webapps/examples/WEB-INF/classes/websocket/echo/servers.json
Propchange:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoAsyncAnnotation.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoStreamAnnotation.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/servers.json
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
