You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2014/11/23 13:30:26 UTC
svn commit: r1641174 - in /tomcat/trunk: conf/
res/META-INF/jasper.jar/services/
res/META-INF/tomcat-websocket.jar/services/ res/rat/
Author: markt
Date: Sun Nov 23 12:30:25 2014
New Revision: 1641174
URL: http://svn.apache.org/r1641174
Log:
Review buildbot RAT results (still more to do)
- Add licenses to files where they are currently missing
- Update RAT excludes
Modified:
tomcat/trunk/conf/tomcat-users.xsd
tomcat/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer
tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.servlet.ServletContainerInitializer
tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.ContainerProvider
tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator
tomcat/trunk/res/rat/rat-excludes.txt
Modified: tomcat/trunk/conf/tomcat-users.xsd
URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/tomcat-users.xsd?rev=1641174&r1=1641173&r2=1641174&view=diff
==============================================================================
--- tomcat/trunk/conf/tomcat-users.xsd (original)
+++ tomcat/trunk/conf/tomcat-users.xsd Sun Nov 23 12:30:25 2014
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
<xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://tomcat.apache.org/xml"
xmlns:users="http://tomcat.apache.org/xml"
Modified: tomcat/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer?rev=1641174&r1=1641173&r2=1641174&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer (original)
+++ tomcat/trunk/res/META-INF/jasper.jar/services/javax.servlet.ServletContainerInitializer Sun Nov 23 12:30:25 2014
@@ -1 +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.
+
org.apache.jasper.servlet.JasperInitializer
\ No newline at end of file
Modified: tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.servlet.ServletContainerInitializer
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.servlet.ServletContainerInitializer?rev=1641174&r1=1641173&r2=1641174&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.servlet.ServletContainerInitializer (original)
+++ tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.servlet.ServletContainerInitializer Sun Nov 23 12:30:25 2014
@@ -1 +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.
+
org.apache.tomcat.websocket.server.WsSci
\ No newline at end of file
Modified: tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.ContainerProvider
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.ContainerProvider?rev=1641174&r1=1641173&r2=1641174&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.ContainerProvider (original)
+++ tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.ContainerProvider Sun Nov 23 12:30:25 2014
@@ -1 +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.
+
org.apache.tomcat.websocket.WsContainerProvider
\ No newline at end of file
Modified: tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfig%24Configurator?rev=1641174&r1=1641173&r2=1641174&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator (original)
+++ tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.server.ServerEndpointConfig$Configurator Sun Nov 23 12:30:25 2014
@@ -1 +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.
+
org.apache.tomcat.websocket.server.DefaultServerEndpointConfigurator
\ No newline at end of file
Modified: tomcat/trunk/res/rat/rat-excludes.txt
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/rat/rat-excludes.txt?rev=1641174&r1=1641173&r2=1641174&view=diff
==============================================================================
--- tomcat/trunk/res/rat/rat-excludes.txt (original)
+++ tomcat/trunk/res/rat/rat-excludes.txt Sun Nov 23 12:30:25 2014
@@ -32,6 +32,13 @@
- JSON files (RFC7159) are data and cannot contain comments
+ - local build configuration files
+
+ - *.mdl are Rational Rose data files and cannot contain comments
+
+ - file fragments that are combined during the build process and therefore can
+ not contain a license header in every fragment
+
output/build/webapps/docs/*.html
output/build/webapps/docs/appdev/*.html
output/build/webapps/docs/architecture/*.html
@@ -62,10 +69,22 @@ output/dist/webapps/docs/jspapi/package-
output/dist/webapps/docs/servletapi/package-list
output/dist/src/test/webapp/bug53257/*.txt
+output/dist/src/test/webapp/bug53257/foo bar/foobar.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/src/webapps/examples/WEB-INF/classes/websocket/echo/servers.json
output/dist/webapps/examples/WEB-INF/classes/websocket/echo/servers.json
+
+build.properties
+
+output/build/webapps/docs/architecture/requestProcess/roseModel.mdl
+output/dist/src/webapps/docs/architecture/requestProcess/roseModel.mdl
+output/dist/webapps/docs/architecture/requestProcess/roseModel.mdl
+webapps/docs/architecture/requestProcess/roseModel.mdl
+
+output/dist/confinstall/tomcat-users_2.xml
+output/dist/src/res/confinstall/tomcat-users_2.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org