You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/07/15 21:59:00 UTC

cvs commit: avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder TypeBuilder.java XMLLegacyCreator.java XMLTypeCreator.java

bloritsch    2003/07/15 12:59:00

  Modified:    meta/api/src/java/org/apache/avalon/meta/info
                        MetaInfoLocator.java
               meta/impl/src/java/org/apache/avalon/meta/info/builder
                        TypeBuilder.java XMLLegacyCreator.java
                        XMLTypeCreator.java
  Log:
  Change getClassName to getKey()
  
  Revision  Changes    Path
  1.2       +1 -1      avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/MetaInfoLocator.java
  
  Index: MetaInfoLocator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/meta/api/src/java/org/apache/avalon/meta/info/MetaInfoLocator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MetaInfoLocator.java	15 Jul 2003 19:15:56 -0000	1.1
  +++ MetaInfoLocator.java	15 Jul 2003 19:58:59 -0000	1.2
  @@ -67,7 +67,7 @@
        *
        * @return the class name
        */
  -    String getClassName();
  +    String getKey();
   
       /**
        * Get the required stream based on extension.  The extension is the "type" of
  
  
  
  1.4       +2 -2      avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/TypeBuilder.java
  
  Index: TypeBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/meta/impl/src/java/org/apache/avalon/meta/info/builder/TypeBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TypeBuilder.java	15 Jul 2003 19:15:56 -0000	1.3
  +++ TypeBuilder.java	15 Jul 2003 19:59:00 -0000	1.4
  @@ -233,7 +233,7 @@
               m_basePath = m_class.getName().replace('.', '/') + ".";
           }
   
  -        public String getClassName()
  +        public String getKey()
           {
               return m_class.getName();
           }
  
  
  
  1.5       +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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLLegacyCreator.java	15 Jul 2003 19:15:56 -0000	1.4
  +++ XMLLegacyCreator.java	15 Jul 2003 19:59:00 -0000	1.5
  @@ -129,7 +129,7 @@
           {
               final String message =
                 REZ.getString( "builder.bad-toplevel-block-element.error",
  -                   locator.getClassName(),
  +                   locator.getKey(),
                      topLevelName );
               throw new ConfigurationException( message );
           }
  @@ -138,7 +138,7 @@
   
           configuration = info.getChild( "block" );
           final InfoDescriptor descriptor =
  -            buildInfoDescriptor( locator.getClassName(), configuration );
  +            buildInfoDescriptor( locator.getKey(), configuration );
   
           configuration = info.getChild( "loggers" );
           final CategoryDescriptor[] loggers = new CategoryDescriptor[0];
  
  
  
  1.5       +3 -3      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLTypeCreator.java	15 Jul 2003 19:15:56 -0000	1.4
  +++ XMLTypeCreator.java	15 Jul 2003 19:59:00 -0000	1.5
  @@ -124,7 +124,7 @@
           {
               final String message =
                   REZ.getString( "builder.bad-toplevel-element.error",
  -                        locator.getClassName(),
  +                        locator.getKey(),
                                  topLevelName );
               throw new ConfigurationException( message );
           }
  @@ -140,7 +140,7 @@
           configuration = info.getChild( "info", false );
   
           final InfoDescriptor descriptor =
  -            buildInfoDescriptor( locator.getClassName(), configuration );
  +            buildInfoDescriptor( locator.getKey(), configuration );
   
           configuration = info.getChild( "loggers" );
           final CategoryDescriptor[] loggers = buildLoggers( configuration );
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org