You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/07/10 23:19:09 UTC
cvs commit: avalon-sandbox/meta/tools/src/test/org/apache/avalon/meta MetaTestCase.java
mcconnell 2003/07/10 14:19:09
Modified: meta .cvsignore
meta/impl/src/java/org/apache/avalon/meta/info/builder
XMLLegacyCreator.java XMLTypeCreator.java
meta/impl/src/java/org/apache/avalon/meta/info/writer
XMLTypeWriter.java
meta/tools/src/java/org/apache/avalon/meta/info/builder
TaggedTypeBuilder.java
meta/tools/src/java/org/apache/avalon/meta/info/builder/tags
LoggerTag.java
meta/tools/src/test/org/apache/avalon/meta MetaTestCase.java
Added: meta/api/src/java/org/apache/avalon/meta/info
CategoryDescriptor.java
Log:
Rename LoggerDescriptor to CategoryDescriptor.
Revision Changes Path
1.2 +1 -0 avalon-sandbox/meta/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 10 Jul 2003 12:10:01 -0000 1.1
+++ .cvsignore 10 Jul 2003 21:19:08 -0000 1.2
@@ -4,3 +4,4 @@
target
build.xml
site
+build.xml
\ No newline at end of file
1.1 avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/CategoryDescriptor.java
Index: CategoryDescriptor.java
===================================================================
/*
============================================================================
The Apache Software License, Version 1.1
============================================================================
Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
tion, 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", "Apache Avalon", "Avalon Framework" 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 apache@apache.org.
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 (INCLU-
DING, 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.meta.info;
import java.util.Properties;
/**
* A descriptor describing the Loggers that the Component
* will use. The name of each Logger is relative to the
* Logger passed to the component (namespace separator is '.').
* "" names root logger.
*
* <p>Also associated with each Logger is a set of arbitrary
* attributes that can be used to store extra information
* about Logger requirements.</p>
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision: 1.1 $ $Date: 2003/07/10 21:19:08 $
*/
public class CategoryDescriptor
extends Descriptor
{
private final String m_name;
/**
* Create a descriptor for Logger.
*
* @param name the logging category name
* @param attributes a set of attributes associated with the declaration
*
* @exception NullPointerException if name argument is null
*/
public CategoryDescriptor( final String name,
final Properties attributes )
throws NullPointerException
{
super( attributes );
if( null == name )
{
throw new NullPointerException( "name" );
}
m_name = name;
}
/**
* Return the name of logger.
*
* @return the name of Logger.
*/
public String getName()
{
return m_name;
}
}
1.2 +3 -3 avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLLegacyCreator.java
Index: XMLLegacyCreator.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLLegacyCreator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLLegacyCreator.java 10 Jul 2003 12:10:12 -0000 1.1
+++ XMLLegacyCreator.java 10 Jul 2003 21:19:08 -0000 1.2
@@ -64,7 +64,7 @@
import org.apache.avalon.meta.info.EntryDescriptor;
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.ExtensionDescriptor;
-import org.apache.avalon.meta.info.LoggerDescriptor;
+import org.apache.avalon.meta.info.CategoryDescriptor;
import org.apache.avalon.meta.info.ReferenceDescriptor;
import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
@@ -153,7 +153,7 @@
buildInfoDescriptor( classname, configuration );
configuration = info.getChild( "loggers" );
- final LoggerDescriptor[] loggers = new LoggerDescriptor[0];
+ final CategoryDescriptor[] loggers = new CategoryDescriptor[0];
final ContextDescriptor context = buildPhoenixContext( );
configuration = info.getChild( "services" );
1.2 +12 -12 avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java
Index: XMLTypeCreator.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLTypeCreator.java 10 Jul 2003 12:10:14 -0000 1.1
+++ XMLTypeCreator.java 10 Jul 2003 21:19:08 -0000 1.2
@@ -65,7 +65,7 @@
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.EntryDescriptor;
import org.apache.avalon.meta.info.ExtensionDescriptor;
-import org.apache.avalon.meta.info.LoggerDescriptor;
+import org.apache.avalon.meta.info.CategoryDescriptor;
import org.apache.avalon.meta.info.ReferenceDescriptor;
import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
@@ -155,7 +155,7 @@
buildInfoDescriptor( classname, configuration );
configuration = info.getChild( "loggers" );
- final LoggerDescriptor[] loggers = buildLoggers( configuration );
+ final CategoryDescriptor[] loggers = buildLoggers( configuration );
configuration = info.getChild( "context" );
final ContextDescriptor context = buildContext( configuration );
@@ -257,14 +257,14 @@
}
/**
- * A utility method to build an array of {@link LoggerDescriptor} objects
+ * A utility method to build an array of {@link CategoryDescriptor} objects
* from specified configuraiton.
*
* @param configuration the loggers configuration
- * @return the created LoggerDescriptor
+ * @return the created CategoryDescriptor
* @throws ConfigurationException if an error occurs
*/
- protected LoggerDescriptor[] buildLoggers( final Configuration configuration )
+ protected CategoryDescriptor[] buildLoggers( final Configuration configuration )
throws ConfigurationException
{
final Configuration[] elements = configuration.getChildren( "logger" );
@@ -272,27 +272,27 @@
for( int i = 0; i < elements.length; i++ )
{
- final LoggerDescriptor logger = buildLogger( elements[ i ] );
+ final CategoryDescriptor logger = buildLogger( elements[ i ] );
loggers.add( logger );
}
- return (LoggerDescriptor[])loggers.toArray( new LoggerDescriptor[ loggers.size() ] );
+ return (CategoryDescriptor[])loggers.toArray( new CategoryDescriptor[ loggers.size() ] );
}
/**
- * A utility method to build a {@link LoggerDescriptor}
+ * A utility method to build a {@link CategoryDescriptor}
* object from specified configuraiton.
*
* @param logger the Logger configuration
- * @return the created LoggerDescriptor
+ * @return the created CategoryDescriptor
* @throws ConfigurationException if an error occurs
*/
- private LoggerDescriptor buildLogger( Configuration logger )
+ private CategoryDescriptor buildLogger( Configuration logger )
throws ConfigurationException
{
final Properties attributes = buildAttributes( logger.getChild( "attributes" ) );
final String name = logger.getAttribute( "name", "" );
- return new LoggerDescriptor( name, attributes );
+ return new CategoryDescriptor( name, attributes );
}
/**
1.2 +4 -4 avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/writer/XMLTypeWriter.java
Index: XMLTypeWriter.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/writer/XMLTypeWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLTypeWriter.java 10 Jul 2003 12:10:19 -0000 1.1
+++ XMLTypeWriter.java 10 Jul 2003 21:19:08 -0000 1.2
@@ -59,7 +59,7 @@
import org.apache.avalon.meta.info.Descriptor;
import org.apache.avalon.meta.info.EntryDescriptor;
import org.apache.avalon.meta.info.InfoDescriptor;
-import org.apache.avalon.meta.info.LoggerDescriptor;
+import org.apache.avalon.meta.info.CategoryDescriptor;
import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.meta.info.ExtensionDescriptor;
@@ -177,7 +177,7 @@
* @throws IOException if unable to write xml
*/
private void writeLoggers( final Writer writer,
- final LoggerDescriptor[] loggers )
+ final CategoryDescriptor[] loggers )
throws IOException
{
if( 0 == loggers.length )
@@ -201,7 +201,7 @@
* @throws IOException if unable to write xml
*/
private void writeLogger( final Writer writer,
- final LoggerDescriptor logger )
+ final CategoryDescriptor logger )
throws IOException
{
writer.write( "\n <logger name=\"" );
1.2 +3 -3 avalon-sandbox/meta/tools/src/java/org/apache/avalon/meta/info/builder/TaggedTypeBuilder.java
Index: TaggedTypeBuilder.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/tools/src/java/org/apache/avalon/meta/info/builder/TaggedTypeBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TaggedTypeBuilder.java 10 Jul 2003 12:10:37 -0000 1.1
+++ TaggedTypeBuilder.java 10 Jul 2003 21:19:08 -0000 1.2
@@ -56,7 +56,7 @@
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.ExtensionDescriptor;
import org.apache.avalon.meta.info.InfoDescriptor;
-import org.apache.avalon.meta.info.LoggerDescriptor;
+import org.apache.avalon.meta.info.CategoryDescriptor;
import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
import org.apache.avalon.meta.info.Type;
@@ -98,7 +98,7 @@
{
final InfoDescriptor info = buildInfo( javaClass );
final ServiceDescriptor[] services = new ServicesTag( javaClass ).getServices();
- final LoggerDescriptor[] loggers = new LoggerTag( javaClass ).getLoggers();
+ final CategoryDescriptor[] loggers = new LoggerTag( javaClass ).getLoggers();
final DependencyDescriptor[] dependencies = new DependencyTag( javaClass ).getDependencies();
final StageDescriptor[] stages = new StageTag( javaClass ).getStages();
final ExtensionDescriptor[] extensions = new ExtensionTag( javaClass ).getExtensions();
1.2 +6 -6 avalon-sandbox/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/LoggerTag.java
Index: LoggerTag.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/tools/src/java/org/apache/avalon/meta/info/builder/tags/LoggerTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LoggerTag.java 10 Jul 2003 12:10:40 -0000 1.1
+++ LoggerTag.java 10 Jul 2003 21:19:09 -0000 1.2
@@ -57,7 +57,7 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;
-import org.apache.avalon.meta.info.LoggerDescriptor;
+import org.apache.avalon.meta.info.CategoryDescriptor;
/**
* A doclet tag handler supporting 'logger' tags.
@@ -97,7 +97,7 @@
* LogEnabled interface.
* @return the set of logger descriptos
*/
- public LoggerDescriptor[] getLoggers()
+ public CategoryDescriptor[] getLoggers()
{
final JavaMethod[] methods =
getLifecycleMethods( "enableLogging", LOGGER_CLASS );
@@ -116,13 +116,13 @@
getNamedParameter( tags[ i ], NAME_PARAM, "" );
if( !marked.contains( name ) ){
- final LoggerDescriptor logger =
- new LoggerDescriptor( name, null );
+ final CategoryDescriptor logger =
+ new CategoryDescriptor( name, null );
loggers.add( logger );
marked.add( name );
}
}
}
- return (LoggerDescriptor[])loggers.toArray( new LoggerDescriptor[ loggers.size() ] );
+ return (CategoryDescriptor[])loggers.toArray( new CategoryDescriptor[ loggers.size() ] );
}
}
1.2 +3 -3 avalon-sandbox/meta/tools/src/test/org/apache/avalon/meta/MetaTestCase.java
Index: MetaTestCase.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/tools/src/test/org/apache/avalon/meta/MetaTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MetaTestCase.java 10 Jul 2003 12:10:43 -0000 1.1
+++ MetaTestCase.java 10 Jul 2003 21:19:09 -0000 1.2
@@ -15,7 +15,7 @@
import org.apache.avalon.meta.info.Type;
import org.apache.avalon.meta.info.ContextDescriptor;
import org.apache.avalon.meta.info.EntryDescriptor;
-import org.apache.avalon.meta.info.LoggerDescriptor;
+import org.apache.avalon.meta.info.CategoryDescriptor;
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.ServiceDescriptor;
import org.apache.avalon.meta.info.writer.*;
@@ -224,10 +224,10 @@
Type type = m_secondary;
assertTrue( "version", type.getInfo().getVersion().toString().equals( "2.4.0" ) );
assertTrue( "name", type.getInfo().getName().equals( "secondary-component" ) );
- LoggerDescriptor[] loggers = type.getLoggers();
+ CategoryDescriptor[] loggers = type.getLoggers();
if( loggers.length == 1 )
{
- LoggerDescriptor logger = loggers[0];
+ CategoryDescriptor logger = loggers[0];
if( !logger.getName().equals( "system" ) )
{
assertTrue( "Logger name is not system", false );
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org