avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl ContextBuilder.java
Date Fri, 11 Jul 2003 12:07:13 GMT
mcconnell    2003/07/11 05:07:13

  Modified:    merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl
                        ContextBuilder.java
  Log:
  Sync. with Avalon Meta.
  
  Revision  Changes    Path
  1.3       +6 -6      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/ContextBuilder.java
  
  Index: ContextBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/impl/ContextBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContextBuilder.java	1 May 2003 10:45:23 -0000	1.2
  +++ ContextBuilder.java	11 Jul 2003 12:07:13 -0000	1.3
  @@ -224,7 +224,7 @@
                                   final String error =
                                           "Unable to build a context value for the entry:
'"
                                           + key + "' type: "
  -                                        + entry.getType();
  +                                        + entry.getClassname();
   
                                   if( entry.isRequired() )
                                   {
  @@ -246,7 +246,7 @@
                   try
                   {
                       boolean ok = objectImplementsType(
  -                            classloader, object, entry.getType() );
  +                            classloader, object, entry.getClassname() );
                       if( ok )
                       {
                           map.put( key, object );
  @@ -257,7 +257,7 @@
                                   + key + "' of class '"
                                   + object.getClass().getName()
                                   + "' does not implement the type '"
  -                                + entry.getType();
  +                                + entry.getClassname();
                           throw new ContextException( error );
                       }
                   } catch( ClassNotFoundException cnfe )
  @@ -265,7 +265,7 @@
                       final String error =
                               "Context criteria for the key '" + key
                               + "' specifies an unknown type '"
  -                            + entry.getType() + "'.";
  +                            + entry.getClassname() + "'.";
                       throw new ContextException( error );
                   }
               } else
  @@ -275,7 +275,7 @@
                       final String error =
                               "Unable to resolve a context value for the entry: '"
                               + key + "' type: "
  -                            + entry.getType();
  +                            + entry.getClassname();
                       throw new ContextException( error );
                   }
               }
  
  
  

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


Mime
View raw message