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/meta/src/java/org/apache/avalon/meta/model/verifier ProfileVerifier.java
Date Mon, 14 Jul 2003 22:44:13 GMT
mcconnell    2003/07/14 15:44:13

  Modified:    merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl
                        DefaultTypeRepository.java
               merlin/composition/src/java/org/apache/avalon/composition/model/impl
                        DefaultTypeRepository.java
               merlin/meta/src/java/org/apache/avalon/meta/model/verifier
                        ProfileVerifier.java
  Log:
  Shift component type implementation class verifier from Merlin to Avalon Meta.
  
  Revision  Changes    Path
  1.7       +3 -3      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/DefaultTypeRepository.java
  
  Index: DefaultTypeRepository.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/DefaultTypeRepository.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultTypeRepository.java	14 Jul 2003 22:02:37 -0000	1.6
  +++ DefaultTypeRepository.java	14 Jul 2003 22:44:13 -0000	1.7
  @@ -68,7 +68,7 @@
   import org.apache.avalon.meta.info.ExtensionDescriptor;
   import org.apache.avalon.meta.info.Type;
   import org.apache.avalon.meta.info.builder.TypeBuilder;
  -import org.apache.avalon.meta.verifier.ComponentVerifier;
  +import org.apache.avalon.meta.info.verifier.TypeVerifier;
   
   /**
    * A type manager implemetation provides support for the creation,
  @@ -378,7 +378,7 @@
           Class clazz = getComponentClass( type );
           Class[] classes = getServiceClasses( type );
           Class[] lifecycleExtensions = getExtensionClasses( type );
  -        ComponentVerifier verifier = new ComponentVerifier();
  +        TypeVerifier verifier = new TypeVerifier();
           verifier.verifyComponent( name, clazz, classes );
       }
   
  
  
  
  1.8       +1 -3      avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java
  
  Index: DefaultTypeRepository.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultTypeRepository.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultTypeRepository.java	14 Jul 2003 22:03:43 -0000	1.7
  +++ DefaultTypeRepository.java	14 Jul 2003 22:44:13 -0000	1.8
  @@ -75,8 +75,6 @@
   import org.apache.avalon.meta.info.ExtensionDescriptor;
   import org.apache.avalon.meta.info.StageDescriptor;
   import org.apache.avalon.meta.info.Type;
  -import org.apache.avalon.meta.info.builder.TypeBuilder;
  -import org.apache.avalon.meta.verifier.ComponentVerifier;
   
   /**
    * A type manager implemetation provides support for the creation,
  
  
  
  1.2       +9 -9      avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/verifier/ProfileVerifier.java
  
  Index: ProfileVerifier.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/verifier/ProfileVerifier.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ProfileVerifier.java	13 Mar 2003 01:06:09 -0000	1.1
  +++ ProfileVerifier.java	14 Jul 2003 22:44:13 -0000	1.2
  @@ -59,8 +59,8 @@
   import org.apache.avalon.meta.info.ServiceDescriptor;
   import org.apache.avalon.meta.info.StageDescriptor;
   import org.apache.avalon.meta.info.Type;
  -import org.apache.avalon.meta.verifier.ComponentVerifier;
  -import org.apache.avalon.meta.verifier.VerifyException;
  +import org.apache.avalon.meta.info.verifier.TypeVerifier;
  +import org.apache.avalon.meta.info.verifier.VerifyException;
   
   /**
    * This Class verifies that an implementation is valid wrt the
  @@ -72,7 +72,7 @@
    *   <li>Verify that the Class objects for Component implement the
    *       service interfaces.</li>
    *   <li>Verify that the Class is a valid Avalon Component as per the
  - *       rules in {@link ComponentVerifier} object.</li>
  + *       rules in {@link TypeVerifier} object.</li>
    *   <li>Verify that the Class is Composable/Serviceable if and only if
    *       dependencies are declared.</li>
    *   <li>Verify that the Class is Contextualizable if and context
  @@ -90,21 +90,21 @@
       /**
        * The verifier for components in assembly.
        */
  -    private final ComponentVerifier m_verifier;
  +    private final TypeVerifier m_verifier;
   
       /**
  -     * Create an MetaDataVerifier using base Componert ComponentVerifier.
  +     * Create an MetaDataVerifier using base componert TypeVerifier.
        */
       public ProfileVerifier()
       {
  -        this( new ComponentVerifier() );
  +        this( new TypeVerifier() );
       }
   
       /**
  -     * Create an AssemblyVerifier using specified Component ComponentVerifier.
  +     * Create an AssemblyVerifier using specified Component TypeVerifier.
        * @param verifier the component verifier used by the meta-data verifier
        */
  -    public ProfileVerifier( final ComponentVerifier verifier )
  +    public ProfileVerifier( final TypeVerifier verifier )
       {
           if( null == verifier )
           {
  
  
  

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


Mime
View raw message