From 27bdd79d86ad357c4f268b65d8d265df9f5be1f5 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 4 Aug 2007 22:17:42 +0000 Subject: [PATCH] Fix results of running the license checking tool for conf directory git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@562771 13f79535-47bb-0310-9956-ffa450edef68 --- conf/catalina.policy | 15 +++++++++++++++ conf/catalina.properties | 15 +++++++++++++++ conf/context.xml | 17 +++++++++++++++++ conf/logging.properties | 15 +++++++++++++++ conf/server.xml | 17 +++++++++++++++++ conf/tomcat-users.xml | 16 ++++++++++++++++ conf/web.xml | 16 ++++++++++++++++ 7 files changed, 111 insertions(+) diff --git a/conf/catalina.policy b/conf/catalina.policy index 4c51c1b44..ffef72654 100644 --- a/conf/catalina.policy +++ b/conf/catalina.policy @@ -1,3 +1,18 @@ +// 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. + // ============================================================================ // catalina.corepolicy - Security Policy Permissions for Tomcat 6 // diff --git a/conf/catalina.properties b/conf/catalina.properties index a560e307b..00d758a23 100644 --- a/conf/catalina.properties +++ b/conf/catalina.properties @@ -1,3 +1,18 @@ +# 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. + # # List of comma-separated packages that start with or equal this string # will cause a security exception to be thrown when diff --git a/conf/context.xml b/conf/context.xml index 44a6d4c60..90bf554dd 100644 --- a/conf/context.xml +++ b/conf/context.xml @@ -1,3 +1,20 @@ + + diff --git a/conf/logging.properties b/conf/logging.properties index c00e5d375..973dc4ad3 100644 --- a/conf/logging.properties +++ b/conf/logging.properties @@ -1,3 +1,18 @@ +# 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. + handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4admin.org.apache.juli.FileHandler, 5host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler .handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler diff --git a/conf/server.xml b/conf/server.xml index 8c7e3d429..4a0d2784e 100644 --- a/conf/server.xml +++ b/conf/server.xml @@ -1,3 +1,20 @@ + +