donaldp     2002/06/25 00:41:37

  Modified:    containerkit/src/java/org/apache/excalibur/containerkit/verifier
                        MetaDataVerifier.java
  Log:
  Use utility method to get to classname of component
  
  Revision  Changes    Path
  1.5       +16 -5     
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/MetaDataVerifier.java
  
  Index: MetaDataVerifier.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/MetaDataVerifier.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MetaDataVerifier.java     23 Jun 2002 14:58:26 -0000      1.4
  +++ MetaDataVerifier.java     25 Jun 2002 07:41:37 -0000      1.5
  @@ -139,7 +139,7 @@
                   final String message =
                       REZ.getString( "metadata.declare-uneeded-entrys.error",
                                      component.getName(),
  -                                   component.getClassname() );
  +                                   getClassname( component ) );
                   throw new VerifyException( message );
               }
           }
  @@ -171,7 +171,7 @@
                   final String message =
                       REZ.getString( "metadata.declare-uneeded-deps.error",
                                      component.getName(),
  -                                   component.getClassname() );
  +                                   getClassname( component ) );
                   throw new VerifyException( message );
               }
           }
  @@ -231,17 +231,28 @@
           Class clazz = null;
           try
           {
  -            clazz = classLoader.loadClass( component.getClassname() );
  +            clazz = classLoader.loadClass( getClassname( component ) );
           }
           catch( final Exception e )
           {
               final String message =
                   REZ.getString( "assembly.bad-class.error",
                                  component.getName(),
  -                               component.getClassname(),
  +                               getClassname( component ),
                                  e.toString() );
               throw new VerifyException( message );
           }
           return clazz;
  +    }
  +
  +    /**
  +     * Utility method to aquire classname for component.
  +     *
  +     * @param component the component
  +     * @return the classname for component
  +     */
  +    private String getClassname( final ComponentMetaData component )
  +    {
  +        return 
component.getComponentInfo().getComponentDescriptor().getImplementationKey();
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to