Author: rgoers Date: Fri Jul 20 15:11:52 2012 New Revision: 1363826 URL: http://svn.apache.org/viewvc?rev=1363826&view=rev Log: Fix file heading on ResolverUtil. Add trademark statement to page footings
Modified: logging/log4j/log4j2/trunk/NOTICE.txt logging/log4j/log4j2/trunk/api/pom.xml logging/log4j/log4j2/trunk/api/src/site/site.xml logging/log4j/log4j2/trunk/core/pom.xml logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java logging/log4j/log4j2/trunk/core/src/site/site.xml logging/log4j/log4j2/trunk/flume-ng/pom.xml logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml logging/log4j/log4j2/trunk/jcl-bridge/pom.xml logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml logging/log4j/log4j2/trunk/log4j12-api/pom.xml logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml logging/log4j/log4j2/trunk/slf4j-impl/pom.xml logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml logging/log4j/log4j2/trunk/src/site/site.xml Modified: logging/log4j/log4j2/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/NOTICE.txt?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/NOTICE.txt (original) +++ logging/log4j/log4j2/trunk/NOTICE.txt Fri Jul 20 15:11:52 2012 @@ -2,4 +2,7 @@ Apache log4j2 1.0-alpha1 Copyright 2012 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file +The Apache Software Foundation (http://www.apache.org/). + +ResolverUtil.java +Copyright 2005-2006 Tim Fennell \ No newline at end of file Modified: logging/log4j/log4j2/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/pom.xml?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/pom.xml (original) +++ logging/log4j/log4j2/trunk/api/pom.xml Fri Jul 20 15:11:52 2012 @@ -80,6 +80,8 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>2.8</version> <configuration> + <bottom>Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved. Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the + Apache Logging project logo are trademarks of The Apache Software Foundation.</bottom> <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating project --> <detectOfflineLinks>false</detectOfflineLinks> Modified: logging/log4j/log4j2/trunk/api/src/site/site.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/site/site.xml?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/site/site.xml (original) +++ logging/log4j/log4j2/trunk/api/src/site/site.xml Fri Jul 20 15:11:52 2012 @@ -31,5 +31,8 @@ <item name="Log4j" href="../index.html"/> </links> <menu ref="reports"/> + <footer><div class="row span16">Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the + Apache Logging project logo are trademarks of The Apache Software Foundation.</div> + </footer> </body> </project> Modified: logging/log4j/log4j2/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/pom.xml?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/pom.xml (original) +++ logging/log4j/log4j2/trunk/core/pom.xml Fri Jul 20 15:11:52 2012 @@ -181,6 +181,8 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>2.8</version> <configuration> + <bottom>Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved. Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the + Apache Logging project logo are trademarks of The Apache Software Foundation.</bottom> <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating project --> <detectOfflineLinks>false</detectOfflineLinks> Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/config/plugins/ResolverUtil.java Fri Jul 20 15:11:52 2012 @@ -1,16 +1,18 @@ -/* Copyright 2005-2006 Tim Fennell +/* + * 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 * - * Licensed 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 + * 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. + * See the license for the specific language governing permissions and + * limitations under the license. */ package org.apache.logging.log4j.core.config.plugins; Modified: logging/log4j/log4j2/trunk/core/src/site/site.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/site/site.xml?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/site/site.xml (original) +++ logging/log4j/log4j2/trunk/core/src/site/site.xml Fri Jul 20 15:11:52 2012 @@ -31,5 +31,8 @@ <item name="Log4j" href="../index.html"/> </links> <menu ref="reports"/> + <footer><div class="row span16">Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the + Apache Logging project logo are trademarks of The Apache Software Foundation.</div> + </footer> </body> </project> Modified: logging/log4j/log4j2/trunk/flume-ng/pom.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/pom.xml?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-ng/pom.xml (original) +++ logging/log4j/log4j2/trunk/flume-ng/pom.xml Fri Jul 20 15:11:52 2012 @@ -119,6 +119,8 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>2.8</version> <configuration> + <bottom>Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved. Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the + Apache Logging project logo are trademarks of The Apache Software Foundation.</bottom> <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating project --> <detectOfflineLinks>false</detectOfflineLinks> Modified: logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml (original) +++ logging/log4j/log4j2/trunk/flume-ng/src/site/site.xml Fri Jul 20 15:11:52 2012 @@ -31,5 +31,8 @@ <item name="Log4j" href="../index.html"/> </links> <menu ref="reports"/> + <footer><div class="row span16">Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the + Apache Logging project logo are trademarks of The Apache Software Foundation.</div> + </footer> </body> </project> Modified: logging/log4j/log4j2/trunk/jcl-bridge/pom.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jcl-bridge/pom.xml?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/jcl-bridge/pom.xml (original) +++ logging/log4j/log4j2/trunk/jcl-bridge/pom.xml Fri Jul 20 15:11:52 2012 @@ -91,6 +91,8 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>2.8</version> <configuration> + <bottom>Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved. Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the + Apache Logging project logo are trademarks of The Apache Software Foundation.</bottom> <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating project --> <detectOfflineLinks>false</detectOfflineLinks> Modified: logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml (original) +++ logging/log4j/log4j2/trunk/jcl-bridge/src/site/site.xml Fri Jul 20 15:11:52 2012 @@ -31,5 +31,8 @@ <item name="Log4j" href="../index.html"/> </links> <menu ref="reports"/> + <footer><div class="row span16">Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the + Apache Logging project logo are trademarks of The Apache Software Foundation.</div> + </footer> </body> </project> Modified: logging/log4j/log4j2/trunk/log4j12-api/pom.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/pom.xml?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j12-api/pom.xml (original) +++ logging/log4j/log4j2/trunk/log4j12-api/pom.xml Fri Jul 20 15:11:52 2012 @@ -88,6 +88,8 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>2.8</version> <configuration> + <bottom>Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved. Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the + Apache Logging project logo are trademarks of The Apache Software Foundation.</bottom> <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating project --> <detectOfflineLinks>false</detectOfflineLinks> Modified: logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml (original) +++ logging/log4j/log4j2/trunk/log4j12-api/src/site/site.xml Fri Jul 20 15:11:52 2012 @@ -31,5 +31,8 @@ <item name="Log4j" href="../index.html"/> </links> <menu ref="reports"/> + <footer><div class="row span16">Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the + Apache Logging project logo are trademarks of The Apache Software Foundation.</div> + </footer> </body> </project> Modified: logging/log4j/log4j2/trunk/slf4j-impl/pom.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/pom.xml?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/slf4j-impl/pom.xml (original) +++ logging/log4j/log4j2/trunk/slf4j-impl/pom.xml Fri Jul 20 15:11:52 2012 @@ -95,6 +95,8 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>2.8</version> <configuration> + <bottom>Copyright © {inceptionYear}-{currentYear} {organizationName}. All Rights Reserved. Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the + Apache Logging project logo are trademarks of The Apache Software Foundation.</bottom> <!-- module link generation is completely broken in the javadoc plugin for a multi-module non-aggregating project --> <detectOfflineLinks>false</detectOfflineLinks> Modified: logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml (original) +++ logging/log4j/log4j2/trunk/slf4j-impl/src/site/site.xml Fri Jul 20 15:11:52 2012 @@ -31,5 +31,8 @@ <item name="Log4j" href="../index.html"/> </links> <menu ref="reports"/> + <footer><div class="row span16">Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the + Apache Logging project logo are trademarks of The Apache Software Foundation.</div> + </footer> </body> </project> Modified: logging/log4j/log4j2/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/site/site.xml?rev=1363826&r1=1363825&r2=1363826&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/src/site/site.xml (original) +++ logging/log4j/log4j2/trunk/src/site/site.xml Fri Jul 20 15:11:52 2012 @@ -146,5 +146,8 @@ <item name="Log4j Companions" href="http://logging.apache.org/log4j/companions"/> </links> <menu ref="reports"/> + <footer><div class="row span16">Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the + Apache Logging project logo are trademarks of The Apache Software Foundation.</div> + </footer> </body> </project>