mcconnell 2003/09/12 10:32:42
Modified: framework maven.xml project.xml
framework/impl project.xml
framework/site project.xml
Added: framework/api/src/java/org/apache/avalon/framework/logger
AbstractLogEnabled.java
Removed: framework/impl/src/java/org/apache/avalon/framework/logger
AbstractLogEnabled.java
Log:
Update to RC4 including migration of AbstractLogEnabled from impl to api.
Revision Changes Path
1.5 +10 -0 avalon-sandbox/framework/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/framework/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 4 Sep 2003 06:06:34 -0000 1.4
+++ maven.xml 12 Sep 2003 17:32:41 -0000 1.5
@@ -112,6 +112,16 @@
<ant:include name="docs/**"/>
</ant:fileset>
</ant:copy>
+
+ <!-- Add composite jar -->
+ <ant:jar jarfile="${maven.build.dir}/${maven.final.name}.jar"
+ compress="true" manifest="manifest.mf">
+ <ant:fileset dir="api/target/classes"/>
+ <ant:fileset dir="impl/target/classes"/>
+ </ant:jar>
+ <ant:copy todir="${maven.dist.bin.assembly.dir}"
+ file="${maven.build.dir}/${maven.final.name}.jar"/>
+
</goal>
<goal
1.5 +1 -1 avalon-sandbox/framework/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/framework/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 9 Sep 2003 21:53:35 -0000 1.4
+++ project.xml 12 Sep 2003 17:32:41 -0000 1.5
@@ -5,7 +5,7 @@
<name>Avalon Framework</name>
<groupId>avalon-framework</groupId>
<id>avalon-framework</id>
- <currentVersion>4.1.5-RC3</currentVersion>
+ <currentVersion>4.1.5</currentVersion>
<inceptionYear>2000</inceptionYear>
<organization>
1.1
avalon-sandbox/framework/api/src/java/org/apache/avalon/framework/logger/AbstractLogEnabled.java
Index: AbstractLogEnabled.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 1997-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 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 "Jakarta", "Avalon", 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 Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.avalon.framework.logger;
/**
* Utility class to allow construction of easy components that will perform logging.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
* @version CVS $Revision: 1.1 $ $Date: 2003/09/12 17:32:42 $
*/
public abstract class AbstractLogEnabled
implements LogEnabled
{
///Base Logger instance
private Logger m_logger;
/**
* Set the components logger.
*
* @param logger the logger
*/
public void enableLogging( final Logger logger )
{
m_logger = logger;
}
/**
* Helper method to allow sub-classes to aquire logger.
* This method exists rather than exposing a member variable
* because it protects other users against future changes. It
* also means they do not have to use our naming convention.
*
* <p>There is no performance penalty as this is a final method
* and will be inlined by the JVM.</p>
*
* @return the Logger
*/
protected final Logger getLogger()
{
return m_logger;
}
/**
* Helper method to setup other components with same logger.
*
* @param component the component to pass logger object to
*/
protected void setupLogger( final Object component )
{
setupLogger( component, (String)null );
}
/**
* Helper method to setup other components with logger.
* The logger has the subcategory of this components logger.
*
* @param component the component to pass logger object to
* @param subCategory the subcategory to use (may be null)
*/
protected void setupLogger( final Object component, final String subCategory )
{
Logger logger = m_logger;
if( null != subCategory )
{
logger = m_logger.getChildLogger( subCategory );
}
setupLogger( component, logger );
}
/**
* Helper method to setup other components with logger.
*
* @param component the component to pass logger object to
* @param logger the Logger
*/
protected void setupLogger( final Object component, final Logger logger )
{
if( component instanceof LogEnabled )
{
( (LogEnabled)component ).enableLogging( logger );
}
}
}
1.3 +1 -1 avalon-sandbox/framework/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/framework/impl/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 22 Aug 2003 12:49:47 -0000 1.2
+++ project.xml 12 Sep 2003 17:32:42 -0000 1.3
@@ -17,7 +17,7 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-RC2</version>
+ <version>4.1.5</version>
</dependency>
<dependency>
1.3 +2 -3 avalon-sandbox/framework/site/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/framework/site/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 22 Aug 2003 12:33:57 -0000 1.2
+++ project.xml 12 Sep 2003 17:32:42 -0000 1.3
@@ -6,7 +6,6 @@
<name>Avalon Framework</name>
<id>avalon-framework-docs</id>
- <currentVersion>4.1.5-RC2</currentVersion>
<shortDescription>Avalon Framework API</shortDescription>
<description>Avalon Framework API</description>
@@ -23,12 +22,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-RC2</version>
+ <version>4.1.5</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5-RC2</version>
+ <version>4.1.5</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
