Return-Path: 
 <avalon-cvs-return-7261-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 36023 invoked from network); 6 Jun 2002 03:48:09 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 6 Jun 2002 03:48:09 -0000
Received: (qmail 19412 invoked by uid 97); 6 Jun 2002 03:48:20 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 19347 invoked by uid 97); 6 Jun 2002 03:48:19 -0000
Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:avalon-cvs-subscribe@jakarta.apache.org>
List-Help: <mailto:avalon-cvs-help@jakarta.apache.org>
List-Post: <mailto:avalon-cvs@jakarta.apache.org>
List-Id: "Avalon CVS List" <avalon-cvs.jakarta.apache.org>
Reply-To: "Avalon Developers List" <avalon-dev@jakarta.apache.org>
Delivered-To: mailing list avalon-cvs@jakarta.apache.org
Received: (qmail 19333 invoked by uid 97); 6 Jun 2002 03:48:18 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 6 Jun 2002 03:48:04 -0000
Message-ID: <20020606034804.9129.qmail@icarus.apache.org>
From: donaldp@apache.org
To: jakarta-avalon-excalibur-cvs@apache.org
Subject: cvs commit:
 jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier
 AssemblyVerifier.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

donaldp     2002/06/05 20:48:04

  Modified:    containerkit/src/java/org/apache/excalibur/containerkit/verifier
                        AssemblyVerifier.java
  Log:
  Made a bunch of methods protected so that
  subclasses can overide them
  
  Revision  Changes    Path
  1.6       +27 -27    jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/AssemblyVerifier.java
  
  Index: AssemblyVerifier.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/AssemblyVerifier.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AssemblyVerifier.java	6 Jun 2002 03:38:55 -0000	1.5
  +++ AssemblyVerifier.java	6 Jun 2002 03:48:04 -0000	1.6
  @@ -44,7 +44,7 @@
    * </ul>
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.5 $ $Date: 2002/06/06 03:38:55 $
  + * @version $Revision: 1.6 $ $Date: 2002/06/06 03:48:04 $
    */
   public class AssemblyVerifier
       extends AbstractLogEnabled
  @@ -132,7 +132,7 @@
        * @param blocks the ComponentMetaData objects for the blocks
        * @throws VerifyException if an error occurs
        */
  -    private void verifyValidDependencies( final ComponentMetaData[] blocks )
  +    public void verifyValidDependencies( final ComponentMetaData[] blocks )
           throws VerifyException
       {
           for( int i = 0; i < blocks.length; i++ )
  @@ -147,7 +147,7 @@
        * @param components the ComponentMetaData objects for the components
        * @throws VerifyException if an error occurs
        */
  -    private void verifyNoCircularDependencies( final ComponentMetaData[] components )
  +    protected void verifyNoCircularDependencies( final ComponentMetaData[] components )
           throws VerifyException
       {
           for( int i = 0; i < components.length; i++ )
  @@ -167,9 +167,9 @@
        * @param components the ComponentMetaData objects for the components
        * @throws VerifyException if an error occurs
        */
  -    private void verifyNoCircularDependencies( final ComponentMetaData component,
  -                                               final ComponentMetaData[] components,
  -                                               final Stack stack )
  +    protected void verifyNoCircularDependencies( final ComponentMetaData component,
  +                                                 final ComponentMetaData[] components,
  +                                                 final Stack stack )
           throws VerifyException
       {
           final ComponentMetaData[] dependencies = getDependencies( component, components );
  @@ -201,8 +201,8 @@
        * @param stack the Stack
        * @return the path of dependency
        */
  -    private String getDependencyTrace( final ComponentMetaData component,
  -                                       final Stack stack )
  +    protected String getDependencyTrace( final ComponentMetaData component,
  +                                         final Stack stack )
       {
           final StringBuffer sb = new StringBuffer();
           sb.append( "[ " );
  @@ -240,8 +240,8 @@
        * @param components the total set of components in application
        * @return the dependencies of component
        */
  -    private ComponentMetaData[] getDependencies( final ComponentMetaData component,
  -                                                 final ComponentMetaData[] components )
  +    protected ComponentMetaData[] getDependencies( final ComponentMetaData component,
  +                                                   final ComponentMetaData[] components )
       {
           final ArrayList dependencies = new ArrayList();
           final DependencyMetaData[] deps = component.getDependencies();
  @@ -262,7 +262,7 @@
        * @param components the ComponentMetaData objects for the components
        * @throws VerifyException if an error occurs
        */
  -    private void verifyDependencyReferences( final ComponentMetaData[] components )
  +    protected void verifyDependencyReferences( final ComponentMetaData[] components )
           throws VerifyException
       {
           for( int i = 0; i < components.length; i++ )
  @@ -278,8 +278,8 @@
        * @param others the ComponentMetaData objects for the other components
        * @throws VerifyException if an error occurs
        */
  -    private void verifyDependencyReferences( final ComponentMetaData component,
  -                                             final ComponentMetaData[] others )
  +    protected void verifyDependencyReferences( final ComponentMetaData component,
  +                                               final ComponentMetaData[] others )
           throws VerifyException
       {
           final ComponentInfo info = component.getComponentInfo();
  @@ -326,8 +326,8 @@
        * @param components the array of Blocks to search
        * @return the Block if found, else null
        */
  -    private ComponentMetaData getComponentMetaData( final String name,
  -                                                    final ComponentMetaData[] components )
  +    protected ComponentMetaData getComponentMetaData( final String name,
  +                                                      final ComponentMetaData[] components )
       {
           for( int i = 0; i < components.length; i++ )
           {
  @@ -347,8 +347,8 @@
        * @param components the ComponentMetaData objects for the components
        * @throws VerifyException if an error occurs
        */
  -    private void verifyTypes( final ComponentMetaData[] components,
  -                              final ClassLoader classLoader )
  +    protected void verifyTypes( final ComponentMetaData[] components,
  +                                final ClassLoader classLoader )
           throws VerifyException
       {
           for( int i = 0; i < components.length; i++ )
  @@ -364,7 +364,7 @@
        * @param block the ComponentMetaData object for the blocks
        * @throws VerifyException if an error occurs
        */
  -    private void verifyType( final ComponentMetaData block, final ClassLoader classLoader )
  +    protected void verifyType( final ComponentMetaData block, final ClassLoader classLoader )
           throws VerifyException
       {
           final String name = block.getName();
  @@ -398,7 +398,7 @@
        * @param components the Components metadata
        * @throws VerifyException if an error occurs
        */
  -    private void verifyValidNames( final ComponentMetaData[] components )
  +    protected void verifyValidNames( final ComponentMetaData[] components )
           throws VerifyException
       {
           for( int i = 0; i < components.length; i++ )
  @@ -420,7 +420,7 @@
        * @param name the name to check
        * @return true if valid, false otherwise
        */
  -    private boolean isValidName( final String name )
  +    protected boolean isValidName( final String name )
       {
           final int size = name.length();
           for( int i = 0; i < size; i++ )
  @@ -444,7 +444,7 @@
        * @param components the Components
        * @throws VerifyException if an error occurs
        */
  -    private void checkNamesUnique( final ComponentMetaData[] components )
  +    protected void checkNamesUnique( final ComponentMetaData[] components )
           throws VerifyException
       {
           for( int i = 0; i < components.length; i++ )
  @@ -487,7 +487,7 @@
        * @param block the ComponentMetaData describing the block
        * @throws VerifyException if an error occurs
        */
  -    private void verifyDependenciesMap( final ComponentMetaData block )
  +    protected void verifyDependenciesMap( final ComponentMetaData block )
           throws VerifyException
       {
           //Make sure all role entries specified in config file are valid
  @@ -540,9 +540,9 @@
        * @return an array of Classes for all the services
        * @throws VerifyException if an error occurs
        */
  -    private Class[] getServiceClasses( final String name,
  -                                       final ServiceDescriptor[] services,
  -                                       final ClassLoader classLoader )
  +    protected Class[] getServiceClasses( final String name,
  +                                         final ServiceDescriptor[] services,
  +                                         final ClassLoader classLoader )
           throws VerifyException
       {
           final Class[] classes = new Class[ services.length ];
  @@ -576,8 +576,8 @@
        * @return true if candidate services contains a service that matches
        *         specified service, false otherwise
        */
  -    private boolean hasMatchingService( final ServiceDescriptor service,
  -                                        final ServiceDescriptor[] candidates )
  +    protected boolean hasMatchingService( final ServiceDescriptor service,
  +                                          final ServiceDescriptor[] candidates )
       {
           for( int i = 0; i < candidates.length; i++ )
           {
  
  
  

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