From c9c9d2c692cbb947cf5c84db6c5537a3eaf7eeee Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 5 Mar 2010 09:03:30 +0000 Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48861 for Tomcat 7. Still an issue for Tomcat-lite git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@919338 13f79535-47bb-0310-9956-ffa450edef68 --- .../util/bcel/classfile/AnnotationElementValue.java | 17 +++++++++++++++++ .../tomcat/util/bcel/classfile/ArrayElementValue.java | 17 +++++++++++++++++ .../tomcat/util/bcel/classfile/ClassElementValue.java | 17 +++++++++++++++++ .../tomcat/util/bcel/classfile/EnumElementValue.java | 17 +++++++++++++++++ java/org/apache/tomcat/util/bcel/classfile/package.html | 16 ++++++++++++++++ java/org/apache/tomcat/util/bcel/util/package.html | 16 ++++++++++++++++ .../apache/catalina/deploy/TestSecurityConstraint.java | 16 ++++++++++++++++ .../loader/TestWebappClassLoaderMemoryLeak.java | 16 ++++++++++++++++ 8 files changed, 132 insertions(+) diff --git a/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java b/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java index b27f45049..007e24f92 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java +++ b/java/org/apache/tomcat/util/bcel/classfile/AnnotationElementValue.java @@ -1,3 +1,20 @@ +/* + * 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. + * + */ package org.apache.tomcat.util.bcel.classfile; import java.io.DataOutputStream; diff --git a/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java b/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java index 961fb0ffc..1b6015d8b 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ArrayElementValue.java @@ -1,3 +1,20 @@ +/* + * 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. + * + */ package org.apache.tomcat.util.bcel.classfile; import java.io.DataOutputStream; diff --git a/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java b/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java index 7b84e4b00..8d54720eb 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java +++ b/java/org/apache/tomcat/util/bcel/classfile/ClassElementValue.java @@ -1,3 +1,20 @@ +/* + * 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. + * + */ package org.apache.tomcat.util.bcel.classfile; import java.io.DataOutputStream; diff --git a/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java b/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java index e8793832f..999be89a1 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java +++ b/java/org/apache/tomcat/util/bcel/classfile/EnumElementValue.java @@ -1,3 +1,20 @@ +/* + * 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. + * + */ package org.apache.tomcat.util.bcel.classfile; import java.io.DataOutputStream; diff --git a/java/org/apache/tomcat/util/bcel/classfile/package.html b/java/org/apache/tomcat/util/bcel/classfile/package.html index 2bf7c28cc..e82c2d95a 100644 --- a/java/org/apache/tomcat/util/bcel/classfile/package.html +++ b/java/org/apache/tomcat/util/bcel/classfile/package.html @@ -1,3 +1,19 @@ + diff --git a/java/org/apache/tomcat/util/bcel/util/package.html b/java/org/apache/tomcat/util/bcel/util/package.html index abef411d5..01618ecc0 100644 --- a/java/org/apache/tomcat/util/bcel/util/package.html +++ b/java/org/apache/tomcat/util/bcel/util/package.html @@ -1,3 +1,19 @@ + diff --git a/test/org/apache/catalina/deploy/TestSecurityConstraint.java b/test/org/apache/catalina/deploy/TestSecurityConstraint.java index b9560fd8c..98c2c8e6e 100644 --- a/test/org/apache/catalina/deploy/TestSecurityConstraint.java +++ b/test/org/apache/catalina/deploy/TestSecurityConstraint.java @@ -1,3 +1,19 @@ +/* + * 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. + */ package org.apache.catalina.deploy; import java.util.HashSet; diff --git a/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java b/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java index 4605c22c9..58179d9ea 100644 --- a/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java +++ b/test/org/apache/catalina/loader/TestWebappClassLoaderMemoryLeak.java @@ -1,3 +1,19 @@ +/* + * 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. + */ package org.apache.catalina.loader; import java.io.IOException; -- 2.11.0