gdamour 2004/02/25 01:58:15
Modified:modules/system/src/java/org/apache/geronimo/system
ClockPool.java ThreadPool.java
modules/system/src/java/org/apache/geronimo/system/configuration
LocalConfigStore.java
modules/system/src/java/org/apache/geronimo/system/logging/log4j
CachingLog4jLog.java Log4jService.java
NamedNDC.java NamedNDCConverter.java
NamedNDCFilter.java PatternLayout.java
PatternParser.java URLConfigurator.java XLevel.java
modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender
AbstractAppenderService.java
ConsoleAppenderService.java
DailyRollingFileAppenderService.java
FileAppenderService.java
RollingFileAppenderService.java
modules/system/src/java/org/apache/geronimo/system/main
CommandLine.java Daemon.java
modules/system/src/java/org/apache/geronimo/system/repository
ReadOnlyRepository.java
modules/system/src/java/org/apache/geronimo/system/serverinfo
ServerConstants.java ServerInfo.java
modules/system/src/test/org/apache/geronimo/system/configuration
LocalConfigStoreTest.java
Log:
License migration: 1.1 => 2.0
Revision ChangesPath
1.2 +15 -54
incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/ClockPool.java
Index: ClockPool.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/ClockPool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClockPool.java24 Feb 2004 04:38:26 - 1.1
+++ ClockPool.java25 Feb 2004 09:58:14 - 1.2
@@ -1,59 +1,20 @@
-/*
- * The Apache Software License, Version 1.1
+/**
*
+ * Copyright 2004 The Apache Software Foundation
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
- * reserved.
+ * 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
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in
- *the documentation and/or other materials provided with the
- *distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *if any, must include the following acknowledgment:
- * "This product includes software developed by the
- *Apache Software Foundation (http://www.apache.org/)."
- *Alternately, this acknowledgment may appear in the software itself,
- *if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xalan" and "Apache Software Foundation" must
- *not be used to endorse or promote products derived from this
- *software without prior written permission. For written
- *permission, please contact [EMAIL PROTECTED]
- *
- * 5. Products derived from this software may not be called "Apache",
- *nor may "Apache" appear in their name, without prior written
- *permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Sof
